chef-provisioning 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e3304a5ecfc8f5bea393fa3726fc0d42fa302f67
-  data.tar.gz: 0a10809301c0dea45997d8ae05de2d3abe50ff6a
+  metadata.gz: 88e66a0f2f8ba08fe89dd0bacfafc5347e60ab1e
+  data.tar.gz: 8613f4903f14bfbee91ad754733a666c7f926b57
 SHA512:
-  metadata.gz: 5e49ae5b867145555c90fcc3db39c46b10590045455222653d8ca2215cb8300e7d4ef1094d2842b50459998a58838dea5c663652724d57f74c9fdee35a899cd4
-  data.tar.gz: c98943e0ca2c338e9973815588d081e49ee4cd86b07a3e55666eda8740a3f47cfab02c1ed257ff05921f4a6b3398a7aa0a6bda594c12e958a91d656f5236bc93
+  metadata.gz: 7573ea723df0c01690c01e593f135c1fd3eeac2e0279a521befba486251f045bb51cf5b8af614b9a91f17f835c90af3ce831b33265533bbd88aadf22cd5fa79a
+  data.tar.gz: 773f45f5108f16e456bc75f6fd1bdb2e54f5daa3d35d1a13eb19dd6c17c631e041df21262ed10cdaa567ec1f110c009224c787c54fe7fb135ee5f81bf26d1dc9

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Chef Provisioning Changelog
 
+## 1.1.0
+
+- Fix machine_batch :destroy, no longer creating extra threads ([#321][])
+- Allow user to specify a custom stdout in `Chef::Config[:stdout]` ([#311][])
+- If `convergence_options[:bootstrap_proxy]` is populated use it to download chef ([#317][])
+
 ## 1.0.1 (4/7/2015)
 
 - Clean up dependencies ([#316][])
@@ -279,7 +285,10 @@
 [#297]: https://github.com/chef/chef-provisioning/issues/297
 [#299]: https://github.com/chef/chef-provisioning/issues/299
 [#303]: https://github.com/chef/chef-provisioning/issues/303
+[#311]: https://github.com/chef/chef-provisioning/issues/311
 [#316]: https://github.com/chef/chef-provisioning/issues/316
+[#317]: https://github.com/chef/chef-provisioning/issues/317
+[#321]: https://github.com/chef/chef-provisioning/issues/321
 [@MrMMorris]: https://github.com/MrMMorris
 [@causton1]: https://github.com/causton1
 [@chef]: https://github.com/chef
@@ -296,4 +305,4 @@
 [@mwrock]: https://github.com/mwrock
 [@segv]: https://github.com/segv
 [@xeon22]: https://github.com/xeon22
-[@xorl]: https://github.com/xorl
+[@xorl]: https://github.com/xorl

data/lib/chef/provider/machine_batch.rb

@@ -77,7 +77,7 @@ class MachineBatch < Chef::Provider::LWRPBase
   action :destroy do
     parallel_do(by_current_driver) do |driver, specs_and_options|
       driver.destroy_machines(action_handler, specs_and_options, parallelizer)
-      parallel_do(specs_and_options.keys).each do |machine_spec|
+      specs_and_options.keys.each do |machine_spec|
         machine_spec.delete(action_handler)
       end
     end

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

@@ -64,7 +64,20 @@ module Provisioning
 
         # Install chef client
         # TODO ssh verification of install.sh before running arbtrary code would be nice?
-        @@install_sh_cache[install_sh_url] ||= Net::HTTP.get(URI(install_sh_url))
+        if convergence_options[:bootstrap_proxy].empty?
+          @@install_sh_cache[install_sh_url] ||= Net::HTTP.get(URI(install_sh_url))
+        else
+          @@install_sh_cache[install_sh_url] ||= begin
+            proxy_uri = URI.parse(convergence_options[:bootstrap_proxy])
+            chef_uri  = URI.parse(@install_sh_url)
+            proxy     = Net::HTTP::Proxy(proxy_uri.host, proxy_uri.port, proxy_uri.user, proxy_uri.password)
+            req       = Net::HTTP::Get.new(chef_uri.path)
+            script    = proxy.start(chef_uri.host, :use_ssl => proxy_uri.scheme == 'https') do |http|
+              http.request(req)
+            end
+            script.body
+          end
+        end
         machine.write_file(action_handler, install_sh_path, @@install_sh_cache[install_sh_url], :ensure_dir => true)
         # TODO handle bad version case better
         machine.execute(action_handler, install_sh_command_line)

data/lib/chef/provisioning/transport.rb

@@ -67,18 +67,23 @@ module Provisioning
         options[:stream].call(stdout_chunk, stderr_chunk)
       else
         if stdout_chunk
-          if options[:stream_stdout]
-            options[:stream_stdout].print stdout_chunk
+          if options.has_key?(:stream_stdout)
+            stream = options[:stream_stdout]
           elsif options[:stream] || config[:log_level] == :debug
-            STDOUT.print stdout_chunk
+            stream = config[:stdout] || STDOUT
           end
+
+          stream.print stdout_chunk if stream
         end
+
         if stderr_chunk
-          if options[:stream_stderr]
-            options[:stream_stderr].print stderr_chunk
+          if options.has_key?(:stream_stderr)
+            stream = options[:stream_stderr]
           elsif options[:stream] || config[:log_level] == :debug
-            STDERR.print stderr_chunk
+            stream = config[:stderr] || STDERR
           end
+
+          stream.print stderr_chunk if stream
         end
       end
     end

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

@@ -90,6 +90,7 @@ module Provisioning
         SSHResult.new(command, execute_options, stdout, stderr, exitstatus)
       end
 
+      # TODO why does #read_file download it to the target host?
       def read_file(path)
         Chef::Log.debug("Reading file #{path} from #{username}@#{host}")
         result = StringIO.new
@@ -208,7 +209,7 @@ module Provisioning
             execute("chown #{username} #{remote_tempfile}").error!
             do_download remote_tempfile, local_path
           rescue => e
-              Chef::Log.error "Unable to download #{path} to #{local_path} on #{username}@#{host} -- #{e}"
+              Chef::Log.error "Unable to download #{path} to #{remote_tempfile} on #{username}@#{host} -- #{e}"
               nil
           ensure
             # Clean up afterwards

data/lib/chef/provisioning/version.rb

@@ -1,5 +1,5 @@
 class Chef
 module Provisioning
-  VERSION = '1.0.1'
+  VERSION = '1.1.0'
 end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-provisioning
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - John Keiser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-07 00:00:00.000000000 Z
+date: 2015-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef