halite 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5249265d5c7c72220587865b41b064803b947f6a
-  data.tar.gz: 7c9793d015ef7a1bcdac708ffeb8f97abeff9ce1
+  metadata.gz: bce33914c9ed0fcf28bc4739ef04bf41b5528b9a
+  data.tar.gz: d5af9a38530b3b346deb1b49315266e47996670c
 SHA512:
-  metadata.gz: 8a1e2e4de4f7bd411cf491cb4c8032803d24d74606f42b339c243cf40b721e17743e6e4705f328f67bee7b0ee643c3aeeb77bf61e3bd7465d1c6b44f28d4c452
-  data.tar.gz: ac647c3327ada3bfefa57f1b96bd1181da4c03fb1583f786d437183aca9245f0f0bf8d1ecc4fb98f1cd6a0a6f3f166c3f702d87d3f6b2816b42067dbf9b675e5
+  metadata.gz: ec86cb776cc8eb7850c9b6e84506486dff8180df57ffb6c1b41e87d60e6a1a98c08c989e4ef8d21502def4d8432da422db805f3ca78bd022372d3d38023696bc
+  data.tar.gz: ad00a903f3a5d7af87334fff1d7a083e047fde44aa69de1217bcc74022250a25f5b96f8e70af3c237b995c04da72a8c1180b8049ac29592d2a34ee55da105c6a

data/.travis.yml

@@ -1,6 +1,10 @@
 sudo: false
 cache: bundler
 language: ruby
+addons:
+  apt:
+    packages:
+    - libgecode-dev
 rvm:
 - "2.0"
 - "2.1"
@@ -8,10 +12,6 @@ rvm:
 gemfile:
 - gemfiles/default.gemfile
 - gemfiles/master.gemfile
-addons:
-  apt:
-    packages:
-    - libgecode-dev
 env:
   global:
   - USE_SYSTEM_GECODE=true

data/CHANGELOG.md

@@ -1,9 +1,16 @@
 # Changelog
 
+## v1.0.2
+
+* Handle converting cookbooks with pre-release version numbers and other
+  non-Chef compatible components.
+* Include a cookbook's changelog file in converted output.
+* Handle OS X's case-insensitivity when converting misc. type files (README, etc).
+
 ## v1.0.1
 
-Fix issues with pre-release version numbers.
+* Fix issues with pre-release version numbers.
 
 ## v1.0.0
 
-Initial release!
+* Initial release!

data/Gemfile

@@ -18,13 +18,10 @@ source 'https://rubygems.org/'
 
 gemspec path: File.expand_path('..', __FILE__)
 
-def dev_gem(name, path: File.join('..', name), github: "poise/#{name}")
-  github = "#{github}/#{name}" unless github.include?('/')
+def dev_gem(name, path: File.join('..', name))
   path = File.expand_path(File.join('..', path), __FILE__)
   if File.exist?(path)
     gem name, path: path
-  else
-    gem name, github: github
   end
 end
 

data/gemfiles/master.gemfile

@@ -17,5 +17,5 @@
 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', github: 'poise/poise'
+gem 'poise-boiler', github: 'poise/poise-boiler'

data/lib/halite/berkshelf/source.rb

@@ -43,7 +43,7 @@ module Halite
           # Build a fake "remote" cookbook
           ::Berkshelf::APIClient::RemoteCookbook.new(
             cook.cookbook_name,
-            cook.version,
+            cook.cookbook_version,
             {
               location_type: 'halite',
               location_path: cook.name,

data/lib/halite/converter/metadata.rb

@@ -30,7 +30,7 @@ module Halite
         ''.tap do |buf|
           buf << gem_data.license_header
           buf << "name #{gem_data.cookbook_name.inspect}\n"
-          buf << "version #{gem_data.version.inspect}\n"
+          buf << "version #{gem_data.cookbook_version.inspect}\n"
           if gem_data.spec.description && !gem_data.spec.description.empty?
             buf << "description #{gem_data.spec.description.inspect}\n"
           end

data/lib/halite/converter/misc.rb

@@ -31,7 +31,7 @@ module Halite
       # @param output_path [String] Output path for the cookbook.
       # @return [void]
       def self.write(gem_data, output_path)
-        %w{Readme License Copying Contributing}.each do |name|
+        %w{Readme License Copying Contributing Changelog}.each do |name|
           if path = gem_data.find_misc_path(name) # rubocop:disable Lint/AssignmentInCondition
             FileUtils.copy(path, File.join(output_path, File.basename(path)), preserve: true)
           end

data/lib/halite/gem.rb

@@ -62,6 +62,18 @@ module Halite
       end
     end
 
+    # Version of the gem sanitized for Chef. This means no non-numeric tags and
+    # only three numeric components.
+    #
+    # @return [String]
+    def cookbook_version
+      if match = version.match(/^(\d+\.\d+\.(\d+)?)/)
+        match[1]
+      else
+        raise Halite::Error.new("Unable to parse #{version.inspect} as a Chef cookbook version")
+      end
+    end
+
     # Path to the .gemspec for this gem. This is different from
     # Gem::Specification#spec_file because the Rubygems API is shit and just
     # assumes the file layout matches normal, which is not the case with Bundler
@@ -159,7 +171,7 @@ module Halite
       [name, name.upcase, name.downcase].each do |base|
         ['.md', '', '.txt', '.html'].each do |suffix|
           path = File.join(spec.full_gem_path, base+suffix)
-          return path if File.exist?(path)
+          return path if File.exist?(path) && Dir.entries(File.dirname(path)).include?(File.basename(path))
         end
       end
       # Didn't find anything
@@ -179,7 +191,7 @@ module Halite
       spec = dep.to_spec || dep.to_specs.last
       raise Error.new("Cannot find a gem to satisfy #{dep}") unless spec
       spec
-    rescue Gem::LoadError => ex
+    rescue ::Gem::LoadError => ex
       raise Error.new("Cannot find a gem to satisfy #{dep}: #{ex}")
     end
   end

data/lib/halite/rake_helper.rb

@@ -91,7 +91,7 @@ module Halite
     def install_kitchen
       desc 'Run all Test Kitchen tests'
       task 'chef:kitchen' do
-        sh 'kitchen test -d always'
+        sh(*%w{kitchen test -d always})
       end
 
       add_test_task('chef:kitchen')
@@ -114,6 +114,7 @@ module Halite
     def release_cookbook
       Dir.chdir(pkg_path) do
         sh('stove --no-git')
+        shell.say("Pushed #{gemspec.name} #{gemspec.version} to supermarket.chef.io.", :green)
       end
     end
 

data/lib/halite/version.rb

@@ -17,5 +17,5 @@
 
 module Halite
   # Halite version.
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 end

data/spec/converter/metadata_spec.rb

@@ -21,6 +21,7 @@ describe Halite::Converter::Metadata do
     let(:gem_name) { 'mygem' }
     let(:cookbook_name) { gem_name }
     let(:version) { '1.0.0' }
+    let(:cookbook_version) { version }
     let(:cookbook_dependencies) { [] }
     let(:spec) do
       instance_double('Gem::Specification', description: '')
@@ -34,6 +35,7 @@ describe Halite::Converter::Metadata do
         name: gem_name,
         spec: spec,
         version: version,
+        cookbook_version: cookbook_version,
       )
     end
     subject { described_class.generate(gem_data) }

data/spec/gem_spec.rb

@@ -25,6 +25,7 @@ describe Halite::Gem do
 
   context 'when loading halite' do
     its(:name) { is_expected.to eq 'halite' }
+    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 }
   end
@@ -32,6 +33,7 @@ describe Halite::Gem do
   context 'when loading halite with a version' do
     let(:gem_version) { Halite::VERSION }
     its(:name) { is_expected.to eq 'halite' }
+    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 }
   end
@@ -46,8 +48,9 @@ describe Halite::Gem do
   context 'when loading test1' do
     let(:gem_name) { 'test1' }
     its(:name) { is_expected.to eq 'test1' }
-    its(:version) { is_expected.to eq '1.2.3' }
     its(:cookbook_name) { is_expected.to eq 'test1' }
+    its(:version) { is_expected.to eq '1.2.3' }
+    its(:cookbook_version) { is_expected.to eq '1.2.3' }
     its(:license_header) { is_expected.to eq "# coding: utf-8\n# Awesome license\n" }
     its(:each_library_file) { is_expected.to eq [
       [File.expand_path('../fixtures/gems/test1/lib/test1.rb', __FILE__), 'test1.rb'],
@@ -81,8 +84,9 @@ describe Halite::Gem do
   context 'when loading test2' do
     let(:gem_name) { 'test2' }
     its(:name) { is_expected.to eq 'test2' }
-    its(:version) { is_expected.to eq '4.5.6' }
     its(:cookbook_name) { is_expected.to eq 'test2' }
+    its(:version) { is_expected.to eq '4.5.6' }
+    its(:cookbook_version) { is_expected.to eq '4.5.6' }
     its(:license_header) { is_expected.to eq "# coding: utf-8\n" }
     its(:each_library_file) { is_expected.to eq [
       [File.expand_path('../fixtures/gems/test2/lib/test2.rb', __FILE__), 'test2.rb'],
@@ -127,6 +131,13 @@ describe Halite::Gem do
     its(:is_halite_cookbook?) { is_expected.to be_truthy }
   end # /context when loading test3
 
+  context 'when loading test4' do
+    let(:gem_name) { 'test4' }
+    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' }
+  end # /context when loading test4
+
   context 'when loading a Gem::Dependency' do
     let(:dependency) do
       reqs = []

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: halite
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Noah Kantrowitz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-20 00:00:00.000000000 Z
+date: 2015-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef