kitchen-cabinet 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d58227e726c5b26286ae825e07f5713753491e7
-  data.tar.gz: b573cdb8c5753e37a9db8165d9bcc4c1711c2c27
+  metadata.gz: 47b7cc6c79c82d35d205d6ee9385b2cbc5f62686
+  data.tar.gz: 6ccfb49f7fe889a1846ae95baa3900a083423cd7
 SHA512:
-  metadata.gz: f821af56fdb1e45ab1a9188fc90b1f3a1fa435b8b40f9b907669caee2e0e1b9be2a0ba20a4d9333b762b13d3fe051bd0daa0e12fb307c55d5dcf71fbf97cbd59
-  data.tar.gz: d1eb4145f93c8c0bc02031d38439d14e04697bf0935fcd55b37ed94ec4366b493e11cdedf13186822e339ea742a27646ba4faa80260d9a023b1927b2d9db4364
+  metadata.gz: c09ff07834a45d5e2d62bbab614c312a5fb89a943877bf321f94d0845b3648fcb45765d4ecc8d211a389131efa9914d7ad537d8ea77bf55a5899ee7f232c1e05
+  data.tar.gz: 55f504888bdc1a3d3b63a4cf6031955dca30c7a220b6176083fbfedb53ababcca7b1f29ecdafdf37d39e68be1a2e9ac6ebc64b0f51e07b14e580d4745febe301

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## v1.2.0:
+
+* Run commands from current directory if not otherwise specified with -o
+* Added `cabinet update` to update cookbook the cookbook you are currently in.
+* Updated config files (.coverage, JetBrains files to gitignore and chefignore, etc)
+
 ## v1.1.1:
 
 * Refactored code

data/README.md

