poise-languages 1.3.3 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 008fbb1c6b0f93e7579a1501d0bf326e1856a021
-  data.tar.gz: 25b5176424836a53b9143d4b6d143a3c64d33cac
+  metadata.gz: 0b0b22c0e5713511a2467b58158f1675d591d1f0
+  data.tar.gz: e4f1bcccbb1bcd84aa28919c03ecd6066f53e543
 SHA512:
-  metadata.gz: ecee153c5e3d81b2f310d0449c266be92573fb5558c5a3b3db3c548b3df3609a9845ce196ec0302a7a186213ef12d1f46f8bbb9a28376364efa84d68aea71a08
-  data.tar.gz: 20812e074fac41b31241e9504f4b9084d312f30d831da11c82ccd6ec969579ccfbc64b56120329f6e498ee23ee1ba7b3a9d0c5eb5ff15262a9c22670039a57be
+  metadata.gz: 7a42e47e7e0cd8815b61756e6bd933aeb1139a8181544b35ad8fe5b620655d107d5355aa9f27ad85040bec1bdc7765b10035860435464200d19d5b73d21de792
+  data.tar.gz: 1006b3f1fc173a13c145d78bd3bbd96a9a4b0397eaa66505ea4d771b456fe37c634a024daf9b9a615e343cdf5e8dfcfb928002321403b732b23148b956057f77

data/.travis.yml

@@ -17,4 +17,6 @@ gemfile:
 - test/gemfiles/chef-12.4.gemfile
 - test/gemfiles/chef-12.5.gemfile
 - test/gemfiles/chef-12.6.gemfile
+- test/gemfiles/chef-12.7.gemfile
+- test/gemfiles/chef-12.8.gemfile
 - test/gemfiles/master.gemfile

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## v1.4.0
+
+* Use `poise-archive` to unpack static binary archives. This should work better
+  on AIX and Solaris, as well as making it easier to add more archive formats in
+  the future.
+
 ## v1.3.3
 
 * [#3](https://github.com/poise/poise-languages/pull/3) Fix `static` binary

data/Gemfile

@@ -29,5 +29,6 @@ end
 
 dev_gem 'halite'
 dev_gem 'poise'
+dev_gem 'poise-archive'
 dev_gem 'poise-boiler'
 dev_gem 'poise-profiler'

data/lib/poise_languages/static/mixin.rb

@@ -52,7 +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),
+          machine_label: self.class.static_machine_label_wrapper(node, new_resource),
         }
       end
 
@@ -67,7 +67,7 @@ module PoiseLanguages
         def provides_auto?(node, resource)
           # Check that the version starts with our project name and the machine
           # we are on is supported.
-          resource.version.to_s =~ /^#{static_name}(-|$)/ && static_machines.include?(static_machine_label(node))
+          resource.version.to_s =~ /^#{static_name}(-|$)/ && static_machines.include?(static_machine_label_wrapper(node, resource))
         end
 
         # Set some default inversion provider options. Package name can't get
@@ -111,14 +111,26 @@ module PoiseLanguages
           end
         end
 
-        def static_machine_label(node)
+        def static_machine_label(node, _resource=nil)
           "#{node['kernel']['name'].downcase}-#{node['kernel']['machine']}"
         end
 
+        # Wrapper for {#static_machine_label} because I need to add an argument.
+        # This preserves backwards compat.
+        #
+        # @api private
+        def static_machine_label_wrapper(node, resource)
+          args = [node]
+          arity = method(:static_machine_label).arity
+          args << resource if arity > 1 || arity < 0
+          static_machine_label(*args)
+        end
+
         def included(klass)
           super
           klass.extend ClassMethods
         end
+
       end
 
       extend ClassMethods

data/lib/poise_languages/static/resource.rb

@@ -72,7 +72,6 @@ module PoiseLanguages
       # @return [void]
       def action_install
         notifying_block do
-          install_utils unless node.platform_family?('mac_os_x', 'windows', 'aix', 'solaris2')
           download_archive
           create_directory
           # Unpack is handled as a notification from download_archive.
@@ -91,22 +90,13 @@ module PoiseLanguages
 
       private
 
-      def install_utils
-        package [].tap {|utils|
-          utils << 'tar' if new_resource.cache_path =~ /\.t(ar|gz|bz|xz)/
-          utils << 'bzip2' if new_resource.cache_path =~ /\.t?bz/
-          # This probably won't work on RHEL?
-          utils << 'xz-utils' if new_resource.cache_path =~ /\.t?xz/
-        }
-      end
-
       def create_directory
         unpack_resource = unpack_archive
         directory new_resource.path do
           user 0
           group 0
           mode '755'
-          notifies :run, unpack_resource, :immediately
+          notifies :unpack, unpack_resource, :immediately
         end
       end
 
@@ -117,32 +107,17 @@ module PoiseLanguages
           owner 0
           group 0
           mode '644'
-          notifies :run, unpack_resource, :immediately if ::File.exist?(new_resource.path)
+          notifies :unpack, unpack_resource, :immediately if ::File.exist?(new_resource.path)
           retries new_resource.download_retries
         end
       end
 
       def unpack_archive
-        # Build up the unpack command. Someday this will probably need to
-        # support unzip too.
-        cmd = %w{tar}
-        cmd << "--strip-components=#{new_resource.strip_components}" if new_resource.strip_components && new_resource.strip_components > 0
-        cmd << if new_resource.cache_path =~ /\.t?gz/
-          '-xzvf'
-        elsif new_resource.cache_path =~ /\.t?bz/
-          '-xjvf'
-        elsif new_resource.cache_path =~ /\.t?xz/
-          '-xJvf'
-        else
-          '-xvf'
-        end
-        cmd << new_resource.cache_path
-
-        @unpack_archive ||= execute 'unpack archive' do
-          # Run via notification from #download_archive.
+        @unpack_archive ||= poise_archive new_resource.cache_path do
+          # Run via notification from #download_archive and #create_directory.
           action :nothing
-          command cmd
-          cwd new_resource.path
+          destination new_resource.path
+          strip_components new_resource.strip_components
         end
       end
 

data/lib/poise_languages/system/mixin.rb

@@ -29,7 +29,7 @@ module PoiseLanguages
       # @return [PoiseLanguages::System::Resource]
       def install_system_packages
         dev_package_overrides = system_dev_package_overrides
-        poise_languages_system options['package_name'] || system_package_name do
+        poise_languages_system system_package_name do
           # Otherwise use the default install action.
           action(:upgrade) if options['package_upgrade']
           parent new_resource
@@ -68,6 +68,8 @@ module PoiseLanguages
       # @api public
       # @return [String]
       def system_package_name
+        # If we have an override, just use that.
+        return options['package_name'] if options['package_name']
         # Look up all packages for this language on this platform.
         system_packages = self.class.packages && node.value_for_platform(self.class.packages)
         if !system_packages && self.class.default_package

data/lib/poise_languages/version.rb

@@ -16,5 +16,5 @@
 
 
 module PoiseLanguages
-  VERSION = '1.3.3'
+  VERSION = '1.4.0'
 end

data/poise-languages.gemspec

@@ -35,6 +35,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'halite', '~> 1.0'
   spec.add_dependency 'poise', '~> 2.5'
+  spec.add_dependency 'poise-archive', '~> 1.0'
 
   spec.add_development_dependency 'poise-boiler', '~> 1.0'
 end

data/test/gemfiles/chef-12.7.gemfile

@@ -0,0 +1,19 @@
+#
+# Copyright 2015-2016, Noah Kantrowitz
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+eval_gemfile File.expand_path('../../../Gemfile', __FILE__)
+
+gem 'chef', '~> 12.7.2'

data/test/gemfiles/chef-12.8.gemfile

