bourdain 1.5.1 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f98d85d9d67886c3df6084ce7582b5049839917c
-  data.tar.gz: 6d7830d78f934c2a13a7df1faa67ca3d00bde200
+  metadata.gz: d375a119ab4d7c7e96ab1b84b8c5e3116931f641
+  data.tar.gz: 076696693e74e35c28a47ee8c2e7a5ba4f01ca24
 SHA512:
-  metadata.gz: b85e4ef8e55452f0fcac91bf086e972fc34caf635638edc6a6937571660c912a4f37cafe586906f2979a2927e219f888bc769643e169424364efa9311123816c
-  data.tar.gz: d50dc05554e8d0e5f58ce87524f1c6b1bcc187cd253e789228e7cf2c4c276067cc94ae9f606ca63743431d0e087b9dc59cf395523e7eccb057c86a83af8ca745
+  metadata.gz: a8840f296b116a7f81c4f667471c0765d2c5456aac303129791e4e290ba8cd6efbae5258cb9543dfe8af35af9a4beb1afbe965c18f9298a8f0f930089501d575
+  data.tar.gz: 974c011362614fc2355e89ee1dccfe4caa8d88e36dbe72aef2ed2cd159a9968ddcafea1c7a86dc98cab1cba3750d1ae835f196e509a3acdca6242976202b0373

data/VERSION

@@ -1 +1 @@
-1.5.1
+1.6.0

data/lib/bourdain/metadata.rb

@@ -17,4 +17,7 @@ module Bourdain
          \/___/  \/___/  \/___/  \/_/ \/__,_ /\/__/\/_/ \/_/\/_/\/_/
                                                              v%s
   EOART
+  CHEFDK_PATH = '/opt/chefdk'
+  REQUIRE_RUBY_VERSION = '2.1'
+  RECOMMEND_RUBY_VERSION = '2.3'
 end

data/lib/bourdain/resources.rb

@@ -47,6 +47,8 @@ module Bourdain
 
     def error! ; @status = 1 end
 
+    def fatal! ; @status = 2 ; exit @status end
+
     def require_versionfile!
       return true if File::exists?('VERSION')
       log.fatal "I don't see any VERSION file around here..."
@@ -61,9 +63,9 @@ module Bourdain
       false
     end
 
-    def require_chef!
+    def require_kitchen!
       return true if File::exists?('Howto.md')
-      log.fatal "I don't see any Chef stuff around here, is this the Chef repo?"
+      log.fatal "Hm, things don't look quite right, is this the root of the Kitchen?"
       @status = 1
       false
     end

data/lib/bourdain/resources/checks.rb

@@ -65,6 +65,6 @@ module Bourdain
   end
 end
 
-require_relative 'checks/chef'
+require_relative 'checks/kitchen'
 require_relative 'checks/bourdain'
 require_relative 'checks/cookbooks'

data/lib/bourdain/resources/checks/bourdain.rb

@@ -10,7 +10,7 @@ module Bourdain
 
       def initialize cookbook_config
         super []
-        return unless require_chef!
+        return unless require_kitchen!
         check_bourdain!
       end
 

data/lib/bourdain/resources/checks/cookbooks.rb

@@ -10,7 +10,7 @@ module Bourdain
 
       def initialize cookbook_config
         super []
-        return unless require_chef!
+        return unless require_kitchen!
         log.info 'Checking cookbooks, this may take a while...'
         check_gitlab_cookbooks! cookbook_config
         check_local_cookbooks! cookbook_config

data/lib/bourdain/resources/checks/kitchen.rb

@@ -0,0 +1,134 @@
+require 'fileutils'
+
+
+module Bourdain
+  module Checks
+    class KitchenCheck < Check
+      usage :check, <<-END
+        Check on the Kitchen
+        kitchen
+      END
+
+
+      def initialize cookbook_config
+        super []
+        return unless require_kitchen!
+        check_kitchen_repo!
+      end
+
+
+
+    private
+
+      def which cmd ; `which #{cmd}`.strip end
+
+      def shebang cmd
+        File.read(which(cmd)).lines.first.strip
+      rescue
+        log.fatal 'Could not calculate shebang for "%s"' % cmd
+        nil
+      end
+
+      def shebangs cmds ; Hash[cmds.map { |c| [ c, shebang(c) ] }] end
+
+      def check_kitchen_repo!
+        if Gem::Version.new(RUBY_VERSION) < Gem::Version.new(REQUIRE_RUBY_VERSION)
+          log.fatal <<-END.gsub(/^ +/,'').strip
+            Whoa! Looks like you got an old version of Ruby!
+
+            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
+          fatal!
+        end
+
+        unless File.exist? CHEFDK_PATH
+          log.fatal <<-END.gsub(/^ +/,'').strip
+            Whoa! Looks like you don't have ChefDK installed!
+
+            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
+          fatal!
+        end
+
+        if ENV['PATH'] =~ /chefdk/
+          log.fatal <<-END.gsub(/^ +/,'').strip
+            Whoa! Looks like you got ChefDK on your PATH!
+
+            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
+          fatal!
+        end
+
+        { # 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
+            log.error <<-END.gsub(/^ +/,'')
+              Head's up: I seem some conflicting shebang lines.
+
+              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|
+              log.error '  %s: %s' % [
+                cmd, shebang ? shebang.inspect : 'missing?'
+              ]
+            end
+            log.error <<-END.gsub(/^ +/,'').rstrip
+
+              Depending on your Ruby install method, this may not actually be an
+              issue at all, but it could aid in debugging.
+            END
+            error!
+          end
+        end
+
+        if youre_dirty? '.'
+          log.warn  "Your Kitchen is dirty."
+        elsif youre_ahead? '.'
+          log.warn  "Your Kitchen is ahead of the remote."
+        elsif youre_behind? '.'
+          log.error  "Looks like your Kitchen is behind the remote."
+          error!
+        else
+          log.info  "Your Kitchen looks up-to-date."
+        end
+
+        log.info 'Updating your Bundle...'
+        system 'bundle update'
+      end
+
+    end
+  end
+end

data/lib/bourdain/resources/commands/check.rb

@@ -48,7 +48,7 @@ module Bourdain
           Trollop::die 'Invalid <check> provided' if check.nil?
         end
 
-        return unless require_chef!
+        return unless require_kitchen!
 
         if check.nil?
           @status = Bourdain::Registry.map('check') do |c|

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

@@ -31,7 +31,7 @@ module Bourdain
         Trollop::die 'No <path> provided' if path.nil?
         Trollop::die 'Invalid <path> provided' unless valid? path
 
-        return unless require_chef!
+        return unless require_kitchen!
 
         if Dir::exists? path
           log.warn "Cookbook already exists. Doing nothing."

data/templates/chef/environment.json

@@ -1,8 +1,10 @@
 {
   "name": "<%= name %>",
   "description": "<%= description %>",
-  "default_attributes": {},
-  "override_attributes": {},
+  "default_attributes": {
+  },
+  "override_attributes": {
+  },
   "chef_type": "environment",
   "json_class": "Chef::Environment"
-}
+}

data/templates/chef/role.json

@@ -1,9 +1,13 @@
 {
   "name": "<%= name %>",
   "description": "<%= description %>",
-  "default_attributes": {},
-  "override_attributes": {},
-  "run_list": [ "recipe[<%= name %>]" ],
+  "default_attributes": {
+  },
+  "override_attributes": {
+  },
+  "run_list": [
+    "recipe[<%= name %>]"
+  ],
   "json_class": "Chef::Role",
   "chef_type": "role"
-}
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bourdain
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.6.0
 platform: ruby
 authors:
 - Sean Clemmer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-02 00:00:00.000000000 Z
+date: 2016-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pmap
@@ -112,8 +112,8 @@ files:
 - lib/bourdain/resources.rb
 - lib/bourdain/resources/checks.rb
 - lib/bourdain/resources/checks/bourdain.rb
-- lib/bourdain/resources/checks/chef.rb
 - lib/bourdain/resources/checks/cookbooks.rb
+- lib/bourdain/resources/checks/kitchen.rb
 - lib/bourdain/resources/commands.rb
 - lib/bourdain/resources/commands/bump.rb
 - lib/bourdain/resources/commands/check.rb
@@ -157,7 +157,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Tools for badass chefs

data/lib/bourdain/resources/checks/chef.rb

@@ -1,43 +0,0 @@
-require 'fileutils'
-
-
-module Bourdain
-  module Checks
-
-    class ChefCheck < Check
-      usage :check, <<-END
-        Check the underlying Kitchen
-        chef
-      END
-
-
-      def initialize cookbook_config
-        super []
-        return unless require_chef!
-        check_chef_repo!
-      end
-
-
-
-    private
-
-      def check_chef_repo!
-        # Check if we have an up-to-date copy of the Kitchen
-        if youre_dirty? '.'
-          log.warn  "Your Kitchen is dirty."
-        elsif youre_ahead? '.'
-          log.warn  "Your Kitchen is ahead of the remote."
-        elsif youre_behind? '.'
-          log.error  "Looks like your Kitchen is behind the remote."
-          error!
-        else
-          log.info  "Your Kitchen looks up-to-date."
-        end
-
-        log.info 'Updating your Bundle...'
-        system 'bundle update'
-      end
-
-    end
-  end
-end