halite 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a42a9b842d21763abf144daa10997a8f37c8ffda
-  data.tar.gz: a1751ed26b28b813aa1b05c03ad1d82aac86ee09
+  metadata.gz: 3d1bc19ae8a72bb862340afa0214c5be90974d73
+  data.tar.gz: cd89d974c5481647c360edfaef147a4fef596d17
 SHA512:
-  metadata.gz: f7eabc21a9a311c068d7b6c58cc9c203f47a10e1fcc2c97bb0ff49b41aea2a19fb6e91418710cc8ab6c447524940d23251d0140c7b30437a35619046afed2385
-  data.tar.gz: ebaeb2cfe08d6c2997d39828ca1f0efb3dcfd4f8b8c085f76a25a3386a041694955962bb5430b9e917a9c08da3ff489c3c499ef6dff6b4cf3d2499bc2244223c
+  metadata.gz: 9d12f3883c3fda75bb249bf9e67248720767db6721950b74f4e6d7325da1af4152226b056682b2bc2e20391c76b222432a5f2f36c77ec26f75e808c9e67564cd
+  data.tar.gz: b2aecb6a9a796d8777c2029b033715044025488da843089e0bdae363d3d02c65d45e5b3edf2e3595ec1277f2eba2bccfbccc36a116e68ac30f40407ef3af453a

data/.travis.yml

@@ -1,10 +1,6 @@
 sudo: false
 cache: bundler
 language: ruby
-addons:
-  apt:
-    packages:
-    - libgecode-dev
 rvm:
 - "2.0"
 - "2.1"
@@ -18,6 +14,7 @@ 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
 env:
@@ -25,4 +22,6 @@ env:
   - USE_SYSTEM_GECODE=true
   - secure: bNxYOvi85lnPIPO1qR6NnhfqlREfMXSjmd+xCH01e/gg3x00D+3uyQIotQtglgHRItVIR36GqX70q2g/reudxBsCjfUhH2vDgbtmrWe1ow78rt1xZRlFMQs7JfBpfWKkox5i9mrdzZDekZACA0HUMI1pRM0MYQmkuol/oZw5H4A=
   - secure: ecX52GLF7IHCiaPEDzPtztiEmu2mNPfyyPrM7aaNsufat7DdsZqPP9LKpCTOoJC+Jgz9sdbQ6Hf61CeZAsrqZ8sKKdiXUoBUXdcBhvuPdpIbfwq97hjOoqQV7rLSD4EW58fipJU8Rl5P1ijFJizHIyxNB+VWBow3niIMGjIEUSE=
+before_install:
+- if [[ $BUNDLE_GEMFILE == *master.gemfile ]]; then gem update --system && gem install bundler; fi
 script: bundle exec rake integration

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Halite Changelog
 
+## v1.2.1
+
+* Compatibility with Foodcritic 6.0. `issues_url` will be added to the generated
+  `metadata.rb`. This can be set via `metadata['issues_url']` or auto-detected
+  if the spec's `homepage` is set to a GitHub project.
+* Compatibility with RubyGems 2.2.
+
 ## v1.2.0
 
 * Allow passing a `Halite::Gem` object to `Halite.convert`.

data/gemfiles/chef-12.0.gemfile

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

data/gemfiles/chef-12.1.gemfile

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

data/gemfiles/chef-12.2.gemfile

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

data/gemfiles/chef-12.4.gemfile

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

data/gemfiles/chef-12.5.gemfile

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

data/gemfiles/chef-12.7.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.7.2'

data/gemfiles/master.gemfile

@@ -19,3 +19,4 @@ eval_gemfile File.expand_path('../../Gemfile', __FILE__)
 gem 'chef', github: 'chef/chef'
 gem 'poise', github: 'poise/poise'
 gem 'poise-boiler', github: 'poise/poise-boiler'
+gem 'poise-profiler', github: 'poise/poise-profiler'

data/halite.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
   spec.email = %w{noah@coderanger.net}
   spec.description = 'A set of helpers to write Chef cookbooks as Ruby gems.'
   spec.summary = spec.description
-  spec.homepage = 'https://github.com/coderanger/halite'
+  spec.homepage = 'https://github.com/poise/halite'
   spec.license = 'Apache 2.0'
 
   spec.files = `git ls-files`.split($/)

