kitchen-cabinet 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 99aea26399fc3f69deb9108743f3dee9e385ca89
-  data.tar.gz: f10a08c659ec3b682e33b4ffffb10d0e10fe4df7
+  metadata.gz: 54cfbe8021410b0a68c2cc4dded7ee588eba95e6
+  data.tar.gz: c2ca2b6d157a4c53f7d8a4278acc5751b1eccb79
 SHA512:
-  metadata.gz: d143919033ca700ee42de22ad8123eea75743f94713684d3966b7e4251563345b02bbbcbd924177ccbd4471877bb4b852b592fe8a73de4f65a8b5a2c6b30164e
-  data.tar.gz: e55c4b8115dd3640a18686cbb41e115cfe4bc43f12a7e639dca22c3d1eefca355046a1443f9e33da98291eb10a17ba3455f76b8106af1f62f97de6b7a247b173
+  metadata.gz: 6291a1cd420aaca963c27de971bb2598dd6ff75bdeb9f92e70bb02fd8add87f8486c51a2b3d04f03be126e17eb0346a0ce876038278706c60c63f9ce4ef95a58
+  data.tar.gz: 99c32005875a10897015ab1a8ad5e2e85cff1d504ed67ff542758a2a0f89f731221ee06f6cec97aa50fb86d8a38251a79892894df62042be4e32e41f45550996

data/CHANGELOG.md

@@ -1,7 +1,15 @@
+## v2.0.1
+* Fixed `cabinet update` command.
+* Vastly simplified bin logic
+* Rake still runs tests, but soon it will be used just for releases (Guard runs tests already)
+
 ## 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)
 
+####Known bugs:
+* `cabinet update` does not work.
+
 ## v1.2.0:
 
 * Run commands from current directory if not otherwise specified with -o

data/bin/cabinet

@@ -14,7 +14,7 @@ opt_parser = OptionParser.new do |opt|
   opt.banner = 'Usage: cabinet [options] <cookbook name>'
   opt.separator  ''
   opt.separator  'Options'
-  opt.on('-o', '--cookbook-path PATH', 'The directory where the cookbook will be created') do |path|
+  opt.on('-o', '--cookbook-path PATH', 'The directory where the cookbook will be created.') do |path|
     options[:path] = path
   end
   opt.on('-C', '--copyright COPYRIGHT_HOLDER', 'The  name  of  the  copyright holder.') do |copyright|
@@ -42,58 +42,32 @@ Error.opt_error('Please specify some options.', opt_parser) if ARGV.empty?
 
 cookbook_name = ARGV.pop
 
+options[:update] = true if cookbook_name == 'update'
+
 if options[:path].respond_to?(:to_str)
-  path = File.join(options[:path], cookbook_name)
-  cookbook_path = path
+  cookbook_path = File.join(options[:path], cookbook_name)
 else
-  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'
+ options[:path] = Dir.getwd
 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
+  cookbook_name = File.basename(options[:path])
+  cookbook_path = options[:path]
+else
+  cookbook_path = File.join(options[:path], cookbook_name)
 end
 
 if options[:update]
-  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)
-    Error.opt_error('Make sure you specify -o and a cookbook name!', opt_parser)
-  end
-  if cookbook_name
+  if File.exists?(File.join(cookbook_path, 'metadata.rb'))
     require 'kitchen-cabinet/update'
     Update.update_cookbook(cookbook_name, options, cookbook_path)
     exit
   else
-    Error.opt_error('Define a path with `-o` and a cookbook name!', opt_parser)
+    puts Error.opt_error('Specify a path or run from within the cookbook folder!', opt_parser)
+    exit
   end
-elsif cookbook_name
-  Cabinet.init(cookbook_name, options, cookbook_path)
-  puts "Cookbook #{cookbook_name} created successfully"
-  puts 'Next steps...'
-  puts "  $ cd #{cookbook_path}"
-  puts '  $ bundle install'
-  puts '  $ bundle exec berks install'
-  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
+
+Cabinet.init(cookbook_name, options, cookbook_path)
+exit

data/kitchen-cabinet.gemspec

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

data/lib/kitchen-cabinet/cabinet.rb

@@ -13,6 +13,19 @@ class Cabinet
     init_kitchen(cookbook_name, cookbook_path)
     init_spec(cookbook_name, cookbook_path)
     write_configs(cookbook_name, options, cookbook_path)
+    puts "Cookbook #{cookbook_name} created successfully"
+    puts 'Next steps...'
+    puts "  $ cd #{cookbook_path}"
+    puts '  $ bundle install'
+    puts '  $ bundle exec berks install'
+    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'
   end
 
   def self.init_chef(cookbook_name, options, cookbook_path)

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

@@ -15,7 +15,6 @@ end
 
 group :release do
   gem 'stove', '~> 1.1'
-  # gem 'stove', '~> 2.0.0.beta.2'
   gem 'rspec_junit_formatter'
   gem 'rubocop-checkstyle_formatter'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-cabinet
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Taylor Price
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-17 00:00:00.000000000 Z
+date: 2014-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef