kitchen-cabinet 1.2.1.dev → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 44302f9d56d8ce49112cf18c66679dad6595ee56
-  data.tar.gz: 9992ee0534e54e308c98c14dc800e738e7a0ce79
+  metadata.gz: 99aea26399fc3f69deb9108743f3dee9e385ca89
+  data.tar.gz: f10a08c659ec3b682e33b4ffffb10d0e10fe4df7
 SHA512:
-  metadata.gz: eca3b94d3f72f0c3753c49b9e49ca5ea458c394a503a52501c721ade59fd7f0f6f3bba8fef89d2394fdfb87cffdff73aaa3f8ebdf751404b7ea8fe50ca294abd
-  data.tar.gz: 0233443bc85e4e8aa32451881434f81fd933fd91599d298ef0cd797d30df3fa07d472f7a86bc090ac70dc8623f5d7a39a8947c670ae6a80b0270d3744e970272
+  metadata.gz: d143919033ca700ee42de22ad8123eea75743f94713684d3966b7e4251563345b02bbbcbd924177ccbd4471877bb4b852b592fe8a73de4f65a8b5a2c6b30164e
+  data.tar.gz: e55c4b8115dd3640a18686cbb41e115cfe4bc43f12a7e639dca22c3d1eefca355046a1443f9e33da98291eb10a17ba3455f76b8106af1f62f97de6b7a247b173

data/CHANGELOG.md

@@ -1,5 +1,6 @@
-
+## v2.0.0
 * Read knife.rb config for cookbook values if no cli overrides are used
+* Uses Rake to execute tests instead of Strainer (Strainer is being phased out)
 
 ## v1.2.0:
 

data/README.md

