poise-languages 1.4.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b0b22c0e5713511a2467b58158f1675d591d1f0
-  data.tar.gz: e4f1bcccbb1bcd84aa28919c03ecd6066f53e543
+  metadata.gz: a246857fd31c0cf4787253270c166b5093090e39
+  data.tar.gz: 7026c170387e885343071f282efab2bce450ae0b
 SHA512:
-  metadata.gz: 7a42e47e7e0cd8815b61756e6bd933aeb1139a8181544b35ad8fe5b620655d107d5355aa9f27ad85040bec1bdc7765b10035860435464200d19d5b73d21de792
-  data.tar.gz: 1006b3f1fc173a13c145d78bd3bbd96a9a4b0397eaa66505ea4d771b456fe37c634a024daf9b9a615e343cdf5e8dfcfb928002321403b732b23148b956057f77
+  metadata.gz: c8dff6c5c9d497b825cf3741d7d2fdb60efb6b5afa9b847dde104f2074d4d34a3b63b54ba2c575e1ec08b401ff446f7242b99183fa96efeb4a62add3b8b6daaf
+  data.tar.gz: 9c5d5994987986e48970e3f36d234a3fab8dcb10f8b139fb9e9afce0d7133cb7ba8ce2c86814522515ad1881114240eec368be7dc931de51ba76be8cf0881796

data/.travis.yml

@@ -2,7 +2,7 @@ sudo: false
 cache: bundler
 language: ruby
 rvm:
-- '2.2'
+- 2.3.1
 env:
   - secure: hBSCgjWddgLHgzkhAx1ItgA0joNdevIwYgo6B34fJ9meGVuntP1zbHgEJ/H4wzCnxumU7cvGo0DOy93nctrpy/El9YeQ8pqfqwt0vywDBY7FhNoRV2oW59+TsvOyUvdmO6YThv17qjzWf19Ag15A5X5LgfbCrFdubXpueOSMfgSsHzny3cjF+GTuh8Ykvs8U8914JlhLNc7k7Z/cyXog7i3sO83vaHEWUBytEsnBIc1YXbbp3d1B+7YiF2EDrFxMbyN2BjmjrWpkpl31SgiyneCmw8Vj8Q4T3seK9qRrLeX5HvIdtSa0YLTvxO4kfrsNlgcJgLOmVqqMo2EStT2LRDR1DdeP9Nj8RinqkNQ7lOl4InNK7IM6Kl56dgGmnt7ZVs2kVt1xhzqWQEcRYbP14kUocCzt6A9p4gLy9trQTkBGqgCIcxFqiyfXPLJv3yAYQovGemkv6WfPAViPum7GL+98pBj0TFbiRLLcOljijbAQOi7R2VTdgaHJVBDQ5u8R9mtcecTyiBJwgYn0INY7IjpGoL1mepRNBfG9gW1+awyfvGLeYXe3dISuaPUDKZHaRSKIvJIo2Pi/OxYUPsBLiF4cL8fg6DiB9Ly/AHmI2fgct+lvkByq6ec4NlSWpSyBRtBYF7uCEkXSeSo2MPCEmPxoY/S4pO6Jz6LPtzWRdRk=
 before_install: "gem install bundler"

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## v2.0.0
+
+* Backwards-incompatible change to SCL management to comply with their new repo
+  packages and layout. Uses `centos-release-scl-rh` repo package or the
+  `rhel-variant-rhscl` RedHat subscription.
+
 ## v1.4.0
 
 * Use `poise-archive` to unpack static binary archives. This should work better

data/lib/poise_languages/command/mixin.rb

@@ -18,6 +18,7 @@ require 'shellwords'
 
 require 'poise'
 
+require 'poise_languages/error'
 require 'poise_languages/utils'
 
 
@@ -179,12 +180,17 @@ module PoiseLanguages
           end
           # Inject other options.
           options[:timeout] ||= new_resource.timeout
+          # Find the actual binary to use. Raise an exception if we see false
+          # which happens if no parent resource is found, no explicit default
+          # binary was given, and which() fails to find a thing.
+          binary = new_resource.send(name)
+          raise Error.new("Unable to find a #{name} binary for command: #{command_args.is_a?(Array) ? Shellwords.shelljoin(command_args) : command_args}") unless binary
           command = if command_args.length == 1 && command_args.first.is_a?(String)
             # String mode, sigh.