data/lib/halite/converter/metadata.rb

@@ -40,6 +40,7 @@ module Halite
           buf << "maintainer #{gem_data.spec.authors.join(', ').inspect}\n" unless gem_data.spec.authors.empty?
           buf << "maintainer_email #{Array(gem_data.spec.email).join(',').inspect}\n" if gem_data.spec.email
           buf << "source_url #{gem_data.spec.homepage.inspect} if defined?(source_url)\n" if gem_data.spec.homepage
+          buf << "issues_url #{gem_data.issues_url.inspect} if defined?(issues_url)\n" if gem_data.issues_url
           buf << "license #{gem_data.spec.licenses.join(', ').inspect}\n" unless gem_data.spec.licenses.empty?
           gem_data.cookbook_dependencies.each do |dep|
             buf << "depends #{dep.name.inspect}"

data/lib/halite/gem.rb

@@ -96,10 +96,25 @@ module Halite
       File.join(spec.full_gem_path, spec.name + '.gemspec')
     end
 
+    # License header extacted from the gemspec. Suitable for inclusion in other
+    # Ruby source files.
+    #
+    # @return [String]
     def license_header
       IO.readlines(spec_file).take_while { |line| line.strip.empty? || line.strip.start_with?('#') }.join('')
     end
 
+    # URL to the issue tracker for this project.
+    #
+    # @return [String, nil]
+    def issues_url
+      if spec.metadata['issues_url']
+        spec.metadata['issues_url']
+      elsif spec.homepage =~ /^http(s)?:\/\/(www\.)?github\.com/
+        spec.homepage.chomp('/') + '/issues'
+      end
+    end
+
     # Iterate over all the files in the gem, with an optional prefix. Each
     # element in the iterable will be [full_path, relative_path], where
     # relative_path is relative to the prefix or gem path.

data/lib/halite/version.rb

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

data/spec/converter/metadata_spec.rb

@@ -22,6 +22,7 @@ describe Halite::Converter::Metadata do
     let(:cookbook_name) { gem_name }
     let(:version) { '1.0.0' }
     let(:cookbook_version) { version }
+    let(:issues_url) { nil }
     let(:cookbook_dependencies) { [] }
     let(:gem_metadata) { {} }
     let(:spec) do
@@ -46,6 +47,7 @@ describe Halite::Converter::Metadata do
         spec: spec,
         version: version,
         cookbook_version: cookbook_version,
+        issues_url: issues_url,
       )
     end
     subject { described_class.generate(gem_data) }
@@ -127,6 +129,17 @@ version "1.0.0"
 chef_version ">= 0" if defined?(chef_version)
 EOH
     end # /context with a chef_version
+
+    context 'with an issues_url' do
+      let(:issues_url) { 'http://issues' }
+
+      it { is_expected.to eq <<-EOH }
+name "mygem"
+version "1.0.0"
+issues_url "http://issues" if defined?(issues_url)
+chef_version "~> 12" if defined?(chef_version)
+EOH
+    end # /context with an issues_url
   end # /describe #generate
 
   describe '#write' do

data/spec/dependencies_spec.rb

@@ -36,6 +36,9 @@ describe Halite::Dependencies do
 
   before do
     allow(Gem::Specification).to receive(:stubs).and_return(gem_stubs)
+    allow(Gem::Specification).to receive(:stubs_for) do |name|
+      gem_stubs.select {|stub| stub.name == name }
+    end
   end
 
   describe '#extract_from_requirements' do

data/spec/fixtures/gems/test4/test4.gemspec

@@ -12,6 +12,7 @@ Gem::Specification.new do |spec|
   spec.summary = %q||
   spec.homepage = 'http://example.com/'
   spec.license = 'Apache 2.0'
+  spec.metadata['issues_url'] = 'http://issues'
 
   spec.files = `cd #{File.expand_path('..', __FILE__)} && git ls-files`.split($/)
   spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }

data/spec/gem_spec.rb

@@ -28,6 +28,7 @@ describe Halite::Gem do
     its(:cookbook_name) { is_expected.to eq 'halite' }
     its(:version) { is_expected.to eq Halite::VERSION }
     its(:spec) { is_expected.to be_a Gem::Specification }
