poise-python 1.2.1 → 1.3.0

data/lib/poise_python/resources/python_runtime_test.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2015, Noah Kantrowitz
+# 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.
@@ -40,7 +40,7 @@ module PoisePython
         attribute(:path, kind_of: String, default: lazy { default_path })
 
         def default_path
-          ::File.join('', 'opt', "python_test_#{name}")
+          ::File.join('', "python_test_#{name}")
         end
       end
 
@@ -146,33 +146,36 @@ EOH
             end
             test_import('requests', 'requests_version', python: nil, virtualenv: ::File.join(new_resource.path, 'venv3'))
 
-            # Create a non-root user and test installing with it.
-            test_user = "py#{new_resource.name}"
-            test_home = ::File.join('', 'home', test_user)
-            group test_user do
-              system true
-            end
-            user test_user do
-              comment "Test user for python_runtime_test #{new_resource.name}"
-              gid test_user
-              home test_home
-              shell '/bin/false'
-              system true
-            end
-            directory test_home do
-              mode '700'
-              group test_user
-              user test_user
-            end
-            test_venv = python_virtualenv ::File.join(test_home, 'env') do
-              python new_resource.name
-              user test_user
-            end
-            python_package 'attrs' do
-              user test_user
-              virtualenv test_venv
+            # Don't run the user tests on Windows.
+            unless node.platform_family?('windows')
+              # Create a non-root user and test installing with it.
+              test_user = "py#{new_resource.name}"
+              test_home = ::File.join('', 'home', test_user)
+              group 'g'+test_user do
+                system true
+              end
+              user test_user do
+                comment "Test user for python_runtime_test #{new_resource.name}"
+                gid 'g'+test_user
+                home test_home
+                shell '/bin/false'
+                system true
+              end
+              directory test_home do
+                mode '700'
+                group 'g'+test_user
+                user test_user
+              end
+              test_venv = python_virtualenv ::File.join(test_home, 'env') do
+                python new_resource.name
+                user test_user
+              end
+              python_package 'attrs' do
+                user test_user
+                virtualenv test_venv
+              end
+              test_import('attrs', 'attr', python: nil, virtualenv: test_venv, user: test_user)
             end
-            test_import('attrs', 'attr', python: nil, virtualenv: test_venv, user: test_user)
           end
         end
 
@@ -187,8 +190,8 @@ EOH
         def test_version(python: new_resource.name, virtualenv: nil)
           # Only queue up this resource once, the ivar is just for tracking.
           @python_version_test ||= file ::File.join(new_resource.path, 'python_version.py') do
-            user 'root'
-            group 'root'
+            user node.platform_family?('windows') ? Poise::Utils::Win32.admin_user : 'root'
+            group node['root_group']
             mode '644'
             content <<-EOH
 import sys, platform
@@ -205,8 +208,8 @@ EOH
         def test_import(name, path=name, python: new_resource.name, virtualenv: nil, user: nil)
           # Only queue up this resource once, the ivar is just for tracking.
           @python_import_test ||= file ::File.join(new_resource.path, 'import_version.py') do
-            user 'root'
-            group 'root'
+            user node.platform_family?('windows') ? Poise::Utils::Win32.admin_user : 'root'
+            group node['root_group']
             mode '644'
             content <<-EOH
 try:

data/lib/poise_python/resources/python_virtualenv.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2015, Noah Kantrowitz
+# 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.
@@ -98,7 +98,11 @@ module PoisePython
         alias_method :action_delete, :action_uninstall
 
         def python_binary
-          ::File.join(new_resource.path, 'bin', 'python')
+          if node.platform_family?('windows')
+            ::File.join(new_resource.path, 'Scripts', 'python.exe')
+          else
+            ::File.join(new_resource.path, 'bin', 'python')
+          end
         end
 
         def python_environment

data/lib/poise_python/utils.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2015, Noah Kantrowitz
+# 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.

