Permalink
Browse files

Adding librarian-chef as a dependency, fixing specs to work with new …

…hashie
  • Loading branch information...
1 parent bb63504 commit f452f39b2b4c29b7b5d4700d439635ba1734b12a @mkocher committed Apr 6, 2013
Showing with 6 additions and 126 deletions.
  1. +1 −0 .gitignore
  2. +0 −121 Gemfile.lock
  3. +1 −1 soloist.gemspec
  4. +4 −4 spec/lib/soloist/config_spec.rb
View
@@ -4,3 +4,4 @@ pkg/*
/.vagrant
/examples/cookbooks
/examples/tmp
+Gemfile.lock
@hiremaga

hiremaga Apr 8, 2013

Collaborator

Yes ;)

View
@@ -1,121 +0,0 @@
-PATH
- remote: .
- specs:
- soloist (1.0.0)
- awesome_print
- chef
- hashie (~> 1.2)
- librarian
- net-ssh
- thor
-
-GEM
- remote: http://rubygems.org/
- specs:
- archive-tar-minitar (0.5.2)
- awesome_print (1.1.0)
- chef (11.4.0)
- erubis
- highline (>= 1.6.9)
- json (>= 1.4.4, <= 1.7.7)
- mixlib-authentication (>= 1.3.0)
- mixlib-cli (~> 1.3.0)
- mixlib-config (>= 1.1.2)
- mixlib-log (>= 1.3.0)
- mixlib-shellout
- net-ssh (~> 2.6)
- net-ssh-multi (~> 1.1.0)
- ohai (>= 0.6.0)
- rest-client (>= 1.0.4, < 1.7.0)
- yajl-ruby (~> 1.1)
- coderay (1.0.8)
- diff-lcs (1.1.3)
- erubis (2.7.0)
- gem-release (0.4.1)
- guard (1.5.4)
- listen (>= 0.4.2)
- lumberjack (>= 1.0.2)
- pry (>= 0.9.10)
- thor (>= 0.14.6)
- guard-bundler (1.0.0)
- bundler (~> 1.0)
- guard (~> 1.1)
- guard-rspec (2.2.0)
- guard (>= 1.1)
- rspec (~> 2.11)
- guard-shell (0.5.1)
- guard (>= 1.1.0)
- hashie (1.2.0)
- highline (1.6.16)
- ipaddress (0.8.0)
- json (1.7.7)
- json (1.7.7-java)
- librarian (0.0.26)
- archive-tar-minitar (>= 0.5.2)
- chef (>= 0.10)
- highline
- thor (~> 0.15)
- listen (0.6.0)
- lumberjack (1.0.2)
- method_source (0.8.1)
- mime-types (1.21)
- mixlib-authentication (1.3.0)
- mixlib-log
- mixlib-cli (1.3.0)
- mixlib-config (1.1.2)
- mixlib-log (1.4.1)
- mixlib-shellout (1.1.0)
- net-ssh (2.6.6)
- net-ssh-gateway (1.2.0)
- net-ssh (>= 2.6.5)
- net-ssh-multi (1.1)
- net-ssh (>= 2.1.4)
- net-ssh-gateway (>= 0.99.0)
- ohai (6.16.0)
- ipaddress
- mixlib-cli
- mixlib-config
- mixlib-log
- mixlib-shellout
- systemu
- yajl-ruby
- pry (0.9.10)
- coderay (~> 1.0.5)
- method_source (~> 0.8)
- slop (~> 3.3.1)
- pry (0.9.10-java)
- coderay (~> 1.0.5)
- method_source (~> 0.8)
- slop (~> 3.3.1)
- spoon (~> 0.0)
- rb-fsevent (0.9.2)
- rest-client (1.6.7)
- mime-types (>= 1.16)
- rspec (2.12.0)
- rspec-core (~> 2.12.0)
- rspec-expectations (~> 2.12.0)
- rspec-mocks (~> 2.12.0)
- rspec-core (2.12.0)
- rspec-expectations (2.12.0)
- diff-lcs (~> 1.1.3)
- rspec-mocks (2.12.0)
- slop (3.3.3)
- spoon (0.0.1)
- systemu (2.5.2)
- terminal-notifier-guard (1.5.3)
- thor (0.16.0)
- yajl-ruby (1.1.0)
-
-PLATFORMS
- java
- ruby
-
-DEPENDENCIES
- gem-release
- guard-bundler
- guard-rspec
- guard-shell
- rb-fsevent
- rspec
- soloist!
- terminal-notifier-guard
View
@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
s.require_paths = ["lib"]
s.add_dependency "chef"
- s.add_dependency "librarian"
+ s.add_dependency "librarian-chef"
s.add_dependency "thor"
s.add_dependency "hashie", "~> 1.2"
s.add_dependency "net-ssh"
@@ -151,20 +151,20 @@
end
describe "#merge!" do
- let(:soloist_rc) { Soloist::RoyalCrown.new(:recipes => ["guts"], :node_attributes => {:reliable => "maybe"}) }
- let(:other_rc) { Soloist::RoyalCrown.new(:recipes => ["chum"], :node_attributes => {:tasty => "maybe"}) }
+ let(:soloist_rc) { Soloist::RoyalCrown.new('recipes' => ["guts"], "node_attributes" => {"reliable" => "maybe"}) }
+ let(:other_rc) { Soloist::RoyalCrown.new('recipes' => ["chum"], "node_attributes" => {"tasty" => "maybe"}) }
let(:other_config) { Soloist::Config.new(other_rc) }
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

0 comments on commit f452f39

Please sign in to comment.