From 74736637c8e4066d203d6538d14c650760f9c796 Mon Sep 17 00:00:00 2001 From: Akira Matsuda Date: Wed, 20 Apr 2011 07:50:22 +0900 Subject: [PATCH] from jeweler to bundler because combination of gemspec method and jeweler task caused circular dependency in the generated metadata --- .gitignore | 46 +-------- Gemfile | 3 + Gemfile.lock | 147 ----------------------------- Rakefile | 50 +--------- VERSION | 1 - kaminari.gemspec | 201 ++++++---------------------------------- lib/kaminari.rb | 1 - lib/kaminari/version.rb | 2 +- 8 files changed, 38 insertions(+), 413 deletions(-) delete mode 100644 Gemfile.lock delete mode 100644 VERSION diff --git a/.gitignore b/.gitignore index 347e06f..d7452db 100644 --- a/.gitignore +++ b/.gitignore @@ -1,45 +1,7 @@ -# rcov generated -coverage - -# rdoc generated -rdoc - -# yard generated -doc -.yardoc - -# bundler +*.gem .bundle +Gemfile.lock +pkg/* -# jeweler generated -pkg - -# log +doc log - -# Have editor/IDE/OS specific files you need to ignore? Consider using a global gitignore: -# -# * Create a file at ~/.gitignore -# * Include files you want ignored -# * Run: git config --global core.excludesfile ~/.gitignore -# -# After doing this, these files will be ignored in all your git projects, -# saving you from having to 'pollute' every project you touch with them -# -# Not sure what to needs to be ignored for particular editors/OSes? Here's some ideas to get you started. (Remember, remove the leading # of the line) -# -# For MacOS: -# -#.DS_Store -# -# For TextMate -#*.tmproj -#tmtags -# -# For emacs: -#*~ -#\#* -#.\#* -# -# For vim: -#*.swp diff --git a/Gemfile b/Gemfile index e0a7662..e90d1af 100644 --- a/Gemfile +++ b/Gemfile @@ -1 +1,4 @@ +source "http://rubygems.org" + +# Specify your gem's dependencies in kaminari.gemspec gemspec diff --git a/Gemfile.lock b/Gemfile.lock deleted file mode 100644 index 763bc87..0000000 --- a/Gemfile.lock +++ /dev/null @@ -1,147 +0,0 @@ -PATH - remote: . - specs: - kaminari (0.11.0) - kaminari - -GEM - specs: - abstract (1.0.0) - actionmailer (3.0.7) - actionpack (= 3.0.7) - mail (~> 2.2.15) - actionpack (3.0.7) - activemodel (= 3.0.7) - activesupport (= 3.0.7) - builder (~> 2.1.2) - erubis (~> 2.6.6) - i18n (~> 0.5.0) - rack (~> 1.2.1) - rack-mount (~> 0.6.14) - rack-test (~> 0.5.7) - tzinfo (~> 0.3.23) - activemodel (3.0.7) - activesupport (= 3.0.7) - builder (~> 2.1.2) - i18n (~> 0.5.0) - activerecord (3.0.7) - activemodel (= 3.0.7) - activesupport (= 3.0.7) - arel (~> 2.0.2) - tzinfo (~> 0.3.23) - activeresource (3.0.7) - activemodel (= 3.0.7) - activesupport (= 3.0.7) - activesupport (3.0.7) - arel (2.0.9) - bson (1.3.0) - builder (2.1.2) - capybara (0.4.1.2) - celerity (>= 0.7.9) - culerity (>= 0.2.4) - mime-types (>= 1.16) - nokogiri (>= 1.3.3) - rack (>= 1.0.0) - rack-test (>= 0.5.4) - selenium-webdriver (>= 0.0.27) - xpath (~> 0.1.3) - celerity (0.8.9) - childprocess (0.1.8) - ffi (~> 1.0.6) - culerity (0.2.15) - database_cleaner (0.6.6) - diff-lcs (1.1.2) - erubis (2.6.6) - abstract (>= 1.0.0) - ffi (1.0.7) - rake (>= 0.8.7) - git (1.2.5) - i18n (0.5.0) - jeweler (1.5.2) - bundler (~> 1.0.0) - git (>= 1.2.5) - rake - json_pure (1.5.1) - mail (2.2.17) - activesupport (>= 2.3.6) - i18n (>= 0.4.0) - mime-types (~> 1.16) - treetop (~> 1.4.8) - mime-types (1.16) - mongo (1.3.0) - bson (>= 1.3.0) - mongoid (2.0.1) - activemodel (~> 3.0) - mongo (~> 1.3) - tzinfo (~> 0.3.22) - will_paginate (~> 3.0.pre) - nokogiri (1.4.4) - polyglot (0.3.1) - rack (1.2.2) - rack-mount (0.6.14) - rack (>= 1.0.0) - rack-test (0.5.7) - rack (>= 1.0) - rails (3.0.7) - actionmailer (= 3.0.7) - actionpack (= 3.0.7) - activerecord (= 3.0.7) - activeresource (= 3.0.7) - activesupport (= 3.0.7) - bundler (~> 1.0) - railties (= 3.0.7) - railties (3.0.7) - actionpack (= 3.0.7) - activesupport (= 3.0.7) - rake (>= 0.8.7) - thor (~> 0.14.4) - rake (0.8.7) - rcov (0.9.9) - rr (1.0.2) - rspec (2.5.0) - rspec-core (~> 2.5.0) - rspec-expectations (~> 2.5.0) - rspec-mocks (~> 2.5.0) - rspec-core (2.5.1) - rspec-expectations (2.5.0) - diff-lcs (~> 1.1.2) - rspec-mocks (2.5.0) - rspec-rails (2.5.0) - actionpack (~> 3.0) - activesupport (~> 3.0) - railties (~> 3.0) - rspec (~> 2.5.0) - rubyzip (0.9.4) - selenium-webdriver (0.1.4) - childprocess (>= 0.1.7) - ffi (>= 1.0.7) - json_pure - rubyzip - sqlite3 (1.3.3) - steak (1.1.0) - rspec (>= 1.3) - thor (0.14.6) - treetop (1.4.9) - polyglot (>= 0.3.1) - tzinfo (0.3.26) - will_paginate (3.0.pre2) - xpath (0.1.3) - nokogiri (~> 1.3) - -PLATFORMS - ruby - -DEPENDENCIES - bundler (>= 1.0.0) - capybara - database_cleaner - jeweler - kaminari! - mongoid (>= 2) - rails (>= 3.0.0) - rcov - rr - rspec - rspec-rails - sqlite3 - steak diff --git a/Rakefile b/Rakefile index 5ea8d60..1468421 100644 --- a/Rakefile +++ b/Rakefile @@ -1,42 +1,7 @@ # encoding: utf-8 -require 'rubygems' require 'bundler' -begin - Bundler.setup(:default, :development) -rescue Bundler::BundlerError => e - $stderr.puts e.message - $stderr.puts "Run `bundle install` to install missing gems" - exit e.status_code -end -require 'rake' - -require 'jeweler' -Jeweler::Tasks.new do |gem| - # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options - gem.name = "kaminari" - gem.homepage = "http://github.com/amatsuda/kaminari" - gem.license = "MIT" - gem.summary = 'A pagination engine plugin for Rails 3' - gem.description = 'Kaminari is a Scope & Engine based, clean, powerful, customizable and sophisticated paginator for Rails 3' - gem.email = "ronnie@dio.jp" - gem.authors = ["Akira Matsuda"] - # Include your dependencies below. Runtime dependencies are required when using your gem, - # and development dependencies are only needed for development (ie running rake tasks, tests, etc) - gem.add_development_dependency 'rails', '>= 3.0.0' - gem.add_development_dependency 'bundler', '>= 1.0.0' - gem.add_development_dependency 'sqlite3' - gem.add_development_dependency 'mongoid', '>= 2' - gem.add_development_dependency 'rspec' - gem.add_development_dependency 'rspec-rails' - gem.add_development_dependency 'rr' - gem.add_development_dependency 'steak' - gem.add_development_dependency 'capybara' - gem.add_development_dependency 'database_cleaner' - gem.add_development_dependency 'rcov' - gem.add_development_dependency 'jeweler' -end -Jeweler::RubygemsDotOrgTasks.new +Bundler::GemHelper.install_tasks require 'rspec/core' require 'rspec/core/rake_task' @@ -44,23 +9,14 @@ RSpec::Core::RakeTask.new(:spec) do |spec| spec.pattern = FileList['spec/**/*_spec.rb'] end -RSpec::Core::RakeTask.new(:rcov) do |spec| - spec.pattern = 'spec/**/*_spec.rb' - spec.rcov = true -end - task :default => :spec require 'rake/rdoctask' Rake::RDocTask.new do |rdoc| - version = File.exist?('VERSION') ? File.read('VERSION') : "" + require 'kaminari/version' rdoc.rdoc_dir = 'rdoc' - rdoc.title = "kaminari #{version}" + rdoc.title = "kaminari #{Kaminari::VERSION}" rdoc.rdoc_files.include('README*') rdoc.rdoc_files.include('lib/**/*.rb') end - -task :test do - Rake::Task[:spec].invoke -end diff --git a/VERSION b/VERSION deleted file mode 100644 index 142464b..0000000 --- a/VERSION +++ /dev/null @@ -1 +0,0 @@ -0.11.0 \ No newline at end of file diff --git a/kaminari.gemspec b/kaminari.gemspec index c4afff0..202f25d 100644 --- a/kaminari.gemspec +++ b/kaminari.gemspec @@ -1,181 +1,34 @@ -# Generated by jeweler -# DO NOT EDIT THIS FILE DIRECTLY -# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec' # -*- encoding: utf-8 -*- +$:.push File.expand_path("../lib", __FILE__) +require "kaminari/version" Gem::Specification.new do |s| - s.name = %q{kaminari} - s.version = "0.11.0" + s.name = 'kaminari' + s.version = Kaminari::VERSION + s.platform = Gem::Platform::RUBY + s.authors = ['Akira Matsuda'] + s.email = ['ronnie@dio.jp'] + s.homepage = 'https://github.com/amatsuda/kaminari' + s.summary = 'A pagination engine plugin for Rails 3' + s.description = 'Kaminari is a Scope & Engine based, clean, powerful, customizable and sophisticated paginator for Rails 3' - s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= - s.authors = ["Akira Matsuda"] - s.date = %q{2011-04-19} - s.description = %q{Kaminari is a Scope & Engine based, clean, powerful, customizable and sophisticated paginator for Rails 3} - s.email = %q{ronnie@dio.jp} - s.extra_rdoc_files = [ - "LICENSE.txt", - "README.rdoc" - ] - s.files = [ - ".document", - ".gemtest", - ".rspec", - "CHANGELOG", - "Gemfile", - "Gemfile.lock", - "LICENSE.txt", - "README.rdoc", - "Rakefile", - "VERSION", - "app/views/kaminari/_first_page.html.erb", - "app/views/kaminari/_first_page.html.haml", - "app/views/kaminari/_gap.html.erb", - "app/views/kaminari/_gap.html.haml", - "app/views/kaminari/_last_page.html.erb", - "app/views/kaminari/_last_page.html.haml", - "app/views/kaminari/_next_page.html.erb", - "app/views/kaminari/_next_page.html.haml", - "app/views/kaminari/_page.html.erb", - "app/views/kaminari/_page.html.haml", - "app/views/kaminari/_paginator.html.erb", - "app/views/kaminari/_paginator.html.haml", - "app/views/kaminari/_prev_page.html.erb", - "app/views/kaminari/_prev_page.html.haml", - "config/locales/kaminari.yml", - "kaminari.gemspec", - "lib/generators/kaminari/views_generator.rb", - "lib/kaminari.rb", - "lib/kaminari/engine.rb", - "lib/kaminari/helpers/action_view_extension.rb", - "lib/kaminari/helpers/paginator.rb", - "lib/kaminari/helpers/tags.rb", - "lib/kaminari/models/active_record_extension.rb", - "lib/kaminari/models/active_record_relation_methods.rb", - "lib/kaminari/models/configuration_methods.rb", - "lib/kaminari/models/mongoid_criteria_methods.rb", - "lib/kaminari/models/mongoid_extension.rb", - "lib/kaminari/models/page_scope_methods.rb", - "lib/kaminari/railtie.rb", - "lib/kaminari/version.rb", - "spec/acceptance/acceptance_helper.rb", - "spec/acceptance/support/helpers.rb", - "spec/acceptance/support/paths.rb", - "spec/acceptance/users_spec.rb", - "spec/fake_app.rb", - "spec/helpers/helpers_spec.rb", - "spec/helpers/tags_spec.rb", - "spec/models/active_record_relation_methods_spec.rb", - "spec/models/default_per_page_spec.rb", - "spec/models/mongoid_spec.rb", - "spec/models/scopes_spec.rb", - "spec/spec_helper.rb", - "spec/support/database_cleaner.rb", - "spec/support/matchers.rb" - ] - s.homepage = %q{http://github.com/amatsuda/kaminari} - s.licenses = ["MIT"] - s.require_paths = ["lib"] - s.rubygems_version = %q{1.7.2} - s.summary = %q{A pagination engine plugin for Rails 3} - s.test_files = [ - "spec/acceptance/acceptance_helper.rb", - "spec/acceptance/support/helpers.rb", - "spec/acceptance/support/paths.rb", - "spec/acceptance/users_spec.rb", - "spec/fake_app.rb", - "spec/helpers/helpers_spec.rb", - "spec/helpers/tags_spec.rb", - "spec/models/active_record_relation_methods_spec.rb", - "spec/models/default_per_page_spec.rb", - "spec/models/mongoid_spec.rb", - "spec/models/scopes_spec.rb", - "spec/spec_helper.rb", - "spec/support/database_cleaner.rb", - "spec/support/matchers.rb" - ] + s.rubyforge_project = 'kaminari' - if s.respond_to? :specification_version then - s.specification_version = 3 + s.files = `git ls-files`.split("\n") + s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n") + s.extra_rdoc_files = ['README.rdoc'] + s.require_paths = ['lib'] - if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then - s.add_runtime_dependency(%q, [">= 0"]) - s.add_development_dependency(%q, [">= 3.0.0"]) - s.add_development_dependency(%q, [">= 1.0.0"]) - s.add_development_dependency(%q, [">= 0"]) - s.add_development_dependency(%q, [">= 2"]) - s.add_development_dependency(%q, [">= 0"]) - s.add_development_dependency(%q, [">= 0"]) - s.add_development_dependency(%q, [">= 0"]) - s.add_development_dependency(%q, [">= 0"]) - s.add_development_dependency(%q, [">= 0"]) - s.add_development_dependency(%q, [">= 0"]) - s.add_development_dependency(%q, [">= 0"]) - s.add_development_dependency(%q, [">= 0"]) - s.add_development_dependency(%q, [">= 3.0.0"]) - s.add_development_dependency(%q, [">= 1.0.0"]) - s.add_development_dependency(%q, [">= 0"]) - s.add_development_dependency(%q, [">= 2"]) - s.add_development_dependency(%q, [">= 0"]) - s.add_development_dependency(%q, [">= 0"]) - s.add_development_dependency(%q, [">= 0"]) - s.add_development_dependency(%q, [">= 0"]) - s.add_development_dependency(%q, [">= 0"]) - s.add_development_dependency(%q, [">= 0"]) - s.add_development_dependency(%q, [">= 0"]) - s.add_development_dependency(%q, [">= 0"]) - else - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 3.0.0"]) - s.add_dependency(%q, [">= 1.0.0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 2"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 3.0.0"]) - s.add_dependency(%q, [">= 1.0.0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 2"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - end - else - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 3.0.0"]) - s.add_dependency(%q, [">= 1.0.0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 2"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 3.0.0"]) - s.add_dependency(%q, [">= 1.0.0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 2"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - end + s.licenses = ['MIT'] + + s.add_dependency 'rails', ['>= 3.0.0'] + s.add_development_dependency 'bundler', ['>= 1.0.0'] + s.add_development_dependency 'sqlite3', ['>= 0'] + s.add_development_dependency 'mongoid', ['>= 2'] + s.add_development_dependency 'rspec', ['>= 0'] + s.add_development_dependency 'rspec-rails', ['>= 0'] + s.add_development_dependency 'rr', ['>= 0'] + s.add_development_dependency 'steak', ['>= 0'] + s.add_development_dependency 'capybara', ['>= 0'] + s.add_development_dependency 'database_cleaner', ['>= 0'] end - diff --git a/lib/kaminari.rb b/lib/kaminari.rb index e84a96d..fe4d6f7 100644 --- a/lib/kaminari.rb +++ b/lib/kaminari.rb @@ -1,3 +1,2 @@ -require File.join(File.dirname(__FILE__), 'kaminari/version') require File.join(File.dirname(__FILE__), 'kaminari/railtie') require File.join(File.dirname(__FILE__), 'kaminari/engine') diff --git a/lib/kaminari/version.rb b/lib/kaminari/version.rb index 3c9d6be..1e93694 100644 --- a/lib/kaminari/version.rb +++ b/lib/kaminari/version.rb @@ -1,3 +1,3 @@ module Kaminari - VERSION = File.read File.join(File.dirname(__FILE__), '../../VERSION') + VERSION = '0.11.1' end