data/lib/poise_python/utils/python_encoder.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2015, Noah Kantrowitz
+# 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.

data/lib/poise_python/version.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2015, Noah Kantrowitz
+# 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.
@@ -16,5 +16,5 @@
 
 
 module PoisePython
-  VERSION = '1.2.1'
+  VERSION = '1.3.0'
 end

data/poise-python.gemspec

@@ -1,5 +1,5 @@
 #
-# Copyright 2015, Noah Kantrowitz
+# 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.
@@ -34,8 +34,8 @@ Gem::Specification.new do |spec|
   spec.require_paths = %w{lib}
 
   spec.add_dependency 'halite', '~> 1.0'
-  spec.add_dependency 'poise', '~> 2.0'
-  spec.add_dependency 'poise-languages', '~> 1.2'
+  spec.add_dependency 'poise', '~> 2.7'
+  spec.add_dependency 'poise-languages', '~> 1.3'
 
-  spec.add_development_dependency 'poise-boiler', '~> 1.0'
+  spec.add_development_dependency 'poise-boiler', '~> 1.8'
 end

data/test/{cookbooks/poise-python_test → cookbook}/metadata.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2015, Noah Kantrowitz
+# 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.

data/test/cookbook/recipes/default.rb

@@ -0,0 +1,78 @@
+#
+# 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 'poise_python/resources/python_runtime_test'
+
+# Install lsb-release because Debian 6 doesn't by default and serverspec requires it
+package 'lsb-release' if platform?('debian') && node['platform_version'].start_with?('6')
+
+# Which tests to run on each platform.
+tests_to_run = value_for_platform(
+  default:  %w{py2 py3 system pypy pip},
+  centos: {default: %w{py2 py3 system scl pypy pip}},
+  redhat: {default: %w{py2 py3 system scl pypy pip}},
+  ubuntu: {
+    '12.04' => %w{py2 pypy pip},
+    'default' => %w{py2 py3 system pypy pip},
+  },
+  windows: {default: %w{py2 py3}},
+)
+
+%w{py2 py3 system pypy scl pip msi}.each do |test|
+  unless tests_to_run.include?(test)
+    file "/no_#{test}"
+    next
+  end
+
+  case test
+  when 'py2'
+    python_runtime_test '2'
+  when 'py3'
+    python_runtime_test '3'
+  when 'system'
+    python_runtime_test 'system' do
+      version ''
+      runtime_provider :system
+    end
+  when 'scl'
+    python_runtime_test 'scl' do
+      version ''
+      runtime_provider :scl
+    end
+  when 'pypy'
+    python_runtime_test 'pypy'
+  when 'pip'
+    # Specific test for pip reversion working correctly.
+    pip_provider = value_for_platform_family(default: :portable_pypy, windows: :msi)
+    python_runtime 'pip1' do
+      pip_version '7.1.2'
+      provider pip_provider
+      options path: '/test_pip1'
+      version ''
+    end
+    python_runtime 'pip2' do
+      provider pip_provider
+      options path: '/test_pip2'
+      version ''
+    end
+    python_runtime 'pip2b' do
+      pip_version '7.1.2'
+      provider pip_provider
+      options path: '/test_pip2'
+      version ''
+    end
+  end
+end

data/{Berksfile → test/gemfiles/chef-12.1.gemfile}

@@ -1,5 +1,5 @@
 #
-# Copyright 2015, Noah Kantrowitz
+# 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.
@@ -14,15 +14,6 @@
 # limitations under the License.
 #
 
-source 'https://supermarket.chef.io/'
-extension 'halite'
+eval_gemfile File.expand_path('../../../Gemfile', __FILE__)
 
-# Force the rebuild every time for development.
-cookbook 'poise', gem: 'poise'
-cookbook 'poise-languages', gem: 'poise-languages'
-cookbook 'poise-python', gem: 'poise-python'
-
-group :test do
-  cookbook 'poise-python_test', path: 'test/cookbooks/poise-python_test'
-  cookbook 'apt'
-end
+gem 'chef', '~> 12.1.2'

