diff --git a/Gemfile.lock b/Gemfile.lock index ca68aef..677ea46 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,8 +1,8 @@ PATH remote: . specs: - fuel_purchase (0.0.12) - emitter (~> 0.3) + fuel_purchase (0.0.14) + emitter GEM remote: http://rubygems.org/ @@ -36,12 +36,12 @@ GEM activesupport (>= 2.3.4) conversions (1.4.5) activesupport (>= 2.3.4) - cucumber (0.8.3) + cucumber (0.9.4) builder (~> 2.1.2) diff-lcs (~> 1.1.2) - gherkin (~> 2.0.2) - json_pure (~> 1.4.3) - term-ansicolor (~> 1.0.4) + gherkin (~> 2.2.9) + json (~> 1.4.6) + term-ansicolor (~> 1.0.5) data_miner (0.5.7) activerecord (>= 2.3.4) activesupport (>= 2.3.4) @@ -54,8 +54,8 @@ GEM remote_table (~> 0.2.32) taps (>= 0.3.11) diff-lcs (1.1.2) - earth (0.3.2) - activerecord (>= 3.0.0.beta4) + earth (0.3.8) + activerecord (~> 3) cohort_scope (>= 0.0.7) conversions (>= 1.4.5) data_miner (~> 0.5.6) @@ -63,18 +63,17 @@ GEM geokit (>= 1.5.0) loose_tight_dictionary (>= 0.0.8) weighted_average (>= 0.0.4) - emitter (0.3.0) - activesupport (>= 3.0.0) - characterizable (~> 0.1.2) - cohort_scope (~> 0.1.0) - data_miner (~> 0.5.5) - earth (~> 0.3.1) - falls_back_on (= 0.0.3) - fast_timestamp (>= 0.0.4) + emitter (0.3.3) + activesupport (~> 3) + characterizable (~> 0.1) + cohort_scope (~> 0.1) + data_miner (~> 0.5) + earth (~> 0.3) + falls_back_on (~> 0.0.3) leap (~> 0.4.4) - summary_judgement (>= 1.3.8) - timeframe (>= 0.0.8) - weighted_average (>= 0.0.4) + summary_judgement (~> 1.3) + timeframe (~> 0.0.8) + weighted_average (~> 0.0.4) errata (0.2.4) activesupport (>= 2.3.4) remote_table (>= 0.2.31) @@ -84,18 +83,19 @@ GEM fast_timestamp (0.0.4) gemcutter (0.6.1) geokit (1.5.0) - gherkin (2.0.2) - trollop (~> 1.16.2) + gherkin (2.2.9) + json (~> 1.4.6) + term-ansicolor (~> 1.0.5) git (1.2.5) - hoe (2.7.0) + hoe (2.8.0) rake (>= 0.8.7) - rubyforge (>= 2.0.4) hpricot (0.8.3) i18n (0.5.0) jeweler (1.4.0) gemcutter (>= 0.1.0) git (>= 1.2.5) rubyforge (>= 2.0.0) + json (1.4.6) json_pure (1.4.6) leap (0.4.5) activesupport (~> 3.0.0) @@ -108,9 +108,12 @@ GEM amatch (>= 0.2.5) andand (>= 1.3.1) mime-types (1.16) + mustache (0.12.0) nokogiri (1.4.4) rack (1.2.1) rake (0.8.7) + rcov (0.9.9) + rdiscount (1.6.5) rdoc (2.5.11) remote_table (0.2.32) activesupport (>= 2.3.4) @@ -120,20 +123,25 @@ GEM slither (>= 0.99.4) rest-client (1.6.1) mime-types (>= 1.16) + rocco (0.5) + mustache + rdiscount roo (1.3.11) GData (>= 0.0.4) hpricot (>= 0.6) libxml-ruby (>= 1.1.3) rubyzip (>= 0.9.1) spreadsheet (>= 0.6.4) - rspec (2.2.0) - rspec-core (~> 2.2) - rspec-expectations (~> 2.2) - rspec-mocks (~> 2.2) - rspec-core (2.2.1) - rspec-expectations (2.2.0) - diff-lcs (~> 1.1.2) - rspec-mocks (2.2.0) + 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.1) + rspec-core (~> 2.0.1) + rspec-expectations (~> 2.0.1) ruby-ole (1.2.11.1) rubyforge (2.0.4) json_pure (>= 1.1.7) @@ -142,16 +150,23 @@ GEM sinatra (1.0) rack (>= 1.0) slither (0.99.4) - sniff (0.3.1) + sniff (0.4.5) aaronh-chronic (~> 0.3.9) activerecord (~> 3.0.0) activesupport (~> 3.0.0) common_name (~> 0.1.5) + cucumber (~> 0.9.4) earth (~> 0.3.1) fast_timestamp (~> 0.0.4) + jeweler (~> 1.4.0) + rake + rcov + rdoc + rocco + rspec (~> 2.0.0) sqlite3-ruby (~> 1.3.0) timeframe (~> 0.0.8) - spreadsheet (0.6.4.1) + spreadsheet (0.6.5.0) ruby-ole sqlite3-ruby (1.3.2) summary_judgement (1.3.8) @@ -167,7 +182,6 @@ GEM term-ansicolor (1.0.5) timeframe (0.0.8) activesupport (>= 2.3.5) - trollop (1.16.2) tzinfo (0.3.23) verbs (2.0.9) activesupport (>= 2.3.4) @@ -182,11 +196,10 @@ PLATFORMS DEPENDENCIES activerecord (~> 3) bundler (~> 1.0.0) - cucumber (= 0.8.3) - emitter (~> 0.3) + emitter fuel_purchase! jeweler (= 1.4.0) rake rdoc rspec (~> 2) - sniff + sniff (~> 0.4.5) diff --git a/Rakefile b/Rakefile index 8c3e486..87ad63d 100644 --- a/Rakefile +++ b/Rakefile @@ -39,13 +39,12 @@ require_or_fail('jeweler', 'Jeweler (or a dependency) not available. Install it Dir.glob(File.join('lib', 'test_support', '**/*.rb')) gem.add_development_dependency 'activerecord', '~>3' gem.add_development_dependency 'bundler', '~>1.0.0' - gem.add_development_dependency 'cucumber', '=0.8.3' gem.add_development_dependency 'jeweler', '=1.4.0' gem.add_development_dependency 'rake' gem.add_development_dependency 'rdoc' gem.add_development_dependency 'rspec', '~>2' - gem.add_development_dependency 'sniff' unless ENV['LOCAL_SNIFF'] - gem.add_dependency 'emitter', '~>0.3' + gem.add_development_dependency 'sniff', '~>0.4.5' unless ENV['LOCAL_SNIFF'] + gem.add_dependency 'emitter' end Jeweler::GemcutterTasks.new end diff --git a/fuel_purchase.gemspec b/fuel_purchase.gemspec index 0ea5b2d..4f3f303 100644 --- a/fuel_purchase.gemspec +++ b/fuel_purchase.gemspec @@ -9,7 +9,7 @@ Gem::Specification.new do |s| s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= s.authors = ["Andy Rossmeissl", "Seamus Abshere", "Ian Hough", "Matt Kling", "Derek Kastner"] - s.date = %q{2010-12-07} + s.date = %q{2010-12-15} s.description = %q{A software model in Ruby for the greenhouse gas emissions of a fuel purchase} s.email = %q{andy@rossmeissl.net} s.extra_rdoc_files = [ @@ -47,34 +47,31 @@ Gem::Specification.new do |s| if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then s.add_development_dependency(%q, ["~> 3"]) s.add_development_dependency(%q, ["~> 1.0.0"]) - s.add_development_dependency(%q, ["= 0.8.3"]) s.add_development_dependency(%q, ["= 1.4.0"]) s.add_development_dependency(%q, [">= 0"]) s.add_development_dependency(%q, [">= 0"]) s.add_development_dependency(%q, ["~> 2"]) - s.add_development_dependency(%q, [">= 0"]) - s.add_runtime_dependency(%q, ["~> 0.3"]) + s.add_development_dependency(%q, ["~> 0.4.5"]) + s.add_runtime_dependency(%q, [">= 0"]) else s.add_dependency(%q, ["~> 3"]) s.add_dependency(%q, ["~> 1.0.0"]) - s.add_dependency(%q, ["= 0.8.3"]) s.add_dependency(%q, ["= 1.4.0"]) s.add_dependency(%q, [">= 0"]) s.add_dependency(%q, [">= 0"]) s.add_dependency(%q, ["~> 2"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, ["~> 0.3"]) + s.add_dependency(%q, ["~> 0.4.5"]) + s.add_dependency(%q, [">= 0"]) end else s.add_dependency(%q, ["~> 3"]) s.add_dependency(%q, ["~> 1.0.0"]) - s.add_dependency(%q, ["= 0.8.3"]) s.add_dependency(%q, ["= 1.4.0"]) s.add_dependency(%q, [">= 0"]) s.add_dependency(%q, [">= 0"]) s.add_dependency(%q, ["~> 2"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, ["~> 0.3"]) + s.add_dependency(%q, ["~> 0.4.5"]) + s.add_dependency(%q, [">= 0"]) end end