@@ -0,0 +1,19 @@
+#
+# Copyright 2015-2016, Noah Kantrowitz
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+eval_gemfile File.expand_path('../../../Gemfile', __FILE__)
+
+gem 'chef', '~> 12.8.1'

data/test/gemfiles/master.gemfile

@@ -19,5 +19,6 @@ eval_gemfile File.expand_path('../../../Gemfile', __FILE__)
 gem 'chef', github: 'chef/chef'
 gem 'halite', github: 'poise/halite'
 gem 'poise', github: 'poise/poise'
+gem 'poise-archive', github: 'poise/poise-archive'
 gem 'poise-boiler', github: 'poise/poise-boiler'
 gem 'poise-profiler', github: 'poise/poise-profiler'

data/test/spec/spec_helper.rb

@@ -16,3 +16,4 @@
 
 require 'poise_boiler/spec_helper'
 require 'poise_languages'
+require 'poise_archive/cheftie'

data/test/spec/static/resource_spec.rb

@@ -23,120 +23,16 @@ describe PoiseLanguages::Static::Resource do
     chef_run.execute('unpack archive')
   end
 
-  context 'on Ubuntu' do
+  context 'action :install' do
     recipe do
       poise_languages_static '/opt/myapp' do
         source 'http://example.com/myapp.tar'
       end
     end
 
