poise-languages 2.0.3 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a0dd01ed6eb47171782da7f2fa43d1d4115ba543
-  data.tar.gz: d6c1cbda3452daecf72031e8b8e30e196bd746bf
+  metadata.gz: aa8fb75f5fa14464a435297e7d6fd3d0ad4ec335
+  data.tar.gz: 81c08315aab320fa78dd5290f77ab7d7c1d8927d
 SHA512:
-  metadata.gz: 2b4d786b663cab44e18fb3381ca8e0daf1ded3c8bb5946263bb044a12218609cd3e2291e92f6b152ae5b3a477e454715232ca3e1e7ef3c96a23c8d1534d9491d
-  data.tar.gz: a04fb627b5728e8e3f991fd3c3d23918b6ef6de3d12fbd6d21178cf799cae0b9f8dcde2fff48edc23b947b3e2929cf80f9f18dfbbe626f94a2c5a91fd5b3060e
+  metadata.gz: e6f20fdea1e6bbac5ca1569250e54b701ddb4c7fa168573ee92fb662c6f05a46b32eece1d67f82225c533492f1b64cd937324b609dda072cb9502d041ff50184
+  data.tar.gz: 5421e5fe10fe7df56b386efbd5c9c9d5258e3d37cb7acd151a191358b569b99bc9a2515cfb829c7c78f8fb8fc2f0fc227201f86b4617f6a354717a197eabba56

data/.travis.yml

@@ -1,22 +1,45 @@
 sudo: false
 cache: bundler
 language: ruby
-rvm:
-- 2.3.1
 env:
-  - secure: hBSCgjWddgLHgzkhAx1ItgA0joNdevIwYgo6B34fJ9meGVuntP1zbHgEJ/H4wzCnxumU7cvGo0DOy93nctrpy/El9YeQ8pqfqwt0vywDBY7FhNoRV2oW59+TsvOyUvdmO6YThv17qjzWf19Ag15A5X5LgfbCrFdubXpueOSMfgSsHzny3cjF+GTuh8Ykvs8U8914JlhLNc7k7Z/cyXog7i3sO83vaHEWUBytEsnBIc1YXbbp3d1B+7YiF2EDrFxMbyN2BjmjrWpkpl31SgiyneCmw8Vj8Q4T3seK9qRrLeX5HvIdtSa0YLTvxO4kfrsNlgcJgLOmVqqMo2EStT2LRDR1DdeP9Nj8RinqkNQ7lOl4InNK7IM6Kl56dgGmnt7ZVs2kVt1xhzqWQEcRYbP14kUocCzt6A9p4gLy9trQTkBGqgCIcxFqiyfXPLJv3yAYQovGemkv6WfPAViPum7GL+98pBj0TFbiRLLcOljijbAQOi7R2VTdgaHJVBDQ5u8R9mtcecTyiBJwgYn0INY7IjpGoL1mepRNBfG9gW1+awyfvGLeYXe3dISuaPUDKZHaRSKIvJIo2Pi/OxYUPsBLiF4cL8fg6DiB9Ly/AHmI2fgct+lvkByq6ec4NlSWpSyBRtBYF7uCEkXSeSo2MPCEmPxoY/S4pO6Jz6LPtzWRdRk=
-before_install: "gem install bundler"
-bundler_args: "--binstubs=$PWD/bin --jobs 3 --retry 3"
+  global: []
+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/chef-12.7.gemfile
-- test/gemfiles/chef-12.8.gemfile
-- test/gemfiles/master.gemfile
+  - ./bin/rake travis
+matrix:
+  include:
+    - rvm: 2.3.1
+      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/chef-12.14.gemfile
+    - rvm: 2.3.1
+      gemfile: test/gemfiles/chef-12.15.gemfile
+    - rvm: 2.3.1
+      gemfile: test/gemfiles/master.gemfile

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## v2.0.4
+
+* Fixes to work with the latest Chef.
+
 ## v2.0.3
 
 * Correct the subscription repository name used for SCLs on RedHat.

data/lib/poise_languages/system/resource.rb

@@ -194,7 +194,7 @@ module PoiseLanguages
                 # In Chef 12.14+, candidate_version is a Chef::Decorator::Lazy object
                 # so we need the nil? check to see if the object being proxied is
                 # nil (i.e. there is no version).
-                unless candidate_version && (!candidate_version.nil?) && candidate_version.start_with?(version)
+                unless candidate_version && (!candidate_version.nil?) && (!candidate_version.empty?) && candidate_version.start_with?(version)
                   raise PoiseLanguages::Error.new("Package #{package_name} would install #{candidate_version}, which does not match #{version.empty? ? version.inspect : version}. Please set the package_name or package_version provider options.")
                 end
               end

data/lib/poise_languages/version.rb

@@ -16,5 +16,5 @@
 
 
 module PoiseLanguages
-  VERSION = '2.0.3'
+  VERSION = '2.0.4'
 end

data/poise-languages.gemspec

@@ -33,6 +33,7 @@ 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.5'
   spec.add_dependency 'poise-archive', '~> 1.0'

data/test/gemfiles/chef-12.1.gemfile

@@ -17,3 +17,6 @@
 eval_gemfile File.expand_path('../../../Gemfile', __FILE__)
 
 gem 'chef', '~> 12.1.2'
+gem 'rack', '< 2'
+gem 'foodcritic', '< 8'
+gem 'fauxhai', '<= 3.9.0'

data/test/gemfiles/chef-12.10.gemfile

@@ -0,0 +1,22 @@
+#
+# 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'
+gem 'foodcritic', '< 8'
+gem 'fauxhai', '<= 3.9.0'

