chef-provisioning 2.3.2 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d3670212688bd0ce77bfcd6b257f02b60c1735ba
-  data.tar.gz: 91df42c77d08dc6bae1cbaff35b47b94cbd9dd84
+  metadata.gz: 381e65468f3aca78eefc7cb3d1d85b69cfbf3adc
+  data.tar.gz: fb541ffa04e6caf5ad8a6761279ecf4107729d59
 SHA512:
-  metadata.gz: 45157667014c2915e2d340c149ba4b9f86382b5d3b3e4c875b8de4564c571843d95f5b7f8e6081a0b2d272299874f469c8c87240755edf44c02aa0c251849152
-  data.tar.gz: 9872540a82807e853556a66f94898cf6612dea8f05120f2079be1d1f0b7c1852d1ee9c96b7d836cd56548f4135c8551e151ce75dfe1e634fb54b2833c0271ae7
+  metadata.gz: 57a63940ce18f5754d0c4724485df86412f8b3b20660db4913ceee7bae8c04637493ecd85613180c1f6cf5d5272383734c1687c34a7f54a2fdef388d21744411
+  data.tar.gz: 590ed99e72fea98d02fcd9fc7370b1ea9914992c8255dbb3d622378c92a10f90d2cd9cd07d6ba1fd227a787eef3e6ebfc2d258d6dd594a7072e8489f39c7ef66

data/CHANGELOG.md

@@ -1,7 +1,18 @@
 # Change Log
 
