knife-windows 1.6.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ecb337e248b812ce32f26edcf172c27d14f3b65c
-  data.tar.gz: 743d0ff57967c01fbd00be60c31ad4bc3aa7bb0c
+  metadata.gz: 5625bfb426520967ee2d9b753db05b7b6ddda38f
+  data.tar.gz: cef98f088ca495ebcae6933d16cf804301ec6259
 SHA512:
-  metadata.gz: 3265ed321b53251c71fc81239b67903016eed4f19a8ee743e116ddf50aae225b257ca2ff9adaa80a9c0dfeb2d94a8dd8af75c35c371cf3bf590bd98938bb6571
-  data.tar.gz: c67d95887c01fc68e71f743a49ca35ac450a0b1228ac1062721d8dc1b72fd0f7efcc81019748872ab633d4be03af5e41e66d8edc6d67e972bf332d75dd785df4
+  metadata.gz: 76723402071d410413a8df53644db66d177c99490597271769be060eed66df819c591da80c67af08a74c5d755f7d3ff39ae13103259b668c3bc3b380721c653a
+  data.tar.gz: 576edbb29512e8b7d79c592c9af8ecb59b75215df4c18595d54d39c34c77b9828519253d8cc16042fb050cb213bf13128d386de1834a3a7e34f396c51e8705da

data/.travis.yml

@@ -2,7 +2,7 @@ language: ruby
 
 rvm:
   - 2.1
-  - 2.2
+  - 2.3
 
 before_install:
   - gem install bundler

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # knife-windows Change Log
 
+## Release 1.7.0
+
+* [knife-windows #400](https://github.com/chef/knife-windows/pull/400) Allow a custom codepage to be specified and passed to the cmd shell
+
 ## Release 1.6.0
 
 * [knife-windows #393](https://github.com/chef/knife-windows/pull/393) Add documentation of the --msi-url option

data/Gemfile

@@ -10,5 +10,4 @@ group :test do
   gem "ruby-wmi"
   gem "httpclient"
   gem 'rake'
-  gem "rack", "< 2.0" # 2.0 requires Ruby 2.2+
 end

data/README.md

@@ -17,7 +17,7 @@ This plugin provides the following Knife subcommands. Specific command options c
 
 ### knife winrm
 
-The `winrm` subcommand allows you to invoke commands in parallel on a subset of the nodes in your infrastructure. The `winrm` subcommand uses the same syntax as the [search subcommand](https://docs.chef.io/knife_search.html); you could could find the uptime of all your web servers using the command:
+The `winrm` subcommand allows you to invoke commands in parallel on a subset of the nodes in your infrastructure. The `winrm` subcommand uses the same syntax as the [search subcommand](https://docs.chef.io/knife_search.html); you could find the uptime of all your web servers using the command:
 
     knife winrm "role:web" "net stats srv" -x Administrator -P 'super_secret_password'
 
@@ -217,6 +217,10 @@ of these authentication transports are outside of the scope of this
 README but details can be found on the
 [WinRM configuration guide](http://msdn.microsoft.com/en-us/library/aa384372\(v=vs.85\).aspx).
 
+### Working with legacy Windows versions
+
+If you are attempting to use `knife winrm` or `knife bootstrap windows winrm` with a version of windows that is older than server 2008 R2 or older than Windows 7 then you may need to alter the default UTF-8 codepage (65001) using the `--winrm-codepage` argument. You can use the codepage native to your locale but `437` is a safe codepage for older Windows versions.
+
 #### Configure SSL on a Windows node
 
 WinRM supports use of SSL to provide privacy and integrity of

data/appveyor.yml

@@ -11,10 +11,10 @@ environment:
     - ruby_version: "20"
       chef_version: "< 12"
 
-    - ruby_version: "21"
+    - ruby_version: "23"
       chef_version: "~> 12.0"
 
-    - ruby_version: "21"
+    - ruby_version: "23"
       chef_version: "master"
 
 clone_folder: c:\projects\knife-windows

data/knife-windows.gemspec

@@ -14,6 +14,7 @@ Gem::Specification.new do |s|
   s.description = s.summary
 
   s.required_ruby_version	= ">= 1.9.1"
+  s.add_dependency "winrm", "~> 2.1"
   s.add_dependency "winrm-elevated", "~> 1.0"
 
   s.add_development_dependency 'pry'

data/lib/chef/knife/winrm_base.rb

@@ -116,6 +116,11 @@ class Chef
             :long => "--session-timeout Minutes",
             :description => "The timeout for the client for the maximum length of the WinRM session",
             :default => 30
+
+          option :winrm_codepage,
+            :long => "--winrm-codepage Codepage",
+            :description => "The codepage to use for the winrm cmd shell",
+            :default => 65001
         end
       end
     end

data/lib/chef/knife/winrm_knife_base.rb

@@ -202,7 +202,8 @@ class Chef
               transport: resolve_winrm_transport,
               no_ssl_peer_verification: resolve_no_ssl_peer_verification,
               ssl_peer_fingerprint: resolve_ssl_peer_fingerprint,
-              shell: locate_config_value(:winrm_shell)
+              shell: locate_config_value(:winrm_shell),
+              codepage: locate_config_value(:winrm_codepage)
             }
 
             if @session_opts[:user] and (not @session_opts[:password])

data/lib/chef/knife/winrm_session.rb

@@ -31,7 +31,8 @@ class Chef
         @host = options[:host]
         @port = options[:port]
         @user = options[:user]
-        @shell = options[:shell]
+        @shell_args = [ options[:shell] ]
+        @shell_args << { codepage: options[:codepage] } if options[:shell] == :cmd
         url = "#{options[:host]}:#{options[:port]}/wsman"
         scheme = options[:transport] == :ssl ? 'https' : 'http'
         @endpoint = "#{scheme}://#{url}"
@@ -63,7 +64,7 @@ class Chef
 
       def relay_command(command)
         session_result = WinRM::Output.new
-        @winrm_session.shell(@shell) do |shell|
+        @winrm_session.shell(*@shell_args) do |shell|
           shell.username = @user.split("\\").last if shell.respond_to?(:username)
           session_result = shell.run(command) do |stdout, stderr|
             print_data(@host, stdout) if stdout

data/lib/knife-windows/version.rb

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

data/spec/unit/knife/winrm_session_spec.rb

@@ -67,5 +67,29 @@ describe Chef::Knife::WinrmSession do
       expect(winrm_connection).to receive(:shell)
       subject.relay_command("cmd.exe echo 'hi'")
     end
+
+    context "cmd shell" do
+      before do
+        options[:shell] = :cmd
+        options[:codepage] = 65001
+      end
+
+      it "creates shell and sends codepage" do
+        expect(winrm_connection).to receive(:shell).with(:cmd, hash_including(codepage: 65001))
+        subject.relay_command("cmd.exe echo 'hi'")
+      end
+    end
+
+    context "powershell shell" do
+      before do
+        options[:shell] = :powershell
+        options[:codepage] = 65001
+      end
+
+      it "does not send codepage to shell" do
+        expect(winrm_connection).to receive(:shell).with(:powershell)
+        subject.relay_command("cmd.exe echo 'hi'")
+      end
+    end
   end
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: knife-windows
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.7.0
 platform: ruby
 authors:
 - Seth Chisamore
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-07 00:00:00.000000000 Z
+date: 2016-10-14 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: winrm
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: winrm-elevated
   requirement: !ruby/object:Gem::Requirement