From b0b9add34dbc1c4ce9ff677e0cb9d105ac39a0ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Tapaj=C3=B3s?= Date: Sun, 16 Jan 2011 22:43:07 -0200 Subject: [PATCH] Using bundler --- Rakefile | 28 +------- couchrest_model.gemspec | 153 ++++------------------------------------ spec/spec_helper.rb | 1 + 3 files changed, 18 insertions(+), 164 deletions(-) diff --git a/Rakefile b/Rakefile index d14a28f..d4abc8a 100644 --- a/Rakefile +++ b/Rakefile @@ -1,3 +1,6 @@ +require 'bundler' +Bundler::GemHelper.install_tasks + require 'rake' require "rake/rdoctask" @@ -12,31 +15,6 @@ EOS exit(0) end -begin - require 'jeweler' - Jeweler::Tasks.new do |gemspec| - gemspec.name = "couchrest_model" - gemspec.summary = "Extends the CouchRest Document for advanced modelling." - gemspec.description = "CouchRest Model provides aditional features to the standard CouchRest Document class such as properties, view designs, associations, callbacks, typecasting and validations." - gemspec.email = "jchris@apache.org" - gemspec.homepage = "http://github.com/couchrest/couchrest_model" - gemspec.authors = ["J. Chris Anderson", "Matt Aimonetti", "Marcos Tapajos", "Will Leinweber", "Sam Lown"] - gemspec.extra_rdoc_files = %w( README.md LICENSE THANKS.md ) - gemspec.files = %w( VERSION LICENSE README.md Rakefile THANKS.md history.txt couchrest.gemspec) + Dir["{examples,lib,spec}/**/*"] - Dir["spec/tmp"] - gemspec.has_rdoc = true - gemspec.add_dependency("couchrest", "~> 1.0.1") - gemspec.add_dependency("mime-types", "~> 1.15") - gemspec.add_dependency("activemodel", "~> 3.0.0") - gemspec.add_dependency("tzinfo", "~> 0.3.22") - gemspec.add_dependency('railties', "~> 3.0.0") - gemspec.add_development_dependency('rspec', '>= 2.0.0') - gemspec.date = Time.now.strftime("%Y-%m-%d") - gemspec.require_path = "lib" - end -rescue LoadError - puts "Jeweler not available. Install it with: gem install jeweler" -end - desc "Run all specs" Rspec::Core::RakeTask.new(:spec) do |spec| spec.rspec_opts = ["--color"] diff --git a/couchrest_model.gemspec b/couchrest_model.gemspec index dfa0335..b117cec 100644 --- a/couchrest_model.gemspec +++ b/couchrest_model.gemspec @@ -1,6 +1,3 @@ -# Generated by jeweler -# DO NOT EDIT THIS FILE DIRECTLY -# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec' # -*- encoding: utf-8 -*- Gem::Specification.new do |s| @@ -17,144 +14,22 @@ Gem::Specification.new do |s| "README.md", "THANKS.md" ] - s.files = [ - "LICENSE", - "README.md", - "Rakefile", - "THANKS.md", - "VERSION", - "history.txt", - "lib/couchrest/model.rb", - "lib/couchrest/model/associations.rb", - "lib/couchrest/model/base.rb", - "lib/couchrest/model/callbacks.rb", - "lib/couchrest/model/casted_array.rb", - "lib/couchrest/model/casted_model.rb", - "lib/couchrest/model/class_proxy.rb", - "lib/couchrest/model/collection.rb", - "lib/couchrest/model/configuration.rb", - "lib/couchrest/model/design_doc.rb", - "lib/couchrest/model/document_queries.rb", - "lib/couchrest/model/errors.rb", - "lib/couchrest/model/extended_attachments.rb", - "lib/couchrest/model/persistence.rb", - "lib/couchrest/model/properties.rb", - "lib/couchrest/model/property.rb", - "lib/couchrest/model/property_protection.rb", - "lib/couchrest/model/support/couchrest.rb", - "lib/couchrest/model/support/hash.rb", - "lib/couchrest/model/typecast.rb", - "lib/couchrest/model/validations.rb", - "lib/couchrest/model/validations/casted_model.rb", - "lib/couchrest/model/validations/locale/en.yml", - "lib/couchrest/model/validations/uniqueness.rb", - "lib/couchrest/model/view.rb", - "lib/couchrest/model/views.rb", - "lib/couchrest/railtie.rb", - "lib/couchrest_model.rb", - "lib/rails/generators/couchrest_model.rb", - "lib/rails/generators/couchrest_model/model/model_generator.rb", - "lib/rails/generators/couchrest_model/model/templates/model.rb", - "spec/couchrest/assocations_spec.rb", - "spec/couchrest/attachment_spec.rb", - "spec/couchrest/base_spec.rb", - "spec/couchrest/casted_model_spec.rb", - "spec/couchrest/casted_spec.rb", - "spec/couchrest/class_proxy_spec.rb", - "spec/couchrest/configuration_spec.rb", - "spec/couchrest/inherited_spec.rb", - "spec/couchrest/persistence_spec.rb", - "spec/couchrest/property_protection_spec.rb", - "spec/couchrest/property_spec.rb", - "spec/couchrest/subclass_spec.rb", - "spec/couchrest/validations.rb", - "spec/couchrest/view_spec.rb", - "spec/fixtures/attachments/README", - "spec/fixtures/attachments/couchdb.png", - "spec/fixtures/attachments/test.html", - "spec/fixtures/base.rb", - "spec/fixtures/more/article.rb", - "spec/fixtures/more/card.rb", - "spec/fixtures/more/cat.rb", - "spec/fixtures/more/client.rb", - "spec/fixtures/more/course.rb", - "spec/fixtures/more/event.rb", - "spec/fixtures/more/invoice.rb", - "spec/fixtures/more/person.rb", - "spec/fixtures/more/question.rb", - "spec/fixtures/more/sale_entry.rb", - "spec/fixtures/more/sale_invoice.rb", - "spec/fixtures/more/service.rb", - "spec/fixtures/more/user.rb", - "spec/fixtures/views/lib.js", - "spec/fixtures/views/test_view/lib.js", - "spec/fixtures/views/test_view/only-map.js", - "spec/fixtures/views/test_view/test-map.js", - "spec/fixtures/views/test_view/test-reduce.js", - "spec/spec_helper.rb" - ] s.homepage = %q{http://github.com/couchrest/couchrest_model} - s.require_paths = ["lib"] s.rubygems_version = %q{1.3.7} s.summary = %q{Extends the CouchRest Document for advanced modelling.} - s.test_files = [ - "spec/couchrest/assocations_spec.rb", - "spec/couchrest/attachment_spec.rb", - "spec/couchrest/base_spec.rb", - "spec/couchrest/casted_model_spec.rb", - "spec/couchrest/casted_spec.rb", - "spec/couchrest/class_proxy_spec.rb", - "spec/couchrest/configuration_spec.rb", - "spec/couchrest/inherited_spec.rb", - "spec/couchrest/persistence_spec.rb", - "spec/couchrest/property_protection_spec.rb", - "spec/couchrest/property_spec.rb", - "spec/couchrest/subclass_spec.rb", - "spec/couchrest/validations.rb", - "spec/couchrest/view_spec.rb", - "spec/fixtures/base.rb", - "spec/fixtures/more/article.rb", - "spec/fixtures/more/card.rb", - "spec/fixtures/more/cat.rb", - "spec/fixtures/more/client.rb", - "spec/fixtures/more/course.rb", - "spec/fixtures/more/event.rb", - "spec/fixtures/more/invoice.rb", - "spec/fixtures/more/person.rb", - "spec/fixtures/more/question.rb", - "spec/fixtures/more/sale_entry.rb", - "spec/fixtures/more/sale_invoice.rb", - "spec/fixtures/more/service.rb", - "spec/fixtures/more/user.rb", - "spec/spec_helper.rb" - ] - - if s.respond_to? :specification_version then - current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION - s.specification_version = 3 - - if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then - s.add_runtime_dependency(%q, ["~> 1.0.1"]) - s.add_runtime_dependency(%q, ["~> 1.15"]) - s.add_runtime_dependency(%q, ["~> 3.0.0"]) - s.add_runtime_dependency(%q, ["~> 0.3.22"]) - s.add_runtime_dependency(%q, ["~> 3.0.0"]) - s.add_development_dependency(%q, [">= 2.0.0"]) - else - s.add_dependency(%q, ["~> 1.0.1"]) - s.add_dependency(%q, ["~> 1.15"]) - s.add_dependency(%q, ["~> 3.0.0"]) - s.add_dependency(%q, ["~> 0.3.22"]) - s.add_dependency(%q, ["~> 3.0.0"]) - s.add_dependency(%q, [">= 2.0.0"]) - end - else - s.add_dependency(%q, ["~> 1.0.1"]) - s.add_dependency(%q, ["~> 1.15"]) - s.add_dependency(%q, ["~> 3.0.0"]) - s.add_dependency(%q, ["~> 0.3.22"]) - s.add_dependency(%q, ["~> 3.0.0"]) - s.add_dependency(%q, [">= 2.0.0"]) - end + + s.files = `git ls-files`.split("\n") + s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n") + s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) } + s.require_paths = ["lib"] + + s.add_dependency(%q, "~> 1.0.1") + s.add_dependency(%q, "~> 1.15") + s.add_dependency(%q, "~> 3.0.0") + s.add_dependency(%q, "~> 0.3.22") + s.add_dependency(%q, "~> 3.0.0") + s.add_dependency(%q, ">= 2.0.0") + s.add_development_dependency(%q, ">= 2.0.0") + s.add_development_dependency(%q, ">= 0.5.7") end diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index fdcadba..3a865b5 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,3 +1,4 @@ +require "bundler/setup" require "rubygems" require "rspec" # Satisfies Autotest and anyone else not using the Rake tasks