-## [2.3.2](https://github.com/chef/chef-provisioning/tree/2.3.2) (2017-04-21)
-[Full Changelog](https://github.com/chef/chef-provisioning/compare/v2.3.1...2.3.2)
+## [2.4.0](https://github.com/chef/chef-provisioning/tree/2.4.0) (2017-06-27)
+[Full Changelog](https://github.com/chef/chef-provisioning/compare/v2.3.2...2.4.0)
+
+**Merged pull requests:**
+
+- allow newer net-ssh-gateway [\#584](https://github.com/chef/chef-provisioning/pull/584) ([jjlimepoint](https://github.com/jjlimepoint))
+- We can’t forward a socketless Zero server, so show a nice\(ish\) error [\#583](https://github.com/chef/chef-provisioning/pull/583) ([coderanger](https://github.com/coderanger))
+- Ignore group/owner/mode attrs on Windows machine until implemented [\#582](https://github.com/chef/chef-provisioning/pull/582) ([paustin01](https://github.com/paustin01))
+- Fix convergence\_options being steamrolled rather than merged [\#581](https://github.com/chef/chef-provisioning/pull/581) ([paustin01](https://github.com/paustin01))
+- add digest command to unix\_machine.files\_different? [\#570](https://github.com/chef/chef-provisioning/pull/570) ([steversmith](https://github.com/steversmith))
+
+## [v2.3.2](https://github.com/chef/chef-provisioning/tree/v2.3.2) (2017-04-21)
+[Full Changelog](https://github.com/chef/chef-provisioning/compare/v2.3.1...v2.3.2)
 
 **Merged pull requests:**
 

data/README.md

@@ -203,7 +203,7 @@ with_machine_options({
     # The following are only available for Linux machines
     install_sh_url: "https://www.chef.io/chef/install.sh", # <- DEFAULT, overwrite if necessary
     install_sh_path: "/tmp/chef-install.sh", # <- DEFAULT, overwrite if necessary
-    install_sh_arguments: "-P chef-dk", # Additional commands to pass to install.sh
+    install_sh_arguments: "-P chefdk", # Additional commands to pass to install.sh
     # The following are only available for Windows machines
     install_msi_url: "foo://bar.com"
   },

data/chef-provisioning.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'net-ssh', '>= 2.9', '< 5.0'
   s.add_dependency 'net-scp', '~> 1.0'
-  s.add_dependency 'net-ssh-gateway', '~> 1.2'
+  s.add_dependency 'net-ssh-gateway', '> 1.2', '< 3.0'
   s.add_dependency 'inifile', '>= 2.0.2'
   s.add_dependency 'cheffish', '>= 4.0', '< 14.0'
   s.add_dependency 'winrm', '~> 2.0'

data/lib/chef/provider/machine_file.rb

@@ -34,12 +34,17 @@ class MachineFile < Chef::Provider::LWRPBase
       machine.upload_file(action_handler, new_resource.local_path, new_resource.path)
     end
 
-    attributes = {}
-    attributes[:group] = new_resource.group if new_resource.group
-    attributes[:owner] = new_resource.owner if new_resource.owner
-    attributes[:mode] = new_resource.mode if new_resource.mode
-
-    machine.set_attributes(action_handler, new_resource.path, attributes)
+    # At some point hopefully we will define WindowsMachine.set_attributes
+    # See https://github.com/chef/chef-provisioning/issues/285 for how to get
+    # rid of this unless check
+    unless machine.kind_of?(Chef::Provisioning::Machine::WindowsMachine)
+      attributes = {}
+      attributes[:group] = new_resource.group if new_resource.group
+      attributes[:owner] = new_resource.owner if new_resource.owner
+      attributes[:mode] = new_resource.mode if new_resource.mode
+
+      machine.set_attributes(action_handler, new_resource.path, attributes)
+    end
   end
 
   action :download do

data/lib/chef/provisioning/convergence_strategy/install_cached.rb

@@ -22,7 +22,7 @@ module Provisioning
       # - :chef_version, :prerelease, :package_cache_path
       # - :package_metadata
       def initialize(convergence_options, config)
-        convergence_options = Cheffish::MergedConfig.new(convergence_options, {
+        convergence_options = Cheffish::MergedConfig.new(convergence_options.to_hash, {
           :client_rb_path => '/etc/chef/client.rb',
           :client_pem_path => '/etc/chef/client.pem'
         })

data/lib/chef/provisioning/convergence_strategy/install_msi.rb

@@ -21,7 +21,7 @@ module Provisioning
       def setup_convergence(action_handler, machine)
         if !convergence_options.has_key?(:client_rb_path) || !convergence_options.has_key?(:client_pem_path)
           system_drive = machine.system_drive
-          @convergence_options = Cheffish::MergedConfig.new(convergence_options, {
+          @convergence_options = Cheffish::MergedConfig.new(convergence_options.to_hash, {
             :client_rb_path => "#{system_drive}\\chef\\client.rb",
             :client_pem_path => "#{system_drive}\\chef\\client.pem",
             :install_script_path => "#{system_drive}\\chef\\\install.ps1"

data/lib/chef/provisioning/convergence_strategy/install_sh.rb

@@ -9,7 +9,7 @@ module Provisioning
       @@install_sh_cache = {}
 
       def initialize(convergence_options, config)
-        convergence_options = Cheffish::MergedConfig.new(convergence_options, {
+        convergence_options = Cheffish::MergedConfig.new(convergence_options.to_hash, {
           :client_rb_path => '/etc/chef/client.rb',
           :client_pem_path => '/etc/chef/client.pem'
         })

data/lib/chef/provisioning/machine/unix_machine.rb

@@ -46,6 +46,9 @@ module Provisioning
         result = transport.execute("md5sum -b #{path}", :read_only => true)
         unless result.exitstatus == 0
           result = transport.execute("md5 -r #{path}", :read_only => true)
+          unless result.exitstatus == 0
+            result = transport.execute("digest -a md5 #{path}", :read_only => true)
+          end
         end
         result.error!
         remote_sum = result.stdout.split(' ')[0]

data/lib/chef/provisioning/transport/ssh.rb

@@ -173,7 +173,11 @@ module Provisioning
 
       def make_url_available_to_remote(local_url)
         uri = URI(local_url)
-        if is_local_machine(uri.host)
+        if uri.scheme == 'chefzero' && !ChefZero::SocketlessServerMap.server_on_port(uri.port).server
+          # There is no .server for a socketless, for a socket-d server it would
+          # be a WEBrick::HTTPServer object.
+          raise 'Cannot forward a socketless Chef Zero server, see https://docs.chef.io/deprecations_local_listen.html for more information'
+        elsif is_local_machine(uri.host)
           port, host = forward_port(uri.port, uri.host, uri.port, 'localhost')
           if !port
             # Try harder if the port is already taken

data/lib/chef/provisioning/version.rb

@@ -1,5 +1,5 @@
 class Chef
 module Provisioning
-  VERSION = '2.3.2'
+  VERSION = '2.4.0'
 end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-provisioning
 version: !ruby/object:Gem::Version
-  version: 2.3.2
+  version: 2.4.0
 platform: ruby
 authors:
 - John Keiser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-21 00:00:00.000000000 Z
+date: 2017-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -48,16 +48,22 @@ dependencies:
   name: net-ssh-gateway
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '1.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '1.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: inifile
   requirement: !ruby/object:Gem::Requirement
@@ -303,7 +309,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: A library for creating machines and infrastructures idempotently in Chef.