-            "#{Shellwords.escape(new_resource.send(name))} #{command_args.first}"
+            "#{Shellwords.escape(binary)} #{command_args.first}"
           else
             # Array mode. Handle both ('one', 'two') and (['one', 'two']).
-            [new_resource.send(name)] + command_args.flatten
+            [binary] + command_args.flatten
           end
           Chef::Log.debug("[#{new_resource}] Running #{name} command: #{command.is_a?(Array) ? Shellwords.shelljoin(command) : command}")
           # Run the command

data/lib/poise_languages/scl/mixin.rb

@@ -28,7 +28,6 @@ module PoiseLanguages
           action :upgrade if options[:package_upgrade]
           dev_package options[:dev_package] == true ? pkg[:devel_name] : options[:dev_package]
           parent new_resource
-          url pkg[:url]
           version options[:package_version]
         end
       end
@@ -80,8 +79,8 @@ module PoiseLanguages
 
       module ClassMethods
         def provides_auto?(node, resource)
-          # They don't build 32-bit versions for these.
-          return false unless node['kernel']['machine'] == 'x86_64'
+          # They don't build 32-bit versions for these and only for RHEL/CentOS.
+          return false unless node['kernel']['machine'] == 'x86_64' && node.platform_family?('rhel')
           version = inversion_options(node, resource)['version']
           !!find_scl_package(node, version)
         end
@@ -104,11 +103,11 @@ module PoiseLanguages
         end
 
         def find_scl_package(node, version)
-          pkg = scl_packages.find {|p| p[:version].start_with?(version) }
-          return unless pkg
-          pkg[:url] = node.value_for_platform(pkg[:urls])
-          return unless pkg[:url]
-          pkg
+          platform_version = ::Gem::Version.create(node['platform_version'])
+          # Filter out anything that doesn't match this EL version.
+          candidate_packages = scl_packages.select {|p| p[:platform_version].satisfied_by?(platform_version) }
+          # Find something with a prefix match on the Python version.
+          candidate_packages.find {|p| p[:version].start_with?(version) }
         end
 
         private
@@ -117,8 +116,8 @@ module PoiseLanguages
           @scl_packages ||= []
         end
 
-        def scl_package(version, name, devel_name=nil, urls)
-          scl_packages << {version: version, name: name, devel_name: devel_name, urls: urls}
+        def scl_package(version, name, devel_name=nil, platform_version='>= 6.0')
+          scl_packages << {version: version, name: name, devel_name: devel_name, platform_version: ::Gem::Requirement.create(platform_version)}
         end
 
         def included(klass)

data/lib/poise_languages/scl/resource.rb

@@ -39,11 +39,14 @@ module PoiseLanguages
       #   Name of the SCL package for the language.
       #   @return [String]
       attribute(:package_name, kind_of: String, name_attribute: true)
+      # @!attribute dev_package
+      #   Name of the -devel package with headers and whatnot.
+      #   @return [String, nil]
       attribute(:dev_package, kind_of: [String, NilClass])
-      # @!attribute url
-      #   URL to the SCL repository package for the language.
-      #   @return [String]
-      attribute(:url, kind_of: String, required: true)
+      # @!attribute version
+      #   Version of the SCL package(s) to install. If unset, follows the same
+      #   semantics as the core `package` resource.
+      #   @return [String, nil]
       attribute(:version, kind_of: [String, NilClass])
       # @!attribute parent
       #   Resource for the language runtime. Used only for messages.
@@ -66,8 +69,7 @@ module PoiseLanguages
       # @return [void]
       def action_install
         notifying_block do
-          install_scl_utils
-          install_scl_repo_package
+          install_scl_repo
           flush_yum_cache
           install_scl_package(:install)
           install_scl_devel_package(:install) if new_resource.dev_package
@@ -79,8 +81,7 @@ module PoiseLanguages
       # @return [void]
       def action_upgrade
         notifying_block do