-    it { is_expected.to install_package('tar') }
-    it { is_expected.to create_directory('/opt/myapp') }
-    it { is_expected.to create_remote_file("#{Chef::Config[:file_cache_path]}/myapp.tar").with(source: 'http://example.com/myapp.tar') }
-  end # /context on Ubuntu
-
-  context 'on Solaris' do
-    let(:chefspec_options) { {platform: 'solaris2', version: '5.11'} }
-    recipe do
-      poise_languages_static '/opt/myapp' do
-        source 'http://example.com/myapp.tar'
-      end
-    end
-
-    it { is_expected.to_not install_package('tar') }
-    it { is_expected.to create_directory('/opt/myapp') }
-    it { is_expected.to create_remote_file("#{Chef::Config[:file_cache_path]}/myapp.tar").with(source: 'http://example.com/myapp.tar') }
-  end # /context on Solaris
-
-  context 'on AIX' do
-    let(:chefspec_options) { {platform: 'aix', version: '7.1'} }
-    recipe do
-      poise_languages_static '/opt/myapp' do
-        source 'http://example.com/myapp.tar'
-      end
-    end
-
-    it { is_expected.to_not install_package('tar') }
-    it { is_expected.to create_directory('/opt/myapp') }
-    it { is_expected.to create_remote_file("#{Chef::Config[:file_cache_path]}/myapp.tar").with(source: 'http://example.com/myapp.tar') }
-  end # /context on AIX
-
-  context 'with a .tar URL' do
-    recipe do
-      poise_languages_static '/opt/myapp' do
-        source 'http://example.com/myapp.tar'
-      end
-    end
-
-    it { is_expected.to install_package('tar') }
-    it { expect(unpack_resource.command).to eq %W{tar --strip-components=1 -xvf #{Chef::Config[:file_cache_path]}/myapp.tar} }
-  end # /context with a .tar URL
-
-  context 'with a .tar.gz URL' do
-    recipe do
-      poise_languages_static '/opt/myapp' do
-        source 'http://example.com/myapp.tar.gz'
-      end
-    end
-
-    it { is_expected.to install_package('tar') }
-    it { expect(unpack_resource.command).to eq %W{tar --strip-components=1 -xzvf #{Chef::Config[:file_cache_path]}/myapp.tar.gz} }
-  end # /context with a .tar.gz URL
-
-  context 'with a .tgz URL' do
-    recipe do
-      poise_languages_static '/opt/myapp' do
-        source 'http://example.com/myapp.tgz'
-      end
-    end
-
-    it { is_expected.to install_package('tar') }
-    it { expect(unpack_resource.command).to eq %W{tar --strip-components=1 -xzvf #{Chef::Config[:file_cache_path]}/myapp.tgz} }
-  end # /context with a .tgz URL
-
-  context 'with a .tar.bz2 URL' do
-    recipe do
-      poise_languages_static '/opt/myapp' do
-        source 'http://example.com/myapp.tar.bz2'
-      end
-    end
-
-    it { is_expected.to install_package(%w{tar bzip2}) }
-    it { expect(unpack_resource.command).to eq %W{tar --strip-components=1 -xjvf #{Chef::Config[:file_cache_path]}/myapp.tar.bz2} }
-  end # /context with a .tar.bz2 URL
-
-  context 'with a .tbz URL' do
-    recipe do
-      poise_languages_static '/opt/myapp' do
-        source 'http://example.com/myapp.tbz'
-      end
-    end
-
-    it { is_expected.to install_package(%w{tar bzip2}) }
-    it { expect(unpack_resource.command).to eq %W{tar --strip-components=1 -xjvf #{Chef::Config[:file_cache_path]}/myapp.tbz} }
-  end # /context with a .tbz URL
-
-  context 'with a .tar.xz URL' do
-    recipe do
-      poise_languages_static '/opt/myapp' do
-        source 'http://example.com/myapp.tar.xz'
-      end
-    end
-
-    it { is_expected.to install_package(%w{tar xz-utils}) }
-    it { expect(unpack_resource.command).to eq %W{tar --strip-components=1 -xJvf #{Chef::Config[:file_cache_path]}/myapp.tar.xz} }
-  end # /context with a .tar.xz URL
-
-  context 'with a .txz URL' do
-    recipe do
-      poise_languages_static '/opt/myapp' do
-        source 'http://example.com/myapp.txz'
-      end
-    end
-
-    it { is_expected.to install_package(%w{tar xz-utils}) }
-    it { expect(unpack_resource.command).to eq %W{tar --strip-components=1 -xJvf #{Chef::Config[:file_cache_path]}/myapp.txz} }
-  end # /context with a .txz URL
+    it { is_expected.to create_directory('/opt/myapp').with(user: 0, group: 0, mode: '755') }
+    it { is_expected.to create_remote_file("#{Chef::Config[:file_cache_path]}/myapp.tar").with(user: 0, group: 0, mode: '644', source: 'http://example.com/myapp.tar', retries: 5) }
+  end # /context 'action :install
 
   context 'action :uninstall' do
     recipe do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: poise-languages
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 1.4.0
 platform: ruby
 authors:
 - Noah Kantrowitz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-15 00:00:00.000000000 Z
+date: 2016-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: halite
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.5'
+- !ruby/object:Gem::Dependency
+  name: poise-archive
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: poise-boiler
   requirement: !ruby/object:Gem::Requirement
@@ -91,6 +105,8 @@ files:
 - test/gemfiles/chef-12.4.gemfile
 - test/gemfiles/chef-12.5.gemfile
 - test/gemfiles/chef-12.6.gemfile
+- test/gemfiles/chef-12.7.gemfile
+- test/gemfiles/chef-12.8.gemfile
 - test/gemfiles/chef-12.gemfile
 - test/gemfiles/master.gemfile
 - test/spec/command/mixin_spec.rb
@@ -122,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.2
 signing_key: 
 specification_version: 4
 summary: A Chef cookbook to help writing language cookbooks.
@@ -135,6 +151,8 @@ test_files:
 - test/gemfiles/chef-12.4.gemfile
 - test/gemfiles/chef-12.5.gemfile
 - test/gemfiles/chef-12.6.gemfile
+- test/gemfiles/chef-12.7.gemfile
+- test/gemfiles/chef-12.8.gemfile
 - test/gemfiles/chef-12.gemfile
 - test/gemfiles/master.gemfile
 - test/spec/command/mixin_spec.rb