halite 1.8.0 → 1.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd168969c0914dcf6682b1245ab25654227a79aa
-  data.tar.gz: 0b56dedf7b66e2fb3a485d426c9d8f05c16186d0
+  metadata.gz: 49aedfb0b8e2389780d6a97f5f523d372e225fae
+  data.tar.gz: '0930bf0f08820b2d2e621133952b4879c245e6d8'
 SHA512:
-  metadata.gz: e2bc627bd0db8fbf3606928e8aa4bbd2468a35f76887dfab64c04a1c44e0300f5c2d533d0243a13bb689d22f265327271df1bedb7ff4c2a4ad728bf1670392cf
-  data.tar.gz: d26476e368199e290eb4fc78ffd0d93e763c7bf3e148309ae89be7d75c36edf238d92415fc642fd5e94f6b5edf92faa40467890451507bd035f04a36fa7372df
+  metadata.gz: 35b55222efbb56e756a5359999067e97e11a42d0321cb878a1fc7c4f2852c6e406b7728fbebcbec78d0ab24dde0c756cd30cdcc2fa5bb1a51ab8223220c28ab0
+  data.tar.gz: 5db26bade528b684f606d7c22989e13a5f386c1745c3296acd5c1f9f4cbd4257008a16e0c73fc5b88ce72b7472ce891541258b3448ddf9fbe382df93d29839f1

data/.travis.yml

@@ -1,21 +1,34 @@
 sudo: false
 cache: bundler
 language: ruby
-rvm:
-- "2.3.3"
-# - "2.4.1"
-gemfile:
-- gemfiles/chef-12.0.gemfile
-- gemfiles/chef-12.1.gemfile
-- gemfiles/chef-12.2.gemfile
-- gemfiles/chef-12.3.gemfile
-- gemfiles/chef-12.4.0.gemfile
-- gemfiles/chef-12.4.gemfile
-- gemfiles/chef-12.5.gemfile
-- gemfiles/chef-12.6.gemfile
-- gemfiles/chef-12.7.gemfile
-- gemfiles/chef-12.gemfile
-- gemfiles/master.gemfile
+matrix:
+  include:
+    - rvm: 2.3.1
+      gemfile: gemfiles/chef-12.gemfile
+    - rvm: 2.4.3
+      gemfile: gemfiles/chef-13.gemfile
+    - rvm: 2.1.4
+      gemfile: gemfiles/chef-12.0.gemfile
+    - rvm: 2.1.4
+      gemfile: gemfiles/chef-12.1.gemfile
+    - rvm: 2.1.4
+      gemfile: gemfiles/chef-12.2.gemfile
+    - rvm: 2.1.4
+      gemfile: gemfiles/chef-12.3.gemfile
+    - rvm: 2.1.6
+      gemfile: gemfiles/chef-12.4.gemfile
+    - rvm: 2.1.6
+      gemfile: gemfiles/chef-12.4.0.gemfile
+    - rvm: 2.1.6
+      gemfile: gemfiles/chef-12.5.gemfile
+    - rvm: 2.1.6
+      gemfile: gemfiles/chef-12.6.gemfile
+    - rvm: 2.1.6
+      gemfile: gemfiles/chef-12.7.gemfile
+    - rvm: 2.4.3
+      gemfile: gemfiles/chef-13.7.6.gemfile
+    - rvm: 2.5.0
+      gemfile: gemfiles/master.gemfile
 env:
   global:
   - USE_SYSTEM_GECODE=true
@@ -29,3 +42,4 @@ before_install:
 - bundle config --local path ${BUNDLE_PATH:-vendor/bundle}
 install: bundle update --jobs=3 --retry=3
 script: bundle exec rake integration
+

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Halite Changelog
 
+## v1.8.1
+
+* Fix compatibility with new Chef API for unregistering resources.
+
 ## v1.8.0
 
 * Give recipes created using the block helper (`recipe do ... end`) a name when

data/README.md

@@ -77,7 +77,7 @@ optional:
 
 ```ruby
 require 'halite/rake_helper'
-Halite::RakeHelper.install_tasks(
+Halite::RakeHelper.install(
   gem_name: 'name', # Name of the gem to convert
   base: File.basename(__FILE__), # Base folder for the gem
 )

data/gemfiles/chef-13.7.16.gemfile

@@ -0,0 +1,21 @@
+#
+# Copyright 2015, 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__)
+
+# this tests a very specific node_map edge case that existed only in 13.7.16 in
+# the released gem line and which affected halite.
+gem 'chef', '= 13.7.16'

data/gemfiles/chef-13.gemfile

@@ -0,0 +1,19 @@
+#
+# Copyright 2015, 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', '~> 13.7'

data/halite.gemspec

@@ -33,7 +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.0', '< 14.0'
+  spec.add_dependency 'chef', '>= 12.0', '< 15'
   spec.add_dependency 'stove', '~> 5.0'
   spec.add_dependency 'bundler' # Used for Bundler.load_gemspec
   spec.add_dependency 'thor' # Used for Thor::Shell

data/lib/halite/spec_helper/patcher.rb

@@ -247,6 +247,9 @@ module Halite
       # @param value [Object] Value to remove.
       # @return [Array<Symbol>]
       def self.remove_from_node_map(node_map, value)
+        # Chef sometime after 13.7.16 supports Chef::NodeMap#delete_class
+        return node_map.delete_class(value).keys if node_map.respond_to?(:delete_class)
+
         # Sigh.
         removed_keys = []
         # 12.4.1+ switched this to a private accessor and lazy init.
@@ -257,11 +260,14 @@ module Halite
         end
         map.each do |key, matchers|
           matchers.delete_if do |matcher|
+            # in 13.7.16 the :value key in the hash was renamed to :klass
+            vkey = matcher.key?(:klass) ? :klass : :value
+
             # In 12.4+ this value is an array of classes, before that it is the class.
-            if matcher[:value].is_a?(Array)
-              matcher[:value].include?(value)
+            if matcher[vkey].is_a?(Array)
+              matcher[vkey].include?(value)
             else
-              matcher[:value] == value
+              matcher[vkey] == value
             end && removed_keys << key # Track removed keys in a hacky way.
           end
           # Clear empty matchers entirely.

data/lib/halite/version.rb

@@ -17,5 +17,5 @@
 
 module Halite
   # Halite version.
-  VERSION = '1.8.0'
+  VERSION = '1.8.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: halite
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.8.1
 platform: ruby
 authors:
 - Noah Kantrowitz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-13 00:00:00.000000000 Z
+date: 2018-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -19,7 +19,7 @@ dependencies:
         version: '12.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '14.0'
+        version: '15'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '12.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '14.0'
+        version: '15'
 - !ruby/object:Gem::Dependency
   name: stove
   requirement: !ruby/object:Gem::Requirement
@@ -140,6 +140,8 @@ files:
 - gemfiles/chef-12.6.gemfile
 - gemfiles/chef-12.7.gemfile
 - gemfiles/chef-12.gemfile
+- gemfiles/chef-13.7.16.gemfile
+- gemfiles/chef-13.gemfile
 - gemfiles/master.gemfile
 - halite.gemspec
 - lib/berkshelf/halite.rb
@@ -241,7 +243,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: A set of helpers to write Chef cookbooks as Ruby gems.