poise-python 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59c887593f03041124e297ead423a1bea2606724
-  data.tar.gz: 4adb8c74b9d0d9d7384b52fef81b59296deea96a
+  metadata.gz: 23cf97832c34abc4295ce1e1f1c9d8cc0eb53077
+  data.tar.gz: 48de254c1244bd372046cf863dfd05a4d9878ca6
 SHA512:
-  metadata.gz: e537cd49c014a599ea9adb74c5c272875d738de6fba7c9e224850ab121635235d94345db19083f90f46730c016494a320423d9060d0d3e92eed139a12f3dcb0c
-  data.tar.gz: 450cef04ad1723458c063ad0444022e65f8c03179c5c8956cff4de256e1a74a76d2f3a7b5e90213a7b9b62a9a12caacbc6f539d7e8ce6c940e9b1f3c24372a03
+  metadata.gz: f700db85d989995831625f6ad79111e8b6cf01b740984e937cdd05c1ec8c3d3b0ffb213a8947b0b83045aa8413d4c06458be759634beb7f0672324926eb866ec
+  data.tar.gz: 37a074375575ee3197d866e9f2ec573b4b24c75490f0c5572b2307812217a773f61912da0ff3549c6d3a3f1278270b22485109cf63eb4b2ee2c3326f7510cba9

data/CHANGELOG.md

@@ -0,0 +1,14 @@
+# Poise-Python Changelog
+
+## v1.1.0
+
+* Add a `:dummy` provider for `python_runtime` for unit testing or complex overrides.
+* Support installing development headers for SCL packages.
+* Refactor Portable PyPy provider to use new helpers from `poise-languages`. This
+  means `portable_pypy` and `portable_pypy3` are now separate providers but the
+  auto-selection logic should still work as before.
+
+## v1.0.0
+
+* Initial release!
+

data/README.md

