diff --git a/Gemfile.lock.development b/Gemfile.lock.development index 545d47c3..f37f8068 100644 --- a/Gemfile.lock.development +++ b/Gemfile.lock.development @@ -1,88 +1,86 @@ PATH remote: . specs: - pickle (0.4.10) + pickle (0.4.11) cucumber (>= 0.8) rake GEM remote: http://rubygems.org/ specs: - actionmailer (3.1.0) - actionpack (= 3.1.0) + actionmailer (3.1.4) + actionpack (= 3.1.4) mail (~> 2.3.0) - actionpack (3.1.0) - activemodel (= 3.1.0) - activesupport (= 3.1.0) + actionpack (3.1.4) + activemodel (= 3.1.4) + activesupport (= 3.1.4) builder (~> 3.0.0) erubis (~> 2.7.0) i18n (~> 0.6) - rack (~> 1.3.2) - rack-cache (~> 1.0.3) + rack (~> 1.3.6) + rack-cache (~> 1.1) rack-mount (~> 0.8.2) rack-test (~> 0.6.1) - sprockets (~> 2.0.0) - activemodel (3.1.0) - activesupport (= 3.1.0) - bcrypt-ruby (~> 3.0.0) + sprockets (~> 2.0.3) + activemodel (3.1.4) + activesupport (= 3.1.4) builder (~> 3.0.0) i18n (~> 0.6) - activerecord (3.1.0) - activemodel (= 3.1.0) - activesupport (= 3.1.0) - arel (~> 2.2.1) + activerecord (3.1.4) + activemodel (= 3.1.4) + activesupport (= 3.1.4) + arel (~> 2.2.3) tzinfo (~> 0.3.29) - activeresource (3.1.0) - activemodel (= 3.1.0) - activesupport (= 3.1.0) - activesupport (3.1.0) + activeresource (3.1.4) + activemodel (= 3.1.4) + activesupport (= 3.1.4) + activesupport (3.1.4) multi_json (~> 1.0) - arel (2.2.1) - bcrypt-ruby (3.0.1) + arel (2.2.3) builder (3.0.0) - capybara (1.1.1) + capybara (1.1.2) mime-types (>= 1.16) nokogiri (>= 1.3.3) rack (>= 1.0.0) rack-test (>= 0.5.4) selenium-webdriver (~> 2.0) xpath (~> 0.1.4) - childprocess (0.2.2) + childprocess (0.3.1) ffi (~> 1.0.6) - cucumber (1.0.6) + cucumber (1.1.9) builder (>= 2.1.2) diff-lcs (>= 1.1.2) - gherkin (~> 2.4.18) + gherkin (~> 2.9.0) json (>= 1.4.6) term-ansicolor (>= 1.0.6) - cucumber-rails (1.0.5) - capybara (>= 1.1.1) - cucumber (~> 1.0.6) + cucumber-rails (1.3.0) + capybara (>= 1.1.2) + cucumber (>= 1.1.8) nokogiri (>= 1.5.0) - database_cleaner (0.6.7) + database_cleaner (0.7.2) diff-lcs (1.1.3) erubis (2.7.0) - fabrication (1.1.0) - factory_girl (2.1.0) - ffi (1.0.9) - gherkin (2.4.21) + fabrication (1.3.2) + factory_girl (3.0.0) + activesupport (>= 3.0.0) + ffi (1.0.11) + gherkin (2.9.1) json (>= 1.4.6) git (1.2.5) hike (1.2.1) i18n (0.6.0) - json (1.6.1) - json_pure (1.6.1) + json (1.6.5) machinist (1.0.6) - mail (2.3.0) + mail (2.3.3) i18n (>= 0.4.0) mime-types (~> 1.16) treetop (~> 1.4.8) - mime-types (1.16) - multi_json (1.0.3) - nokogiri (1.5.0) - polyglot (0.3.2) - rack (1.3.3) - rack-cache (1.0.3) + mime-types (1.18) + multi_json (1.1.0) + nokogiri (1.5.2) + polyglot (0.3.3) + rack (1.3.6) + rack-cache (1.2) rack (>= 0.4) rack-mount (0.8.3) rack (>= 1.0.0) @@ -90,24 +88,24 @@ GEM rack rack-test (0.6.1) rack (>= 1.0) - rails (3.1.0) - actionmailer (= 3.1.0) - actionpack (= 3.1.0) - activerecord (= 3.1.0) - activeresource (= 3.1.0) - activesupport (= 3.1.0) + rails (3.1.4) + actionmailer (= 3.1.4) + actionpack (= 3.1.4) + activerecord (= 3.1.4) + activeresource (= 3.1.4) + activesupport (= 3.1.4) bundler (~> 1.0) - railties (= 3.1.0) - railties (3.1.0) - actionpack (= 3.1.0) - activesupport (= 3.1.0) + railties (= 3.1.4) + railties (3.1.4) + actionpack (= 3.1.4) + activesupport (= 3.1.4) rack-ssl (~> 1.3.2) rake (>= 0.8.7) rdoc (~> 3.4) thor (~> 0.14.6) - rake (0.9.2) - rcov (0.9.10) - rdoc (3.9.4) + rake (0.9.2.2) + rdoc (3.12) + json (~> 1.4) rspec (2.6.0) rspec-core (~> 2.6.0) rspec-expectations (~> 2.6.0) @@ -121,29 +119,29 @@ GEM activesupport (~> 3.0) railties (~> 3.0) rspec (~> 2.6.0) - rubyzip (0.9.4) - selenium-webdriver (2.6.0) - childprocess (>= 0.2.1) - ffi (>= 1.0.7) - json_pure + rubyzip (0.9.6.1) + selenium-webdriver (2.20.0) + childprocess (>= 0.2.5) + ffi (~> 1.0) + multi_json (~> 1.0) rubyzip - sprockets (2.0.0) + sprockets (2.0.3) hike (~> 1.2) rack (~> 1.0) - tilt (!= 1.3.0, ~> 1.1) - sqlite3 (1.3.4) + tilt (~> 1.1, != 1.3.0) + sqlite3 (1.3.5) sqlite3-ruby (1.3.3) sqlite3 (>= 1.3.3) - term-ansicolor (1.0.6) + term-ansicolor (1.0.7) thor (0.14.6) tilt (1.3.3) treetop (1.4.10) polyglot polyglot (>= 0.3.1) - tzinfo (0.3.29) + tzinfo (0.3.32) xpath (0.1.4) nokogiri (~> 1.3) - yard (0.7.2) + yard (0.7.5) PLATFORMS ruby @@ -160,7 +158,6 @@ DEPENDENCIES pickle! rack rails (~> 3.1.0) - rcov rspec-rails (~> 2.6.0) sqlite3-ruby yard diff --git a/History.txt b/History.txt index 4d2701d1..4e9f2535 100644 --- a/History.txt +++ b/History.txt @@ -1,3 +1,8 @@ +== 0.4.11 + +* 1 minor improvement + * Changed find_first_model to cope with Mongoid 3.0.0 [Jules Copeland] + == 0.4.10 * 1 bugfix diff --git a/README.rdoc b/README.rdoc index 7990047c..7be0e224 100644 --- a/README.rdoc +++ b/README.rdoc @@ -458,6 +458,7 @@ To run the specs & features do: The following people have made Pickle better: +* {Jules Copeland}[http://github.com/julescopeland] * {David Padilla}[http://github.com/dabit] * {Ari Epstein}[http://github.com/aepstein] * {Jonathan Hinkle}[http://github.com/hynkle] diff --git a/lib/pickle/version.rb b/lib/pickle/version.rb index cfa0c188..e3cca83f 100644 --- a/lib/pickle/version.rb +++ b/lib/pickle/version.rb @@ -1,3 +1,3 @@ module Pickle - VERSION = "0.4.10" + VERSION = "0.4.11" end \ No newline at end of file diff --git a/pickle.gemspec b/pickle.gemspec index 0184d505..8189a627 100644 --- a/pickle.gemspec +++ b/pickle.gemspec @@ -31,7 +31,6 @@ Gem::Specification.new do |s| s.add_development_dependency "factory_girl" s.add_development_dependency "fabrication" s.add_development_dependency "machinist" - s.add_development_dependency "rcov" s.add_development_dependency "database_cleaner" s.add_development_dependency "capybara" s.add_development_dependency "sqlite3-ruby"