knife-windows 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a3229cbd2ae35abbabd225eca6388515fad47219
-  data.tar.gz: 9fd65acaedc3a6e7fdada29c65b991d119953999
+  metadata.gz: 12b2f640d26c3299271d30e0b81efa2d3ba1baeb
+  data.tar.gz: 044058207473c385798cc53804bc868f9b95a518
 SHA512:
-  metadata.gz: 1d142278057b8ccc5a5d3e8e5727ce338e0ea1e3bd3e15953d16d71511af8bb2402d934dac99f8c987bbf899d27aabbccc99b1c12bd87b5867868e823be80f60
-  data.tar.gz: 848b77590cb0bd8aacbb40ce2fc7e5c855e0682a4e56b8276141099526bae019ec7151fc29e9bfdb21184e30031d99c4d1d866817753abc4e614e5c4eed7570d
+  metadata.gz: d97b93a2bee443dd25dfdc6581473372807d56ed25fa1b1de85a22c3833ebf071773dc0eab7aba35fc8dbf01a0e685095170f6dc37f5897ec778f162ee55ea75
+  data.tar.gz: 84a0ec562d1bc403475b0bc499e5f21e2b57135df36d9c095cbc150ced5e6bb63a37d792d0390086beea8f81bb195d73fc44998c256c042cca7359488dd72038

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # knife-windows Change Log
 
+## Release 1.1.4
+* Bumps winrm-s and winrm dependencies to address a winrm-s incompatibility bug with winrm 1.5
+
 ## Release 1.1.3
 * [knife-windows #329](https://github.com/chef/knife-windows/pull/329) Pin to a minimum winrm-s of 0.3.2 addressing encoding issues in 0.3.1
 

data/knife-windows.gemspec

@@ -14,8 +14,8 @@ Gem::Specification.new do |s|
   s.description = s.summary
 
   s.required_ruby_version	= ">= 1.9.1"
-  s.add_dependency "winrm", "~> 1.3"
-  s.add_dependency "winrm-s", "~> 0.3.2"
+  s.add_dependency "winrm", "~> 1.5"
+  s.add_dependency "winrm-s", "~> 0.3.4"
   s.add_dependency "nokogiri"
 
   s.add_development_dependency 'pry'
@@ -25,4 +25,3 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 end
-

data/lib/chef/knife/bootstrap_windows_base.rb

@@ -289,11 +289,13 @@ class Chef
 
         STDOUT.sync = STDERR.sync = true
 
-        if (Chef::Config[:validation_key] && !File.exist?(File.expand_path(Chef::Config[:validation_key])))
-          if Chef::VERSION.split('.').first.to_i == 11
-            ui.error("Unable to find validation key. Please verify your configuration file for validation_key config value.")
-            exit 1
-          end
+        if Chef::VERSION.split('.').first.to_i == 11 && Chef::Config[:validation_key] && !File.exist?(File.expand_path(Chef::Config[:validation_key]))
+          ui.error("Unable to find validation key. Please verify your configuration file for validation_key config value.")
+          exit 1
+        end
+
+        if (defined?(chef_vault_handler) && chef_vault_handler.doing_chef_vault?) || 
+            (Chef::Config[:validation_key] && !File.exist?(File.expand_path(Chef::Config[:validation_key])))
 
           unless locate_config_value(:chef_node_name)
             ui.error("You must pass a node name with -N when bootstrapping with user credentials")
@@ -301,7 +303,13 @@ class Chef
           end
 
           client_builder.run
-          chef_vault_handler.run(node_name: config[:chef_node_name]) if chef_vault_handler.doing_chef_vault?
+
+          if client_builder.respond_to?(:client)
+            chef_vault_handler.run(client_builder.client)
+          else
+            chef_vault_handler.run(node_name: config[:chef_node_name])
+          end
+
           bootstrap_context.client_pem = client_builder.client_path
 
         else

data/lib/knife-windows/version.rb

@@ -1,6 +1,6 @@
 module Knife
   module Windows
-    VERSION = "1.1.3"
+    VERSION = "1.1.4"
     MAJOR, MINOR, TINY = VERSION.split('.')
   end
 end

data/spec/unit/knife/bootstrap_windows_winrm_spec.rb

@@ -256,4 +256,40 @@ describe Chef::Knife::BootstrapWindowsWinrm do
       end
     end
   end
+
+  context "when doing chef vault", :chef_gte_12_only do
+    let(:vault_handler) { double('vault_handler', :doing_chef_vault? => true) }
+    let(:node_name) { 'foo.example.com' }
+    before do
+      allow(bootstrap).to receive(:wait_for_remote_response)
+      allow(bootstrap).to receive(:create_bootstrap_bat_command)
+      allow(bootstrap).to receive(:run_command).and_return(0)
+      bootstrap.config[:chef_node_name] = node_name
+      bootstrap.chef_vault_handler = vault_handler
+    end
+
+    context "builder does not respond to client" do
+      before do
+        bootstrap.client_builder = instance_double("Chef::Knife::Bootstrap::ClientBuilder", :run => nil, :client_path => nil)
+      end
+
+      it "passes a node search query to the handler" do
+        expect(vault_handler).to receive(:run).with(node_name: node_name)
+        bootstrap.bootstrap
+      end
+    end
+
+    context "builder responds to client" do
+      let(:client) { Chef::ApiClient.new }
+
+      before do
+        bootstrap.client_builder = double("Chef::Knife::Bootstrap::ClientBuilder", :run => nil, :client_path => nil, :client => client)
+      end
+
+      it "passes a node search query to the handler" do
+        expect(vault_handler).to receive(:run).with(client)
+        bootstrap.bootstrap
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-windows
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - Seth Chisamore
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-30 00:00:00.000000000 Z
+date: 2016-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: winrm
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: winrm-s
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.3.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.3.4
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement