diff --git a/Gemfile b/Gemfile index 4f79c9da..1b1157c3 100644 --- a/Gemfile +++ b/Gemfile @@ -17,7 +17,7 @@ gem "rack-test" gem "mail" gem 'rails', '3.0.0.rc' gem 'sqlite3-ruby', :require=>'sqlite3' -gem 'email_spec', :path => '.' +#gem 'email_spec', :path => '.' gem 'capybara' gem 'database_cleaner' diff --git a/Gemfile.lock b/Gemfile.lock index 2c5310c4..533a39af 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,8 +1,3 @@ -PATH - remote: . - specs: - email_spec (0.6.2) - GEM remote: http://gemcutter.org/ specs: @@ -37,24 +32,29 @@ GEM activesupport (>= 3.0.0.beta) autotest (4.3.2) builder (2.1.2) - capybara (0.3.9) + capybara (0.4.0) + 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.3) - cucumber (0.8.5) + selenium-webdriver (>= 0.0.27) + xpath (~> 0.1.2) + celerity (0.8.2) + childprocess (0.1.3) + ffi (~> 0.6.3) + cucumber (0.9.2) builder (~> 2.1.2) diff-lcs (~> 1.1.2) - gherkin (~> 2.1.4) - json_pure (~> 1.4.3) - term-ansicolor (~> 1.0.4) + gherkin (~> 2.2.5) + json (~> 1.4.6) + term-ansicolor (~> 1.0.5) cucumber-rails (0.3.2) cucumber (>= 0.8.0) cucumber-sinatra (0.2.3) templater (>= 1.0.0) - culerity (0.2.10) + culerity (0.2.12) daemons (1.1.0) database_cleaner (0.5.2) delayed_job (2.0.3) @@ -66,21 +66,24 @@ GEM ffi (0.6.3) rake (>= 0.8.7) gemcutter (0.6.1) - gherkin (2.1.5) - trollop (~> 1.16.2) + gherkin (2.2.9) + json (~> 1.4.6) + term-ansicolor (~> 1.0.5) git (1.2.5) growl-glue (1.0.7) highline (1.6.1) - i18n (0.4.1) + i18n (0.4.2) jeweler (1.4.0) gemcutter (>= 0.1.0) git (>= 1.2.5) rubyforge (>= 2.0.0) - json_pure (1.4.3) - mail (2.2.5) + json (1.4.6) + json_pure (1.4.6) + mail (2.2.9) activesupport (>= 2.3.6) - mime-types - treetop (>= 1.4.5) + i18n (~> 0.4.1) + mime-types (~> 1.16) + treetop (~> 1.4.8) mime-types (1.16) mimetype-fu (0.1.2) nokogiri (1.4.3.1) @@ -88,9 +91,9 @@ GEM pony (1.0) mail (> 2.0) rack (1.2.1) - rack-mount (0.6.9) + rack-mount (0.6.13) rack (>= 1.0.0) - rack-test (0.5.4) + rack-test (0.5.6) rack (>= 1.0) rails (3.0.0.rc) actionmailer (= 3.0.0.rc) @@ -106,22 +109,24 @@ GEM rake (>= 0.8.3) thor (~> 0.14.0) rake (0.8.7) - rspec (2.0.0.beta.19) - rspec-core (= 2.0.0.beta.19) - rspec-expectations (= 2.0.0.beta.19) - rspec-mocks (= 2.0.0.beta.19) - rspec-core (2.0.0.beta.19) - rspec-expectations (2.0.0.beta.19) + rspec (2.0.1) + rspec-core (~> 2.0.1) + rspec-expectations (~> 2.0.1) + rspec-mocks (~> 2.0.1) + rspec-core (2.0.1) + rspec-expectations (2.0.1) diff-lcs (>= 1.1.2) - rspec-mocks (2.0.0.beta.19) - rspec-rails (2.0.0.beta.19) - rspec (= 2.0.0.beta.19) - webrat (>= 0.7.2.beta.1) + rspec-mocks (2.0.1) + rspec-core (~> 2.0.1) + rspec-expectations (~> 2.0.1) + rspec-rails (2.0.1) + rspec (~> 2.0.0) rubyforge (2.0.4) json_pure (>= 1.1.7) rubyzip (0.9.4) - selenium-webdriver (0.0.27) - ffi (>= 0.6.1) + selenium-webdriver (0.0.29) + childprocess (>= 0.0.7) + ffi (~> 0.6.3) json_pure rubyzip sinatra (1.0) @@ -133,15 +138,12 @@ GEM highline (>= 1.4.0) term-ansicolor (1.0.5) test-unit (2.1.1) - thor (0.14.0) + thor (0.14.3) treetop (1.4.8) polyglot (>= 0.3.1) - trollop (1.16.2) - tzinfo (0.3.22) - webrat (0.7.2.beta.1) - nokogiri (>= 1.2.0) - rack (>= 1.0) - rack-test (>= 0.5.3) + tzinfo (0.3.23) + xpath (0.1.2) + nokogiri (~> 1.3) PLATFORMS ruby @@ -154,7 +156,6 @@ DEPENDENCIES cucumber-sinatra database_cleaner delayed_job (>= 2.0.3) - email_spec! growl-glue jeweler mail diff --git a/Rakefile b/Rakefile index 3791fdc4..ca6502de 100644 --- a/Rakefile +++ b/Rakefile @@ -52,8 +52,11 @@ task :default => [:features, :spec, 'example_app: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 diff --git a/VERSION.yml b/VERSION.yml index ca8aa40d..06bc8c52 100644 --- a/VERSION.yml +++ b/VERSION.yml @@ -1,5 +1,5 @@ --- -:minor: 0 -:build: :patch: 0 :major: 1 +:build: +:minor: 1 diff --git a/email_spec.gemspec b/email_spec.gemspec index f1d769ed..68eb20a0 100644 --- a/email_spec.gemspec +++ b/email_spec.gemspec @@ -5,11 +5,11 @@ Gem::Specification.new do |s| s.name = %q{email_spec} - s.version = "1.0.0" + s.version = "1.1.0" s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= s.authors = ["Ben Mabey", "Aaron Gibralter", "Mischa Fierer"] - s.date = %q{2010-08-05} + s.date = %q{2010-12-20} s.description = %q{Easily test email in rspec and cucumber} s.email = %q{ben@benmabey.com} s.extra_rdoc_files = [ @@ -172,9 +172,12 @@ Gem::Specification.new do |s| s.specification_version = 3 if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then + s.add_runtime_dependency(%q, ["~> 2.0.0"]) else + s.add_dependency(%q, ["~> 2.0.0"]) end else + s.add_dependency(%q, ["~> 2.0.0"]) end end diff --git a/examples/rails3_root/Gemfile.lock b/examples/rails3_root/Gemfile.lock index de4e16c2..7353df33 100644 --- a/examples/rails3_root/Gemfile.lock +++ b/examples/rails3_root/Gemfile.lock @@ -1,7 +1,8 @@ PATH - remote: /Users/bmabey/Programming/ruby/email-spec + remote: ../../ specs: - email_spec (0.6.2) + email_spec (1.0.0) + rspec (~> 2.0.0) GEM remote: http://gemcutter.org/