amee 4.1.5 → 4.1.6

data/CHANGELOG.txt

@@ -1,5 +1,8 @@
 = Changelog
 
+== 4.1.6
+* Compatibility with Rails 3.1 (dependency specs only)
+
 == 4.1.3 (also 3.1.2 for Rails 2)
 * Documentation update
 

data/Gemfile

@@ -1,6 +1,6 @@
 source "http://rubygems.org"
 
-gem "activesupport", "~> 3.0.10"
+gem "activesupport", "~> 3.0"
 gem "json"
 gem "log4r"
 gem "nokogiri", "~> 1.4.4"
@@ -13,5 +13,5 @@ group :development do
   gem 'memcache-client'
   gem 'rcov'
   gem 'rdoc'
-  gem 'activerecord', "~> 3.0.10" # To test Rails integration
+  gem 'activerecord', "~> 3.0" # To test Rails integration
 end

data/Gemfile.lock

@@ -1,33 +1,36 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.0.10)
-      activesupport (= 3.0.10)
-      builder (~> 2.1.2)
-      i18n (~> 0.5.0)
-    activerecord (3.0.10)
-      activemodel (= 3.0.10)
-      activesupport (= 3.0.10)
-      arel (~> 2.0.10)
-      tzinfo (~> 0.3.23)
-    activesupport (3.0.10)
-    arel (2.0.10)
-    builder (2.1.2)
+    activemodel (3.1.1)
+      activesupport (= 3.1.1)
+      builder (~> 3.0.0)
+      i18n (~> 0.6)
+    activerecord (3.1.1)
+      activemodel (= 3.1.1)
+      activesupport (= 3.1.1)
+      arel (~> 2.2.1)
+      tzinfo (~> 0.3.29)
+    activesupport (3.1.1)
+      multi_json (~> 1.0)
+    arel (2.2.1)
+    builder (3.0.0)
     diff-lcs (1.1.3)
     flexmock (0.9.0)
     git (1.2.5)
-    i18n (0.5.0)
+    i18n (0.6.0)
     jeweler (1.6.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    json (1.5.4)
+    json (1.6.1)
     log4r (1.1.9)
     memcache-client (1.8.5)
+    multi_json (1.0.3)
     nokogiri (1.4.7)
-    rake (0.9.2)
-    rcov (0.9.10)
-    rdoc (3.9.4)
+    rake (0.9.2.2)
+    rcov (0.9.11)
+    rdoc (3.11)
+      json (~> 1.4)
     rspec (2.6.0)
       rspec-core (~> 2.6.0)
       rspec-expectations (~> 2.6.0)
@@ -36,14 +39,14 @@ GEM
     rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.6.0)
-    tzinfo (0.3.29)
+    tzinfo (0.3.30)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord (~> 3.0.10)
-  activesupport (~> 3.0.10)
+  activerecord (~> 3.0)
+  activesupport (~> 3.0)
   bundler (~> 1.0.0)
   flexmock (> 0.8.6)
   jeweler (~> 1.6.4)

data/VERSION

@@ -1 +1 @@
-4.1.4
+4.1.6

data/amee.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{amee}
-  s.version = "4.1.5"
+  s.version = "4.1.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["James Smith", "James Hetherington", "Andrew Hill", "Andrew Berkeley"]
-  s.date = %q{2011-10-11}
+  s.date = %q{2011-10-28}
   s.default_executable = %q{ameesh}
   s.email = %q{james@floppy.org.uk}
   s.executables = ["ameesh"]
@@ -126,14 +126,14 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/AMEE/amee-ruby}
   s.licenses = ["BSD 3-Clause"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.4.2}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{Ruby interface to the AMEE carbon calculator}
 
   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<activesupport>, ["~> 3.0.10"])
+      s.add_runtime_dependency(%q<activesupport>, ["~> 3.0"])
       s.add_runtime_dependency(%q<json>, [">= 0"])
       s.add_runtime_dependency(%q<log4r>, [">= 0"])
       s.add_runtime_dependency(%q<nokogiri>, ["~> 1.4.4"])
@@ -144,9 +144,9 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<memcache-client>, [">= 0"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
       s.add_development_dependency(%q<rdoc>, [">= 0"])
-      s.add_development_dependency(%q<activerecord>, ["~> 3.0.10"])
+      s.add_development_dependency(%q<activerecord>, ["~> 3.0"])
     else
-      s.add_dependency(%q<activesupport>, ["~> 3.0.10"])
+      s.add_dependency(%q<activesupport>, ["~> 3.0"])
       s.add_dependency(%q<json>, [">= 0"])
       s.add_dependency(%q<log4r>, [">= 0"])
       s.add_dependency(%q<nokogiri>, ["~> 1.4.4"])
@@ -157,10 +157,10 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<memcache-client>, [">= 0"])
       s.add_dependency(%q<rcov>, [">= 0"])
       s.add_dependency(%q<rdoc>, [">= 0"])
-      s.add_dependency(%q<activerecord>, ["~> 3.0.10"])
+      s.add_dependency(%q<activerecord>, ["~> 3.0"])
     end
   else
-    s.add_dependency(%q<activesupport>, ["~> 3.0.10"])
+    s.add_dependency(%q<activesupport>, ["~> 3.0"])
     s.add_dependency(%q<json>, [">= 0"])
     s.add_dependency(%q<log4r>, [">= 0"])
     s.add_dependency(%q<nokogiri>, ["~> 1.4.4"])
@@ -171,7 +171,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<memcache-client>, [">= 0"])
     s.add_dependency(%q<rcov>, [">= 0"])
     s.add_dependency(%q<rdoc>, [">= 0"])
-    s.add_dependency(%q<activerecord>, ["~> 3.0.10"])
+    s.add_dependency(%q<activerecord>, ["~> 3.0"])
   end
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: amee
 version: !ruby/object:Gem::Version 
-  hash: 49
+  hash: 55
   prerelease: 
   segments: 
   - 4
   - 1
-  - 5
-  version: 4.1.5
+  - 6
+  version: 4.1.6
 platform: ruby
 authors: 
 - James Smith
@@ -18,30 +18,28 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-11 00:00:00 +01:00
+date: 2011-10-28 00:00:00 +01:00
 default_executable: ameesh
 dependencies: 
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  name: activesupport
   type: :runtime
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 7
         segments: 
         - 3
         - 0
-        - 10
-        version: 3.0.10
-  requirement: *id001
+        version: "3.0"
+  name: activesupport
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  name: json
   type: :runtime
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -50,12 +48,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id002
+  name: json
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  name: log4r
   type: :runtime
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -64,12 +62,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id003
+  name: log4r
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  name: nokogiri
   type: :runtime
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -80,12 +78,12 @@ dependencies:
         - 4
         - 4
         version: 1.4.4
-  requirement: *id004
+  name: nokogiri
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  name: bundler
   type: :development
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -96,12 +94,12 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  requirement: *id005
+  name: bundler
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  name: jeweler
   type: :development
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -112,12 +110,12 @@ dependencies:
         - 6
         - 4
         version: 1.6.4
-  requirement: *id006
+  name: jeweler
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  name: rspec
   type: :development
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -128,12 +126,12 @@ dependencies:
         - 6
         - 0
         version: 2.6.0
-  requirement: *id007
+  name: rspec
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  name: flexmock
   type: :development
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">"
@@ -144,12 +142,12 @@ dependencies:
         - 8
         - 6
         version: 0.8.6
-  requirement: *id008
+  name: flexmock
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  name: memcache-client
   type: :development
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -158,12 +156,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id009
+  name: memcache-client
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  name: rcov
   type: :development
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -172,12 +170,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id010
+  name: rcov
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  name: rdoc
   type: :development
-  version_requirements: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -186,23 +184,23 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id011
+  name: rdoc
+  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  name: activerecord
   type: :development
-  version_requirements: &id012 !ruby/object:Gem::Requirement 
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 7
         segments: 
         - 3
         - 0
-        - 10
-        version: 3.0.10
-  requirement: *id012
+        version: "3.0"
+  name: activerecord
+  version_requirements: *id012
 description: 
 email: james@floppy.org.uk
 executables: 
@@ -347,7 +345,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.4.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Ruby interface to the AMEE carbon calculator