-          install_scl_utils
-          install_scl_repo_package
+          install_scl_repo
           flush_yum_cache
           install_scl_package(:upgrade)
           install_scl_devel_package(:upgrade) if new_resource.dev_package
@@ -92,25 +93,30 @@ module PoiseLanguages
       # @return [void]
       def action_uninstall
         notifying_block do
-          uninstall_scl_utils
-          uninstall_scl_repo_package
           uninstall_scl_devel_package if new_resource.dev_package
           uninstall_scl_package
-          flush_yum_cache
         end
       end
 
       private
 
-      def install_scl_utils
-        package 'scl-utils' do
-          action :upgrade # This shouldn't be a problem. Famous last words.
-        end
-      end
-
-      def install_scl_repo_package
-        rpm_package 'rhscl-' + new_resource.package_name do
-          source new_resource.url
+      def install_scl_repo
+        if node.platform?('redhat')
+          # Set up the real RHSCL subscription.
+          # NOTE: THIS IS NOT TESTED BECAUSE REDHAT DOESN'T OFFER ANY WAY TO DO
+          # AUTOMATED TESTING. IF YOU USE REDHAT AND THIS BREAKS, PLEASE LET ME
+          # KNOW BY FILING A GITHUB ISSUE AT http://github.com/poise/poise-languages/issues/new.
+          repo_name = "rhel-variant-rhscl-#{node['platform_version'][0]}-rpms"
+          execute "subscription-manager repos --enable #{repo_name}" do
+            not_if { shell_out!('subscription-manager repos --list').stdout.include?(repo_name) }
+          end
+        else
+          package 'centos-release-scl-rh' do
+            # Using upgrade here because changes very very rare and always
+            # important when they happen. If this breaks your prod infra, I'm
+            # sorry :-(
+            action :upgrade
+          end
         end
       end
 
@@ -124,27 +130,16 @@ module PoiseLanguages
       end
 
       def install_scl_package(action)
-        yum_package new_resource.package_name do
+        package new_resource.package_name do
           action action
           version new_resource.version
         end
       end
 
       def install_scl_devel_package(action)
-        yum_package new_resource.dev_package do
+        package new_resource.dev_package do
           action action
-        end
-      end
-
-      def uninstall_scl_utils
-        install_scl_utils.tap do |r|
-          r.action(:remove)
-        end
-      end
-
-      def uninstall_scl_repo_package
-        install_scl_repo_package.tap do |r|
-          r.action(:remove)
+          version new_resource.version
         end
       end
 

data/lib/poise_languages/version.rb

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

data/test/spec/scl/mixin_spec.rb

@@ -27,7 +27,7 @@ describe PoiseLanguages::Scl::Mixin do
       include Poise
       include described_class
       def scl_package
-        {name: 'python34', url: 'http://something.rpm'}
+        {name: 'python34', platform_version: ::Gem::Requirement.create('> 0')}
       end
       def options
         {dev_package: true}
@@ -40,7 +40,7 @@ describe PoiseLanguages::Scl::Mixin do
       poise_test 'test'
     end
 
-    it { is_expected.to install_poise_languages_scl('python34').with(parent: chef_run.poise_test('test'), url: 'http://something.rpm') }
+    it { is_expected.to install_poise_languages_scl('python34').with(parent: chef_run.poise_test('test')) }
   end # /describe #install_scl_package
 
   describe '#uninstall_scl_package' do
@@ -48,7 +48,7 @@ describe PoiseLanguages::Scl::Mixin do
       include Poise
       include described_class
       def scl_package
-        {name: 'python34', url: 'http://something.rpm'}
+        {name: 'python34', platform_version: ::Gem::Requirement.create('> 0')}
       end
       def options
         {dev_package: true}
@@ -61,7 +61,7 @@ describe PoiseLanguages::Scl::Mixin do
       poise_test 'test'
     end
 
-    it { is_expected.to uninstall_poise_languages_scl('python34').with(parent: chef_run.poise_test('test'), url: 'http://something.rpm') }
+    it { is_expected.to uninstall_poise_languages_scl('python34').with(parent: chef_run.poise_test('test')) }
   end # /describe #uninstall_scl_package
 
   describe '#scl_package' do