data/test/gemfiles/chef-12.11.gemfile

@@ -0,0 +1,22 @@
+#
+# 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'
+gem 'foodcritic', '< 8'
+gem 'fauxhai', '<= 3.9.0'

data/test/gemfiles/chef-12.12.gemfile

@@ -0,0 +1,21 @@
+#
+# 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'
+gem 'foodcritic', '< 8'
+gem 'fauxhai', '<= 3.9.0'

data/test/gemfiles/chef-12.13.gemfile

@@ -0,0 +1,21 @@
+#
+# 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'
+gem 'foodcritic', '< 8'
+gem 'fauxhai', '<= 3.9.0'

data/test/gemfiles/chef-12.14.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.14.89'

data/test/gemfiles/chef-12.15.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.15.19'

data/test/gemfiles/chef-12.2.gemfile

@@ -17,3 +17,6 @@
 eval_gemfile File.expand_path('../../../Gemfile', __FILE__)
 
 gem 'chef', '~> 12.2.1'
+gem 'rack', '< 2'
+gem 'foodcritic', '< 8'
+gem 'fauxhai', '<= 3.9.0'

data/test/gemfiles/chef-12.3.gemfile

@@ -17,3 +17,6 @@
 eval_gemfile File.expand_path('../../../Gemfile', __FILE__)
 
 gem 'chef', '~> 12.3.0'
+gem 'rack', '< 2'
+gem 'foodcritic', '< 8'
+gem 'fauxhai', '<= 3.9.0'

data/test/gemfiles/chef-12.4.gemfile

@@ -17,5 +17,7 @@
 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'
+gem 'foodcritic', '< 8'
+gem 'fauxhai', '<= 3.9.0'

data/test/gemfiles/chef-12.5.gemfile

@@ -17,3 +17,6 @@
 eval_gemfile File.expand_path('../../../Gemfile', __FILE__)
 
 gem 'chef', '~> 12.5.1'
+gem 'rack', '< 2'
+gem 'foodcritic', '< 8'
+gem 'fauxhai', '<= 3.9.0'

data/test/gemfiles/chef-12.6.gemfile

@@ -17,3 +17,6 @@
 eval_gemfile File.expand_path('../../../Gemfile', __FILE__)
 
 gem 'chef', '~> 12.6.0'
+gem 'rack', '< 2'
+gem 'foodcritic', '< 8'
+gem 'fauxhai', '<= 3.9.0'

data/test/gemfiles/chef-12.7.gemfile

@@ -17,3 +17,6 @@
 eval_gemfile File.expand_path('../../../Gemfile', __FILE__)
 
 gem 'chef', '~> 12.7.2'
+gem 'rack', '< 2'
+gem 'foodcritic', '< 8'
+gem 'fauxhai', '<= 3.9.0'

data/test/gemfiles/chef-12.8.gemfile

@@ -17,3 +17,6 @@
 eval_gemfile File.expand_path('../../../Gemfile', __FILE__)
 
 gem 'chef', '~> 12.8.1'
+gem 'rack', '< 2'
+gem 'foodcritic', '< 8'
+gem 'fauxhai', '<= 3.9.0'

data/test/gemfiles/chef-12.9.gemfile

@@ -0,0 +1,22 @@
+#
+# 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'
+gem 'foodcritic', '< 8'
+gem 'fauxhai', '<= 3.9.0'

data/test/gemfiles/chef-12.gemfile

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

data/test/spec/system/mixin_spec.rb

@@ -23,6 +23,7 @@ describe PoiseLanguages::System::Mixin do
   end
 
   describe '#install_system_packages' do
+    let(:chefspec_options) { {platform: 'ubuntu', version: '16.04'} }
     provider(:poise_test) do
       include Poise
       include described_class
@@ -41,7 +42,7 @@ describe PoiseLanguages::System::Mixin do
     end
 
     it { is_expected.to install_poise_languages_system('mylang').with(parent: chef_run.poise_test('test'),
-                                                                      dev_package: nil,
+                                                                      dev_package: 'mylang-dev',
                                                                       dev_package_overrides: {},
                                                                       package_version: nil,
                                                                       version: '') }

data/test/spec/system/resource_spec.rb

@@ -36,7 +36,8 @@ describe PoiseLanguages::System::Resource do
       current_resource
     end
     def install_package(name, version)
-      run_context.resource_collection << new_resource unless run_context.resource_collection.keys.include?(new_resource.to_s)
+      rc = defined?(Chef.run_context) ? Chef.run_context : self.run_context
+      rc.resource_collection << new_resource unless rc.resource_collection.keys.include?(new_resource.to_s)
     end
     alias_method :upgrade_package, :install_package
     alias_method :remove_package, :install_package

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: poise-languages
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.4
 platform: ruby
 authors:
 - Noah Kantrowitz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-12 00:00:00.000000000 Z
+date: 2016-12-02 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
@@ -100,6 +114,12 @@ 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.14.gemfile
+- test/gemfiles/chef-12.15.gemfile
 - test/gemfiles/chef-12.2.gemfile
 - test/gemfiles/chef-12.3.gemfile
 - test/gemfiles/chef-12.4.gemfile
@@ -107,6 +127,7 @@ files:
 - 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/spec/command/mixin_spec.rb
@@ -146,6 +167,12 @@ 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.14.gemfile
+- test/gemfiles/chef-12.15.gemfile
 - test/gemfiles/chef-12.2.gemfile
 - test/gemfiles/chef-12.3.gemfile
 - test/gemfiles/chef-12.4.gemfile
@@ -153,6 +180,7 @@ test_files:
 - 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/spec/command/mixin_spec.rb