+    its(:issues_url) { is_expected.to eq 'https://github.com/poise/halite/issues' }
   end
 
   context 'when loading halite with a version' do
@@ -58,6 +59,7 @@ describe Halite::Gem do
     ] }
     its(:cookbook_dependencies) { is_expected.to eq [] }
     its(:is_halite_cookbook?) { is_expected.to be_truthy }
+    its(:issues_url) { is_expected.to be_nil }
 
     describe '#each_file' do
       context 'with no prefixes' do
@@ -95,6 +97,7 @@ describe Halite::Gem do
     ] }
     its(:cookbook_dependencies) { is_expected.to eq [Halite::Dependencies::Dependency.new('testdep', '>= 0', :requirements)] }
     its(:is_halite_cookbook?) { is_expected.to be_truthy }
+    its(:issues_url) { is_expected.to be_nil }
 
     describe '#each_file' do
       context 'with no prefixes' do
@@ -129,6 +132,7 @@ describe Halite::Gem do
     its(:cookbook_name) { is_expected.to eq 'test3' }
     its(:cookbook_dependencies) { is_expected.to eq [Halite::Dependencies::Dependency.new('test2', '~> 4.5.6', :dependencies)] }
     its(:is_halite_cookbook?) { is_expected.to be_truthy }
+    its(:issues_url) { is_expected.to be_nil }
   end # /context when loading test3
 
   context 'when loading test4' do
@@ -136,6 +140,7 @@ describe Halite::Gem do
     its(:cookbook_name) { is_expected.to eq 'test4' }
     its(:version) { is_expected.to eq '2.3.1.rc.1' }
     its(:cookbook_version) { is_expected.to eq '2.3.1' }
+    its(:issues_url) { is_expected.to eq 'http://issues' }
   end # /context when loading test4
 
   context 'when loading a Gem::Dependency' do

data/spec/halite_spec.rb

@@ -0,0 +1,46 @@
+#
+# 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.
+#
+
+require 'spec_helper'
+
+describe Halite do
+  describe '#convert' do
+    let(:fake_gem) do
+      double('Halite::Gem').tap do |g|
+        allow(g).to receive(:is_a?).and_return(false)
+        allow(g).to receive(:is_a?).with(Halite::Gem).and_return(true)
+      end
+    end
+
+    context 'with a gem name' do
+      before do
+        allow(Halite::Gem).to receive(:new).with('mygem').and_return(fake_gem)
+      end
+
+      it do
+        expect(Halite::Converter).to receive(:write).with(fake_gem, '/path')
+        described_class.convert('mygem', '/path')
+      end
+    end # /context with a gem name
+
+    context 'with a Gem object' do
+      it do
+        expect(Halite::Converter).to receive(:write).with(fake_gem, '/path')
+        described_class.convert(fake_gem, '/path')
+      end
+    end # /context with a Gem object
+  end # /describe #convert
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: halite
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Noah Kantrowitz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-27 00:00:00.000000000 Z
+date: 2016-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -138,6 +138,7 @@ files:
 - 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
 - halite.gemspec
@@ -211,11 +212,12 @@ files:
 - spec/fixtures/gems/test4/lib/test4/version.rb
 - spec/fixtures/gems/test4/test4.gemspec
 - spec/gem_spec.rb
+- spec/halite_spec.rb
 - spec/integration_spec.rb
 - spec/runner_spec.rb
 - spec/spec_helper.rb
 - spec/spec_helper_spec.rb
-homepage: https://github.com/coderanger/halite
+homepage: https://github.com/poise/halite
 licenses:
 - Apache 2.0
 metadata: {}
@@ -235,7 +237,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: A set of helpers to write Chef cookbooks as Ruby gems.
@@ -289,6 +291,7 @@ test_files:
 - spec/fixtures/gems/test4/lib/test4/version.rb
 - spec/fixtures/gems/test4/test4.gemspec
 - spec/gem_spec.rb
+- spec/halite_spec.rb
 - spec/integration_spec.rb
 - spec/runner_spec.rb
 - spec/spec_helper.rb