knife-windows 1.4.1 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7bb6cf74b7d035cc8d5a2e165c11b2f31b5d13d3
-  data.tar.gz: 851e56bd0d5329dc2c22b176962772482b231f07
+  metadata.gz: 2626d5fa8eb4c9f59c5fa6d78548a75da2f13191
+  data.tar.gz: c368fddf73e2377cde52ec84ca97d0bc6173d0fa
 SHA512:
-  metadata.gz: 1e09c42feecae9bce95cf1c6dc4f3a3844f0728810c34eb2ff2e2d906c9fdd46f37c53f6dc0f534fd41b7956dace49e9d08d16255e2a00b5ca2088f5af6a8093
-  data.tar.gz: 31c3aad802d5c4245a5f4f2d619a4f4d30512bf44f152597fc56d634b1f764025579c4984871529343be18bcc1887a2bff64e5fef523f587912d940d7a71e36f
+  metadata.gz: e428bb9f8143cb39f06c00c9f668de98a53d7fb561927a3a96068472888f50b905335cc10b10a2822c7c7fe2a6402deb0fbb0324b9a468781cc9461c2e1b1464
+  data.tar.gz: 765c2b04b88c9f30ff13f7e1d865d836f9562223f6a189f53d563db23be793a31ca496ccced45783f70415fa21bfc92e4772c934494b5f7f9184d344f7b0b8cd

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # knife-windows Change Log
 
+## Release 1.5.0
+
+* [knife-windows #377](https://github.com/chef/knife-windows/pull/377) Added code and corresponding RSpecs to read the json attributes from the --json-attributes-file option.
+
 ## Release 1.4.1
 
 * [knife-windows #362](https://github.com/chef/knife-windows/pull/362) Fix `knife windows bootstrap` chef client downloads over a proxy

data/DOC_CHANGES.md

@@ -1,14 +1,14 @@
-<!---
-This file is reset every time a new release is done. This file describes changes that have not yet been released.
-
-Example Doc Change:
-### Headline for the required change
-Description of the required change.
--->
-# knife-windows 1.2.0 doc changes
-
-### Support for NTLM/Negotiate on both windows and linux
-
-This release makes no changes to the command line interface, but users should now be aware that Negotiate authentication and encryption over plaintext HTTP now works on linux in addition to windows.
-
-Users who use knife-windows to bootstrap nodes over plaintext HTTP should also be aware that they no longer need, and in fact should not, configure base images enabling `basic_auth` or enabling `AllowUnencrypted` in their winrm configuration.
+<!---
+This file is reset every time a new release is done. This file describes changes that have not yet been released.
+
+Example Doc Change:
+### Headline for the required change
+Description of the required change.
+-->
+# knife-windows 1.2.0 doc changes
+
+### Support for NTLM/Negotiate on both windows and linux
+
+This release makes no changes to the command line interface, but users should now be aware that Negotiate authentication and encryption over plaintext HTTP now works on linux in addition to windows.
+
+Users who use knife-windows to bootstrap nodes over plaintext HTTP should also be aware that they no longer need, and in fact should not, configure base images enabling `basic_auth` or enabling `AllowUnencrypted` in their winrm configuration.

data/Gemfile

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

data/ci.gemfile

@@ -1,15 +1,16 @@
-source "https://rubygems.org"
-
-# Specify your gem's dependencies in knife-windows.gemspec
-gemspec
-
-if ENV['CHEF_VERSION'] == 'master'
-  gem 'chef', github: 'chef/chef'
-else
-  gem 'chef', ENV['CHEF_VERSION']
-end
-
-gem "rspec", '~> 3.0'
-gem "ruby-wmi"
-gem "httpclient"
-gem 'rake'
+source "https://rubygems.org"
+
+# Specify your gem's dependencies in knife-windows.gemspec
+gemspec
+
+if ENV['CHEF_VERSION'] == 'master'
+  gem 'chef', github: 'chef/chef'
+else
+  gem 'chef', ENV['CHEF_VERSION']
+end
+
+gem "rspec", '~> 3.0'
+gem "ruby-wmi"
+gem "httpclient"
+gem 'rake'
+gem "rack", "< 2.0" # 2.0 requires Ruby 2.2+

data/knife-windows.gemspec

@@ -1,25 +1,25 @@
-# -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "knife-windows/version"
-
-Gem::Specification.new do |s|
-  s.name        = "knife-windows"
-  s.version     = Knife::Windows::VERSION
-  s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Seth Chisamore"]
-  s.email       = ["schisamo@chef.io"]
-  s.license     = "Apache-2.0"
-  s.homepage    = "https://github.com/chef/knife-windows"
-  s.summary     = %q{Plugin that adds functionality to Chef's Knife CLI for configuring/interacting with nodes running Microsoft Windows}
-  s.description = s.summary
-
-  s.required_ruby_version	= ">= 1.9.1"
-  s.add_dependency "winrm", "~> 1.7"
-
-  s.add_development_dependency 'pry'
-
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
-end
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "knife-windows/version"
+
+Gem::Specification.new do |s|
+  s.name        = "knife-windows"
+  s.version     = Knife::Windows::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["Seth Chisamore"]
+  s.email       = ["schisamo@chef.io"]
+  s.license     = "Apache-2.0"
+  s.homepage    = "https://github.com/chef/knife-windows"
+  s.summary     = %q{Plugin that adds functionality to Chef's Knife CLI for configuring/interacting with nodes running Microsoft Windows}
+  s.description = s.summary
+
+  s.required_ruby_version	= ">= 1.9.1"
+  s.add_dependency "winrm", "~> 1.7"
+
+  s.add_development_dependency 'pry'
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  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

@@ -268,7 +268,12 @@ class Chef
         cli_secret_file || cli_secret || knife_secret_file || knife_secret
       end
 
+      def first_boot_attributes
+        config[:first_boot_attributes] || config[:first_boot_attributes_from_file] || {}
+      end
+
       def render_template(template=nil)
+        config[:first_boot_attributes] = first_boot_attributes
         config[:secret] = load_correct_secret
         Erubis::Eruby.new(template).evaluate(bootstrap_context)
       end

data/lib/knife-windows/version.rb

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

data/spec/unit/knife/bootstrap_windows_winrm_spec.rb

@@ -339,4 +339,88 @@ describe Chef::Knife::BootstrapWindowsWinrm do
       end
     end
   end
+
+  describe 'first_boot_attributes' do
+    let(:first_boot_attributes) { { 'a1' => 'b1', 'a2' => 'b2', 'source' => 'hash' } }
+    let(:json_file) { 'my_json.json' }
+    let(:first_boot_attributes_from_file) { read_json_file(json_file) }
+
+    before do
+      File.open(json_file,"w+") do |f|
+        f.write <<-EOH
+{"b2" : "a3", "a4" : "b5", "source" : "file"}
+        EOH
+      end
+    end
+
+    context 'when none of the json-attributes options are passed' do
+      it 'returns an empty hash' do
+        response = bootstrap.first_boot_attributes
+        expect(response).to be == {}
+      end
+    end
+
+    context 'when only --json-attributes option is passed' do
+      before do
+        bootstrap.config[:first_boot_attributes] = first_boot_attributes
+      end
+
+      it 'returns the hash passed by the user in --json-attributes option' do
+        response = bootstrap.first_boot_attributes
+        expect(response).to be == first_boot_attributes
+      end
+    end
+
+    context 'when only --json-attribute-file option is passed' do
+      before do
+        bootstrap.config[:first_boot_attributes_from_file] = first_boot_attributes_from_file
+      end
+
+      it 'returns the hash passed by the user in --json-attribute-file option' do
+        response = bootstrap.first_boot_attributes
+        expect(response).to be == { 'b2' => 'a3', 'a4' => 'b5', 'source' => 'file' }
+      end
+    end
+
+    context 'when both the --json-attributes option and --json-attribute-file options are passed' do
+      before do
+        bootstrap.config[:first_boot_attributes] = first_boot_attributes
+        bootstrap.config[:first_boot_attributes_from_file] = first_boot_attributes_from_file
+      end
+
+      it 'returns the hash passed by the user in --json-attributes option' do
+        response = bootstrap.first_boot_attributes
+        expect(response).to be == first_boot_attributes
+      end
+    end
+
+    after do
+      FileUtils.rm_rf json_file
+    end
+  end
+
+  describe 'render_template' do
+    before do
+      allow(bootstrap).to receive(:first_boot_attributes).and_return(
+        { 'a1' => 'b3', 'a2' => 'b1' }
+      )
+      allow(bootstrap).to receive(:load_correct_secret).and_return(
+        'my_secret'
+      )
+      allow(Erubis::Eruby).to receive_message_chain(:new, :evaluate).and_return(
+        'my_template'
+      )
+    end
+
+    it 'sets correct values into config and returns the correct response' do
+      response = bootstrap.render_template
+      expect(bootstrap.config[:first_boot_attributes]).to be == { 'a1' => 'b3', 'a2' => 'b1' }
+      expect(bootstrap.config[:secret]).to be == 'my_secret'
+      expect(response).to be == 'my_template'
+    end
+  end
+end
+
+def read_json_file(file)
+  Chef::JSONCompat.parse(File.read(file))
 end

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: knife-windows
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.5.0
 platform: ruby
 authors:
 - Seth Chisamore
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-04 00:00:00.000000000 Z
+date: 2016-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: winrm
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Plugin that adds functionality to Chef's Knife CLI for configuring/interacting
@@ -46,9 +46,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
+- .gitignore
+- .rspec
+- .travis.yml
 - CHANGELOG.md
 - DOC_CHANGES.md
 - Gemfile
@@ -108,19 +108,20 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.1
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.3
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Plugin that adds functionality to Chef's Knife CLI for configuring/interacting
   with nodes running Microsoft Windows
 test_files: []
+has_rdoc: