kitchen-cabinet 2.1.1 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: babfe7dd1b78e4ff80e697ad246bba4d055f3d13
-  data.tar.gz: b0d16169272b58d5ef7801a9eb165d8c11dd5153
+  metadata.gz: 5f84400a4f194f5eae711a028481ab6be4a64db0
+  data.tar.gz: 637199f3aed3bae2cfd0759079559377ba7544ee
 SHA512:
-  metadata.gz: a88ae74c7de007219983a798f24beef4a1ea35097a09bd1a902c17f6b1193cb01a9d41a079c2911c8d982349e200e84e26ebaad9344bfae0dd09eca02c820327
-  data.tar.gz: 2fa52eedfe8c53e5c46cd83f0042d673b79bbf7d2a23df0f1b708bd02380dec418a2cf872d4ce857e3cac6244a8053f0d95357081d79a43faefcc32819517fda
+  metadata.gz: 03f94ce6903470b8b3f9134bb49bec4c6b621140c049d3775fc5df260a35ec634cb0a5eed220b9782cad6a9d58881d2f9f9e18be8a05403ea1296c1df268ef53
+  data.tar.gz: b88c607411b138ea233a0004f64a59ae439bf37d96d803e12169817e7636f025dbde68de0dc01600373f64d36107934ed1e94f5471e70a78130a4ed5bb9774e7

data/.rubocop.yml

@@ -1,9 +1,10 @@
 AllCops:
-  Excludes:
+  Exclude:
     - test/**
     - vendor/**
     - ruby/**
     - pkg/**
+    - kitchen-cabinet.gemspec
 
 AlignParameters:
   Enabled: false

data/.travis.yml

@@ -3,6 +3,7 @@ rvm:
   - 1.9.3
   - 2.0.0
   - 2.1.0
+  - 2.1.1
 bundler_args: --without integration development
 script:
   - bundle exec rubocop

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## v3.0.0
+* kitchen cabinet now shells out for knife, so its compatible with omnibus chef and chefdk
+* instead of always specifying dependencies in a gemfile, kitchen-cabinet will now install things like chefspec directly in the embedded ruby of chefdk or omnibus chef (this prevents having to install the gem version of chef on top of your existing setup)
+* Less runtime dependencies! There's no need to rely on test-kitchen or berkshelf when I'm just going to replace the generic generated templates with generic generated templates of my own!
+
 ## 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.

data/Gemfile

@@ -1,33 +1,14 @@
 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'
-  gem 'rubocop',          '~> 0.18', '>= 0.18.0'
-  gem 'chefspec',         '~> 3.2', '>= 3.2.0'
-end
-
-group :integration do
-  gem 'test-kitchen',    '~> 1.1', '>= 1.1.0'
-  gem 'kitchen-vagrant', '~> 0', '>= 0.14.0'
-end
-
-group :release do
-  gem 'stove', '~> 1.1', '>= 1.1.0'
-  gem 'rspec_junit_formatter'
-  gem 'rubocop-checkstyle_formatter'
+  gem 'rubocop',          '~> 0.21', '>= 0.21.0'
+  gem 'rspec',            '~> 2.14', '>= 2.14.1'
 end
 
 group :development do
   gem 'rake',     			  '~> 10.1', '>= 10.1.0'
-  gem 'serverspec',       '~> 0.14', '>= 0.14.2'
-  gem 'guard',            '~> 1.8', '>= 1.8.3'
   gem 'guard-rubocop',    '~> 0.2', '>= 0.2.2'
-  gem 'guard-foodcritic', '~> 1.0', '>= 1.0.0'
-  gem 'guard-kitchen',    '~> 0.0', '>= 0.0.0'
-  gem 'guard-rspec',      '~> 3.1', '>= 3.1.0'
   gem 'rb-fsevent', :require => false
   gem 'rb-inotify', :require => false
   gem 'terminal-notifier-guard', :require => false

data/Rakefile

@@ -1 +1 @@
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'

data/ext/mkrf_conf.rb

@@ -0,0 +1,27 @@
+require 'rubygems'
+require 'rubygems/command.rb'
+require 'rubygems/dependency_installer.rb'
+
+Gem::Command.build_args = ARGV
+
+inst = Gem::DependencyInstaller.new
+if File.exist?('/opt/chefdk')
+  %w(chefspec serverspec guard guard-rubocop guard-foodcritic guard-kitchen guard-rspec rspec).each do |gems|
+    `chef gem install #{gems}`
+  end
+
+elsif File.exist?('/opt/chef')
+  puts 'Consider switching to chefdk or the gem version of chef.'
+  puts 'Some functionality of kitchen-cabinet may not be unavailable with your current setup.'
+  %w(foodcritic rubocop test-kitchen kitchen-vagrant chefspec serverspec guard guard-rubocop guard-foodcritic guard-kitchen guard-rspec rspec).each do |gems|
+    `sudo /opt/chef/embedded/bin/gem install #{gems} --no-ri --no-rdoc`
+  end
+else
+  inst.install 'chef', '~> 11.12.2'
+  inst.install 'chefspec', '~> 0.0.0'
+end
+
+# create dummy rakefile to indicate success
+f = File.open(File.join(File.dirname(__FILE__), 'Rakefile'), 'w')
+f.write("task :default\n")
+f.close

data/kitchen-cabinet.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'kitchen-cabinet'
-  s.version = '2.1.1'
+  s.version = '3.0.0'
   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'
@@ -16,12 +16,10 @@ EOF
   s.required_ruby_version = '>= 1.9.3'
   s.require_paths = ['lib']
   s.test_files  = s.files.grep(%r{^(test|spec|features)/})
-  s.files = `git ls-files`.split($/)
+  s.files = `git ls-files`.split($RS)
   s.executables = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  s.extensions = 'ext/mkrf_conf.rb'
 
-  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'
   s.add_runtime_dependency 'git', '~> 1.2', '>= 1.2.6'
   s.add_runtime_dependency 'erubis', '~> 2.7', '>= 2.7.0'
   s.add_development_dependency 'rspec', '~> 2.14', '>= 2.14.1'

data/lib/kitchen-cabinet/cabinet.rb

@@ -7,105 +7,59 @@ class Cabinet
   require 'erubis'
   def self.init(cookbook_name, options, cookbook_path)
     init_chef(cookbook_name, options, cookbook_path)
-    init_git(cookbook_name, options, cookbook_path)
-    init_berkshelf(cookbook_name, options, cookbook_path)
-    init_kitchen(cookbook_name, cookbook_path)
+    init_git(cookbook_path)
     init_spec(cookbook_name, cookbook_path)
-    write_configs(cookbook_name, options, cookbook_path)
+    write_configs(cookbook_name, cookbook_path)
     puts "Cookbook #{cookbook_name} created successfully"
     puts 'Next steps...'
-    puts "  $ cd #{cookbook_path}"
+    puts '  $ cd ' + cookbook_path + '/' + cookbook_name
     puts '  $ bundle install'
     puts '  $ bundle exec berks install'
   end
 
-  def self.chef_check
-    if File.exist?('/opt/chef')
-      ENV['GEM_HOME'] = '/opt/chef/embedded/lib/ruby/gems/1.9.1'
-    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']
-    else
-      puts 'You don\'t appear to have chef installed.'
-      puts 'Please install the gem or omnibus version - `gem install chef` or http://www.getchef.com/chef/install/'
-      exit
-    end
-  end
-
-  def self.chef_rewrite(cookbook_path)
+  def self.chef_rewrite(cookbook_path, cookbook_name)
     %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) }
+      contents = "\# Encoding: utf-8\n#{File.read(File.join(cookbook_path, cookbook_name, file))}"
+      File.open(File.join(cookbook_path, cookbook_name, file), 'w') { |f| f.write(contents) }
     end
-    metadata_replace = File.read(File.join(cookbook_path, 'metadata.rb'))
+    metadata_replace = File.read(File.join(cookbook_path, cookbook_name, 'metadata.rb'))
     replace = metadata_replace.gsub(/version          '0.1.0'/, "version IO.read(File.join(File.dirname(__FILE__), 'VERSION')) rescue \"0.1.0\"")
-    File.open(File.join(cookbook_path, 'metadata.rb'), 'w') { |file| file.puts replace }
+    File.open(File.join(cookbook_path, cookbook_name, 'metadata.rb'), 'w') { |file| file.puts replace }
   end
 
   def self.init_chef(cookbook_name, options, cookbook_path)
-    tool = 'chef'
-    puts "* Initializing #{tool}"
-    chef_check
-    puts "Using #{tool} from " + ENV['GEM_HOME']
-    require 'chef/knife/cookbook_create'
-    create_cookbook = Chef::Knife::CookbookCreate.new
-    create_cookbook.name_args = [cookbook_name]
-    create_cookbook.config[:cookbook_path]      = options[:path]
+    puts '* Initializing chef'
+    cookbook_path = options[:path]
     if File.exist?(File.join(ENV['HOME'], '.chef', 'knife.rb'))
-      require 'chef'
-      Chef::Config.from_file(File.join(ENV['HOME'], '.chef', 'knife.rb'))
+      `knife cookbook create #{cookbook_name} -o #{cookbook_path} -r md`
+    else
+      copyright = options[:copyright]  || 'Copyright_Holder'
+      license   = options[:license]    || 'License_Type'
+      email     = options[:email]      || 'Email'
+      `knife cookbook create #{cookbook_name} -C #{copyright} -I #{license} -m #{email} -o #{cookbook_path} -r md`
     end
-    create_cookbook.config[:cookbook_copyright] = options[:copyright]  || Chef::Config[:cookbook_copyright]
-    create_cookbook.config[:cookbook_license]   = options[:license]    || Chef::Config[:cookbook_license]
-    create_cookbook.config[:cookbook_email]     = options[:email]      || Chef::Config[:cookbook_email]
-    create_cookbook.run
-    chef_rewrite(cookbook_path)
+    chef_rewrite(cookbook_path, cookbook_name)
   end
 
-  def self.init_git(cookbook_name, options, cookbook_path)
-    tool = 'git'
-    puts "* Initializing #{tool}"
+  def self.init_git(cookbook_path)
+    puts '* Initializing git'
     require 'git'
     Git.init(cookbook_path, git_dir: "#{cookbook_path}/.git")
   end
 
-  def self.init_berkshelf(cookbook_name, options, cookbook_path)
-    tool = 'berkshelf'
-    puts "* Initializing #{tool}"
-    require 'berkshelf'
-    require 'berkshelf/base_generator'
-    require 'berkshelf/init_generator'
-    Berkshelf::InitGenerator.new(
-      [cookbook_path],
-        skip_test_kitchen: true,
-        skip_vagrant: true
-    ).invoke_all
-  end
-
-  def self.init_kitchen(cookbook_name, cookbook_path)
-    tool = 'kitchen'
-    puts "* Initializing #{tool}"
-    require 'kitchen'
-    require 'kitchen/generator/init'
-    Kitchen::Generator::Init.new([], {}, destination_root: cookbook_path).invoke_all
-  end
-
   def self.init_spec(cookbook_name, cookbook_path)
     require 'kitchen-cabinet/spec'
-    @tool = %w(chefspec serverspec)
-    @tool.each do |tool|
+    %w(chefspec serverspec).each do |tool|
       Spec.install_specs(tool, cookbook_path, cookbook_name)
     end
   end
 
-  def self.write_configs(cookbook_name, options, cookbook_path)
-    @template = %w(chefignore .gitignore Gemfile Berksfile .kitchen.yml Guardfile Thorfile .rubocop.yml VERSION)
+  def self.write_configs(cookbook_name, cookbook_path)
     puts 'this is the ' + cookbook_name + ' cookbook.'
     require 'kitchen-cabinet/config'
-    @template.each do |template|
-      Initconfig.write_config(cookbook_name, options, cookbook_path, template)
+    %w(chefignore .gitignore Gemfile Berksfile .kitchen.yml Guardfile Thorfile .rubocop.yml VERSION).each do |template|
+      Initconfig.write_config(cookbook_name, cookbook_path, template)
     end
   end
 end

data/lib/kitchen-cabinet/config.rb

@@ -1,6 +1,6 @@
 # Writes configs for cabinet and update.
 class Initconfig
-  def self.write_config(cookbook_name, options, cookbook_path, template)
+  def self.write_config(cookbook_name, cookbook_path, template)
     tname = File.read(File.join(File.dirname(File.expand_path(__FILE__)), "templates/#{template}.eruby"))
     eruby = Erubis::Eruby.new(tname)
     File.open(File.join(cookbook_path, "#{template}"), 'w') { |f| f.write(eruby.result(:cookbook_name => cookbook_name)) }

data/lib/kitchen-cabinet/spec.rb

@@ -4,14 +4,13 @@
 # Removes duplication of code between chefspec and serverspec installs.
 class Spec
   def self.install_specs(tool, cookbook_path, cookbook_name)
-    @spec = %w(spec_helper.rb default_spec.rb)
     if tool == 'chefspec'
       spec_path = File.join(cookbook_path, 'spec')
     elsif tool == 'serverspec'
       spec_path = File.join(cookbook_path, 'test', 'integration', 'default', 'serverspec')
     end
     puts "* Initializing #{tool}"
-    @spec.each do |spec|
+    %w(spec_helper.rb default_spec.rb).each do |spec|
       FileUtils.mkdir_p(spec_path)
       tname = File.read(File.join(File.dirname(File.expand_path(__FILE__)), "templates/#{tool}/#{spec}.eruby"))
       eruby = Erubis::Eruby.new(tname)

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

@@ -1,27 +1,16 @@
 source 'https://rubygems.org'
 
+<% unless File.exist?('/opt/chefdk') -%>
 gem 'berkshelf', '~> 2.0', '>= 2.0.14'
 
 group :unit do
   gem 'foodcritic',       '~> 3', '>= 3.0.0'
   gem 'rubocop',          '~> 0.18', '>= 0.18.0'
   gem 'chefspec',         '~> 3.2', '>= 3.2.0'
-end
-
-group :integration do
-  gem 'test-kitchen',    '~> 1.1', '>= 1.1.0'
-  gem 'kitchen-vagrant', '~> 0', '>= 0.14.0'
-end
-
-group :release do
-  gem 'rspec_junit_formatter'
-  gem 'rubocop-checkstyle_formatter'
-  gem 'thor-scmversion',  '~> 1.4', '>= 1.4.0'
-  gem 'git',              '~> 1.2', '>= 1.2.6'
+  gem 'serverspec',       '~> 0.14', '>= 0.14.2'
 end
 
 group :development do
-  gem 'serverspec',       '~> 0.14', '>= 0.14.2'
   gem 'guard',            '~> 1.8', '>= 1.8.3'
   gem 'guard-rubocop',    '~> 0.2', '>= 0.2.2'
   gem 'guard-foodcritic', '~> 1.0', '>= 1.0.0'
@@ -31,3 +20,15 @@ group :development do
   gem 'rb-inotify', :require => false
   gem 'terminal-notifier-guard', :require => false
 end
+
+group :integration do
+  gem 'test-kitchen',    '~> 1.2', '>= 1.2.1'
+  gem 'kitchen-vagrant', '~> 0.15', '>= 0.15.0'
+end
+<% end -%>
+group :release do
+  gem 'rspec_junit_formatter'
+  gem 'rubocop-checkstyle_formatter'
+  gem 'thor-scmversion',  '~> 1.4', '>= 1.4.0'
+  gem 'git',              '~> 1.2', '>= 1.2.6'
+end

data/lib/kitchen-cabinet/update.rb

@@ -3,12 +3,11 @@
 
 # The Update class helps you maintain the versions and config of your cookbook creation tools
 class Update
-  def self.update_cookbook(cookbook_name, options, cookbook_path)
-    @template = %w(chefignore Gemfile Guardfile Thorfile .rubocop.yml)
+  def self.update_cookbook(cookbook_name, cookbook_path)
     require 'kitchen-cabinet/config'
     puts "Updating #{cookbook_name}..."
-    @template.each do |template|
-      Initconfig.write_config(cookbook_name, options, cookbook_path, template)
+    %w(chefignore Gemfile Guardfile Thorfile .rubocop.yml).each do |template|
+      Initconfig.write_config(cookbook_name, cookbook_path, template)
       puts "#{template} is up to date!"
     end
   end

metadata

@@ -1,75 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-cabinet
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 3.0.0
 platform: ruby
 authors:
 - Taylor Price
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-14 00:00:00.000000000 Z
+date: 2014-05-01 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: test-kitchen
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.1.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.1.1
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.5'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.5.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.5'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.5.1
-- !ruby/object:Gem::Dependency
-  name: berkshelf
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.12
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.12
 - !ruby/object:Gem::Dependency
   name: git
   requirement: !ruby/object:Gem::Requirement
@@ -137,7 +77,8 @@ description: |+
 email: tprice@onehealth.com
 executables:
 - cabinet
-extensions: []
+extensions:
+- ext/mkrf_conf.rb
 extra_rdoc_files: []
 files:
 - ".gitignore"
@@ -151,6 +92,7 @@ files:
 - README.md
 - Rakefile
 - bin/cabinet
+- ext/mkrf_conf.rb
 - kitchen-cabinet.gemspec
 - lib/kitchen-cabinet/cabinet.rb
 - lib/kitchen-cabinet/config.rb