bourdain 1.6.0 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d375a119ab4d7c7e96ab1b84b8c5e3116931f641
-  data.tar.gz: 076696693e74e35c28a47ee8c2e7a5ba4f01ca24
+  metadata.gz: ce8924ef181043fcb63aac82f0bdb47411352ab3
+  data.tar.gz: 0bf26f7f20f2fc7d769101c38b6e89555c66fc1b
 SHA512:
-  metadata.gz: a8840f296b116a7f81c4f667471c0765d2c5456aac303129791e4e290ba8cd6efbae5258cb9543dfe8af35af9a4beb1afbe965c18f9298a8f0f930089501d575
-  data.tar.gz: 974c011362614fc2355e89ee1dccfe4caa8d88e36dbe72aef2ed2cd159a9968ddcafea1c7a86dc98cab1cba3750d1ae835f196e509a3acdca6242976202b0373
+  metadata.gz: f30fe73cda0c2a81d7efb27fc6061aa0876c17e2c1eb4df6768dbbaf6a1f7d0c2d5f3a2b2d5e506b5be230d4d8051e4f6512ab0e5550016254cf13e22f185542
+  data.tar.gz: ed5b93a7697822f9a50a4a7a7ee50b780a925b4ef2383a8b2fbfe03ddd4decc764854e65ee3531f980cb924534276abeaa43fbc94208988779fa9f9cf8073ffa

data/VERSION

@@ -1 +1 @@
-1.6.0
+1.6.1

data/templates/cookbook/Rakefile

@@ -1,6 +1,15 @@
-require 'rubygems'
-require 'bundler'
-require 'rake'
+begin
+  require 'rubygems'
+  require 'bundler'
+  require 'rake'
+  require 'json'
+  require 'jsonlint/rake_task'
+rescue LoadError
+  puts "\e[31mCouldn't load required gems, have you run \e[35m`bundle exec tony check`\e[31m recently?\e[0m"
+  puts "\e[31mYou prolly need to \e[35m`bundle update`\e[31m with the latest Kitchen...\e[0m"
+  exit 2
+end
+
 
 
 def master?
@@ -14,7 +23,17 @@ end
 
 
 def realm?
-  `git ls-files` =~ /\bBerksfile\.lock\b/
+  !kitchen? && `git ls-files` =~ /\bBerksfile\.lock\b/
+end
+
+
+def kitchen?
+  `git ls-files` =~ /\bGemfile\b/
+end
+
+
+def versioned?
+  File.exist? 'VERSION'
 end
 
 
@@ -25,7 +44,7 @@ end
 
 def youre_dirty?
   dirty = `git diff HEAD --numstat`.split("\n").length > 0
-  raise unless $?.exitstatus.zero?
+  raise '`git diff` failed' unless $?.exitstatus.zero?
   dirty
 end
 
@@ -38,10 +57,10 @@ end
 
 
 def youre_behind?
-  `git fetch >/dev/null 2>&1`
-  `git pull --tags >/dev/null 2>&1`
+  `git fetch --tags`
+  raise '`git fetch --tags` failed' unless $?.exitstatus.zero?
   behind = `git log ..origin/master --oneline`.split("\n").length > 0
-  raise unless $?.exitstatus.zero?
+  raise '`git log` failed' unless $?.exitstatus.zero?
   return behind
 end
 
@@ -56,41 +75,107 @@ end
 def bump component
   youre_dirty!
   youre_behind!
-  `tony bump #{component}`
+  `bundle exec tony bump #{component}`
+  raise '`tony bump` failed' unless $?.exitstatus.zero?
   if realm?
-    `berks`
+    `bundle exec berks`
+    raise '`berks` failed' unless $?.exitstatus.zero?
     `git add Berksfile.lock`
+    raise '`git add` failed' unless $?.exitstatus.zero?
   end
   version = current_version
   `git add VERSION`
+  raise '`git add` failed' unless $?.exitstatus.zero?
   `git commit -m "Version bump to #{version}"`
+  raise '`git commit` failed' unless $?.exitstatus.zero?
   `git tag -a v#{version} -m v#{version}`
-  raise 'Could not add tag' unless $?.exitstatus.zero?
+  raise '`git tag` failed' unless $?.exitstatus.zero?
   puts 'Version is now "%s"' % version
 end
 
 
-def bump_and_release component
-  lint
-  bump component
+def bump_and_release component=nil
+  bump component unless component == :nop
   youre_dirty!
   youre_behind!
   `git push`
-  raise 'Push failed' unless $?.exitstatus.zero?
-  `git push --tag`
-  raise 'Tag push failed' unless $?.exitstatus.zero?
+  raise '`git push` failed' unless $?.exitstatus.zero?
+  `git push --tags`
+  raise '`git push --tags` failed' unless $?.exitstatus.zero?
 end
 
 
 def repo_root_dir
-  `git rev-parse --show-toplevel`.strip
+  root_dir = `git rev-parse --show-toplevel`.strip
+  raise '`git rev-parse` failed' unless $?.exitstatus.zero?
+  root_dir
+end
+
+
+def json_files kind
+  Dir[File.join(repo_root_dir, kind, '**', '*.json')]
+end
+
+
+def check_items kind
+  json_files(kind).each do |item_path|
+    item_name = File.basename(item_path, '.json')
+    item_file = File.read item_path
+    item      = JSON.parse item_file
+    item_id   = item['id'] || item['name']
+    if item_id && item_name != item_id
+      raise 'Invalid %s: %s' % [ kind, item_name ]
+    end
+  end
 end
 
 
-def lint
-  system "knife cookbook test #{File.basename repo_root_dir} -o .."
-  raise 'Failed "knife cookbook test"' unless $?.exitstatus.zero?
-  system 'foodcritic .' # Merely a suggestion
+def check_role_and_environment_naming
+  cookbook_name = File.basename repo_root_dir
+
+  env_names = json_files('environments').map { |f| File.basename(f, '.json') }
+
+  es = env_names.select { |n| !(n =~ /^#{cookbook_name}/) }
+  unless es.empty?
+    raise 'Hey, I found an environment not named after the realm! (%s)' % es.join(', ')
+  end
+
+  role_names = json_files('roles').map { |f| File.basename(f, '.json') }
+
+  rs = role_names.select { |n| !(n =~ /^#{cookbook_name}/) }
+  unless rs.empty?
+    raise 'Hey, I found a role not named after the realm! (%s)' % rs.join(', ')
+  end
+
+  cs = role_names & env_names
+
+  unless cs.empty?
+    raise "Hey, I found a role with the same name as an environment! (%s)" % cs.join(', ')
+  end
+end
+
+
+def prettify_json_files commit=false
+  puts 'Prettifying JSON files'
+  json_files('*').each do |path|
+    reformatted = JSON.pretty_generate(JSON.parse(File.read(path)))
+    File.open(path, 'w') { |f| f.puts reformatted }
+    `git add #{path} >/dev/null 2>&1`
+  end
+  `git commit -m 'Prettify JSON files [automated]'` if commit
+end
+
+
+def lint commit=false
+  if kitchen? # skip most linting
+    check_items 'data_bags'
+    prettify_json_files commit
+    return
+  end
+
+  system "bundle exec knife cookbook test #{File.basename repo_root_dir} -o .."
+  raise '`knife cookbook test` failed' unless $?.exitstatus.zero?
+  system 'bundle exec foodcritic .' # Merely a suggestion, no "raise" here
 
   unless realm?
     if Dir.exist? File.join(repo_root_dir, 'environments')
@@ -102,63 +187,202 @@ def lint
     end
 
     if Dir.exist? File.join(repo_root_dir, 'data_bags')
-      raise "Hey, I found data bags--this isn't realm!"
+      raise "Hey, I found data bags, but this isn't realm!"
+    end
+
+  else # realm
+    check_items 'environments'
+    check_items 'roles'
+    check_items 'data_bags'
+    check_role_and_environment_naming
+    prettify_json_files commit
+  end
+end
+
+
+CHEFDK_PATH = '/opt/chefdk'
+REQUIRE_RUBY_VERSION = '2.1'
+RECOMMEND_RUBY_VERSION = '2.3'
+
+def which cmd ; `which #{cmd}`.strip end
+
+def shebang cmd
+  File.read(which(cmd)).lines.first.strip
+rescue
+  puts "\e[31mCould not calculate shebang for %s\e[0m" % cmd.inspect
+  nil
+end
+
+def shebangs cmds ; Hash[cmds.map { |c| [ c, shebang(c) ] }] end
+
+def check_installation
+  if Gem::Version.new(RUBY_VERSION) < Gem::Version.new(REQUIRE_RUBY_VERSION)
+    puts "\e[31mWhoa! Looks like you got an old version of Ruby!\e[0m"
+    puts
+    puts <<-END.gsub(/^ +/,'').strip
+      Your Ruby installation is a little too old to support. We ask that
+      users upgrade to at least v#{REQUIRE_RUBY_VERSION}. We recommend at least v#{RECOMMEND_RUBY_VERSION} for best
+      results. There are lots of ways to accomplish this:
+
+      - Homebrew: `brew install ruby`
+      - Source: https://www.ruby-lang.org/en/documentation/installation#building-from-source
+      - chruby+ruby-install: https://github.com/postmodern/chruby#readme
+      - rbenv+ruby-build: https://github.com/rbenv/rbenv#readme
+      - RVM: https://rvm.io
+
+      Make sure you update Bundler, too (`gem install bundler`)
+
+      You should fix this ASAP.
+    END
+    raise
+  end
+
+  unless File.exist? CHEFDK_PATH
+    puts "\e[31mWhoa! Looks like you don't have ChefDK installed!\e[0m"
+    puts
+    puts <<-END.gsub(/^ +/,'').strip
+      While the Kitchen distributes all the Chef-related tooling you need,
+      some tools like Vagrant expect ChefDK to be installed. Chef provides
+      omnibus packages for most platforms:
+
+      - https://downloads.chef.io/chef-dk
+
+      Note that although ChefDK should be installed, it should not be on
+      your PATH, as the embedded tools may conflict with those provided by
+      the Kitchen. The Kitchen will use ChefDK as necessary.
+
+      You should fix this ASAP.
+    END
+    raise
+  end
+
+  if ENV['PATH'] =~ /chefdk/
+    puts "\e[31mWhoa! Looks like you got ChefDK on your PATH!\e[0m"
+    puts
+    puts <<-END.gsub(/^ +/,'').strip
+      The Kitchen distributes all the Chef-related tooling you need,
+      acting as a kind of ChefDK tailored for Blue Jeans. Unfortunately,
+      ChefDK sometimes distributes conflicting tooling, so we ask users
+      to avoid putting ChefDK on their PATH but leave it installed. The
+      Kitchen will use ChefDK as necessary.
+
+      You should fix this ASAP.
+    END
+    raise
+  end
+
+  err = false
+  { # Which commands important for what tooling
+    'Ruby' => %w[ gem bundle ],
+    'Chef' => %w[ rake berks tony foodcritic kitchen ]
+  }.each do |tooling, check_commands|
+    check_shebangs = shebangs check_commands
+    unless check_shebangs.values.uniq.size == 1
+      puts "\e[33mHead's up: I seem some conflicting shebang lines.\e[0m"
+      puts
+      puts <<-END.gsub(/^ +/,'')
+        The Kitchen depends on a stable, clean installation of #{tooling}
+        tooling. We expect that all these Gems are managed by the same
+        installation, but it's easy for things to get messy:
+      END
+      check_shebangs.each do |cmd, shebang|
+        puts '- %s: %s' % [
+          cmd, shebang ? shebang.inspect : 'missing?'
+        ]
+      end
+      puts <<-END.gsub(/^ +/,'').rstrip
+
+        Depending on your Ruby install method, this may not actually be an
+        issue at all, but it could aid in debugging. You might also try simply
+        prefixing your command with `bundle exec` to execute within the context
+        of the current gem bundle.
+      END
+      err = true
     end
   end
+
+  puts "\e[32mYour Kitchen installation looks good\e[0m" unless err
 end
 
 
 
+JsonLint::RakeTask.new do |t|
+  t.paths = %w[ **/*.json ]
+end
+
+desc 'Check your Kitchen installation'
+task :check do
+  check_installation
+end
+
 
 desc 'Perform syntax check and linting'
-task :lint do
+task lint: :jsonlint do
   lint
 end
+task full_lint: :jsonlint do
+  lint true
+end
 
 
 if test_kitchen?
   desc 'Execute default Test Kitchen test suite'
   task test: :lint do
-    system 'kitchen test'
+    system 'bundle exec kitchen test'
   end
 end
 
 
-desc 'Print the current version'
-task :version do
-  puts current_version
+if versioned?
+  desc 'Print the current version'
+  task :version do
+    puts current_version
+  end
 end
 
 
+
 if master?
-  namespace :release do
-    desc 'Release new major version'
-    task :major do
-      bump_and_release :major
+  if kitchen?
+    desc 'Release a Kitchen update'
+    task release: %w[ check full_lint ] do
+      bump_and_release :nop
     end
 
-    desc 'Release new minor version'
-    task :minor do
-      bump_and_release :minor
+  else
+    namespace :release do
+      desc 'Release new major version'
+      task major: %w[ check full_lint ] do
+        bump_and_release :major
+      end
+
+      desc 'Release new minor version'
+      task minor: %w[ check full_lint ] do
+        bump_and_release :minor
+      end
+
+      task patch: %w[ check full_lint ] do
+        bump_and_release :patch
+      end
     end
 
-    task :patch do
-      bump_and_release :patch
-    end
+    desc 'Release a new patch version'
+    task release: %w[ release:patch ]
   end
 
-  desc 'Release a new patch version'
-  task release: %w[ release:patch ]
-
 
   if realm?
     desc 'Apply Berksfile lock to an environment'
     task :constrain, [ :env ] do |_, args|
-      lint
+      check_installation
       youre_dirty!
       youre_behind!
+      envs = json_files('environments').map { |f| File.basename(f, '.json') }
+      raise 'Could not find local environment "%s"' % args[:env] unless envs.include?(args[:env])
       `git tag -a #{args[:env]} -m #{args[:env]} --force`
-      `git push --tag --force`
+      raise '`git tag` failed' unless $?.exitstatus.zero?
+      `git push origin #{args[:env]} --force`
+      raise '`git push` failed' unless $?.exitstatus.zero?
     end
   end
 end

data/templates/cookbook/recipes/example.rb

@@ -2,37 +2,3 @@
 # Cookbook Name:: <%= cookbook_name %>
 # Recipe:: <%= name %>
 #
-<%- attribute_ns = cookbook_name.gsub(/^(bjn|app|base|fork|realm)_/, '') -%>
-
-<%- if name == 'default' -%>
-# group node['<%= attribute_ns %>']['user'] do
-#   system true
-# end
-
-# user node['<%= attribute_ns %>']['user'] do
-#   gid node['<%= attribute_ns %>']['user']
-#   shell '/bin/false'
-#   system true
-# end
-
-# directory node['<%= attribute_ns %>']['logs'] do
-#   owner node['<%= attribute_ns %>']['user']
-#   group node['<%= attribute_ns %>']['user']
-#   recursive true
-# end
-
-# directory node['<%= attribute_ns %>']['data'] do
-#   owner node['<%= attribute_ns %>']['user']
-#   group node['<%= attribute_ns %>']['user']
-#   recursive true
-# end
-
-# ark '<%= attribute_ns %>' do
-#   url node['<%= attribute_ns %>']['url']
-#   checksum node['<%= attribute_ns %>']['checksum']
-#   version node['<%= attribute_ns %>']['version']
-#   home_dir node['<%= attribute_ns %>']['home']
-#   owner node['<%= attribute_ns %>']['user']
-#   group node['<%= attribute_ns %>']['user']
-# end
-<%- end -%>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bourdain
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.1
 platform: ruby
 authors:
 - Sean Clemmer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-18 00:00:00.000000000 Z
+date: 2016-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pmap
@@ -157,8 +157,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Tools for badass chefs
 test_files: []
+has_rdoc: