poise-python 1.5.1 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f304a2454721479e3c38acad468e98a2774757e
-  data.tar.gz: b232e65292bf44a165365aff618bf43eba398fcb
+  metadata.gz: ce39dfd6c5b8b8003f462ba7893cfb9ef0ae169f
+  data.tar.gz: 8ffe437521b352b6921d35312a8be893d85772ad
 SHA512:
-  metadata.gz: 78e693a8d1fdb7d0928ffc6946fbcc4c229bddc9b492999cc4067ae6f8ae7f51a77197a1863567a02056429864806febf39d7914f75b4ce6371b6d6710c59c82
-  data.tar.gz: 73957a301bf9c69bde856b5afedc5f7628a0d31e8d3c4166d9e68bd210293c0d4ad557eba770a955f8671aef69dbd8feddc6acbac65be9574f349d023df4c818
+  metadata.gz: de2552c9e02388871d91dd02a10655aeb975be311fc4518ab594ffcd6e32e674275ca907bd5d8a978473634fabf8eaeefaec4a07c75255204fdb838d814dd9aa
+  data.tar.gz: cc89c455a9e4a13353e4fb1b79bbe6a3c3daa24bf3c466f1c39789d710718b0511debd9a66b98fe28ee38a546537e367950469e3d4525ac03331b477d3761cfa

data/.travis.yml

@@ -4,14 +4,22 @@ language: ruby
 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'
+before_install:
+  - 'if [[ $BUNDLE_GEMFILE == *master.gemfile ]]; then gem update --system; fi'
+  - gem --version
+  - gem install bundler
+  - bundle --version
+  - 'bundle config --local path ${BUNDLE_PATH:-$(dirname $BUNDLE_GEMFILE)/vendor/bundle}'
+  - bundle config --local bin $PWD/bin
+install: bundle update --jobs=3 --retry=3
 script:
   - ./bin/rake travis
 matrix:
   include:
-    - rvm: 2.1.9
+    - rvm: 2.3.1
       gemfile: test/gemfiles/chef-12.gemfile
+    - rvm: 2.4.1
+      gemfile: test/gemfiles/chef-13.gemfile
     - rvm: 2.1.4
       gemfile: test/gemfiles/chef-12.1.gemfile
     - rvm: 2.1.4
@@ -39,4 +47,18 @@ matrix:
     - rvm: 2.1.9
       gemfile: test/gemfiles/chef-12.13.gemfile
     - rvm: 2.3.1
+      gemfile: test/gemfiles/chef-12.14.gemfile
+    - rvm: 2.3.1
+      gemfile: test/gemfiles/chef-12.15.gemfile
+    - rvm: 2.3.1
+      gemfile: test/gemfiles/chef-12.16.gemfile
+    - rvm: 2.3.1
+      gemfile: test/gemfiles/chef-12.17.gemfile
+    - rvm: 2.3.1
+      gemfile: test/gemfiles/chef-12.18.gemfile
+    - rvm: 2.3.1
+      gemfile: test/gemfiles/chef-12.19.gemfile
+    - rvm: 2.4.1
+      gemfile: test/gemfiles/chef-13.0.gemfile
+    - rvm: 2.4.1
       gemfile: test/gemfiles/master.gemfile

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Poise-Python Changelog
 
+## v1.6.0
+
+* Improved handling for Python 3.3.
+* Updated PyPy release lists.
+* Fix file permissions for non-root-owned virtualenvs.
+* Support for Chef 13.
+
 ## v1.5.1
 
 * Fix handling of packages with underscores in the name.

data/Gemfile

@@ -1,5 +1,5 @@
 #
-# Copyright 2015-2016, Noah Kantrowitz
+# Copyright 2015-2017, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/README.md

@@ -435,7 +435,7 @@ The Poise test server infrastructure is sponsored by [Rackspace](https://rackspa
 
 ## License
 
-Copyright 2015-2016, Noah Kantrowitz
+Copyright 2015-2017, Noah Kantrowitz
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

data/Rakefile

@@ -1,5 +1,5 @@
 #
-# Copyright 2015-2016, Noah Kantrowitz
+# Copyright 2015-2017, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/chef/attributes/default.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2015-2016, Noah Kantrowitz
+# Copyright 2015-2017, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/chef/recipes/default.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2015-2016, Noah Kantrowitz
+# Copyright 2015-2017, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/poise_python.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2015-2016, Noah Kantrowitz
+# Copyright 2015-2017, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/poise_python/cheftie.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2015-2016, Noah Kantrowitz
+# Copyright 2015-2017, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/poise_python/error.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2015-2016, Noah Kantrowitz
+# Copyright 2015-2017, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/poise_python/python_command_mixin.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2015-2016, Noah Kantrowitz
+# Copyright 2015-2017, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/poise_python/python_providers.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2015-2016, Noah Kantrowitz
+# Copyright 2015-2017, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/poise_python/python_providers/base.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2015-2016, Noah Kantrowitz
+# Copyright 2015-2017, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/poise_python/python_providers/dummy.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2015-2016, Noah Kantrowitz
+# Copyright 2015-2017, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/poise_python/python_providers/msi.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2016, Noah Kantrowitz
+# Copyright 2016-2017, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/poise_python/python_providers/portable_pypy.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2015-2016, Noah Kantrowitz
+# Copyright 2015-2017, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -26,7 +26,7 @@ module PoisePython
       provides(:portable_pypy)
       include PoiseLanguages::Static(
         name: 'pypy',
-        versions: %w{4.0.1 2.6.1 2.5.1 2.5 2.4 2.3.1 2.3 2.2.1 2.2 2.1 2.0.2},
+        versions: %w{5.7.1 5.6 5.4.1 5.4 5.3.1 5.1.1 5.1 5.0.1 5.0 4.0.1 2.6.1 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'
       )

data/lib/poise_python/python_providers/portable_pypy3.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2015-2016, Noah Kantrowitz
+# Copyright 2015-2017, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -26,11 +26,27 @@ module PoisePython
       provides(:portable_pypy3)
       include PoiseLanguages::Static(
         name: 'pypy3',
-        versions: %w{2.4 2.3.1},
+        # Don't put prereleases first so they aren't used for prefix matches on ''.
+        versions: %w{2.4 5.7.1-beta 5.7-beta 5.5-alpha-20161014 5.5-alpha-20161013 5.2-alpha-20160602 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 self.default_inversion_options(node, resource)
+        super.tap do |options|
+          if resource.version && resource.version =~ /^(pypy3-)?5(\.\d)?/
+            # We need a different default base URL for pypy3.3
+            # This is the same as before but `/pypy3.3` as the prefix on the filename.
+            basename = if $2 == '.2' || $2 == '.5'
+              'pypy3.3'
+            else
+              'pypy3.5'
+            end
+            options['url'] = "https://bitbucket.org/squeaky/portable-pypy/downloads/#{basename}-%{version}-%{kernel}_%{machine}-portable.tar.bz2"
+          end
+        end
+      end
+
       def python_binary
         ::File.join(static_folder, 'bin', 'pypy')
       end

data/lib/poise_python/python_providers/scl.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2015-2016, Noah Kantrowitz
+# Copyright 2015-2017, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/poise_python/python_providers/system.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2015-2016, Noah Kantrowitz
+# Copyright 2015-2017, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/poise_python/resources.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2015-2016, Noah Kantrowitz
+# Copyright 2015-2017, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/poise_python/resources/pip_requirements.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2015-2016, Noah Kantrowitz
+# Copyright 2015-2017, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/poise_python/resources/python_execute.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2015-2016, Noah Kantrowitz
+# Copyright 2015-2017, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/poise_python/resources/python_package.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2015-2016, Noah Kantrowitz
+# Copyright 2015-2017, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -99,19 +99,19 @@ EOH
         # @!attribute group
         #   System group to install the package.
         #   @return [String, Integer, nil]
-        attribute(:group, kind_of: [String, Integer, NilClass])
+        attribute(:group, kind_of: [String, Integer, NilClass], default: lazy { default_group })
         # @!attribute install_options
         #   Options string to be used with `pip install`.
-        #   @return [String, nil, false]
-        attribute(:install_options, kind_of: [String, NilClass, FalseClass], default: nil)
+        #   @return [String, Array<String>, nil, false]
+        attribute(:install_options, kind_of: [String, Array, NilClass, FalseClass], default: nil)
         # @!attribute list_options
         #   Options string to be used with `pip list`.
-        #   @return [String, nil, false]
-        attribute(:list_options, kind_of: [String, NilClass, FalseClass], default: nil)
+        #   @return [String, Array<String>, nil, false]
+        attribute(:list_options, kind_of: [String, Array, NilClass, FalseClass], default: nil)
         # @!attribute user
         #   System user to install the package.
         #   @return [String, Integer, nil]
-        attribute(:user, kind_of: [String, Integer, NilClass])
+        attribute(:user, kind_of: [String, Integer, NilClass], default: lazy { default_user })
 
         def initialize(*args)
           super
@@ -141,6 +141,35 @@ EOH
         def source(arg=nil)
           raise NoMethodError if arg
         end
+
+        private
+
+        # Find a default group, if any, from the parent Python.
+        #
+        # @api private
+        # @return [String, Integer, nil]
+        def default_group
+          # Use an explicit is_a? hack because python_runtime is a container so
+          # it gets the whole DSL and this will always respond_to?(:group).
+          if parent_python && parent_python.is_a?(PoisePython::Resources::PythonVirtualenv::Resource)
+            parent_python.group
+          else
+            nil
+          end
+        end
+
+        # Find a default user, if any, from the parent Python.
+        #
+        # @api private
+        # @return [String, Integer, nil]
+        def default_user
+          # See default_group for explanation of is_a? hack grossness.
+          if parent_python && parent_python.is_a?(PoisePython::Resources::PythonVirtualenv::Resource)
+            parent_python.user
+          else
+            nil
+          end
+        end
       end
 
       # The default provider for the `python_package` resource.
@@ -268,9 +297,15 @@ EOH
           runner = opts.delete(:pip_runner) || %w{-m pip.__main__}
           type_specific_options = new_resource.send(:"#{options_type}_options")
           full_cmd = if new_resource.options || type_specific_options
-            # We have to use a string for this case to be safe because the
-            # options are a string and I don't want to try and parse that.
-            "#{runner.join(' ')} #{pip_command} #{new_resource.options} #{type_specific_options} #{Shellwords.join(pip_options)}"
+            if (new_resource.options && new_resource.options.is_a?(String)) || (type_specific_options && type_specific_options.is_a?(String))
+              # We have to use a string for this case to be safe because the
+              # options are a string and I don't want to try and parse that.
+              global_options = new_resource.options.is_a?(Array) ? Shellwords.join(new_resource.options) : new_resource.options.to_s
+              type_specific_options = type_specific_options.is_a?(Array) ? Shellwords.join(type_specific_options) : type_specific_options.to_s
+              "#{runner.join(' ')} #{pip_command} #{global_options} #{type_specific_options} #{Shellwords.join(pip_options)}"
+            else
+              runner + (pip_command ? [pip_command] : []) + (new_resource.options || []) + (type_specific_options || []) + pip_options
+            end
           else
             # No special options, use an array to skip the extra /bin/sh.
             runner + (pip_command ? [pip_command] : []) + pip_options

data/lib/poise_python/resources/python_runtime.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2015-2016, Noah Kantrowitz
+# Copyright 2015-2017, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/poise_python/resources/python_runtime_pip.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2015-2016, Noah Kantrowitz
+# Copyright 2015-2017, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,6 +14,7 @@
 # limitations under the License.
 #
 
+require 'fileutils'
 require 'tempfile'
 
 require 'chef/resource'
@@ -122,7 +123,12 @@ module PoisePython
               boostrap_cmd = [new_resource.parent.python_binary, temp.path, '--upgrade', '--force-reinstall']
               boostrap_cmd << "pip==#{new_resource.version}" if new_resource.version
               Chef::Log.debug("[#{new_resource}] Running pip bootstrap command: #{boostrap_cmd.join(' ')}")
-              poise_shell_out!(boostrap_cmd, environment: new_resource.parent.python_environment.merge('PIP_NO_SETUPTOOLS' => '1', 'PIP_NO_WHEEL' => '1'))
+              # Gross is_a? hacks but because python_runtime is a container, it
+              # gets the full DSL and this has user and group methods from that.
+              user = new_resource.parent.is_a?(PoisePython::Resources::PythonVirtualenv::Resource) ? new_resource.parent.user : nil
+              group = new_resource.parent.is_a?(PoisePython::Resources::PythonVirtualenv::Resource) ? new_resource.parent.group : nil
+              FileUtils.chown(user, group, temp.path) if user || group
+              poise_shell_out!(boostrap_cmd, environment: new_resource.parent.python_environment.merge('PIP_NO_SETUPTOOLS' => '1', 'PIP_NO_WHEEL' => '1'), group: group, user: user)
             ensure
               temp.close unless temp.closed?
               temp.unlink

data/lib/poise_python/resources/python_runtime_test.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2015-2016, Noah Kantrowitz
+# Copyright 2015-2017, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -170,11 +170,11 @@ EOH
                 python new_resource.name
                 user test_user
               end
-              python_package 'attrs' do
+              python_package 'docopt' do
                 user test_user
                 virtualenv test_venv
               end
-              test_import('attrs', 'attr', python: nil, virtualenv: test_venv, user: test_user)
+              test_import('docopt', python: nil, virtualenv: test_venv, user: test_user)
             end
           end
         end

data/lib/poise_python/resources/python_virtualenv.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2015-2016, Noah Kantrowitz
+# Copyright 2015-2017, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -125,7 +125,8 @@ module PoisePython
             end
           else
             converge_by("Creating venv at #{new_resource.path}") do
-              create_virtualenv(%w{venv --without-pip})
+              use_withoutpip = cmd.stdout.include?('--without-pip')
+              create_virtualenv(use_withoutpip ? %w{venv --without-pip} : %w{venv})
             end
           end
         end

data/lib/poise_python/utils.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2015-2016, Noah Kantrowitz
+# Copyright 2015-2017, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/poise_python/utils/python_encoder.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2015-2016, Noah Kantrowitz
+# Copyright 2015-2017, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/poise_python/version.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2015-2016, Noah Kantrowitz
+# Copyright 2015-2017, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,5 +16,5 @@
 
 
 module PoisePython
-  VERSION = '1.5.1'
+  VERSION = '1.6.0'
 end