@@ -337,7 +337,6 @@ end
 
 The `portable_pypy` provider installs Python using the [Portable PyPy](https://github.com/squeaky-pl/portable-pypy)
 packages. These are only available for Linux, but should work on any Linux OS.
-Support is included for both `pypy` and `pypy3`.
 
 ```ruby
 python_runtime 'myapp' do
@@ -346,6 +345,18 @@ python_runtime 'myapp' do
 end
 ```
 
+### `portable_pypy3`
+
+The `portable_pypy3` provider installs Python 3 using the [Portable PyPy](https://github.com/squeaky-pl/portable-pypy)
+packages. These are only available for Linux, but should work on any Linux OS.
+
+```ruby
+python_runtime 'myapp' do
+  provider :portable_pypy3
+  version 'pypy3'
+end
+```
+
 #### Options
 
 * `folder` – Folder to install PyPy in. *(default: /opt/<package name>)*

data/lib/poise_python/python_providers.rb

@@ -14,7 +14,11 @@
 # limitations under the License.
 #
 
+require 'chef/platform/provider_priority_map'
+
+require 'poise_python/python_providers/dummy'
 require 'poise_python/python_providers/portable_pypy'
+require 'poise_python/python_providers/portable_pypy3'
 require 'poise_python/python_providers/scl'
 require 'poise_python/python_providers/system'
 
@@ -27,6 +31,7 @@ module PoisePython
     autoload :Base, 'poise_python/python_providers/base'
 
     Chef::Platform::ProviderPriorityMap.instance.priority(:python_runtime, [
+      PoisePython::PythonProviders::PortablePyPy3,
       PoisePython::PythonProviders::PortablePyPy,
       PoisePython::PythonProviders::Scl,
       PoisePython::PythonProviders::System,

data/lib/poise_python/python_providers/dummy.rb

@@ -0,0 +1,69 @@
+#
+# Copyright 2015, 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.
+#
+
+require 'poise_python/python_providers/base'
+
+
+module PoisePython
+  module PythonProviders
+    # Inversion provider for the `python_runtime` resource to use a fake Python,
+    # for use in unit tests.
+    #
+    # @since 1.1.0
+    # @provides dummy
+    class Dummy < Base
+      provides(:dummy)
+
+      def self.default_inversion_options(node, resource)
+        super.merge({
+          # Manual overrides for dummy data.
+          python_binary: ::File.join('', 'python'),
+          python_environment: nil,
+        })
+      end
+
+      # The `install` action for the `python_runtime` resource.
+      #
+      # @return [void]
+      def action_install
+        # This space left intentionally blank.
+      end
+
+      # The `uninstall` action for the `python_runtime` resource.
+      #
+      # @return [void]
+      def action_uninstall
+        # This space left intentionally blank.
+      end
+
+      # Path to the non-existent python.
+      #
+      # @return [String]
+      def python_binary
+        options['python_binary']
+      end
+
+      # Environment for the non-existent python.
+      #
+      # @return [String]
+      def python_environment
+        options['python_environment'] || super
+      end
+
+    end
+  end
+end
+

data/lib/poise_python/python_providers/portable_pypy.rb

@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-require 'chef/resource'
+require 'poise_languages/static'
 
 require 'poise_python/error'
 require 'poise_python/python_providers/base'
@@ -24,73 +24,29 @@ module PoisePython
   module PythonProviders
     class PortablePyPy < Base
       provides(:portable_pypy)
-
-      PYPY_PACKAGES = {
-        'pypy' => %w{2.6 2.5.1 2.5 2.4 2.3.1 2.3 2.2.1 2.2 2.1 2.0.2},
-        'pypy3' => %w{2.4 2.3.1},
-      }
-
-      # Only use this to install pypy.
-      #
-      # @api private
-      def self.provides_auto?(node, resource)
-        super || (resource.version.start_with?('pypy') && node['kernel']['name'].downcase == 'linux')
-      end
+      include PoiseLanguages::Static(
+        name: 'pypy',
+        versions: %w{2.6 2.5.1 2.5 2.4 2.3.1 2.3 2.2.1 2.2 2.1 2.0.2},
+        machines: %w{linux-i686 linux-x86_64},
+        url: 'https://bitbucket.org/squeaky/portable-pypy/downloads/pypy-%{version}-%{kernel}_%{machine}-portable.tar.bz2'
+      )
 
       def python_binary
-        ::File.join(pypy_folder, 'bin', 'pypy')
+        ::File.join(static_folder, 'bin', 'pypy')
       end
 
       private
 
       def install_python
-        path = ::File.join(Chef::Config[:file_cache_path], "#{pypy_package}.tar.bz2")
-        folder = pypy_folder
-        url = pypy_package_url
-
-        package %w{tar bzip2}
-
-        unpack = execute 'unpack pypy' do
-          action :nothing
-          command ['tar', 'xjvf', path]
-          cwd ::File.dirname(folder)
-        end
-
-        remote_file path do
-          source url
-          owner 'root'
-          group 'root'
-          mode '644'
-          notifies :run, unpack, :immediately
-        end
+        install_static
       end
 
       def uninstall_python
-        directory pypy_folder do
-          action :delete
-          recursive true
-        end
-      end
-
-      def pypy_package
-        @pypy_package ||= begin
-          match = options['version'].match(/^(pypy(?:|3))(?:-(.*))?$/)
-          package_type = match ? match[1] : 'pypy'
-          version_prefix = (match && match[2]).to_s
-          version = PYPY_PACKAGES[package_type].find {|v| v.start_with?(version_prefix) }
-          "#{package_type}-#{version}-#{node['kernel']['name'].downcase}_#{node['kernel']['machine']}-portable"
-        end
-      end
-
-      def pypy_folder
-        options['folder'] || ::File.join('', 'opt', pypy_package)
-      end
-
-      def pypy_package_url
-        options['url'] || "https://bitbucket.org/squeaky/portable-pypy/downloads/#{pypy_package}.tar.bz2"
+        uninstall_static
       end
 
     end
   end
 end
 
+

data/lib/poise_python/python_providers/portable_pypy3.rb

@@ -0,0 +1,51 @@
+#
+# Copyright 2015, 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.
+#
+
+require 'poise_languages/static'
+
+require 'poise_python/error'
+require 'poise_python/python_providers/base'
+
+
+module PoisePython
+  module PythonProviders
+    class PortablePyPy3 < Base
+      provides(:portable_pypy3)
+      include PoiseLanguages::Static(
+        name: 'pypy3',
+        versions: %w{2.4 2.3.1},
+        machines: %w{linux-i686 linux-x86_64},
+        url: 'https://bitbucket.org/squeaky/portable-pypy/downloads/pypy3-%{version}-%{kernel}_%{machine}-portable.tar.bz2'
+      )
+
+      def python_binary
+        ::File.join(static_folder, 'bin', 'pypy')
+      end
+
+      private
+
+      def install_python
+        install_static
+      end
+
+      def uninstall_python
+        uninstall_static
+      end
+
+    end
+  end
+end
+

data/lib/poise_python/python_providers/scl.rb

@@ -26,13 +26,13 @@ module PoisePython
     class Scl < Base
       include PoiseLanguages::Scl::Mixin
       provides(:scl)
-      scl_package('3.4.2', 'rh-python34', {
+      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', {
+      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',
@@ -42,7 +42,7 @@ module PoisePython
           '~> 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('2.7.8', 'python27', {
+      scl_package('2.7.8', 'python27', 'python27-python-devel', {
         ['redhat', 'centos'] => {
           '~> 7.0' => 'https://www.softwarecollections.org/en/scls/rhscl/python27/epel-7-x86_64/download/rhscl-python27-epel-7-x86_64.noarch.rpm',
           '~> 6.0' => 'https://www.softwarecollections.org/en/scls/rhscl/python27/epel-6-x86_64/download/rhscl-python27-epel-6-x86_64.noarch.rpm',

data/lib/poise_python/resources/pip_requirements.rb

@@ -26,7 +26,8 @@ module PoisePython
     # (see PipRequirements::Resource)
     # @since 1.0.0
     module PipRequirements
-      # A `pip_requirements` resource to manage Python virtual environments.
+      # A `pip_requirements` resource to install packages from a requirements.txt
+      # file using pip.
       #
       # @provides pip_requirements
       # @action install

data/lib/poise_python/resources/python_package.rb

@@ -84,6 +84,10 @@ EOH
       class Resource < Chef::Resource::Package
         include PoisePython::PythonCommandMixin
         provides(:python_package)
+        # Manually create matchers because #actions is unreliable.
+        %i{install upgrade remove}.each do |action|
+          Poise::Helpers::ChefspecMatchers.create_matcher(:python_package, action)
+        end
 
 
         # @!attribute group

data/lib/poise_python/version.rb

@@ -16,5 +16,5 @@
 
 
 module PoisePython
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'
 end

data/poise-python.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
   spec.email = %w{noah@coderanger.net}
   spec.description = "A Chef cookbook for managing Python installations."
   spec.summary = spec.description
-  spec.homepage = 'https://github.com/poise/python'
+  spec.homepage = 'https://github.com/poise/poise-python'
   spec.license = 'Apache 2.0'
 
   spec.files = `git ls-files`.split($/)
@@ -35,7 +35,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'halite', '~> 1.0'
   spec.add_dependency 'poise', '~> 2.0'
-  spec.add_dependency 'poise-languages', '~> 1.0.dev'
+  spec.add_dependency 'poise-languages', '~> 1.2'
 
   spec.add_development_dependency 'poise-boiler', '~> 1.0'
 end

data/test/spec/python_providers/dummy_spec.rb

@@ -0,0 +1,56 @@
+#
+# Copyright 2015, 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.
+#
+
+require 'spec_helper'
+
+describe PoisePython::PythonProviders::Dummy do
+  let(:python_runtime) { chef_run.python_runtime('test') }
+  step_into(:python_runtime)
+  recipe do
+    python_runtime 'test' do
+      provider :dummy
+    end
+  end
+
+  describe '#python_binary' do
+    subject { python_runtime.python_binary }
+
+    it { is_expected.to eq '/python' }
+  end # /describe #python_binary
+
+  describe '#python_environment' do
+    subject { python_runtime.python_environment }
+
+    it { is_expected.to eq({}) }
+  end # /describe #python_environment
+
+  describe 'action :install' do
+    # Just make sure it doesn't error.
+    it { run_chef }
+  end # /describe action :install
+
+  describe 'action :uninstall' do
+    recipe do
+      python_runtime 'test' do
+        action :uninstall
+        provider :dummy
+      end
+    end
+
+    # Just make sure it doesn't error.
+    it { run_chef }
+  end # /describe action :uninstall
+end

data/test/spec/python_providers/portable_pypy3_spec.rb

@@ -0,0 +1,58 @@
+#
+# Copyright 2015, 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.
+#
+
+require 'spec_helper'
+
+describe PoisePython::PythonProviders::PortablePyPy3 do
+  let(:python_version) { nil }
+  let(:chefspec_options) { {platform: 'ubuntu', version: '14.04'} }
+  let(:default_attributes) { {poise_python_version: python_version} }
+  let(:python_runtime) { chef_run.python_runtime('test') }
+  step_into(:python_runtime)
+  recipe do
+    python_runtime 'test' do
+      version node['poise_python_version']
+      virtualenv_version false
+    end
+  end
+
+  shared_examples_for 'portablepypy3 provider' do |base|
+    it { expect(python_runtime.provider_for_action(:install)).to be_a described_class }
+    it { is_expected.to install_poise_languages_static(File.join('', 'opt', base)).with(source: "https://bitbucket.org/squeaky/portable-pypy/downloads/#{base}-linux_x86_64-portable.tar.bz2") }
+    it { expect(python_runtime.python_binary).to eq File.join('', 'opt', base, 'bin', 'pypy') }
+  end
+
+  context 'with version pypy3' do
+    let(:python_version) { 'pypy3' }
+    it_behaves_like 'portablepypy3 provider', 'pypy3-2.4'
+  end # /context with version pypy3
+
+  context 'with version pypy3-2.3.1' do
+    let(:python_version) { 'pypy3-2.3.1' }
+    it_behaves_like 'portablepypy3 provider', 'pypy3-2.3.1'
+  end # /context with version pypy3-2.3.1
+
+  context 'action :uninstall' do
+    recipe do
+      python_runtime 'test' do
+        version 'pypy3'
+        action :uninstall
+      end
+    end
+
+    it { is_expected.to uninstall_poise_languages_static('/opt/pypy3-2.4') }
+  end # /context action :uninstall
+end

data/test/spec/python_providers/portable_pypy_spec.rb

@@ -29,32 +29,22 @@ describe PoisePython::PythonProviders::PortablePyPy do
     end
   end
 
-  shared_examples_for 'portablepypy provider' do |name|
+  shared_examples_for 'portablepypy provider' do |base|
     it { expect(python_runtime.provider_for_action(:install)).to be_a described_class }
-    it { is_expected.to create_remote_file(File.join(Chef::Config[:file_cache_path], "#{name}.tar.bz2")).with(source: "https://bitbucket.org/squeaky/portable-pypy/downloads/#{name}.tar.bz2") }
-    it { expect(python_runtime.python_binary).to eq "/opt/#{name}/bin/pypy"}
+    it { is_expected.to install_poise_languages_static(File.join('', 'opt', base)).with(source: "https://bitbucket.org/squeaky/portable-pypy/downloads/#{base}-linux_x86_64-portable.tar.bz2") }
+    it { expect(python_runtime.python_binary).to eq File.join('', 'opt', base, 'bin', 'pypy') }
   end
 
   context 'with version pypy' do
     let(:python_version) { 'pypy' }
-    it_behaves_like 'portablepypy provider', 'pypy-2.6-linux_x86_64-portable'
+    it_behaves_like 'portablepypy provider', 'pypy-2.6'
   end # /context with version pypy
 
   context 'with version pypy-2.4' do
     let(:python_version) { 'pypy-2.4' }
-    it_behaves_like 'portablepypy provider', 'pypy-2.4-linux_x86_64-portable'
+    it_behaves_like 'portablepypy provider', 'pypy-2.4'
   end # /context with version pypy-2.4
 
-  context 'with version pypy3' do
-    let(:python_version) { 'pypy3' }
-    it_behaves_like 'portablepypy provider', 'pypy3-2.4-linux_x86_64-portable'
-  end # /context with version pypy3
-
-  context 'with version pypy3-2.3.1' do
-    let(:python_version) { 'pypy3-2.3.1' }
-    it_behaves_like 'portablepypy provider', 'pypy3-2.3.1-linux_x86_64-portable'
-  end # /context with version pypy3-2.3.1
-
   context 'action :uninstall' do
     recipe do
       python_runtime 'test' do
@@ -63,6 +53,6 @@ describe PoisePython::PythonProviders::PortablePyPy do
       end
     end
 
-    it { is_expected.to delete_directory('/opt/pypy-2.6-linux_x86_64-portable').with(recursive: true) }
+    it { is_expected.to uninstall_poise_languages_static('/opt/pypy-2.6') }
   end # /context action :uninstall
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: poise-python
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Noah Kantrowitz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-24 00:00:00.000000000 Z
+date: 2015-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: halite
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.dev
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.dev
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: poise-boiler
   requirement: !ruby/object:Gem::Requirement
@@ -79,6 +79,7 @@ files:
 - ".travis.yml"
 - ".yardopts"
 - Berksfile
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
@@ -91,7 +92,9 @@ files:
 - lib/poise_python/python_command_mixin.rb
 - lib/poise_python/python_providers.rb
 - lib/poise_python/python_providers/base.rb
+- lib/poise_python/python_providers/dummy.rb
 - lib/poise_python/python_providers/portable_pypy.rb
+- lib/poise_python/python_providers/portable_pypy3.rb
 - lib/poise_python/python_providers/scl.rb
 - lib/poise_python/python_providers/system.rb
 - lib/poise_python/resources.rb
@@ -114,6 +117,8 @@ files:
 - test/gemfiles/master.gemfile
 - test/integration/default/serverspec/default_spec.rb
 - test/spec/python_command_mixin_spec.rb
+- test/spec/python_providers/dummy_spec.rb
+- test/spec/python_providers/portable_pypy3_spec.rb
 - test/spec/python_providers/portable_pypy_spec.rb
 - test/spec/python_providers/scl_spec.rb
 - test/spec/python_providers/system_spec.rb
@@ -124,7 +129,7 @@ files:
 - test/spec/spec_helper.rb
 - test/spec/utils/python_encoder_spec.rb
 - test/spec/utils_spec.rb
-homepage: https://github.com/poise/python
+homepage: https://github.com/poise/poise-python
 licenses:
 - Apache 2.0
 metadata: {}
@@ -157,6 +162,8 @@ test_files:
 - test/gemfiles/master.gemfile
 - test/integration/default/serverspec/default_spec.rb
 - test/spec/python_command_mixin_spec.rb
+- test/spec/python_providers/dummy_spec.rb
+- test/spec/python_providers/portable_pypy3_spec.rb
 - test/spec/python_providers/portable_pypy_spec.rb
 - test/spec/python_providers/scl_spec.rb
 - test/spec/python_providers/system_spec.rb