poise-languages 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f4a05fa47de317277eae76e90f0e2f8fd4f03d72
-  data.tar.gz: e3c4ef2901a9c2ccb9f0467334389060533448e2
+  metadata.gz: 6f6513d765b3d69409dbd7a4ae5e30d71a0b78c9
+  data.tar.gz: 73b6d0b35651da918deeee5ecfc6acdc726576a8
 SHA512:
-  metadata.gz: dce25fe02f0b2c9c66764c19d1278d95262b0a2ae7aa2ff865a223baa21f6acc97df83ef22cd1e438e378ca9043f2bfca19d522c24e63be5818cae7394142557
-  data.tar.gz: b0ec72f8eda800c9a0a0423920c5bd704697af0c4561431d3e30e14e471b495b9b240e6e2aa288b5f1fc38c19203d27a9e859ff9577ee8d16a97032f3e2d1cc5
+  metadata.gz: d600c8ede972ec0d5b5f63e6b0466539ec756844f85dcf41286fcc6335c7722567620d173d9668ae4dfa7edabfd9b63c8136bd1cb03e8e6ca4f350286cb0ac78
+  data.tar.gz: 72c3191bd757a71db694ff83bd41d71b31ec80ecc162789c7c8438f5d659766f5de3a785cf7bda66558ea546f56857a10684ef18ba5ab946ebe980acc1fcb899

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## v1.3.0
+
+* `%{machine_label}` is available in URL template for static download.
+* Automatically retry `remote_file` downloads to handle transient HTTP failures.
+* All `*_shell_out` language command helpers use `poise_shell_out` to set `$HOME`
+  and other environment variables by default.
+
 ## v1.2.0
 
 * Support for installing development headers with SCL providers.

data/lib/poise_languages/command/mixin.rb

@@ -16,7 +16,6 @@
 
 require 'shellwords'
 
-require 'chef/mixin/shell_out'
 require 'poise'
 
 require 'poise_languages/utils'
@@ -161,7 +160,7 @@ module PoiseLanguages
 
       # A mixin for providers that run language commands.
       module Provider
-        include Chef::Mixin::ShellOut
+        include Poise::Utils::ShellOut
 
         private
 
@@ -171,16 +170,12 @@ module PoiseLanguages
         # @param name [Symbol] Language name.
         # @param command_args [Array] Arguments to `shell_out`.
         # @return [Mixlib::ShellOut]
-        def language_command_shell_out(name, *command_args)
-          options = if command_args.last.is_a?(Hash)
-            command_args.pop.dup
-          else
-            {}
-          end
+        def language_command_shell_out(name, *command_args, **options)
           # Inject our environment variables if needed.
+          options[:environment] ||= {}
           parent = new_resource.send(:"parent_#{name}")
           if parent
-            options[:environment] = parent.send(:"#{name}_environment").merge(options[:environment] || {})
+            options[:environment].update(parent.send(:"#{name}_environment"))
           end
           # Inject other options.
           options[:timeout] ||= new_resource.timeout
@@ -193,7 +188,7 @@ module PoiseLanguages
           end
           Chef::Log.debug("[#{new_resource}] Running #{name} command: #{command.is_a?(Array) ? Shellwords.shelljoin(command) : command}")
           # Run the command
-          shell_out(command, options)
+          poise_shell_out(command, options)
         end
 
         # Run a command using the configured language via `shell_out!`.

data/lib/poise_languages/static/mixin.rb

@@ -52,6 +52,7 @@ module PoiseLanguages
           version: options['static_version'],
           kernel: node['kernel']['name'].downcase,
           machine: node['kernel']['machine'],
+          machine_label: self.class.static_machine_label(node),
         }
       end
 
@@ -61,6 +62,7 @@ module PoiseLanguages
         attr_accessor :static_machines
         attr_accessor :static_url
         attr_accessor :static_strip_components
+        attr_accessor :static_retries
 
         def provides_auto?(node, resource)
           # Check that the version starts with our project name and the machine
@@ -77,6 +79,8 @@ module PoiseLanguages
           super.merge({
             # Path to install the package. Defaults to /opt/name-version.
             path: nil,
+            # Number of times to retry failed downloads.
+            retries: static_retries,
             # Full version number for use in interpolation.
             static_version: static_version(node, resource),
             # Value to pass to tar --strip-components.
@@ -86,17 +90,18 @@ module PoiseLanguages
           })
         end
 
