knife_sous 0.1.0pre → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 12f12c0d9fc05adff47a4b537620423eb46aa86f
-  data.tar.gz: e49c05ceeb12b09b0bf3a26d07ca2ba0d90e58a7
+  metadata.gz: c2c77c4b1ded63abf5028f5565cb4aa1528d8d10
+  data.tar.gz: 2fb6c81078d94c3829c7f33ec9bfd9467e715a63
 SHA512:
-  metadata.gz: 26a30033b1caafb772dde6eaee684a0b0c58fc615dbf31577887d38bee50de65beb0ab52ca4eb299cacf278cd76ccb49d3204c8a624b34fbf8b3b5cfa37cd876
-  data.tar.gz: becdfeae62f8812bc341afda3567e42f0f31b4c23d382a24c99eb3b388220f4b52881d58bb8cf50e467d84fc5595e7080038d8dc4cff5d8738f7d1fa19c2ab00
+  metadata.gz: 1b1b706fecd1bcd663075e396e323738f2beb2c5823688a406a09c4f4ab93b57c2311cc247834a2299991805060789ae45c2d664e46e074445b75e2079b303b9
+  data.tar.gz: df0353b97fd0587c4890341844d55c6b519afc0e186877a6de4e3dc25de7d8a33d08c32f4bcbcc5b39aab4d56033b48bfa634ec6f8dac7ef0bf43def8ca86404

data/Gemfile

@@ -5,4 +5,3 @@ gemspec
 gem 'guard'
 gem 'guard-rspec'
 gem 'pry'
-

data/knife_sous.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |s|
   s.email       = "shaun@substantail.com"
 
   s.name        = 'knife_sous'
-  s.version     = "0.1.0pre"
+  s.version     = "0.2.0"
   s.description = %q{Knife plugin for managing knife-solo nodes}
   s.summary     = %q{A Chef Knife plugin which uses a DSL to configure and
 manage knife solo nodes. Run knife solo commands on one or multiple nodes.}

data/lib/knife_sous/node.rb

@@ -15,6 +15,7 @@ module KnifeSous
 
     def update_config(other_config={})
       config = convert_aliases(normalize_hash(other_config))
+      @config[:chef_node_name] = @name
       @config.merge!(config)
     end
 
@@ -28,10 +29,6 @@ module KnifeSous
       config_hash
     end
 
-    def node_name
-      @config[:node_name] || @name
-    end
-
     def method_missing(method_name, *args, &block)
       @config[method_name.to_sym]
     end

data/spec/lib/knife_sous/node_spec.rb

@@ -12,19 +12,7 @@ describe KnifeSous::Node do
 
     it "should accept config arguments as a hash" do
       options_hash = {ssh_config: 'stuff', other_something: 'foo' }
-      KnifeSous::Node.new(:node_tastic, options_hash).config.should == options_hash
-    end
-  end
-
-  describe "#node_name" do
-    it "should set the node name" do
-      node = KnifeSous::Node.new('some node', node_name: 'node_tastic')
-      node.node_name.should == 'node_tastic'
-    end
-
-    it "should default to the node name" do
-      node = KnifeSous::Node.new('some node')
-      node.node_name.should == 'some node'
+      KnifeSous::Node.new(:node_tastic, options_hash).config.should == options_hash.merge!(chef_node_name: "node_tastic")
     end
   end
 
@@ -32,13 +20,14 @@ describe KnifeSous::Node do
     it "should merge config options" do
      node =  KnifeSous::Node.new(:node_tastic, foo: 'bar', baz: 'stuff')
      node.update_config(baz: 'new stuff')
-     node.config.should == { foo: 'bar', baz: 'new stuff' }
+     node.config.should == { foo: 'bar', baz: 'new stuff', chef_node_name: 'node_tastic' }
     end
   end
 
   describe "config hash" do
     it "should sanitize hash keys" do
-      KnifeSous::Node.new(:node_tastic, 'fOO-BAr' => 'baz').config.keys.should =~ [:foo_bar]
+      node = KnifeSous::Node.new(:node_tastic, 'fOO-BAr' => 'baz')
+      node.config.keys.should include :foo_bar
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife_sous
 version: !ruby/object:Gem::Version
-  version: 0.1.0pre
+  version: 0.2.0
 platform: ruby
 authors:
 - Shaun Dern
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-21 00:00:00.000000000 Z
+date: 2013-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -139,9 +139,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: knife_sous
 rubygems_version: 2.0.6