Hashie 2.0 fixes

Fix tests for hashie 2.0 hash indexing changes Remove Gemfile.lock Add /tmp to .gitignore Require hashie ~> 2.0
mkocher · Feb 27, 2013 · f371682 · f371682
1 parent 06e7cfd
commit f371682
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 134 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,3 +4,5 @@ pkg/*
 /.vagrant
 /examples/cookbooks
 /examples/tmp
+tmp/
+Gemfile.lock
diff --git a/Gemfile.lock b/Gemfile.lock
diff --git a/soloist.gemspec b/soloist.gemspec
@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
   s.add_dependency "chef"
   s.add_dependency "librarian"
   s.add_dependency "thor"
-  s.add_dependency "hashie"
+  s.add_dependency "hashie", "~> 2.0"
   s.add_dependency "net-ssh"
   s.add_dependency "awesome_print"
 

diff --git a/spec/lib/soloist/config_spec.rb b/spec/lib/soloist/config_spec.rb
@@ -158,13 +158,13 @@
     it "merges another config into the current one" do
       config.merge!(other_config)
       config.royal_crown.recipes.should =~ ["guts", "chum"]
-      config.royal_crown.node_attributes.keys.should =~ [:reliable, :tasty]
+      config.royal_crown.node_attributes.keys.should =~ ["reliable", "tasty"]
     end
 
     it "does not trample the other config" do
       config.merge!(other_config)
       other_config.royal_crown.recipes.should =~ ["chum"]
-      other_config.royal_crown.node_attributes.should == {:tasty => "maybe"}
+      other_config.royal_crown.node_attributes.should == {"tasty" => "maybe"}
     end
   end