poise-python 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a12da22a9f150574726a0269d44cb5eacbdcb924
-  data.tar.gz: 4ece1e0b399f553cf09a115ef1ccdf733454d86d
+  metadata.gz: 7500de072f7a8087c804a127c870a8c6b16b5aca
+  data.tar.gz: d600e7a8144e251e8d2faa81bb8da5d1a58dcdad
 SHA512:
-  metadata.gz: d45e0538ac533f844e9e8e9d0f8ce88edbb9b88594ecb8a5577fc8e44166aeb2a885e544e8a46aeb1593075a50e386d63c04e349e1ab9bc8b8b660ca903aad7a
-  data.tar.gz: db9ebcab6fb2dc3ebcb28eafc533d9e88223d53003703238d1398079546c2f3946c609292ba26922eb49da6df3f936f02c788f80887c9c22e90c46646f53fc8d
+  metadata.gz: d0673eb2b7dfe1d1b3e946edb8de5d8ff4c8a7253ce7499f608e8f6321698bba79c21b9d66b8df3706f2855d71225ef8c3278bda434dbad5e5d2b9d17869bf73
+  data.tar.gz: b995f972baacd4f6482cae93ec8405194a7e1ad9584b7df66bab06066aa2df5a54e9ba270b2778c62c0a7df3d88336efbf2924d51400af8cb7af9e4bd5559136

data/.travis.yml

@@ -1,22 +1,42 @@
----
 sudo: false
 cache: bundler
 language: ruby
-rvm:
-- '2.2'
 env:
   global:
-  - secure: j4GV/0NXC6p/+XxgK2isMCzccR7ry8cxLJZZbJN5P+958lLGmYtPPsfAN+aRzcR3Uc/alLcsjXvceCjJWU7qYpkN1x9cn564J1X3OIOygi6xdYQIMLL5Guxp01QYabFlrmZeUnTVMTkdR1H4aRrpzW4kTuc5hbIZaJl0enEe1Dd+vbCw2GOTXFnPTeLDCaCSNXXhXmqqWD64leFR2PTwx8fwrXyCB/bDRXhFdsFA5Q/tCGW7PDaYujbqSCegpuz+uvHoM5S2k2XY3pShWZm9WcmEzCLEfhOGCc1s+ia7TZ0iV7kzEq11mNTdSl6nJtBUiKsgqw1TRPFhhUj2Bp/K+cNsd06rtFE3In2zbqbgyJ0qnyQHs2FZO//ve8bug+B0lA3i6SantruS1Fc9NjwjqzOmqmaqNhnVl1jEQTOB3JUC465QShySF0aJtjE5khD7PzGwCw6cqhPBLH5ZTmqCYvl/egYLMlvVr1Nboa+0YFdzUqoTFJpRTsu89l8+1+Eu9pvHn0CwsjWmEVHahIw/GEBjhLPDinquJNxWz1q49ozlohntbRmWhbgzz6D4wPrbBdyW7rYm8p6d2sOy6Op2zsVv4c7Dj3pcLLd9J5o6RaNxf4wLd5VFLNJR6/wldsZXGxV/iP16oyasabYIQYZNbP0U1hZiUpLQ5cvKYc6xRTM=
-before_install: "gem install bundler"
-bundler_args: "--binstubs=$PWD/bin --jobs 3 --retry 3"
+    - secure: j4GV/0NXC6p/+XxgK2isMCzccR7ry8cxLJZZbJN5P+958lLGmYtPPsfAN+aRzcR3Uc/alLcsjXvceCjJWU7qYpkN1x9cn564J1X3OIOygi6xdYQIMLL5Guxp01QYabFlrmZeUnTVMTkdR1H4aRrpzW4kTuc5hbIZaJl0enEe1Dd+vbCw2GOTXFnPTeLDCaCSNXXhXmqqWD64leFR2PTwx8fwrXyCB/bDRXhFdsFA5Q/tCGW7PDaYujbqSCegpuz+uvHoM5S2k2XY3pShWZm9WcmEzCLEfhOGCc1s+ia7TZ0iV7kzEq11mNTdSl6nJtBUiKsgqw1TRPFhhUj2Bp/K+cNsd06rtFE3In2zbqbgyJ0qnyQHs2FZO//ve8bug+B0lA3i6SantruS1Fc9NjwjqzOmqmaqNhnVl1jEQTOB3JUC465QShySF0aJtjE5khD7PzGwCw6cqhPBLH5ZTmqCYvl/egYLMlvVr1Nboa+0YFdzUqoTFJpRTsu89l8+1+Eu9pvHn0CwsjWmEVHahIw/GEBjhLPDinquJNxWz1q49ozlohntbRmWhbgzz6D4wPrbBdyW7rYm8p6d2sOy6Op2zsVv4c7Dj3pcLLd9J5o6RaNxf4wLd5VFLNJR6/wldsZXGxV/iP16oyasabYIQYZNbP0U1hZiUpLQ5cvKYc6xRTM=
+before_install: gem install bundler
+bundler_args: '--binstubs=$PWD/bin --jobs 3 --retry 3'
 script:
-- "./bin/rake travis"
-gemfile:
-- test/gemfiles/chef-12.gemfile
-- test/gemfiles/chef-12.1.gemfile
-- test/gemfiles/chef-12.2.gemfile
-- test/gemfiles/chef-12.3.gemfile
-- test/gemfiles/chef-12.4.gemfile
-- test/gemfiles/chef-12.5.gemfile
-- test/gemfiles/chef-12.6.gemfile
-- test/gemfiles/master.gemfile
+  - ./bin/rake travis
+matrix:
+  include:
+    - rvm: 2.1.9
+      gemfile: test/gemfiles/chef-12.gemfile
+    - rvm: 2.1.4
+      gemfile: test/gemfiles/chef-12.1.gemfile
+    - rvm: 2.1.4
+      gemfile: test/gemfiles/chef-12.2.gemfile
+    - rvm: 2.1.4
+      gemfile: test/gemfiles/chef-12.3.gemfile
+    - rvm: 2.1.6
+      gemfile: test/gemfiles/chef-12.4.gemfile
+    - rvm: 2.1.6
+      gemfile: test/gemfiles/chef-12.5.gemfile
+    - rvm: 2.1.6
+      gemfile: test/gemfiles/chef-12.6.gemfile
+    - rvm: 2.1.6
+      gemfile: test/gemfiles/chef-12.7.gemfile
+    - rvm: 2.1.6
+      gemfile: test/gemfiles/chef-12.8.gemfile
+    - rvm: 2.1.8
+      gemfile: test/gemfiles/chef-12.9.gemfile
+    - rvm: 2.1.8
+      gemfile: test/gemfiles/chef-12.10.gemfile
+    - rvm: 2.1.8
+      gemfile: test/gemfiles/chef-12.11.gemfile
+    - rvm: 2.1.8
+      gemfile: test/gemfiles/chef-12.12.gemfile
+    - rvm: 2.1.9
+      gemfile: test/gemfiles/chef-12.13.gemfile
+    - rvm: 2.3.1
+      gemfile: test/gemfiles/master.gemfile

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Poise-Python Changelog
 
+## v1.5.0
+
+* Support new SCL structure and packages.
+
 ## v1.4.0
 
 * Add system package names for Ubuntu 16.04.

data/Gemfile

@@ -31,5 +31,5 @@ dev_gem 'halite'
 dev_gem 'poise'
 dev_gem 'poise-archive'
 dev_gem 'poise-boiler'
-dev_gem 'poise-languages'
+dev_gem 'poise-languages', github: 'poise/poise-languages'
 dev_gem 'poise-profiler'

data/README.md

@@ -27,6 +27,30 @@ end
 pip_requirements '/opt/myapp/requirements.txt'
 ```
 
+## Installing a Package From a URI
+
+While using `python_package 'git+https://github.com/example/mypackage.git'` will
+sometimes work, this approach is not recommended. Unfortunately pip's support
+for installing directly from URI sources is limited and cannot support the API
+used for the `python_package` resource. You can run the install either directly
+from the URI or through an intermediary `git` resource:
+
+```ruby
+# Will re-install on every converge unless you add a not_if/only_if.
+python_execute '-m pip install git+https://github.com/example/mypackage.git'
+
+# Will only re-install when the git repository updates.
+python_execute 'install mypackage' do
+  action :nothing
+  command '-m pip install .'
+  cwd '/opt/mypackage'
+end
+git '/opt/mypackage' do
+  repository 'https://github.com/example/mypackage.git'
+  notifies :run, 'python_execute[install mypackage]', :immediately
+end
+```
+
 ## Supported Python Versions
 
 This cookbook can install at least Python 2.7, Python 3, and PyPy on all
@@ -77,9 +101,11 @@ python_runtime '2'
 
 * `version` – Version of Python to install. If a partial version is given, use the
   latest available version matching that prefix. *(name property)*
+* `get_pip_url` – URL to download the `get-pip.py` bootstrap script from.
+  *(default: https://bootstrap.pypa.io/get-pip.py)*
 * `pip_version` – Version of pip to install. If set to `true`, use the latest.
-  If set to `false`, do not install pip. Can also be set to a URL to a copy of
-  the `get-pip.py` script. *(default: true)*
+  If set to `false`, do not install pip. For backward compatibility, can also be
+  set to a URL instead of `get_pip_url`. *(default: true)*
 * `setuptools_version` – Version of Setuptools to install. If set to `true`, use
   the latest. If set to `false`, do not install Setuptools. *(default: true)*
 * `virtualenv_version` – Version of virtualenv to install. If set to `true`,

data/lib/poise_python/python_providers/base.rb

@@ -28,6 +28,7 @@ module PoisePython
       # @api private
       def self.default_inversion_options(node, new_resource)
         super.merge({
+          get_pip_url: new_resource.get_pip_url,
           pip_version: new_resource.pip_version,
           setuptools_version: new_resource.setuptools_version,
           version: new_resource.version,
@@ -103,13 +104,14 @@ module PoisePython
       def install_pip
         pip_version_or_url = options[:pip_version]
         return unless pip_version_or_url
-        # If there is a : in the version, use it as a URL.
+        # If there is a : in the version, use it as a URL and ignore the actual
+        # URL option.
         if pip_version_or_url.is_a?(String) && pip_version_or_url.include?(':')
           pip_version = nil
           pip_url = pip_version_or_url
         else
           pip_version = pip_version_or_url
-          pip_url = nil
+          pip_url = options[:get_pip_url]
         end
         Chef::Log.debug("[#{new_resource}] Installing pip #{pip_version || 'latest'}")
         # Install or bootstrap pip.
@@ -117,7 +119,7 @@ module PoisePython
           parent new_resource
           # If the version is `true`, don't pass it at all.
           version pip_version if pip_version.is_a?(String)
-          get_pip_url pip_url if pip_url
+          get_pip_url pip_url
         end
       end
 

data/lib/poise_python/python_providers/scl.rb

@@ -26,32 +26,10 @@ module PoisePython
     class Scl < Base
       include PoiseLanguages::Scl::Mixin
       provides(:scl)
-      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('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',
-        },
-        'fedora' => {
-          '~> 21.0' => 'https://www.softwarecollections.org/en/scls/rhscl/python27/fedora-21-x86_64/download/rhscl-python27-fedora-21-x86_64.noarch.rpm',
-          '~> 20.0' => 'https://www.softwarecollections.org/en/scls/rhscl/python27/fedora-20-x86_64/download/rhscl-python27-fedora-20-x86_64.noarch.rpm',
-        },
-      })
+      scl_package('3.5.1', 'rh-python35', 'rh-python35-python-devel', '>= 7.0')
+      scl_package('3.4.2', 'rh-python34', 'rh-python34-python-devel')
+      scl_package('3.3.2', 'python33', 'python33-python-devel')
+      scl_package('2.7.8', 'python27', 'python27-python-devel')
 
       def python_binary
         ::File.join(scl_folder, 'root', 'usr', 'bin', 'python')

data/lib/poise_python/resources/python_runtime.rb

@@ -46,22 +46,20 @@ module PoisePython
         #   @example Install Python 2.7
         #     python_runtime '2.7'
         attribute(:version, kind_of: String, name_attribute: true)
+        # @!attribute get_pip_url
+        #   URL to download the get-pip.py script from. If not sure, the default
+        #   of https://bootstrap.pypa.io/get-pip.py is used. If you want to skip
+        #   the pip installer entirely, set {#pip_version} to `false`.
+        #   @return [String]
+        attribute(:get_pip_url, kind_of: String, default: 'https://bootstrap.pypa.io/get-pip.py')
         # @!attribute pip_version
         #   Version of pip to install. If set to `true`, the latest available
         #   pip will be used. If set to `false`, pip will not be installed. If
-        #   set to a URL, that will be used as the URL to get-pip.py. If a
-        #   non-URL version is given, the get-pip.py installer will be
-        #   downloaded from the internet.
-        #   @note Due to https://github.com/pypa/pip/issues/1087, the latest
-        #     version of pip will always be installed initially. It will then
-        #     downgrade to the requested version if needed.
+        #   set to a URL, that will be used as the URL to get-pip.py instead of
+        #   {#get_pip_url}.
         #   @note Disabling the pip install may result in other resources being
         #     non-functional.
         #   @return [String, Boolean]
-        #   @example Install from a locally-hosted copy of get-pip.py
-        #     python_runtime '2' do
-        #       pip_version 'http://myserver/get-pip.py'
-        #     end
         attribute(:pip_version, kind_of: [String, TrueClass, FalseClass], default: true)
         # @!attribute setuptools_version
         #   Version of Setuptools to install. It set to `true`, the latest

data/lib/poise_python/resources/python_runtime_pip.rb

@@ -26,8 +26,6 @@ module PoisePython
     # @since 1.0.0
     # @api private
     module PythonRuntimePip
-      # URL for the default get-pip.py script.
-      DEFAULT_GET_PIP_URL = 'https://bootstrap.pypa.io/get-pip.py'
       # Earliest version of pip we will try upgrading in-place.
       PIP_INPLACE_VERSION = Gem::Version.create('7.0.0')
 
@@ -49,9 +47,9 @@ module PoisePython
         #   @return [String]
         attribute(:version, kind_of: String)
         # @!attribute get_pip_url
-        #   URL to the get-pip.py script. Defaults to pulling it from pypa.io.
+        #   URL to the get-pip.py script.
         #   @return [String]
-        attribute(:get_pip_url, kind_of: String, default: DEFAULT_GET_PIP_URL)
+        attribute(:get_pip_url, kind_of: String, required: true)
       end
 
       # The default provider for `python_runtime_pip`.

data/lib/poise_python/version.rb

@@ -16,5 +16,5 @@
 
 
 module PoisePython
-  VERSION = '1.4.0'
+  VERSION = '1.5.0'
 end

data/poise-python.gemspec

@@ -33,9 +33,10 @@ Gem::Specification.new do |spec|
   spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = %w{lib}
 
+  spec.add_dependency 'chef', '~> 12.1'
   spec.add_dependency 'halite', '~> 1.0'
   spec.add_dependency 'poise', '~> 2.7'
-  spec.add_dependency 'poise-languages', '~> 1.3'
+  spec.add_dependency 'poise-languages', '~> 2.0'
 
   spec.add_development_dependency 'poise-boiler', '~> 1.8'
 end

data/test/gemfiles/chef-12.1.gemfile

@@ -17,3 +17,4 @@
 eval_gemfile File.expand_path('../../../Gemfile', __FILE__)
 
 gem 'chef', '~> 12.1.2'
+gem 'rack', '< 2'

data/test/gemfiles/chef-12.10.gemfile

@@ -0,0 +1,20 @@
+#
+# Copyright 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.10.24'
+gem 'rack', '< 2'

data/test/gemfiles/chef-12.11.gemfile

@@ -0,0 +1,20 @@
+#
+# Copyright 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.11.18'
+gem 'rack', '< 2'

data/test/gemfiles/chef-12.12.gemfile

@@ -0,0 +1,19 @@
+#
+# Copyright 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.12.15'

data/test/gemfiles/chef-12.13.gemfile

@@ -0,0 +1,19 @@
+#
+# Copyright 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.13.37'

data/test/gemfiles/chef-12.2.gemfile

@@ -17,3 +17,4 @@
 eval_gemfile File.expand_path('../../../Gemfile', __FILE__)
 
 gem 'chef', '~> 12.2.1'
+gem 'rack', '< 2'

data/test/gemfiles/chef-12.3.gemfile

@@ -17,3 +17,4 @@
 eval_gemfile File.expand_path('../../../Gemfile', __FILE__)
 
 gem 'chef', '~> 12.3.0'
+gem 'rack', '< 2'

data/test/gemfiles/chef-12.4.gemfile

@@ -17,5 +17,5 @@
 eval_gemfile File.expand_path('../../../Gemfile', __FILE__)
 
 gem 'chef', '~> 12.4.3'
-# Pending https://github.com/berkshelf/ridley/pull/335
+gem 'rack', '< 2'
 gem 'ridley', '4.4.1'

data/test/gemfiles/chef-12.5.gemfile

@@ -17,3 +17,4 @@
 eval_gemfile File.expand_path('../../../Gemfile', __FILE__)
 
 gem 'chef', '~> 12.5.1'
+gem 'rack', '< 2'

data/test/gemfiles/chef-12.6.gemfile

@@ -17,3 +17,4 @@
 eval_gemfile File.expand_path('../../../Gemfile', __FILE__)
 
 gem 'chef', '~> 12.6.0'
+gem 'rack', '< 2'

data/test/gemfiles/chef-12.7.gemfile

@@ -0,0 +1,20 @@
+#
+# 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'
+gem 'rack', '< 2'

data/test/gemfiles/chef-12.8.gemfile

@@ -0,0 +1,20 @@
+#
+# 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'
+gem 'rack', '< 2'

data/test/gemfiles/chef-12.9.gemfile

@@ -0,0 +1,20 @@
+#
+# Copyright 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.9.41'
+gem 'rack', '< 2'

data/test/gemfiles/chef-12.gemfile

@@ -16,4 +16,4 @@
 
 eval_gemfile File.expand_path('../../../Gemfile', __FILE__)
 
-gem 'chef', '~> 12.6'
+gem 'chef', '~> 12.13'

data/test/gemfiles/master.gemfile

@@ -21,5 +21,5 @@ 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-languages', github: 'poise/poise-languages'
+# gem 'poise-languages', github: 'poise/poise-languages'
 gem 'poise-profiler', github: 'poise/poise-profiler'

data/test/spec/python_providers/scl_spec.rb

@@ -41,7 +41,7 @@ describe PoisePython::PythonProviders::Scl do
 
   context 'with version ""' do
     let(:python_version) { '' }
-    it_behaves_like 'scl provider', 'rh-python34'
+    it_behaves_like 'scl provider', 'rh-python35'
   end # /context with version ""
 
   context 'with version "2"' do
@@ -51,7 +51,7 @@ describe PoisePython::PythonProviders::Scl do
 
   context 'with version "3"' do
     let(:python_version) { '3' }
-    it_behaves_like 'scl provider', 'rh-python34'
+    it_behaves_like 'scl provider', 'rh-python35'
   end # /context with version "3"
 
   context 'with version "3.3"' do
@@ -59,6 +59,12 @@ describe PoisePython::PythonProviders::Scl do
     it_behaves_like 'scl provider', 'python33'
   end # /context with version "3.3"
 
+  context 'with version "" on CentOS 6' do
+    let(:chefspec_options) { {platform: 'centos', version: '6.0'} }
+    let(:python_version) { '' }
+    it_behaves_like 'scl provider', 'rh-python34'
+  end # /context with version "" on CentOS 6
+
   context 'action :uninstall' do
     recipe do
       python_runtime 'test' do

data/test/spec/resources/python_runtime_pip_spec.rb

@@ -20,7 +20,9 @@ describe PoisePython::Resources::PythonRuntimePip do
   step_into(:python_runtime_pip)
   recipe do
     python_runtime 'test'
-    python_runtime_pip 'test'
+    python_runtime_pip 'test' do
+      get_pip_url 'http://example.com/'
+    end
   end
   before do
     provider = PoisePython::Resources::PythonRuntimePip::Provider

data/test/spec/resources/python_runtime_spec.rb

@@ -0,0 +1,83 @@
+#
+# 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.
+#
+
+require 'spec_helper'
+
+class PythonRuntimeTestProvider < PoisePython::PythonProviders::Base
+  provides(:test)
+  def self.provides_auto?(*args)
+    true
+  end
+  def python_binary
+    '/python'
+  end
+  def install_python
+  end
+  def uninstall_python
+  end
+end
+
+describe PoisePython::Resources::PythonRuntime do
+  step_into(:python_runtime)
+  let(:venv_installed) { false }
+  before do
+    allow_any_instance_of(PythonRuntimeTestProvider).to receive(:poise_shell_out).with(%w{/python -m venv -h}, environment: {}).and_return(double(error?: !venv_installed))
+  end
+
+  context 'with defaults' do
+    recipe do
+      python_runtime 'test' do
+        provider :test
+      end
+    end
+
+    it { is_expected.to install_python_runtime_pip('test').with(version: nil, get_pip_url: 'https://bootstrap.pypa.io/get-pip.py') }
+  end # /context with defaults
+
+  context 'with a pip_version' do
+    recipe do
+      python_runtime 'test' do
+        provider :test
+        pip_version '1.2.3'
+      end
+    end
+
+    it { is_expected.to install_python_runtime_pip('test').with(version: '1.2.3', get_pip_url: 'https://bootstrap.pypa.io/get-pip.py') }
+  end # /context with a pip_version
+
+  context 'with a pip_version URL' do
+    recipe do
+      python_runtime 'test' do
+        provider :test
+        pip_version 'http://example.com/get-pip.py'
+      end
+    end
+
+    it { is_expected.to install_python_runtime_pip('test').with(version: nil, get_pip_url: 'http://example.com/get-pip.py') }
+  end # /context with a pip_version URL
+
+  context 'with a pip_version and a get_pip_url' do
+    recipe do
+      python_runtime 'test' do
+        provider :test
+        pip_version '1.2.3'
+        get_pip_url 'http://example.com/get-pip.py'
+      end
+    end
+
+    it { is_expected.to install_python_runtime_pip('test').with(version: '1.2.3', get_pip_url: 'http://example.com/get-pip.py') }
+  end # /context with a pip_version and a get_pip_url
+end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: poise-python
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Noah Kantrowitz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-06 00:00:00.000000000 Z
+date: 2016-08-29 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: chef
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '12.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '12.1'
 - !ruby/object:Gem::Dependency
   name: halite
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: poise-boiler
   requirement: !ruby/object:Gem::Requirement
@@ -113,11 +127,18 @@ files:
 - test/docker/docker.ca
 - test/docker/docker.pem
 - test/gemfiles/chef-12.1.gemfile
+- test/gemfiles/chef-12.10.gemfile
+- test/gemfiles/chef-12.11.gemfile
+- test/gemfiles/chef-12.12.gemfile
+- test/gemfiles/chef-12.13.gemfile
 - test/gemfiles/chef-12.2.gemfile
 - test/gemfiles/chef-12.3.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/chef-12.9.gemfile
 - test/gemfiles/chef-12.gemfile
 - test/gemfiles/master.gemfile
 - test/integration/default/serverspec/default_spec.rb
@@ -130,6 +151,7 @@ files:
 - test/spec/resources/pip_requirements_spec.rb
 - test/spec/resources/python_package_spec.rb
 - test/spec/resources/python_runtime_pip_spec.rb
+- test/spec/resources/python_runtime_spec.rb
 - test/spec/resources/python_virtualenv_spec.rb
 - test/spec/spec_helper.rb
 - test/spec/utils/python_encoder_spec.rb
@@ -154,7 +176,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 for managing Python installations.
@@ -164,11 +186,18 @@ test_files:
 - test/docker/docker.ca
 - test/docker/docker.pem
 - test/gemfiles/chef-12.1.gemfile
+- test/gemfiles/chef-12.10.gemfile
+- test/gemfiles/chef-12.11.gemfile
+- test/gemfiles/chef-12.12.gemfile
+- test/gemfiles/chef-12.13.gemfile
 - test/gemfiles/chef-12.2.gemfile
 - test/gemfiles/chef-12.3.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/chef-12.9.gemfile
 - test/gemfiles/chef-12.gemfile
 - test/gemfiles/master.gemfile
 - test/integration/default/serverspec/default_spec.rb
@@ -181,8 +210,8 @@ test_files:
 - test/spec/resources/pip_requirements_spec.rb
 - test/spec/resources/python_package_spec.rb
 - test/spec/resources/python_runtime_pip_spec.rb
+- test/spec/resources/python_runtime_spec.rb
 - test/spec/resources/python_virtualenv_spec.rb
 - test/spec/spec_helper.rb
 - test/spec/utils/python_encoder_spec.rb
 - test/spec/utils_spec.rb
-has_rdoc: