bourdain 1.3.2 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b7eaf6efe6460156dd99798d547efc2b74c6c975
-  data.tar.gz: c3b098365fd5ad4110ebdc02b6d0a47d8e7aab11
+  metadata.gz: 117b60c641b6c056e3e29697f9e12656f237a3de
+  data.tar.gz: 9dab833b7832fce0c41a462006794697547bbc22
 SHA512:
-  metadata.gz: 6d411e186adaaf6ae87727c10166962e797c6c17078c62b0d356bf9e9dcc8a76c64d98039cedfcf3ea6e86f06311387f80adacdc16e8e4ae230102e638288662
-  data.tar.gz: c067373d916944faeb80987ca96e940cd8f50eed70e61f6c69a6830dc927c2f66b8d9f2d4573a13a58cb1742550884c63761990428b93b11bf4aa1f51b029f8d
+  metadata.gz: c0fcff7bf0d08bee9bee2ada6bf3002a4df2a7449fba5b6744dad6567f28abf0e782becae7e46bebba5d39d34f50e0eacec055ab48a6d055de9bb0a5f0022e32
+  data.tar.gz: e16eb27cb9d80efe02a63620e87d2ae2164e2fdedd1ef494e41bd511e553da3aa2fb0c4105cd0b4c6395df3a911f2ef9196c779aabfcd21815c1e423d2b23407

data/VERSION

@@ -1 +1 @@
-1.3.2
+1.3.3

data/lib/bourdain/helpers.rb

@@ -14,7 +14,7 @@ def apply_template file, opts
   template_name, locals = opts[:template], opts[:locals]
   locals = Bourdain::Helpers::Locals.new(locals).bind unless locals.nil?
   template_path = gem_path('templates', *template_name)
-  template = ERB.new File.read(template_path)
+  template = ERB.new File.read(template_path), nil, '-'
   contents = template.result(locals).strip
   File.open(file, 'w') { |f| f.write contents }
 end

data/lib/bourdain/resources/generators/cookbook.rb

@@ -14,6 +14,7 @@ module Bourdain
           --recipe :: Generate a default recipe (default: true)
           --berksfile :: Generate a Berksfile (default: true)
           --gitignore (-i) :: Generate a .gitignore (default: true)
+          --rakefile (-r) :: Generate a Rakefile (default: true)
           --metadata :: Generate cookbook metadata (default: true)
           --readme (-m) :: Generate a Readme (default: true)
           --kitchenfile :: Generate a Test Kitchen file (default: true)
@@ -37,6 +38,12 @@ module Bourdain
           return
         end
 
+        type = case path
+        when /apps/   then :app
+        when /realms/ then :realm
+        when /bases/  then :base
+        when /forks/  then :fork
+        end
         name = File.basename(normalized(path))
 
         FileUtils.mkdir_p path
@@ -69,7 +76,12 @@ module Bourdain
 
         if opts[:gitignore]
           apply_template File.join(path, '.gitignore'), \
-            template: %w[ cookbook gitignore ]
+            template: %w[ cookbook gitignore ], locals: { type: type }
+        end
+
+        if opts[:rakefile]
+          apply_template File.join(path, 'Rakefile'), \
+            template: %w[ cookbook Rakefile ]
         end
 
         if opts[:metadata]
@@ -83,10 +95,10 @@ module Bourdain
         end
 
         if opts[:kitchenfile]
-          minitest_path = File.join(path, 'test', 'integration', 'default', 'minitest')
+          minitest_path = File.join(path, 'files', 'default', 'test')
           FileUtils.mkdir_p minitest_path
-          apply_template File.join(minitest_path, 'test_default.rb'), \
-            template: %w[ cookbook busser_minitest.rb ], locals: {
+          apply_template File.join(minitest_path, 'default_test.rb'), \
+            template: %w[ cookbook minitest.rb ], locals: {
               cookbook_name: name, recipe_name: 'default'
             }
           apply_template File.join(path, '.kitchen.yml'), \

data/lib/bourdain/resources/generators/recipe.rb

@@ -37,7 +37,7 @@ module Bourdain
           }
 
         if opts[:minitest]
-          minitest_path = File.join('test', 'integration', 'default', 'minitest', "test_#{name}.rb")
+          minitest_path = File.join('files', 'default', 'test', "#{name}_test.rb")
           FileUtils.mkdir_p File.dirname(minitest_path)
           apply_template minitest_path, \
             template: %w[ cookbook busser_minitest.rb ], locals: {

data/templates/cookbook/Berksfile

@@ -1,3 +1,4 @@
 source 'https://api.berkshelf.com'
 metadata
-cookbook 'apt'
+cookbook 'apt'
+cookbook 'minitest-handler'

data/templates/cookbook/Rakefile

@@ -0,0 +1,164 @@
+require 'rubygems'
+require 'bundler'
+require 'rake'
+
+
+def master?
+  `git rev-parse --abbrev-ref HEAD`.strip == 'master'
+end
+
+
+def test_kitchen?
+  File.exist? '.kitchen.yml'
+end
+
+
+def realm?
+  `git ls-files` =~ /\bBerksfile\.lock\b/
+end
+
+
+def current_version
+  File.read('VERSION').strip
+end
+
+
+def youre_dirty?
+  dirty = `git diff HEAD --numstat`.split("\n").length > 0
+  raise unless $?.exitstatus.zero?
+  dirty
+end
+
+
+def youre_dirty!
+  if youre_dirty?
+    raise "You you have uncommitted changes! Commit or stash before continuing."
+  end
+end
+
+
+def youre_behind?
+  `git fetch >/dev/null 2>&1`
+  `git pull --tags >/dev/null 2>&1`
+  behind = `git log ..origin/master --oneline`.split("\n").length > 0
+  raise unless $?.exitstatus.zero?
+  return behind
+end
+
+
+def youre_behind!
+  if youre_behind?
+    raise "You're out of sync with the remote! Try 'git pull --rebase'"
+  end
+end
+
+
+def bump component
+  youre_dirty!
+  youre_behind!
+  `tony bump #{component}`
+  if realm?
+    `berks`
+    `git add Berksfile.lock`
+  end
+  version = current_version
+  `git add VERSION`
+  `git commit -m "Version bump to #{version}"`
+  `git tag -a v#{version} -m v#{version}`
+  raise 'Could not add tag' unless $?.exitstatus.zero?
+  puts 'Version is now "%s"' % version
+end
+
+
+def bump_and_release component
+  lint
+  bump component
+  youre_dirty!
+  youre_behind!
+  `git push`
+  raise 'Push failed' unless $?.exitstatus.zero?
+  `git push --tag`
+  raise 'Tag push failed' unless $?.exitstatus.zero?
+end
+
+
+def repo_root_dir
+  `git rev-parse --show-toplevel`.strip
+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
+
+  unless realm?
+    if Dir.exist? File.join(repo_root_dir, 'environments')
+      raise "Hey, I found environments, but this isn't realm!"
+    end
+
+    if Dir.exist? File.join(repo_root_dir, 'roles')
+      raise "Hey, I found roles, but this isn't realm!"
+    end
+
+    if Dir.exist? File.join(repo_root_dir, 'data_bags')
+      raise "Hey, I found data bags--this isn't realm!"
+    end
+  end
+end
+
+
+
+
+desc 'Perform syntax check and linting'
+task :lint do
+  lint
+end
+
+
+if test_kitchen?
+  desc 'Execute default Test Kitchen test suite'
+  task test: :lint do
+    system 'kitchen test'
+  end
+end
+
+
+desc 'Print the current version'
+task :version do
+  puts current_version
+end
+
+
+if master?
+  namespace :release do
+    desc 'Release new major version'
+    task :major do
+      bump_and_release :major
+    end
+
+    desc 'Release new minor version'
+    task :minor do
+      bump_and_release :minor
+    end
+
+    task :patch do
+      bump_and_release :patch
+    end
+  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
+      youre_dirty!
+      youre_behind!
+      `git tag -a #{args[:env]} -m #{args[:env]} --force`
+      `git push --tag --force`
+    end
+  end
+end

data/templates/cookbook/Vagrantfile

@@ -13,6 +13,7 @@ Vagrant.configure('2') do |config|
       chef.run_list = %w(
         recipe[apt]
         recipe[<%= name %>]
+        recipe[minitest-handler]
       )
     end
   end

data/templates/cookbook/attributes/example.rb

@@ -1,24 +1,25 @@
-<% if name == 'default' %>
-# User for <%= cookbook_name %> directories, files, and services
-default['<%= cookbook_name %>']['user'] = '<%= cookbook_name %>'
-
-# Directory to install the <%= cookbook_name %> source
-default['<%= cookbook_name %>']['home'] = '/opt/<%= cookbook_name %>'
-
-# Directory to store the <%= cookbook_name %> logs
-default['<%= cookbook_name %>']['logs'] = '/var/log/<%= cookbook_name %>'
-
-# Directory to store the <%= cookbook_name %> data
-default['<%= cookbook_name %>']['data'] = '/var/data/<%= cookbook_name %>'
-
-# Version of <%= cookbook_name %> to install
-default['<%= cookbook_name %>']['version'] = '1.0.0'
-
-# Full URL (%pattern-sensitive) for <%= cookbook_name %> releases
-default['<%= cookbook_name %>']['url'] = \
-  'http://example.com/<%= cookbook_name %>%{version}.tar.gz'
-
-# SHA-256 checksum for the bundled release
-default['<%= cookbook_name %>']['checksum'] = \
-  '...'
-<% end %>
+<%- if name == 'default' -%>
+<%- attribute_ns = cookbook_name.gsub(/^(bjn|app|base|fork|realm)_/, '') -%>
+# # User for <%= attribute_ns %> directories, files, and services
+# default['<%= attribute_ns %>']['user'] = '<%= attribute_ns %>'
+#
+# # Directory to install the <%= attribute_ns %> source
+# default['<%= attribute_ns %>']['home'] = '/opt/<%= attribute_ns %>'
+#
+# # Directory to store the <%= attribute_ns %> logs
+# default['<%= attribute_ns %>']['logs'] = '/var/log/<%= attribute_ns %>'
+#
+# # Directory to store the <%= attribute_ns %> data
+# default['<%= attribute_ns %>']['data'] = '/var/data/<%= attribute_ns %>'
+#
+# # Version of <%= attribute_ns %> to install
+# default['<%= attribute_ns %>']['version'] = '1.0.0'
+#
+# # Full URL (%pattern-sensitive) for <%= attribute_ns %> releases
+# default['<%= attribute_ns %>']['url'] = \
+#   'http://example.com/<%= attribute_ns %>%{version}.tar.gz'
+#
+# # SHA-256 checksum for the bundled release
+# default['<%= attribute_ns %>']['checksum'] = \
+#   '...'
+<%- end -%>

data/templates/cookbook/gitignore

@@ -1,5 +1,7 @@
 .vagrant
+<%- unless type == :realm -%>
 Berksfile.lock
+<%- end -%>
 *~
 *#
 .#*

data/templates/cookbook/{busser_minitest.rb → minitest.rb}

@@ -1,4 +1,4 @@
-require 'minitest/autorun'
+require 'minitest/spec'
 
 describe '<%= cookbook_name %>::<%= recipe_name %>' do
   it 'has done the thing' do

data/templates/cookbook/recipes/example.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bourdain
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.3
 platform: ruby
 authors:
 - Sean Clemmer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-14 00:00:00.000000000 Z
+date: 2015-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pmap
@@ -128,14 +128,15 @@ files:
 - templates/chef/knife_plugin_node_log.rb
 - templates/chef/role.json
 - templates/cookbook/Berksfile
+- templates/cookbook/Rakefile
 - templates/cookbook/Readme.md
 - templates/cookbook/VERSION
 - templates/cookbook/Vagrantfile
 - templates/cookbook/attributes/example.rb
-- templates/cookbook/busser_minitest.rb
 - templates/cookbook/gitignore
 - templates/cookbook/kitchen.yml
 - templates/cookbook/metadata.rb
+- templates/cookbook/minitest.rb
 - templates/cookbook/pre-commit
 - templates/cookbook/recipes/example.rb
 homepage: https://github.com/sczizzo/bourdain