@@ -1,8 +1,9 @@
-## kitchen-cabinet
-----
+kitchen-cabinet
+===============
+[![Build Status](https://travis-ci.org/onehealth/kitchen-cabinet.png)](https://travis-ci.org/onehealth/kitchen-cabinet) [![Dependency Status](https://gemnasium.com/onehealth/kitchen-cabinet.png)](https://gemnasium.com/onehealth/kitchen-cabinet) [![Code Climate](https://codeclimate.com/github/onehealth/kitchen-cabinet.png)](https://codeclimate.com/github/onehealth/kitchen-cabinet) [![Gem Version](https://badge.fury.io/rb/kitchen-cabinet.png)](http://badge.fury.io/rb/kitchen-cabinet)
 
 About
-=====
+-----
 
 Inspiration for this gem was taken from [meez](https://github.com/paulczar/meez). It creates an opinionated cookbook complete with testing suites.
 

data/bin/cabinet

@@ -5,6 +5,7 @@ $LOAD_PATH.unshift(File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib
 
 require 'optparse'
 require 'kitchen-cabinet/cabinet'
+require 'kitchen-cabinet/error'
 require 'fileutils'
 
 options = {}
@@ -25,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 (and other config files that don't change much) of an existing project") do
+  opt.on('-u', '--update', 'Update the Gemfile, Chefignore, Guardfile, rubocop.yml, and the Strainerfile.') do
     options[:update] = true
   end
   opt.on('-h', '--help', 'help') do
@@ -37,45 +38,53 @@ end
 
 opt_parser.parse!
 
-if ARGV.empty?
-  puts opt_parser
-  exit
-end
+Error.opt_error('Please specify some options.', opt_parser) if ARGV.empty?
 
 cookbook_name = ARGV.pop
 
-def opt_error(message, opt_parser)
-  puts ''
-  puts message
-  puts ''
-  puts opt_parser
-  exit
-end
-
 if options[:path].respond_to?(:to_str)
   path = File.join(options[:path], cookbook_name)
+  cookbook_path = path
 else
-  puts opt_error('Specify a path!', opt_parser)
+  options[:path] = Dir.getwd
+  puts options[:path] + ' this is the expected path'
+  path = Dir.getwd
+  cookbook_path = File.join(path, cookbook_name)
+  puts cookbook_path + ' this is the cookbook_path'
+end
+
+if cookbook_name == 'update'
+  require 'kitchen-cabinet/update'
+  # path = Dir.getwd
+  metadata = File.join(cookbook_path, 'metadata.rb')
+  puts path
+  puts metadata
+  if File.exists?(metadata)
+    cookbook_name = File.basename(File.expand_path(File.dirname(__FILE__)))
+    Update.update_cookbook(cookbook_name, options, cookbook_path)
+    exit
+  else
+    puts Error.opt_error('Specify a path or run from within the cookbook folder!', opt_parser)
+  end
 end
 
 if options[:update]
-  opt_error("You need to create #{cookbook_name} first!") unless File.exists?(path)
+  Error.opt_error('You need to create the cookbook first!', opt_parser) unless File.exists?(cookbook_path)
   unless options[:path].respond_to?(:to_str) && (cookbook_name.is_a? String)
-    opt_error('Make sure you specify -o and a cookbook name!', opt_parser)
+    Error.opt_error('Make sure you specify -o and a cookbook name!', opt_parser)
   end
   if cookbook_name
-    puts "Updating #{cookbook_name}..."
-    puts 'Gemfile, Chefignore, and Guardfile are up to date.'
-    Cabinet.update_cookbook(cookbook_name, options, path)
+    require 'kitchen-cabinet/update'
+    Update.update_cookbook(cookbook_name, options, cookbook_path)
     exit
   else
-    opt_error('Define a path with `-o` and a cookbook name!', opt_parser)
+    Error.opt_error('Define a path with `-o` and a cookbook name!', opt_parser)
   end
 elsif cookbook_name
-  Cabinet.init(cookbook_name, options, path)
+  Cabinet.init(cookbook_name, options, cookbook_path)
   puts "Cookbook #{cookbook_name} created successfully"
   puts 'Next steps...'
-  puts "  $ cd #{File.join(options[:path], cookbook_name)}"
+  puts "  $ cd #{cookbook_path}"
   puts '  $ bundle install'
   puts '  $ bundle exec berks install'
   puts '  $ bundle exec strainer test'

data/kitchen-cabinet.gemspec

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

@@ -6,106 +6,75 @@
 class Cabinet
   require 'fileutils'
   require 'erubis'
-  def self.init(cookbook_name, options, path)
-    init_chef(cookbook_name, options, path)
-    init_git(cookbook_name, options, path)
-    init_berkshelf(cookbook_name, options, path)
-    init_kitchen(cookbook_name, options, path)
-    init_chefspec(cookbook_name, options, path)
-    init_serverspec(cookbook_name, options, path)
-    write_configs(cookbook_name, options, path)
+  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_spec(cookbook_name, cookbook_path)
+    write_configs(cookbook_name, options, cookbook_path)
   end
 
-  def self.init_chef(cookbook_name, options, path)
+  def self.init_chef(cookbook_name, options, cookbook_path)
     tool = 'chef'
     puts "* Initializing #{tool}"
     require 'chef/knife/cookbook_create'
     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'
+    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'
     create_cookbook.run
     %w{ metadata.rb recipes/default.rb }.each do |file|
       puts "\tRewriting #{file}"
-      contents = "\# Encoding: utf-8\n#{File.read(File.join(path, file))}"
-      File.open(File.join(path, file), 'w') { |f| f.write(contents) }
+      contents = "\# Encoding: utf-8\n#{File.read(File.join(cookbook_path, file))}"
+      File.open(File.join(cookbook_path, file), 'w') { |f| f.write(contents) }
     end
   end
 
-  def self.init_git(cookbook_name, options, path)
+  def self.init_git(cookbook_name, options, cookbook_path)
     tool = 'git'
     puts "* Initializing #{tool}"
     require 'git'
-    Git.init(path, repository: path)
+    Git.init(cookbook_path, repository: cookbook_path)
   end
 
-  def self.init_berkshelf(cookbook_name, options, path)
+  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(
-      [path],
+      [cookbook_path],
         skip_test_kitchen: true,
         skip_vagrant: true
     ).invoke_all
   end
 
-  def self.init_kitchen(cookbook_name, options, path)
+  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: path).invoke_all
+    Kitchen::Generator::Init.new([], {}, destination_root: cookbook_path).invoke_all
   end
 
-  def self.init_chefspec(cookbook_name, options, path)
-    tool = 'chefspec'
-    puts "* Initializing #{tool}"
-    spec_path = File.join(path, 'spec')
-    FileUtils.mkdir_p(spec_path)
-    @spec = %w(spec_helper.rb default_spec.rb)
-    @spec.each do |spec|
-      spec_path = File.join(path, 'spec')
-      tname = File.read(File.join(File.dirname(File.expand_path(__FILE__)), "templates/chefspec/#{spec}.eruby"))
-      eruby = Erubis::Eruby.new(tname)
-      File.open(File.join(spec_path, "#{spec}"), 'w') { |f| f.write(eruby.result(:cookbook_name => cookbook_name)) }
-    end
-  end
-
-  def self.init_serverspec(cookbook_name, options, path)
-    tool = 'serverspec'
-    puts "* Initializing #{tool}"
-    spec_path = File.join(path, 'test', 'integration', 'default', 'serverspec')
-    FileUtils.mkdir_p(spec_path)
-    @spec = %w(spec_helper.rb default_spec.rb)
-    @spec.each do |spec|
-      spec_path = File.join(path, 'spec')
-      tname = File.read(File.join(File.dirname(File.expand_path(__FILE__)), "templates/serverspec/#{spec}.eruby"))
-      eruby = Erubis::Eruby.new(tname)
-      File.open(File.join(spec_path, "#{spec}"), 'w') { |f| f.write(eruby.result(:cookbook_name => cookbook_name)) }
+  def self.init_spec(cookbook_name, cookbook_path)
+    require 'kitchen-cabinet/spec'
+    @tool = %w(chefspec serverspec)
+    @tool.each do |tool|
+      Spec.install_specs(tool, cookbook_path, cookbook_name)
     end
   end
 
-  def self.write_configs(cookbook_name, options, path)
+  def self.write_configs(cookbook_name, options, cookbook_path)
     @template = %w(chefignore .gitignore Gemfile Berksfile .kitchen.yml Guardfile Strainerfile .rubocop.yml)
     puts 'this is the ' + cookbook_name + ' cookbook.'
+    require 'kitchen-cabinet/config'
     @template.each do |template|
-      tname = File.read(File.join(File.dirname(File.expand_path(__FILE__)), "templates/#{template}.eruby"))
-      eruby = Erubis::Eruby.new(tname)
-      File.open(File.join(path, "#{template}"), 'w') { |f| f.write(eruby.result(:cookbook_name => cookbook_name)) }
-    end
-  end
-
-  def self.update_cookbook(cookbook_name, options, path)
-    @template = %w(chefignore Gemfile Guardfile Strainerfile .rubocop.yml)
-    @template.each do |template|
-      tname = File.read(File.join(File.dirname(File.expand_path(__FILE__)), "templates/#{template}.eruby"))
-      eruby = Erubis::Eruby.new(tname)
-      File.open(File.join(path, "#{template}"), 'w') { |f| f.write(eruby.result(:cookbook_name => cookbook_name)) }
+      Initconfig.write_config(cookbook_name, options, cookbook_path, template)
     end
   end
 end

data/lib/kitchen-cabinet/config.rb

@@ -0,0 +1,8 @@
+# Writes configs for cabinet and update.
+class Initconfig
+  def self.write_config(cookbook_name, options, 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)) }
+  end
+end

data/lib/kitchen-cabinet/error.rb

@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+# Encoding: utf-8
+
+# The error class responds with a helpful message whenever you do something
+# that breaks kitchen-cabinet.
+class Error
+  def self.opt_error(message, opt_parser)
+    puts ''
+    puts message
+    puts ''
+    puts opt_parser
+    exit
+  end
+end

data/lib/kitchen-cabinet/spec.rb

@@ -0,0 +1,21 @@
+#!/usr/bin/env ruby
+# Encoding: utf-8
+
+# 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|
+      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)
+      File.open(File.join(spec_path, "#{spec}"), 'w') { |f| f.write(eruby.result(:cookbook_name => cookbook_name)) }
+    end
+  end
+end

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

@@ -7,6 +7,12 @@ Berksfile.lock
 .*.sw[a-z]
 *.un~
 /cookbooks
+.coverage
+
+# JetBrains
+.idea/workspace.xml
+.idea/tasks.xml
+.idea/dataSources.ids
 
 # Bundler
 Gemfile.lock

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

@@ -30,6 +30,7 @@ tmtags
 .project
 .settings
 mkmf.log
+.idea/*
 
 ## COMPILED ##
 ##############
@@ -56,6 +57,7 @@ Procfile
 .kitchen.yml
 .kitchen/*
 .rubocop.yml
+.coverage/*
 
 # SCM #
 #######
@@ -96,4 +98,4 @@ Vagrantfile
 
 # Travis #
 ##########
-.travis.yml
+.travis.yml

data/lib/kitchen-cabinet/update.rb

@@ -0,0 +1,15 @@
+#!/usr/bin/env ruby
+# Encoding: utf-8
+
+# 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)
+    require 'kitchen-cabinet/config'
+    puts "Updating #{cookbook_name}..."
+    @template.each do |template|
+      Initconfig.write_config(cookbook_name, options, cookbook_path, template)
+      puts "#{template} is up to date!"
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-cabinet
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Taylor Price
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-13 00:00:00.000000000 Z
+date: 2014-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -193,6 +193,9 @@ files:
 - bin/cabinet
 - kitchen-cabinet.gemspec
 - lib/kitchen-cabinet/cabinet.rb
+- lib/kitchen-cabinet/config.rb
+- lib/kitchen-cabinet/error.rb
+- lib/kitchen-cabinet/spec.rb
 - lib/kitchen-cabinet/templates/.gitignore.eruby
 - lib/kitchen-cabinet/templates/.kitchen.yml.eruby
 - lib/kitchen-cabinet/templates/.rubocop.yml.eruby
@@ -205,6 +208,7 @@ files:
 - lib/kitchen-cabinet/templates/chefspec/spec_helper.rb.eruby
 - lib/kitchen-cabinet/templates/serverspec/default_spec.rb.eruby
 - lib/kitchen-cabinet/templates/serverspec/spec_helper.rb.eruby
+- lib/kitchen-cabinet/update.rb
 - spec/cabinet_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/onehealth/kitchen-cabinet