halite 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 35d989833c7bbf082dd1025c03c64fd7fa678f5c
-  data.tar.gz: a8b72aea467f681b63a5a35de73323811b5be3a6
+  metadata.gz: a42a9b842d21763abf144daa10997a8f37c8ffda
+  data.tar.gz: a1751ed26b28b813aa1b05c03ad1d82aac86ee09
 SHA512:
-  metadata.gz: 2b2904e09a894cd47f2e74a919c88749958edbc6c9cf158b6d5ba5b435aea7d7ce61e923434018872c2ea81348f41b7b35c21fa23ff7bb812fd8d402fda8e463
-  data.tar.gz: 18615c97d14307608a9ebf8f6fde591e3543ee65e9257001eaa17a498f5f042431e5b99b19f681a66763cb4454a0c96ac34de1d4a5e4d3829decb97781ce8e6a
+  metadata.gz: f7eabc21a9a311c068d7b6c58cc9c203f47a10e1fcc2c97bb0ff49b41aea2a19fb6e91418710cc8ab6c447524940d23251d0140c7b30437a35619046afed2385
+  data.tar.gz: ebaeb2cfe08d6c2997d39828ca1f0efb3dcfd4f8b8c085f76a25a3386a041694955962bb5430b9e917a9c08da3ff489c3c499ef6dff6b4cf3d2499bc2244223c

data/.travis.yml

@@ -15,6 +15,9 @@ 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.gemfile
 - gemfiles/master.gemfile
 env:

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Halite Changelog
 
+## v1.2.0
+
+* Allow passing a `Halite::Gem` object to `Halite.convert`.
+* Allow disabling the stove push as part of `rake release` by setting
+  `$cookbook_push=false` as an environment variable.
+* Process `.foodcritic` when running `rake chef:foodcritic`.
+
 ## v1.1.0
 
 * Support the new `chef_version` metadata field through gem metadata. Defaults

data/Gemfile

@@ -27,6 +27,7 @@ end
 
 dev_gem 'poise'
 dev_gem 'poise-boiler'
+dev_gem 'poise-profiler'
 
 # Test fixture gems
 Dir[File.expand_path('../spec/fixtures/gems/*', __FILE__)].each do |path|

data/gemfiles/chef-12.4.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', '~> 12.4.0'

data/gemfiles/chef-12.5.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', '~> 12.5.0'

data/gemfiles/chef-12.6.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', '~> 12.6.0'

data/lib/halite.rb

@@ -37,6 +37,11 @@ module Halite
   # @example Converting a gem from a loaded gemspec
   #   Halite.convert(Bundler.load_gemspec('mygem.gemspec'), 'dest')
   def self.convert(gem_name, base_path)
-    Converter.write(Gem.new(gem_name), base_path)
+    gem_data = if gem_name.is_a?(Gem)
+      gem_name
+    else
+      Gem.new(gem_name)
+    end
+    Converter.write(gem_data, base_path)
   end
 end

data/lib/halite/helper_base.rb

@@ -17,6 +17,7 @@
 
 # Much inspiration from Bundler's GemHelper. Thanks!
 require 'bundler'
+require 'thor'
 require 'thor/shell'
 
 require 'halite/error'

data/lib/halite/rake_helper.rb

@@ -80,7 +80,14 @@ module Halite
 
       desc 'Run Foodcritic linter'
       task 'chef:foodcritic' do
-        foodcritic_cmd = "foodcritic --chef-version #{Chef::VERSION} --epic-fail any --tags ~FC054 '%{path}'"
+        foodcritic_cmd = "foodcritic --chef-version #{Chef::VERSION} --epic-fail any --tags ~FC054"
+        foodcritic_config = File.join(base, '.foodcritic')
+        if File.exist?(foodcritic_config)
+          IO.readlines(foodcritic_config).each do |line|
+            foodcritic_cmd << " --tags #{line.strip}"
+          end
+        end
+        foodcritic_cmd << " '%{path}'"
         if options[:no_gem]
           sh(foodcritic_cmd % {path: base})
         else
@@ -122,6 +129,8 @@ module Halite
     end
 
     def release_cookbook(path)
+      # To match the behavior of Bundler's release task w.r.t $gem_push.
+      return if %w{n no nil false off 0}.include?(ENV['cookbook_push'].to_s.downcase)
       Dir.chdir(path) do
         sh('stove --no-git')
         shell.say("Pushed #{gemspec.name} #{gemspec.version} to supermarket.chef.io.", :green) unless options[:no_gem]

data/lib/halite/version.rb

@@ -17,5 +17,5 @@
 
 module Halite
   # Halite version.
-  VERSION = '1.1.0'
+  VERSION = '1.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: halite
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Noah Kantrowitz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-18 00:00:00.000000000 Z
+date: 2016-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -135,6 +135,9 @@ files:
 - 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.gemfile
 - gemfiles/master.gemfile
 - halite.gemspec