kitchen-cabinet 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 04569a208aaadc6fa866488135116aef67fd515e
-  data.tar.gz: c53bdbdde59ef73fa8e5fbb514a38c4bbfef5626
+  metadata.gz: babfe7dd1b78e4ff80e697ad246bba4d055f3d13
+  data.tar.gz: b0d16169272b58d5ef7801a9eb165d8c11dd5153
 SHA512:
-  metadata.gz: f80259cb8398ab949829d41a1e52e5ec7319ac54511a6e1817fa53bf0e8057cc2e61f3c1d3441a312f5cfc45f5644126afb32c242e9bc7146fe79487abf3b0e9
-  data.tar.gz: a685428d38a2b494a6e011df82e5f2b625ae7e21e71f2563409da05418537c7d63641817a01fd49e869eb9e00b4e5d7262ba033b0aa1f53a4118a4e4ef5fa884
+  metadata.gz: a88ae74c7de007219983a798f24beef4a1ea35097a09bd1a902c17f6b1193cb01a9d41a079c2911c8d982349e200e84e26ebaad9344bfae0dd09eca02c820327
+  data.tar.gz: 2fa52eedfe8c53e5c46cd83f0042d673b79bbf7d2a23df0f1b708bd02380dec418a2cf872d4ce857e3cac6244a8053f0d95357081d79a43faefcc32819517fda

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## v2.1.1
+* Fixed issue where git would create the contents of .git/ in the main cookbook folder.
+* Modified Berksfile so that site: opscode is commented out. This should make issues with new cookbook versions accidentally being inserted into your chef server much less common.
+* Now your Berksfile.lock files will be committed - we discovered there can be some dependency issues same as with the Gemfile.lock, which we also allow to be comited.
+* thor-scmversion is configured to bump patch version unless otherwise specified in your commit.
+
 ## v2.1.0
 * Updated dependencies
 * Made the Gemfile a bit less restricive by locking minor version and allowing patch updates.

data/bin/cabinet

@@ -58,7 +58,7 @@ else
 end
 
 if options[:update]
-  if File.exists?(File.join(cookbook_path, 'metadata.rb'))
+  if File.exist?(File.join(cookbook_path, 'metadata.rb'))
     require 'kitchen-cabinet/update'
     Update.update_cookbook(cookbook_name, options, cookbook_path)
     exit

data/kitchen-cabinet.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
-  s.name = "kitchen-cabinet"
-  s.version = '2.1.0'
-  s.date = Time.now.strftime("%Y-%m-%d")
+  s.name = 'kitchen-cabinet'
+  s.version = '2.1.1'
+  s.date = Time.now.strftime('%Y-%m-%d')
   s.homepage = 'https://github.com/onehealth/kitchen-cabinet'
   s.summary = 'Initializes a chef cookbook repo with relevant tools'
   s.description = <<EOF
@@ -18,7 +18,7 @@ EOF
   s.test_files  = s.files.grep(%r{^(test|spec|features)/})
   s.files = `git ls-files`.split($/)
   s.executables = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  
+
   s.add_runtime_dependency 'test-kitchen', '~> 1.1', '>= 1.1.1'
   s.add_runtime_dependency 'bundler', '~> 1.5', '>= 1.5.1'
   s.add_runtime_dependency 'berkshelf', '~> 2.0', '>= 2.0.12'

data/lib/kitchen-cabinet/cabinet.rb

@@ -1,6 +1,5 @@
 #!/usr/bin/env ruby
 # Encoding: utf-8
-
 # Cabinet helps create and maintain cookbooks
 # complete with an opinionated testing suite.
 class Cabinet
@@ -21,9 +20,9 @@ class Cabinet
   end
 
   def self.chef_check
-    if File.exists?('/opt/chef')
+    if File.exist?('/opt/chef')
       ENV['GEM_HOME'] = '/opt/chef/embedded/lib/ruby/gems/1.9.1'
-    elsif File.exists?('C:\opscode\chef\\')
+    elsif File.exist?('C:\opscode\chef\\')
       ENV['GEM_HOME'] = 'C:\opscode\chef\embedded\lib\ruby\gems\1.9.1'
     elsif Gem::Specification.find_by_name('chef')
       ENV['GEM_HOME']
@@ -35,7 +34,7 @@ class Cabinet
   end
 
   def self.chef_rewrite(cookbook_path)
-    %w{ metadata.rb recipes/default.rb }.each do |file|
+    %w(metadata.rb recipes/default.rb).each do |file|
       puts "\tRewriting #{file}"
       contents = "\# Encoding: utf-8\n#{File.read(File.join(cookbook_path, file))}"
       File.open(File.join(cookbook_path, file), 'w') { |f| f.write(contents) }
@@ -54,7 +53,7 @@ class Cabinet
     create_cookbook = Chef::Knife::CookbookCreate.new
     create_cookbook.name_args = [cookbook_name]
     create_cookbook.config[:cookbook_path]      = options[:path]
-    if File.exists?(File.join(ENV['HOME'], '.chef', 'knife.rb'))
+    if File.exist?(File.join(ENV['HOME'], '.chef', 'knife.rb'))
       require 'chef'
       Chef::Config.from_file(File.join(ENV['HOME'], '.chef', 'knife.rb'))
     end
@@ -69,7 +68,7 @@ class Cabinet
     tool = 'git'
     puts "* Initializing #{tool}"
     require 'git'
-    Git.init(cookbook_path, repository: cookbook_path)
+    Git.init(cookbook_path, git_dir: "#{cookbook_path}/.git")
   end
 
   def self.init_berkshelf(cookbook_name, options, cookbook_path)

data/lib/kitchen-cabinet/templates/.gitignore.eruby

@@ -1,5 +1,4 @@
 .vagrant/
-Berksfile.lock
 *~
 *#
 .#*

data/lib/kitchen-cabinet/templates/Berksfile.eruby

@@ -1,3 +1,3 @@
-site :opscode
 chef_api :config
+#site: opscode
 metadata

data/lib/kitchen-cabinet/templates/Gemfile.eruby

@@ -1,7 +1,6 @@
 source 'https://rubygems.org'
 
 gem 'berkshelf', '~> 2.0', '>= 2.0.14'
-gem 'chef', '~> 11.8', '>= 11.8.0'
 
 group :unit do
   gem 'foodcritic',       '~> 3', '>= 3.0.0'

data/lib/kitchen-cabinet/templates/Thorfile.eruby

@@ -25,7 +25,7 @@ class Ci < Thor
   desc 'publish', 'Task for CI that publishes cookbook.'
   def publish
     require 'thor/rake_compat'
-    `thor version:bump patch`
+    `thor version:bump auto -d patch`
     `ssh-agent bash -c 'ssh-add /var/lib/jenkins/.ssh/jenkinsbuild_rsa; git push --tags'`
     `berks upload`
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-cabinet
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Taylor Price
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-03 00:00:00.000000000 Z
+date: 2014-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen