caterer 0.10.0 → 0.11.0

data/lib/caterer/action/berkshelf/clean.rb

@@ -12,7 +12,7 @@ module Caterer
 
         def call(env)
 
-          if env[:provisioner].is_a? Caterer::Provisioner::ChefSolo
+          if env[:provisioner].is_a? Caterer::Provisioner::ChefSolo or env[:force_berks_clean]
             ::Berkshelf.formatter.msg "cleaning Caterer's shelf"
             FileUtils.remove_dir(shelf, fore: true)
           end

data/lib/caterer/action/berkshelf/install.rb

@@ -22,13 +22,14 @@ module Caterer
 
           if env[:provisioner].is_a? Caterer::Provisioner::ChefSolo
             configure_cookbooks_path(env[:provisioner])
-            if needs_update?
-              ::Berkshelf.formatter.msg "installing cookbooks..."
-              install(env)
-              update_cache
-            else
-              ::Berkshelf.formatter.msg "up-to-date"
-            end
+          end
+
+          if needs_update? or env[:force_berks_install]
+            ::Berkshelf.formatter.msg "installing cookbooks..."
+            install(env)
+            update_cache
+          else
+            ::Berkshelf.formatter.msg "up-to-date"
           end
 
           @app.call(env)
@@ -38,8 +39,9 @@ module Caterer
 
         def shelf_digest
           berks_content = ::File.read(berksfile.filepath) rescue nil
+          lock_content  = ::File.read("#{berksfile.filepath}.lock") rescue nil
           shelf_content = ::Dir.glob("#{shelf}/[^\.]*")
-          ::Digest::MD5.hexdigest("#{berks_content}/#{shelf_content}")
+          ::Digest::MD5.hexdigest("#{berks_content}/#{lock_content}/#{shelf_content}")
         end
 
         def needs_update?

data/lib/caterer/berkshelf.rb

@@ -27,6 +27,8 @@ module Caterer
 
     def init!
       
+      Caterer.commands.register(:berks) { Caterer::Command::Berks }
+
       Caterer.config_keys.register(:berkshelf) { Config::Berkshelf }
 
       [ :provision, :up ].each do |action|
@@ -35,6 +37,14 @@ module Caterer
 
       Caterer.actions[:clean].use clean
 
+      Caterer.actions.register(:berks_install) do
+        install
+      end
+
+      Caterer.actions.register(:berks_clean) do
+        clean
+      end
+
     end
 
   end

data/lib/caterer/command/berks.rb

@@ -0,0 +1,43 @@
+module Caterer
+  module Command
+    class Berks < Vli::Command::Base
+      
+      def execute
+        options = {}
+        opts = OptionParser.new do |opts|
+          opts.banner = "Usage: cater berks install|update|clean"
+        end
+
+        # Parse the options
+        argv = parse_options(opts)
+        if not argv.any?
+          safe_puts(opts.help)
+          return
+        end
+
+        case argv.first
+        when 'install'
+          run_action :berks_install
+        when 'update'
+          run_action :berks_install, {force_berks_install: true}
+        when 'clean'
+          run_action :berks_clean, {force_berks_clean: true}
+        else
+          safe_puts(opts.help)
+        end
+
+        0
+      end
+
+      def run_action(name, options=nil)
+        options = {
+          :ui => @env.ui,
+          :config => @env.config
+        }.merge(options || {})
+
+        @env.action_runner.run(name, options)
+      end
+
+    end
+  end
+end

data/lib/caterer/command.rb

@@ -2,6 +2,7 @@ module Caterer
   module Command
     autoload :Base,       'caterer/command/base'
     autoload :Clean,      'caterer/command/clean'
+    autoload :Berks,      'caterer/command/berks'
     autoload :Bootstrap,  'caterer/command/bootstrap'
     autoload :Lock,       'caterer/command/lock'
     autoload :Provision,  'caterer/command/provision'

data/lib/caterer/version.rb

@@ -1,3 +1,3 @@
 module Caterer
-  VERSION = "0.10.0"
+  VERSION = "0.11.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caterer
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
   prerelease: 
 platform: ruby
 authors:
@@ -214,6 +214,7 @@ files:
 - lib/caterer/cli.rb
 - lib/caterer/command.rb
 - lib/caterer/command/base.rb
+- lib/caterer/command/berks.rb
 - lib/caterer/command/bootstrap.rb
 - lib/caterer/command/clean.rb
 - lib/caterer/command/lock.rb
@@ -262,7 +263,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4253641693695072200
+      hash: -4401693944212608239
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -271,7 +272,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4253641693695072200
+      hash: -4401693944212608239
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23