Permalink
Browse files

Merge pull request #101 from gardelea/gemspec_bundler_approach

removing jeweler
  • Loading branch information...
2 parents 7451f6f + 79f3348 commit 7afcfd37f85abad62eabc2a20c2bb61b939c0e00 @bmabey bmabey committed Apr 19, 2012
View
@@ -10,3 +10,11 @@ rerun.txt
.bundle
.rvmrc
bundle
+
+# i guess these are needed to remove some file copying clutter
+# that comes out of testing and is not intended to be checked in
+examples/rails_root/features/step_definitions/email_steps.rb
+examples/rails_root/vendor/plugins/email_spec
+examples/rails3_root/features/step_definitions/email_steps.rb
+examples/rails3_root/vendor/plugins/email_spec
+examples/sinatra_root/features/step_definitions/email_steps.rb
View
@@ -2,4 +2,4 @@ rvm:
- 1.9.2
branches:
only:
- - master
+ - gemspec_bundler_approach
View
43 Gemfile
@@ -1,25 +1,24 @@
-source 'http://gemcutter.org'
-#TODO: move these all over to the gemspec (via the Rakefile, except for maybe jeweler?)
-gem "rake", ">= 0.8.7"
-gem "jeweler"
-gem "cucumber"
-gem "cucumber-rails"
-gem "cucumber-sinatra"
-gem "rspec-rails", ">= 2.0.1"
-gem 'delayed_job', '~> 2.0'
-gem "mimetype-fu", :require=> 'mimetype_fu'
-gem "pony"
-gem "sinatra"
-gem "rack-test"
-gem "mail"
-gem 'rails', '3.0.7'
-gem 'sqlite3-ruby', :require=>'sqlite3'
-#gem 'email_spec', :path => '.'
-gem 'capybara'
-gem 'database_cleaner'
+source 'http://rubygems.org'
-gem "test-unit"
+group :development, :test do
+ gem "rake", ">= 0.8.7"
+ gem "cucumber"
+ gem "cucumber-rails", :require => false
+ gem "cucumber-sinatra"
+ gem "rspec-rails", ">= 2.0.1"
+ gem 'delayed_job', '~> 2.0'
+ gem "mimetype-fu", :require=> 'mimetype_fu'
+ gem "pony"
+ gem "sinatra"
+ gem "rack-test"
+ gem "mail"
+ gem 'rails', '3.0.7'
+ gem 'sqlite3'
+
+ gem 'capybara'
+ gem 'database_cleaner'
+ gem "test-unit"
-
-gemspec
+ gemspec
+end
View
@@ -2,35 +2,13 @@ PATH
remote: .
specs:
email_spec (1.3.0)
- autotest
- capybara
- cucumber
- cucumber-rails
- cucumber-sinatra
- database_cleaner
- delayed_job (~> 2.0)
- email_spec
- growl-glue
- jeweler
- launchy
- mail
+ launchy (~> 2.1)
mail (~> 2.2)
- mimetype-fu
- pony
- rack-test
- rails (= 3.0.7)
- rake (>= 0.8.7)
- rspec (>= 2.0.1)
rspec (~> 2.0)
- rspec-rails (>= 2.0.1)
- sinatra
- sqlite3-ruby
- test-unit
GEM
- remote: http://gemcutter.org/
+ remote: http://rubygems.org/
specs:
- ZenTest (4.7.0)
abstract (1.0.0)
actionmailer (3.0.7)
actionpack (= 3.0.7)
@@ -60,8 +38,6 @@ GEM
activesupport (3.0.7)
addressable (2.2.7)
arel (2.0.10)
- autotest (4.4.6)
- ZenTest (>= 4.4.1)
builder (2.1.2)
capybara (1.1.2)
mime-types (>= 1.16)
@@ -96,15 +72,8 @@ GEM
ffi (1.0.11)
gherkin (2.9.3)
json (>= 1.4.6)
- git (1.2.5)
- growl-glue (1.0.7)
highline (1.6.11)
i18n (0.5.0)
- jeweler (1.8.3)
- bundler (~> 1.0)
- git (>= 1.2.5)
- rake
- rdoc
json (1.6.6)
launchy (2.1.0)
addressable (~> 2.2.6)
@@ -139,8 +108,6 @@ GEM
rake (>= 0.8.7)
thor (~> 0.14.4)
rake (0.9.2.2)
- rdoc (3.12)
- json (~> 1.4)
rspec (2.9.0)
rspec-core (~> 2.9.0)
rspec-expectations (~> 2.9.0)
@@ -164,8 +131,6 @@ GEM
rack (~> 1.1)
tilt (>= 1.2.2, < 2.0)
sqlite3 (1.3.5)
- sqlite3-ruby (1.3.3)
- sqlite3 (>= 1.3.3)
templater (1.0.0)
diff-lcs (>= 1.1.2)
extlib (>= 0.9.5)
@@ -192,7 +157,6 @@ DEPENDENCIES
database_cleaner
delayed_job (~> 2.0)
email_spec!
- jeweler
mail
mimetype-fu
pony
@@ -201,5 +165,5 @@ DEPENDENCIES
rake (>= 0.8.7)
rspec-rails (>= 2.0.1)
sinatra
- sqlite3-ruby
+ sqlite3
test-unit
View
@@ -1,5 +1,7 @@
== 1.3.x (git)
+ * removing jeweler in favor of just using bundler for all that gem management type stuff
+
== 1.3.0 2011-04-07
Many thanks to Derek Hammer and George Ardeleanu who both spontaneously cleaned up various parts of the project
View
@@ -1,34 +1,6 @@
require 'rubygems'
-require 'bundler/setup'
-
-require 'rspec/core/rake_task'
-
-
-begin
- require 'jeweler'
- Jeweler::Tasks.new do |s|
- s.name = "email_spec"
- s.platform = Gem::Platform::RUBY
- s.authors = ['Ben Mabey', 'Aaron Gibralter', 'Mischa Fierer']
- s.email = "ben@benmabey.com"
- s.homepage = "http://github.com/bmabey/email-spec/"
- s.summary = "Easily test email in rspec and cucumber"
- s.bindir = "bin"
- s.description = s.summary
- s.require_path = "lib"
- s.files = %w(History.txt install.rb MIT-LICENSE.txt README.rdoc Rakefile) + Dir["lib/**/*"] + Dir["rails_generators/**/*"]
- s.test_files = Dir["spec/**/*"] + Dir["examples/**/*"]
- # rdoc
- s.has_rdoc = true
- s.extra_rdoc_files = %w(README.rdoc MIT-LICENSE.txt)
- s.rubyforge_project = 'email-spec'
- s.add_runtime_dependency "launchy", "~> 2.1"
- s.add_runtime_dependency "mail", "~> 2.2"
- s.add_runtime_dependency "rspec", "~> 2.0"
- end
-rescue LoadError
- puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
-end
+require 'bundler'
+Bundler::GemHelper.install_tasks
begin
require 'cucumber/rake/task'
@@ -40,26 +12,6 @@ rescue LoadError
end
require 'rspec/core/rake_task'
- RSpec::Core::RakeTask.new
+RSpec::Core::RakeTask.new
task :default => [:features, :spec]
-
-desc "Cleans the project of any tmp file that should not be included in the gemspec."
-task :clean do
- #remove stuff from example rails apps
- FileUtils.rm_rf("examples/rails_root")
- FileUtils.rm_rf("examples/sinatra")
- %w[ rails3 sinatra ].each do |ver|
- FileUtils.rm_f("examples/#{ver}_root/features/step_definitions/email_steps.rb")
- FileUtils.rm_f("examples/#{ver}_root/rerun.txt")
- FileUtils.rm_rf("examples/#{ver}_root/log")
- FileUtils.rm_rf("examples/#{ver}_root/vendor")
- end
-
- %w[*.sqlite3 *.log #*#].each do |pattern|
- `find . -name "#{pattern}" -delete`
- end
-end
-
-desc "Cleans the dir and builds the gem"
-task :prep => [:clean, :gemspec, :build]
View
@@ -1,5 +0,0 @@
----
-:patch: 0
-:build:
-:major: 1
-:minor: 3
View
@@ -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|
@@ -13,13 +10,14 @@ Gem::Specification.new do |s|
s.description = "Easily test email in rspec and cucumber"
s.email = "ben@benmabey.com"
s.extra_rdoc_files = [
+ "README.md",
"MIT-LICENSE.txt"
]
s.files = [
+ "README.md",
"History.txt",
"MIT-LICENSE.txt",
"Rakefile",
- "install.rb",
"lib/email-spec.rb",
"lib/email_spec.rb",
"lib/email_spec/address_converter.rb",
@@ -43,78 +41,8 @@ Gem::Specification.new do |s|
s.rubyforge_project = "email-spec"
s.rubygems_version = "1.8.10"
s.summary = "Easily test email in rspec and cucumber"
- s.test_files = ["spec/email_spec", "spec/email_spec/email_viewer_spec.rb", "spec/email_spec/helpers_spec.rb", "spec/email_spec/mail_ext_spec.rb", "spec/email_spec/matchers_spec.rb", "spec/spec_helper.rb", "examples/rails3_root", "examples/rails3_root/app", "examples/rails3_root/app/controllers", "examples/rails3_root/app/controllers/application_controller.rb", "examples/rails3_root/app/controllers/welcome_controller.rb", "examples/rails3_root/app/helpers", "examples/rails3_root/app/helpers/application_helper.rb", "examples/rails3_root/app/mailers", "examples/rails3_root/app/mailers/user_mailer.rb", "examples/rails3_root/app/models", "examples/rails3_root/app/models/user.rb", "examples/rails3_root/app/views", "examples/rails3_root/app/views/user_mailer", "examples/rails3_root/app/views/user_mailer/attachments.html.erb", "examples/rails3_root/app/views/user_mailer/newsletter.html.erb", "examples/rails3_root/app/views/user_mailer/signup.html.erb", "examples/rails3_root/app/views/user_mailer/signup.text.erb", "examples/rails3_root/app/views/welcome", "examples/rails3_root/app/views/welcome/attachments.html.erb", "examples/rails3_root/app/views/welcome/confirm.html.erb", "examples/rails3_root/app/views/welcome/index.html.erb", "examples/rails3_root/app/views/welcome/newsletter.html.erb", "examples/rails3_root/app/views/welcome/signup.html.erb", "examples/rails3_root/attachments", "examples/rails3_root/attachments/document.pdf", "examples/rails3_root/attachments/image.png", "examples/rails3_root/config", "examples/rails3_root/config/application.rb", "examples/rails3_root/config/boot.rb", "examples/rails3_root/config/cucumber.yml", "examples/rails3_root/config/database.yml", "examples/rails3_root/config/environment.rb", "examples/rails3_root/config/environments", "examples/rails3_root/config/environments/development.rb", "examples/rails3_root/config/environments/production.rb", "examples/rails3_root/config/environments/test.rb", "examples/rails3_root/config/initializers", "examples/rails3_root/config/initializers/backtrace_silencers.rb", "examples/rails3_root/config/initializers/cookie_verification_secret.rb", "examples/rails3_root/config/initializers/delayed_job.rb", "examples/rails3_root/config/initializers/inflections.rb", "examples/rails3_root/config/initializers/mime_types.rb", "examples/rails3_root/config/initializers/notifier_job.rb", "examples/rails3_root/config/initializers/rspec_generator.rb", "examples/rails3_root/config/initializers/session_store.rb", "examples/rails3_root/config/locales", "examples/rails3_root/config/locales/en.yml", "examples/rails3_root/config/routes.rb", "examples/rails3_root/config.ru", "examples/rails3_root/db", "examples/rails3_root/db/migrate", "examples/rails3_root/db/migrate/20090125013728_create_users.rb", "examples/rails3_root/db/migrate/20090908054656_create_delayed_jobs.rb", "examples/rails3_root/db/schema.rb", "examples/rails3_root/db/seeds.rb", "examples/rails3_root/doc", "examples/rails3_root/doc/README_FOR_APP", "examples/rails3_root/features", "examples/rails3_root/features/attachments.feature", "examples/rails3_root/features/delayed_job.feature", "examples/rails3_root/features/errors.feature", "examples/rails3_root/features/example.feature", "examples/rails3_root/features/step_definitions", "examples/rails3_root/features/step_definitions/user_steps.rb", "examples/rails3_root/features/step_definitions/web_steps.rb", "examples/rails3_root/features/support", "examples/rails3_root/features/support/env.rb", "examples/rails3_root/features/support/env_ext.rb", "examples/rails3_root/features/support/paths.rb", "examples/rails3_root/Gemfile", "examples/rails3_root/Gemfile.lock", "examples/rails3_root/lib", "examples/rails3_root/lib/notifier_job.rb", "examples/rails3_root/lib/tasks", "examples/rails3_root/lib/tasks/cucumber.rake", "examples/rails3_root/lib/tasks/rspec.rake", "examples/rails3_root/public", "examples/rails3_root/public/404.html", "examples/rails3_root/public/422.html", "examples/rails3_root/public/500.html", "examples/rails3_root/public/favicon.ico", "examples/rails3_root/public/images", "examples/rails3_root/public/images/rails.png", "examples/rails3_root/public/javascripts", "examples/rails3_root/public/javascripts/application.js", "examples/rails3_root/public/javascripts/controls.js", "examples/rails3_root/public/javascripts/dragdrop.js", "examples/rails3_root/public/javascripts/effects.js", "examples/rails3_root/public/javascripts/prototype.js", "examples/rails3_root/public/javascripts/rails.js", "examples/rails3_root/public/robots.txt", "examples/rails3_root/Rakefile", "examples/rails3_root/README", "examples/rails3_root/script", "examples/rails3_root/script/cucumber", "examples/rails3_root/script/rails", "examples/rails3_root/spec", "examples/rails3_root/spec/controllers", "examples/rails3_root/spec/controllers/welcome_controller_spec.rb", "examples/rails3_root/spec/models", "examples/rails3_root/spec/models/user_mailer_spec.rb", "examples/rails3_root/spec/spec_helper.rb", "examples/sinatra_root", "examples/sinatra_root/config.ru", "examples/sinatra_root/features", "examples/sinatra_root/features/errors.feature", "examples/sinatra_root/features/example.feature", "examples/sinatra_root/features/step_definitions", "examples/sinatra_root/features/step_definitions/user_steps.rb", "examples/sinatra_root/features/step_definitions/web_steps.rb", "examples/sinatra_root/features/support", "examples/sinatra_root/features/support/env.rb", "examples/sinatra_root/features/support/paths.rb", "examples/sinatra_root/lib", "examples/sinatra_root/lib/example_sinatra_app.rb"]
- if s.respond_to? :specification_version then
- s.specification_version = 3
-
- if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
- s.add_runtime_dependency(%q<rake>, [">= 0.8.7"])
- s.add_runtime_dependency(%q<jeweler>, [">= 0"])
- s.add_runtime_dependency(%q<cucumber>, [">= 0"])
- s.add_runtime_dependency(%q<cucumber-rails>, [">= 0"])
- s.add_runtime_dependency(%q<cucumber-sinatra>, [">= 0"])
- s.add_runtime_dependency(%q<rspec-rails>, [">= 2.0.1"])
- s.add_runtime_dependency(%q<delayed_job>, ["~> 2.0"])
- s.add_runtime_dependency(%q<mimetype-fu>, [">= 0"])
- s.add_runtime_dependency(%q<pony>, [">= 0"])
- s.add_runtime_dependency(%q<sinatra>, [">= 0"])
- s.add_runtime_dependency(%q<rack-test>, [">= 0"])
- s.add_runtime_dependency(%q<mail>, [">= 0"])
- s.add_runtime_dependency(%q<rails>, ["= 3.0.7"])
- s.add_runtime_dependency(%q<sqlite3-ruby>, [">= 0"])
- s.add_runtime_dependency(%q<capybara>, [">= 0"])
- s.add_runtime_dependency(%q<database_cleaner>, [">= 0"])
- s.add_runtime_dependency(%q<test-unit>, [">= 0"])
- s.add_runtime_dependency(%q<email_spec>, [">= 0"])
- s.add_runtime_dependency(%q<launchy>, ["~> 2.1"])
- s.add_runtime_dependency(%q<mail>, ["~> 2.2"])
- s.add_runtime_dependency(%q<rspec>, ["~> 2.0"])
- else
- s.add_dependency(%q<rake>, [">= 0.8.7"])
- s.add_dependency(%q<jeweler>, [">= 0"])
- s.add_dependency(%q<cucumber>, [">= 0"])
- s.add_dependency(%q<cucumber-rails>, [">= 0"])
- s.add_dependency(%q<cucumber-sinatra>, [">= 0"])
- s.add_dependency(%q<rspec-rails>, [">= 2.0.1"])
- s.add_dependency(%q<delayed_job>, ["~> 2.0"])
- s.add_dependency(%q<mimetype-fu>, [">= 0"])
- s.add_dependency(%q<pony>, [">= 0"])
- s.add_dependency(%q<sinatra>, [">= 0"])
- s.add_dependency(%q<rack-test>, [">= 0"])
- s.add_dependency(%q<mail>, [">= 0"])
- s.add_dependency(%q<rails>, ["= 3.0.7"])
- s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
- s.add_dependency(%q<capybara>, [">= 0"])
- s.add_dependency(%q<database_cleaner>, [">= 0"])
- s.add_dependency(%q<test-unit>, [">= 0"])
- s.add_dependency(%q<email_spec>, [">= 0"])
- s.add_dependency(%q<launchy>, ["~> 2.1"])
- s.add_dependency(%q<mail>, ["~> 2.2"])
- s.add_dependency(%q<rspec>, ["~> 2.0"])
- end
- else
- s.add_dependency(%q<rake>, [">= 0.8.7"])
- s.add_dependency(%q<jeweler>, [">= 0"])
- s.add_dependency(%q<cucumber>, [">= 0"])
- s.add_dependency(%q<cucumber-rails>, [">= 0"])
- s.add_dependency(%q<cucumber-sinatra>, [">= 0"])
- s.add_dependency(%q<rspec-rails>, [">= 2.0.1"])
- s.add_dependency(%q<delayed_job>, ["~> 2.0"])
- s.add_dependency(%q<mimetype-fu>, [">= 0"])
- s.add_dependency(%q<pony>, [">= 0"])
- s.add_dependency(%q<sinatra>, [">= 0"])
- s.add_dependency(%q<rack-test>, [">= 0"])
- s.add_dependency(%q<mail>, [">= 0"])
- s.add_dependency(%q<rails>, ["= 3.0.7"])
- s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
- s.add_dependency(%q<capybara>, [">= 0"])
- s.add_dependency(%q<database_cleaner>, [">= 0"])
- s.add_dependency(%q<test-unit>, [">= 0"])
- s.add_dependency(%q<email_spec>, [">= 0"])
- s.add_dependency(%q<launchy>, ["~> 2.1"])
- s.add_dependency(%q<mail>, ["~> 2.2"])
- s.add_dependency(%q<rspec>, ["~> 2.0"])
- end
+ s.add_dependency(%q<launchy>, ["~> 2.1"])
+ s.add_dependency(%q<mail>, ["~> 2.2"])
+ s.add_dependency(%q<rspec>, ["~> 2.0"])
end
-
@@ -1,14 +1,15 @@
-source 'http://gemcutter.org'
+source 'http://rubygems.org'
+gem "rake", ">= 0.8.7"
gem 'rails', '3.0.7'
-gem 'sqlite3-ruby', :require => 'sqlite3'
+gem 'sqlite3'
gem 'delayed_job', '~> 2.0'
gem 'mimetype-fu', :require => 'mimetype_fu'
group :test do
gem "test-unit"
- gem "cucumber-rails"
+ gem "cucumber-rails", :require => false
gem "database_cleaner"
gem 'capybara'
gem "rspec", ">= 2.0.1"
Oops, something went wrong.

0 comments on commit 7afcfd3

Please sign in to comment.