data/test/gemfiles/chef-12.2.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.2.1'

data/test/gemfiles/chef-12.3.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.3.0'

data/test/gemfiles/chef-12.4.gemfile

@@ -0,0 +1,21 @@
+#
+# 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.4.3'
+# Pending https://github.com/berkshelf/ridley/pull/335
+gem 'ridley', '4.4.1'

data/test/gemfiles/chef-12.5.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.5.1'

data/test/gemfiles/chef-12.6.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.6.0'

data/test/gemfiles/chef-12.gemfile

@@ -1,5 +1,5 @@
 #
-# Copyright 2015, Noah Kantrowitz
+# 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.
@@ -16,4 +16,4 @@
 
 eval_gemfile File.expand_path('../../../Gemfile', __FILE__)
 
-gem 'chef', '~> 12.0'
+gem 'chef', '~> 12.6'

data/test/gemfiles/master.gemfile

@@ -1,5 +1,5 @@
 #
-# Copyright 2015, Noah Kantrowitz
+# 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.
@@ -19,5 +19,7 @@ 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-languages', github: 'poise/poise-languages'
+gem 'poise-profiler', github: 'poise/poise-profiler'

data/test/integration/default/serverspec/default_spec.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2015, Noah Kantrowitz
+# 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.
@@ -14,13 +14,21 @@
 # limitations under the License.
 #
 
+require 'rbconfig'
+
 require 'serverspec'
-set :backend, :exec
+
+if RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/
+  set :backend, :cmd
+  set :os, :family => 'windows'
+else
+  set :backend, :exec
+end
 
 # Set up the shared example for python_runtime_test.
 RSpec.shared_examples 'a python_runtime_test' do |python_name, version=nil|
   let(:python_name) { python_name }
-  let(:python_path) { File.join('', 'opt', "python_test_#{python_name}") }
+  let(:python_path) { File.join('', "python_test_#{python_name}") }
   # Helper for all the file checks.
   def self.assert_file(rel_path, should_exist=true, &block)
     describe rel_path do
@@ -73,16 +81,16 @@ RSpec.shared_examples 'a python_runtime_test' do |python_name, version=nil|
 
   describe 'pip_requirements' do
     assert_file('import_requests') do
-      its(:content) { is_expected.to eq '2.7.0' }
+      its(:content) { is_expected.to match /^2\.7\.0\s*$/ }
     end
     assert_file('import_six') do
-      its(:content) { is_expected.to eq '1.8.0' }
+      its(:content) { is_expected.to match /^1\.8\.0\s*$/ }
     end
   end
 
   describe 'non default version' do
     assert_file('import_requests_version') do
-      its(:content) { is_expected.to eq '2.8.0' }
+      its(:content) { is_expected.to match /^2\.8\.0\s*$/ }
     end
   end
 
@@ -111,13 +119,19 @@ describe 'scl provider', unless: File.exist?('/no_scl') do
   it_should_behave_like 'a python_runtime_test', 'scl'
 end
 
-describe 'pip reversion test' do
-  describe command('/opt/pip1/bin/pypy -m pip --version') do
+describe 'pip reversion test', unless: File.exist?('/no_pip') do
+  path_suffix = if os[:family] == 'windows'
+    '/Scripts/python.exe'
+  else
+    '/bin/pypy'
+  end
+
+  describe command("/test_pip1#{path_suffix} -m pip --version") do
     its(:exit_status) { is_expected.to eq 0 }
     its(:stdout) { is_expected.to include '7.1.2' }
   end
 
-  describe command('/opt/pip2/bin/pypy -m pip --version') do
+  describe command("/test_pip2#{path_suffix} -m pip --version") do
     its(:exit_status) { is_expected.to eq 0 }
     its(:stdout) { is_expected.to include '7.1.2' }
   end