poise-python 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7500de072f7a8087c804a127c870a8c6b16b5aca
-  data.tar.gz: d600e7a8144e251e8d2faa81bb8da5d1a58dcdad
+  metadata.gz: 9f304a2454721479e3c38acad468e98a2774757e
+  data.tar.gz: b232e65292bf44a165365aff618bf43eba398fcb
 SHA512:
-  metadata.gz: d0673eb2b7dfe1d1b3e946edb8de5d8ff4c8a7253ce7499f608e8f6321698bba79c21b9d66b8df3706f2855d71225ef8c3278bda434dbad5e5d2b9d17869bf73
-  data.tar.gz: b995f972baacd4f6482cae93ec8405194a7e1ad9584b7df66bab06066aa2df5a54e9ba270b2778c62c0a7df3d88336efbf2924d51400af8cb7af9e4bd5559136
+  metadata.gz: 78e693a8d1fdb7d0928ffc6946fbcc4c229bddc9b492999cc4067ae6f8ae7f51a77197a1863567a02056429864806febf39d7914f75b4ce6371b6d6710c59c82
+  data.tar.gz: 73957a301bf9c69bde856b5afedc5f7628a0d31e8d3c4166d9e68bd210293c0d4ad557eba770a955f8671aef69dbd8feddc6acbac65be9574f349d023df4c818

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Poise-Python Changelog
 
+## v1.5.1
+
+* Fix handling of packages with underscores in the name.
+
 ## v1.5.0
 
 * Support new SCL structure and packages.

data/Gemfile

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

data/lib/poise_python/resources/python_package.rb

@@ -188,13 +188,13 @@ EOH
             @candidate_version = []
             versions = []
             [resource.package_name].flatten.each do |name|
-              ver = version_data[parse_package_name(name).downcase]
+              ver = version_data[parse_package_name(name)]
               versions << ver[:current]
               @candidate_version << ver[:candidate]
             end
             resource.version(versions)
           else
-            ver = version_data[parse_package_name(resource.package_name).downcase]
+            ver = version_data[parse_package_name(resource.package_name)]
             resource.version(ver[:current])
             @candidate_version = ver[:candidate]
           end
@@ -316,7 +316,7 @@ EOH
             # Example of a line:
             # boto (2.25.0)
             if md = line.match(/^(\S+)\s+\(([^\s,]+).*\)$/i)
-              memo[md[1].downcase] = md[2]
+              memo[parse_package_name(md[1])] = md[2]
             else
               Chef::Log.debug("[#{new_resource}] Unparsable line in pip list: #{line}")
             end
@@ -340,7 +340,7 @@ EOH
             $1
           else
             raw_name
-          end
+          end.downcase.gsub(/_/, '-')
         end
 
       end

data/lib/poise_python/version.rb

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

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/resources/python_package_spec.rb

@@ -97,6 +97,17 @@ describe PoisePython::Resources::PythonPackage do
         it { expect(candidate_version).to eq '1.0.0' }
       end # /context with a package with extras
 
+      context 'with a package with underscores' do
+        let(:package_name) { 'cx_foo' }
+        before do
+          stub_cmd(%w{-m pip.__main__ list}, stdout: '')
+          stub_cmd(%w{- cx-foo}, input: kind_of(String), stdout: '{"cx-foo":"1.0.0"}')
+        end
+
+        its(:version) { is_expected.to be nil }
+        it { expect(candidate_version).to eq '1.0.0' }
+      end # /context with a package with underscores
+
       context 'with options' do
         let(:package_name) { 'foo' }
         before do
@@ -189,6 +200,15 @@ describe PoisePython::Resources::PythonPackage do
             subject
           end
         end # /context with a package with extras
+
+        context 'with a package with underscores' do
+          let(:package_name) { 'cx_foo' }
+          let(:candidate_version) { '1.0.0' }
+          it do
+            stub_cmd(%w{-m pip.__main__ install cx_foo==1.0.0})
+            subject
+          end
+        end # /context with a package with underscores
       end # /describe action :install
 
       describe 'action :upgrade' do
@@ -250,8 +270,9 @@ eventlet (0.12.1)
 Fabric (1.9.1)
 fabric-rundeck (1.2, /Users/coderanger/src/bal/fabric-rundeck)
 flake8 (2.1.0.dev0)
+cx-Freeze (4.3.4)
 EOH
-        it { is_expected.to eq({'eventlet' => '0.12.1', 'fabric' => '1.9.1', 'fabric-rundeck' => '1.2', 'flake8' => '2.1.0.dev0'}) }
+        it { is_expected.to eq({'eventlet' => '0.12.1', 'fabric' => '1.9.1', 'fabric-rundeck' => '1.2', 'flake8' => '2.1.0.dev0', 'cx-freeze' => '4.3.4'}) }
       end # /context with standard content
 
       context 'with malformed content' do
@@ -260,8 +281,9 @@ eventlet (0.12.1)
 Fabric (1.9.1)
 fabric-rundeck (1.2, /Users/coderanger/src/bal/fabric-rundeck)
 flake 8 (2.1.0.dev0)
+cx_Freeze (4.3.4)
 EOH
-        it { is_expected.to eq({'eventlet' => '0.12.1', 'fabric' => '1.9.1', 'fabric-rundeck' => '1.2'}) }
+        it { is_expected.to eq({'eventlet' => '0.12.1', 'fabric' => '1.9.1', 'fabric-rundeck' => '1.2', 'cx-freeze' => '4.3.4'}) }
       end # /context with malformed content
     end # /describe #parse_pip_list
   end # /describe PoisePython::Resources::PythonPackage::Provider

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: poise-python
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Noah Kantrowitz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-29 00:00:00.000000000 Z
+date: 2016-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef