Merge with original.

maxdemarzi · Sep 8, 2012 · 0292553 · 0292553
2 parents 0a1dcaa + faf7f0c
commit 0292553
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,4 +1,4 @@
-script: "bundle exec rake neo4j:install['enterprise','1.8.M06'] neo4j:start spec --trace"
+script: "bundle exec rake neo4j:install['enterprise','1.8.M07'] neo4j:start spec --trace"
 language: ruby
 rvm:
   - 1.9.3
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -6,7 +6,7 @@ PATH
       json
       multi_json
       os
-      rake (>= 0.8.7)
+      rake
       rubyzip
 
 GEM
@@ -22,15 +22,15 @@ GEM
     multi_xml (0.5.1)
     net-http-spy (0.2.1)
     os (0.9.6)
-    rake (0.8.7)
-    rspec (2.10.0)
-      rspec-core (~> 2.10.0)
-      rspec-expectations (~> 2.10.0)
-      rspec-mocks (~> 2.10.0)
-    rspec-core (2.10.1)
-    rspec-expectations (2.10.0)
+    rake (0.9.2.2)
+    rspec (2.11.0)
+      rspec-core (~> 2.11.0)
+      rspec-expectations (~> 2.11.0)
+      rspec-mocks (~> 2.11.0)
+    rspec-core (2.11.1)
+    rspec-expectations (2.11.3)
       diff-lcs (~> 1.1.3)
-    rspec-mocks (2.10.1)
+    rspec-mocks (2.11.2)
     rubyzip (0.9.9)
 
 PLATFORMS
@@ -40,5 +40,5 @@ PLATFORMS
 DEPENDENCIES
   neography!
   net-http-spy (= 0.2.1)
-  rake (~> 0.8.7)
+  rake
   rspec
diff --git a/lib/neography/version.rb b/lib/neography/version.rb
@@ -1,3 +1,3 @@
 module Neography
-  VERSION = "0.0.30"
+  VERSION = "0.0.31"
 end
diff --git a/neography.gemspec b/neography.gemspec
@@ -21,9 +21,9 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency "rspec"
   s.add_development_dependency "net-http-spy", "0.2.1"
-  s.add_development_dependency "rake", "~> 0.8.7"
+  s.add_development_dependency "rake"
   s.add_dependency "httparty", ">= 0.8.1"
-  s.add_dependency "rake", ">= 0.8.7"
+  s.add_dependency "rake"
   s.add_dependency "json"
   s.add_dependency "os"
   s.add_dependency "rubyzip"