-        def static_options(name: nil, versions: [], machines: %w{linux-i686 linux-x86_64}, url: nil, strip_components: 1)
+        def static_options(name: nil, versions: [], machines: %w{linux-i686 linux-x86_64}, url: nil, strip_components: 1, retries: 5)
           raise PoiseLanguages::Error.new("Static archive URL is required, on #{self}") unless url
           self.static_name = name || provides.to_s
           self.static_versions = versions
           self.static_machines = Set.new(machines)
           self.static_url = url
           self.static_strip_components = strip_components
+          self.static_retries = retries
         end
 
         def static_version(node, resource)
-          raw_version = resource.version.gsub(/^#{static_name}(-|$)/, '')
+          raw_version = resource.version.to_s.gsub(/^#{static_name}(-|$)/, '')
           if static_versions.include?(raw_version)
             raw_version
           else

data/lib/poise_languages/static/resource.rb

@@ -39,6 +39,10 @@ module PoiseLanguages
       #   Directory to install to.
       #   @return [String]
       attribute(:path, kind_of: String, name_attribute: true)
+      # @!attribute download_retries
+      #   Number of times to retry failed downloads. Defaults to 5.
+      #   @return [Integer]
+      attribute(:download_retries, kind_of: Integer, default: 5)
       # @!attribute source
       #   URL to download from.
       #   @return [String]
@@ -112,6 +116,7 @@ module PoiseLanguages
           group 0
           mode '644'
           notifies :run, unpack_resource, :immediately
+          retries new_resource.download_retries
         end
       end
 

data/lib/poise_languages/system/mixin.rb

@@ -69,9 +69,9 @@ module PoiseLanguages
       # @return [String]
       def system_package_name
         # Look up all packages for this language on this platform.
-        system_packages = node.value_for_platform(self.class.packages)
+        system_packages = self.class.packages && node.value_for_platform(self.class.packages)
         if !system_packages && self.class.default_package
-          Chef::Log.debug("[#{new_resource}] No known packages for #{node['platform']} #{node['platform_version']}, defaulting to '#{self.class.default_package}'.")
+          Chef::Log.debug("[#{new_resource}] No known packages for #{node['platform']} #{node['platform_version']}, defaulting to '#{self.class.default_package}'.") if self.class.packages
           system_packages = Array(self.class.default_package)
         end
 

data/lib/poise_languages/system/resource.rb

@@ -188,7 +188,7 @@ module PoiseLanguages
           define_method(:load_current_resource) do
             super().tap do |_|
               each_package do |package_name, new_version, current_version, candidate_version|
-                unless candidate_version.start_with?(version)
+                unless candidate_version && candidate_version.start_with?(version)
                   raise PoiseLanguages::Error.new("Package #{package_name} would install #{candidate_version}, which does not match #{version.empty? ? version.inspect : version}. Please set the package_name or package_version provider options.")
                 end
               end

data/lib/poise_languages/version.rb

@@ -16,5 +16,5 @@
 
 
 module PoiseLanguages
-  VERSION = '1.2.0'
+  VERSION = '1.3.0'
 end

data/poise-languages.gemspec

@@ -34,7 +34,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = %w{lib}
 
   spec.add_dependency 'halite', '~> 1.0'
-  spec.add_dependency 'poise', '~> 2.3'
+  spec.add_dependency 'poise', '~> 2.5'
 
   spec.add_development_dependency 'poise-boiler', '~> 1.0'
 end

data/test/spec/command/mixin_spec.rb

@@ -259,7 +259,7 @@ describe PoiseLanguages::Command::Mixin do
         recipe do
           poise_test 'test' do
             command 'foo'
-            expect ['/which/mylang foo', {timeout: 900}]
+            expect ['/which/mylang foo', {environment:{}, timeout: 900}]
           end
         end
         it { run_chef }
@@ -293,7 +293,7 @@ describe PoiseLanguages::Command::Mixin do
         recipe do
           poise_test 'test' do
             command ['foo']
-            expect [['/which/mylang', 'foo'], {timeout: 900}]
+            expect [['/which/mylang', 'foo'], {environment: {}, timeout: 900}]
           end
         end
         it { run_chef }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: poise-languages
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Noah Kantrowitz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-02 00:00:00.000000000 Z
+date: 2016-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: halite
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '2.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '2.5'
 - !ruby/object:Gem::Dependency
   name: poise-boiler
   requirement: !ruby/object:Gem::Requirement