@@ -7,7 +7,7 @@ About
 
 Inspiration for this gem was taken from [meez](https://github.com/paulczar/meez). It creates an opinionated cookbook complete with testing suites.
 
-Once `cabinet` has finished running, you will have a new cookbook complete with an initialized git repo, chefspec, serverspec, strainer, test-kitchen, guard (with notifications via inotify/fsevent/terminal-notifier), rubocop, foodcritic, berkshelf, and stove.
+Once `cabinet` has finished running, you will have a new cookbook complete with an initialized git repo, chefspec, serverspec, test-kitchen, guard (with notifications via inotify/fsevent/terminal-notifier), rubocop, foodcritic, berkshelf, and stove.
 
 It will automatically create a Gemfile for you with different groups set up for development, testing, etc:
 
@@ -34,7 +34,7 @@ group :release do
 end
 
 group :development do
-  gem 'strainer',         '~> 3.3.0'
+  gem 'rake,			  '~> 10.1'
   gem 'serverspec',       '~> 0.14.2'
   gem 'guard',            '~> 1.8'
   gem 'guard-rubocop',    '~> 0.2'
@@ -72,22 +72,21 @@ Options
 ### Example
 
 `````` bash
-➜  ~  cabinet --cookbook-path ~/Desktop -C Taylor Price -I apachev2 -m tprice@onehealth.com test-cookbook
+➜  ~  cabinet --cookbook-path ~/Desktop -C Taylor Price -I apachev2 -m tprice@onehealth.com test
 * Initializing chef
-** Creating cookbook test-cookbook
-** Creating README for cookbook: test-cookbook
-** Creating CHANGELOG for cookbook: test-cookbook
-** Creating metadata for cookbook: test-cookbook
+** Creating cookbook test
+** Creating README for cookbook: test
+** Creating CHANGELOG for cookbook: test
+** Creating metadata for cookbook: test
 	Rewriting metadata.rb
 	Rewriting recipes/default.rb
-* Initializing knife
 * Initializing git
 * Initializing berkshelf
-      create  Desktop/test-cookbook/Berksfile
-      create  Desktop/test-cookbook/Thorfile
-      create  Desktop/test-cookbook/.gitignore
-         run  git init from "./Desktop/test-cookbook"
-      create  Desktop/test-cookbook/Gemfile
+      create  /Users/tprice/Desktop/test/Berksfile
+      create  /Users/tprice/Desktop/test/Thorfile
+      create  /Users/tprice/Desktop/test/.gitignore
+         run  git init from "/Users/tprice/Desktop/test"
+      create  /Users/tprice/Desktop/test/Gemfile
 * Initializing kitchen
       create  .kitchen.yml
       append  Thorfile
@@ -95,34 +94,16 @@ Options
       append  Gemfile
       append  Gemfile
 You must run `bundle install' to fetch any new gems.
-* Initializing guard
 * Initializing chefspec
-* Initializing strainer
-* Initializing rubocop
-* Initializing foodcritic
 * Initializing serverspec
-* Initializing stove
-this is the test-cookbook cookbook.
-Cookbook test-cookbook created successfully
+this is the test cookbook.
+Cookbook test created successfully
 Next steps...
-  $ cd /Users/tprice/Desktop/test-cookbook
+  $ cd /Users/tprice/Desktop/test
   $ bundle install
   $ bundle exec berks install
-  $ bundle exec strainer test
-
-➜  cd ~/Desktop/test-cookbook
-➜  bundle install
-Fetching gem metadata from https://rubygems.org/
-Fetching additional metadata from https://rubygems.org/
-Resolving dependencies...
-...
-...
-Your bundle is complete!
-➜  bundle exec berks install
-Using test (0.1.0) from metadata
-➜  bundle exec strainer test
-...
-...
+  $ bundle exec rake -T
+  ...
 ``````
 
 And so on!

data/bin/cabinet

@@ -26,7 +26,7 @@ opt_parser = OptionParser.new do |opt|
   opt.on('-m', '--email EMAIL', 'The  email  address  for the individual who maintains the cookbook.') do |email|
     options[:email] = email
   end
-  opt.on('-u', '--update', 'Update the Gemfile, Chefignore, Guardfile, rubocop.yml, and the Strainerfile.') do
+  opt.on('-u', '--update', 'Update the Gemfile, Chefignore, Guardfile, rubocop.yml, and the Rakefile.') do
     options[:update] = true
   end
   opt.on('-h', '--help', 'help') do
@@ -87,6 +87,13 @@ elsif cookbook_name
   puts "  $ cd #{cookbook_path}"
   puts '  $ bundle install'
   puts '  $ bundle exec berks install'
-  puts '  $ bundle exec strainer test'
+  puts '  $ bundle exec rake -T'
+  puts 'rake integration                  # Run Test Kitchen integration tests'
+  puts 'rake kitchen:all                  # Run all test instances'
+  puts 'rake kitchen:default-ubuntu-1204  # Run default-ubuntu-1204 test instance'
+  puts 'rake spec                         # Run ChefSpec unit tests'
+  puts 'rake style                        # Run all style checks'
+  puts 'rake style:chef                   # Lint Chef cookbooks'
+  puts 'rake style:ruby                   # Run Ruby style checks'
   exit
 end

data/kitchen-cabinet.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "kitchen-cabinet"
-  s.version = '1.2.1.dev'
+  s.version = '2.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'

data/lib/kitchen-cabinet/cabinet.rb

@@ -22,9 +22,13 @@ class Cabinet
     create_cookbook = Chef::Knife::CookbookCreate.new
     create_cookbook.name_args = [cookbook_name]
     create_cookbook.config[:cookbook_path]      = options[:path]
-    create_cookbook.config[:cookbook_copyright] = options[:copyright]  || 'YOUR_COMPANY_NAME'
-    create_cookbook.config[:cookbook_license]   = options[:license]    || 'YOUR_EMAIL'
-    create_cookbook.config[:cookbook_email]     = options[:email]      || 'none'
+    if File.exists?(File.join(ENV['HOME'], '.chef', 'knife.rb'))
+      require 'chef'
+      Chef::Config.from_file(File.join(ENV['HOME'], '.chef', 'knife.rb'))
+    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
     %w{ metadata.rb recipes/default.rb }.each do |file|
       puts "\tRewriting #{file}"
@@ -70,7 +74,7 @@ class Cabinet
   end
 
   def self.write_configs(cookbook_name, options, cookbook_path)
-    @template = %w(chefignore .gitignore Gemfile Berksfile .kitchen.yml Guardfile Strainerfile .rubocop.yml)
+    @template = %w(chefignore .gitignore Gemfile Berksfile .kitchen.yml Guardfile Rakefile .rubocop.yml)
     puts 'this is the ' + cookbook_name + ' cookbook.'
     require 'kitchen-cabinet/config'
     @template.each do |template|

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

@@ -15,12 +15,13 @@ end
 
 group :release do
   gem 'stove', '~> 1.1'
+  # gem 'stove', '~> 2.0.0.beta.2'
   gem 'rspec_junit_formatter'
   gem 'rubocop-checkstyle_formatter'
 end
 
 group :development do
-  gem 'strainer',         '~> 3.3.0'
+  gem 'rake',     			  '~> 10.1'
   gem 'serverspec',       '~> 0.14.2'
   gem 'guard',            '~> 1.8'
   gem 'guard-rubocop',    '~> 0.2'

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

@@ -0,0 +1,33 @@
+# Encoding: utf-8
+require 'bundler/setup'
+
+namespace :style do
+  require 'rubocop/rake_task'
+  desc 'Run Ruby style checks'
+  Rubocop::RakeTask.new(:ruby)
+
+  require 'foodcritic'
+  desc 'Run Chef style checks'
+  FoodCritic::Rake::LintTask.new(:chef)
+end
+
+desc 'Run all style checks'
+task style: ['style:chef', 'style:ruby']
+
+require 'kitchen'
+desc 'Run Test Kitchen integration tests'
+task :integration do
+  Kitchen.logger = Kitchen.default_file_logger
+  Kitchen::Config.new.instances.each do |instance|
+    instance.test(:always)
+  end
+end
+
+require 'rspec/core/rake_task'
+desc 'Run ChefSpec unit tests'
+RSpec::Core::RakeTask.new(:spec) do |t, args|
+  t.rspec_opts = 'test/unit/spec'
+end
+
+# The default task runs all tests.
+task default: ['style', 'spec', 'integration']

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

@@ -58,6 +58,7 @@ Procfile
 .kitchen/*
 .rubocop.yml
 .coverage/*
+Rakefile
 
 # SCM #
 #######

data/lib/kitchen-cabinet/templates/chefspec/default_spec.rb.eruby

@@ -12,4 +12,4 @@ describe '<%= cookbook_name %>::default' do
     end
 
   end
-end
+end

data/lib/kitchen-cabinet/templates/chefspec/spec_helper.rb.eruby

@@ -16,4 +16,4 @@ require 'chef/application'
 def stub_resources
 end
 
-at_exit { ChefSpec::Coverage.report! }
+at_exit { ChefSpec::Coverage.report! }

data/lib/kitchen-cabinet/templates/serverspec/default_spec.rb.eruby

@@ -4,4 +4,4 @@ require_relative 'spec_helper'
 
 describe 'default' do
   it { pending 'write some tests' }
-end
+end

data/lib/kitchen-cabinet/templates/serverspec/spec_helper.rb.eruby

@@ -8,4 +8,4 @@ RSpec.configure do |c|
   c.before :all do
     c.path = '/sbin:/usr/bin'
   end
-end
+end

data/lib/kitchen-cabinet/update.rb

@@ -4,7 +4,7 @@
 # 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 Strainerfile .rubocop.yml)
+    @template = %w(chefignore Gemfile Guardfile Rakefile .rubocop.yml)
     require 'kitchen-cabinet/config'
     puts "Updating #{cookbook_name}..."
     @template.each do |template|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-cabinet
 version: !ruby/object:Gem::Version
-  version: 1.2.1.dev
+  version: 2.0.0
 platform: ruby
 authors:
 - Taylor Price
@@ -202,7 +202,7 @@ files:
 - lib/kitchen-cabinet/templates/Berksfile.eruby
 - lib/kitchen-cabinet/templates/Gemfile.eruby
 - lib/kitchen-cabinet/templates/Guardfile.eruby
-- lib/kitchen-cabinet/templates/Strainerfile.eruby
+- lib/kitchen-cabinet/templates/Rakefile.eruby
 - lib/kitchen-cabinet/templates/chefignore.eruby
 - lib/kitchen-cabinet/templates/chefspec/default_spec.rb.eruby
 - lib/kitchen-cabinet/templates/chefspec/spec_helper.rb.eruby
@@ -226,9 +226,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2

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

@@ -1,5 +0,0 @@
-# Strainerfile
-rubocop:    bundle exec rubocop $COOKBOOK
-foodcritic: bundle exec foodcritic -f any $SANDBOX/$COOKBOOK
-chefspec:   bundle exec rspec $SANDBOX/$COOKBOOK/test/unit/spec
-knife test: bundle exec knife cookbook test $COOKBOOK