@@ -203,6 +203,7 @@ EOH
     let(:new_resource) { double('resource') }
     subject { provider(:poise_test).provides_auto?(node, new_resource) }
     before do
+      allow(node).to receive(:platform_family?) {|name| name == 'rhel' }
       allow(provider(:poise_test)).to receive(:inversion_options).with(node, new_resource).and_return({})
       allow(provider(:poise_test)).to receive(:find_scl_package).with(node, nil).and_return({})
     end
@@ -213,22 +214,8 @@ EOH
     let(:version) { '' }
     provider(:poise_test) do
       include described_class
-      scl_package('3.4.2', 'rh-python34', 'rh-python34-python-devel', {
-        ['redhat', 'centos'] => {
-          '~> 7.0' => 'https://www.softwarecollections.org/en/scls/rhscl/rh-python34/epel-7-x86_64/download/rhscl-rh-python34-epel-7-x86_64.noarch.rpm',
-          '~> 6.0' => 'https://www.softwarecollections.org/en/scls/rhscl/rh-python34/epel-6-x86_64/download/rhscl-rh-python34-epel-6-x86_64.noarch.rpm',
-        },
-      })
-      scl_package('3.3.2', 'python33', 'python33-python-devel', {
-        ['redhat', 'centos'] => {
-          '~> 7.0' => 'https://www.softwarecollections.org/en/scls/rhscl/python33/epel-7-x86_64/download/rhscl-python33-epel-7-x86_64.noarch.rpm',
-          '~> 6.0' => 'https://www.softwarecollections.org/en/scls/rhscl/python33/epel-6-x86_64/download/rhscl-python33-epel-6-x86_64.noarch.rpm',
-        },
-        'fedora' => {
-          '~> 21.0' => 'https://www.softwarecollections.org/en/scls/rhscl/python33/fedora-21-x86_64/download/rhscl-python33-fedora-21-x86_64.noarch.rpm',
-          '~> 20.0' => 'https://www.softwarecollections.org/en/scls/rhscl/python33/fedora-20-x86_64/download/rhscl-python33-fedora-20-x86_64.noarch.rpm',
-        },
-      })
+      scl_package('3.4.2', 'rh-python34', 'rh-python34-python-devel', '>= 7.0')
+      scl_package('3.3.2', 'python33', 'python33-python-devel')
     end
     subject { provider(:poise_test).send(:find_scl_package, chef_run.node, version) }
 
@@ -239,11 +226,33 @@ EOH
           version: '3.4.2',
           name: 'rh-python34',
           devel_name: 'rh-python34-python-devel',
-          url: 'https://www.softwarecollections.org/en/scls/rhscl/rh-python34/epel-7-x86_64/download/rhscl-rh-python34-epel-7-x86_64.noarch.rpm',
         })
       end
     end # /context on CentOS 7 with no version
 
+    context 'on CentOS 7 with a version' do
+      let(:version) { '3.3' }
+      let(:chefspec_options) { {platform: 'centos', version: '7.0'} }
+      it do
+        is_expected.to include({
+          version: '3.3.2',
+          name: 'python33',
+          devel_name: 'python33-python-devel',
+        })
+      end
+    end # /context on CentOS 7 with a version
+
+    context 'on CentOS 6 with no version' do
+      let(:chefspec_options) { {platform: 'centos', version: '6.0'} }
+      it do
+        is_expected.to include({
+          version: '3.3.2',
+          name: 'python33',
+          devel_name: 'python33-python-devel',
+        })
+      end
+    end # /context on CentOS 6 with no version
+
     context 'on CentOS 6 with a version' do
       let(:version) { '3.3' }
       let(:chefspec_options) { {platform: 'centos', version: '6.0'} }
@@ -252,25 +261,14 @@ EOH
           version: '3.3.2',
           name: 'python33',
           devel_name: 'python33-python-devel',
-          url: 'https://www.softwarecollections.org/en/scls/rhscl/python33/epel-6-x86_64/download/rhscl-python33-epel-6-x86_64.noarch.rpm',
         })
       end
     end # /context on CentOS 6 with a version
 
-    context 'on Ubuntu' do
-      let(:chefspec_options) { {platform: 'ubuntu', version: '12.04'} }
-      it { is_expected.to be_nil }
-    end # /context on Ubuntu
-
     context 'with no devel package' do
       provider(:poise_test) do
         include described_class
-        scl_package('3.4.2', 'rh-python34', {
-          ['redhat', 'centos'] => {
-            '~> 7.0' => 'https://www.softwarecollections.org/en/scls/rhscl/rh-python34/epel-7-x86_64/download/rhscl-rh-python34-epel-7-x86_64.noarch.rpm',
-            '~> 6.0' => 'https://www.softwarecollections.org/en/scls/rhscl/rh-python34/epel-6-x86_64/download/rhscl-rh-python34-epel-6-x86_64.noarch.rpm',
-          },
-        })
+        scl_package('3.4.2', 'rh-python34')
       end
       let(:chefspec_options) { {platform: 'centos', version: '7.0'} }
       it do
@@ -278,7 +276,6 @@ EOH
           version: '3.4.2',
           name: 'rh-python34',
           devel_name: nil,
-          url: 'https://www.softwarecollections.org/en/scls/rhscl/rh-python34/epel-7-x86_64/download/rhscl-rh-python34-epel-7-x86_64.noarch.rpm',
         })
       end
     end # /context with no devel package

data/test/spec/scl/resource_spec.rb

@@ -33,14 +33,12 @@ describe PoiseLanguages::Scl::Resource do
       poise_languages_scl 'mylang' do
         dev_package 'mylang-devel'
         parent r
-        url 'http://mylang.rpm'
       end
     end
 
-    it { is_expected.to upgrade_package('scl-utils') }
-    it { is_expected.to install_rpm_package('rhscl-mylang').with(source: 'http://mylang.rpm') }
-    it { is_expected.to install_yum_package('mylang') }
-    it { is_expected.to install_yum_package('mylang-devel') }
+    it { is_expected.to upgrade_package('centos-release-scl-rh') }
+    it { is_expected.to install_package('mylang') }
+    it { is_expected.to install_package('mylang-devel') }
     it { expect(yum_cache).to receive(:reload); run_chef }
   end # /context action :install
 
@@ -53,14 +51,12 @@ describe PoiseLanguages::Scl::Resource do
         action :upgrade
         dev_package 'mylang-devel'
         parent r
-        url 'http://mylang.rpm'
       end
     end
 
-    it { is_expected.to upgrade_package('scl-utils') }
-    it { is_expected.to install_rpm_package('rhscl-mylang').with(source: 'http://mylang.rpm') }
-    it { is_expected.to upgrade_yum_package('mylang') }
-    it { is_expected.to upgrade_yum_package('mylang-devel') }
+    it { is_expected.to upgrade_package('centos-release-scl-rh') }
+    it { is_expected.to upgrade_package('mylang') }
+    it { is_expected.to upgrade_package('mylang-devel') }
     it { expect(yum_cache).to receive(:reload); run_chef }
   end # /context action :upgrade
 
@@ -73,14 +69,10 @@ describe PoiseLanguages::Scl::Resource do
         action :uninstall
         dev_package 'mylang-devel'
         parent r
-        url 'http://mylang.rpm'
       end
     end
 
-    it { is_expected.to remove_package('scl-utils') }
-    it { is_expected.to remove_rpm_package('rhscl-mylang') }
-    it { is_expected.to remove_yum_package('mylang') }
-    it { is_expected.to remove_yum_package('mylang-devel') }
-    it { expect(yum_cache).to receive(:reload); run_chef }
+    it { is_expected.to remove_package('mylang') }
+    it { is_expected.to remove_package('mylang-devel') }
   end # /context action :uninstall
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: poise-languages
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Noah Kantrowitz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-29 00:00:00.000000000 Z
+date: 2016-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: halite
@@ -138,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.2
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: A Chef cookbook to help writing language cookbooks.
@@ -164,4 +164,3 @@ test_files:
 - test/spec/system/resource_spec.rb
 - test/spec/utils/which_spec.rb
 - test/spec/utils_spec.rb
-has_rdoc: