caterer 0.6.6 → 0.7.0

data/Berksfile

@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
 
-site :opscode
+site :opscode

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

@@ -0,0 +1,26 @@
+module Caterer
+  module Action
+    module Berkshelf
+      class Clean < Base
+        
+        attr_reader :shelf
+
+        def initialize(app, env)
+          super
+          @shelf = Caterer::Berkshelf.shelf_for(env)
+        end
+
+        def call(env)
+
+          if env[:provisioner].is_a? Caterer::Provisioner::ChefSolo
+            ::Berkshelf.formatter.msg "cleaning Caterer's shelf"
+            FileUtils.remove_dir(shelf, fore: true)
+          end
+
+          @app.call(env)
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,50 @@
+module Caterer
+  module Action
+    module Berkshelf
+      class Install < Base
+        
+        attr_reader :shelf
+        attr_reader :berksfile
+
+        def initialize(app, env)
+          super
+
+          @shelf     = Caterer::Berkshelf.shelf_for(env)
+          @berksfile = ::Berkshelf::Berksfile.from_file(env[:config].berkshelf.berksfile_path)
+        end
+
+
+        def call(env)
+
+          if env[:provisioner].is_a? Caterer::Provisioner::ChefSolo
+            configure_cookbooks_path(env[:provisioner])
+            install(env)
+          end
+
+          @app.call(env)
+        end
+
+        protected
+
+        def install(env)
+          ::Berkshelf.formatter.msg "installing cookbooks..."
+          opts = {
+            path: shelf
+          }.merge(env[:config].berkshelf.to_hash).symbolize_keys!
+          berksfile.install(opts)
+        end
+
+        def configure_cookbooks_path(provisioner)
+
+          # if for some reason the cookbooks path is a string, convert it into an array
+          if not provisioner.cookbooks_path.is_a? Array
+            provisioner.cookbooks_path = Array(provisioner.cookbooks_path)
+          end
+
+          provisioner.cookbooks_path.unshift(shelf)
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,20 @@
+module Caterer
+  module Action
+    module Berkshelf
+      class UI < Base
+        
+        def call(env)
+          
+          ::Berkshelf.ui = begin
+            ui = env[:ui].dup
+            ui.resource = "Berkshelf"
+            ui
+          end
+
+          @app.call(env)
+        end
+
+      end
+    end
+  end
+end

data/lib/caterer/action/berkshelf.rb

@@ -0,0 +1,9 @@
+module Caterer
+  module Action
+    module Berkshelf
+      autoload :Clean,    'caterer/action/berkshelf/clean'
+      autoload :Install,  'caterer/action/berkshelf/install'
+      autoload :UI,       'caterer/action/berkshelf/ui'
+    end
+  end
+end

data/lib/caterer/action/provisioner/uninstall.rb

@@ -0,0 +1,14 @@
+module Caterer
+  module Action
+    module Provisioner
+      class Uninstall < Base
+
+        def call(env)
+          env[:provisioner].uninstall(env[:server])
+          @app.call(env)
+        end
+        
+      end
+    end
+  end
+end

data/lib/caterer/action/provisioner.rb

@@ -8,6 +8,7 @@ module Caterer
       autoload :Lock,       'caterer/action/provisioner/lock'
       autoload :Prepare,    'caterer/action/provisioner/prepare'
       autoload :Provision,  'caterer/action/provisioner/provision'
+      autoload :Uninstall,  'caterer/action/provisioner/uninstall'
       autoload :Unlock,     'caterer/action/provisioner/unlock'
       autoload :Validate,   'caterer/action/provisioner/validate'
     end

data/lib/caterer/action.rb

@@ -1,6 +1,7 @@
 module Caterer
   module Action
     autoload :Base,         'caterer/action/base'
+    autoload :Berkshelf,    'caterer/action/berkshelf'
     autoload :Config,       'caterer/action/config'
     autoload :Runner,       'caterer/action/runner'
     autoload :Provisioner,  'caterer/action/provisioner'

data/lib/caterer/actions.rb

@@ -68,4 +68,12 @@ Caterer.actions.register(:reboot) do
     use Caterer::Action::Server::Validate::SSH
     use Caterer::Action::Server::Reboot
   end
+end
+
+Caterer.actions.register(:clean) do
+  Vli::Action::Builder.new do
+    use Caterer.actions.get(:validate)
+    use Caterer::Action::Provisioner::Load
+    use Caterer::Action::Provisioner::Uninstall
+  end
 end

data/lib/caterer/berkshelf.rb

@@ -0,0 +1,43 @@
+require 'berkshelf' # this can take a bit of time :(
+
+module Caterer
+  module Berkshelf
+    
+    extend self
+
+    def shelf_for(env)
+      return nil if env[:uuid].nil?
+
+      File.join(::Berkshelf.berkshelf_path, "caterer", env[:uuid])
+    end
+
+    def install
+      Vli::Action::Builder.new do
+        use Action::Berkshelf::UI
+        use Action::Berkshelf::Install
+      end
+    end
+
+    def clean
+      Vli::Action::Builder.new do
+        use Action::Berkshelf::UI
+        use Action::Berkshelf::Clean
+      end
+    end
+
+    def init!
+      
+      Caterer.config_keys.register(:berkshelf) { Config::Berkshelf }
+
+      [ :provision, :up ].each do |action|
+        Caterer.actions[action].insert_after(Caterer::Action::Provisioner::Load, install)
+      end
+
+      Caterer.actions[:clean].use clean
+
+    end
+
+  end
+end
+
+Caterer::Berkshelf.init!

data/lib/caterer/command/clean.rb

@@ -0,0 +1,24 @@
+module Caterer
+  module Command
+    class Clean < Base
+      
+      def execute
+        options = {}
+        opts = OptionParser.new do |opts|
+          opts.banner = "Usage: cater provision HOST [options]"
+        end
+
+        # Parse the options
+        argv = parse_options(opts, options, true)
+        return if not argv
+
+        with_target_servers(argv, options) do |server|
+          server.clean
+        end
+
+        0
+      end
+
+    end
+  end
+end

data/lib/caterer/command.rb

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

data/lib/caterer/commands.rb

@@ -1,5 +1,6 @@
 # commands
 Caterer.commands.register(:bootstrap) { Caterer::Command::Bootstrap }
+Caterer.commands.register(:clean)     { Caterer::Command::Clean }
 Caterer.commands.register(:lock)      { Caterer::Command::Lock }
 Caterer.commands.register(:provision) { Caterer::Command::Provision }
 Caterer.commands.register(:reboot)    { Caterer::Command::Reboot }

data/lib/caterer/config/base.rb

@@ -6,19 +6,22 @@ module Caterer
       attr_accessor :default_provisioner
 
       def initialize
-        @images  = {}
-        @groups  = {}
+        @images = {}
+        @groups = {}
+        @keys   = {}
         @default_provisioner = :chef_solo
       end
 
       def image(name)
         @images[name] ||= Image.new(name)
         yield @images[name] if block_given?
+        @images[name]
       end
 
       def group(name)
         @groups[name] ||= Group.new(name)
         yield @groups[name] if block_given?
+        @groups[name]
       end
       
       def member(name, &block)
@@ -27,6 +30,19 @@ module Caterer
         end
       end
 
+      # here we allow custom config keys
+      def method_missing(method, *args, &block)
+        @keys[method] ||= begin
+          if klass = Caterer.config_keys.get(method)
+            klass.new
+          else
+            super
+          end
+        end
+        yield @keys[method] if block_given?
+        @keys[method]
+      end
+
     end
   end
 end

data/lib/caterer/config/berkshelf.rb

@@ -0,0 +1,40 @@
+module Caterer
+  module Config
+    class Berkshelf
+      
+      # @return [String]
+      #   path to the Berksfile to use with Vagrant
+      attr_reader :berksfile_path
+
+      # @return [Array<Symbol>]
+      #   only cookbooks in these groups will be installed and copied to
+      #   Vagrant's shelf
+      attr_accessor :only
+
+      # @return [Array<Symbol>]
+      #   cookbooks in all other groups except for these will be installed
+      #   and copied to Vagrant's shelf
+      attr_accessor :except
+
+      def initialize
+        @berksfile_path = File.join(Dir.pwd, ::Berkshelf::DEFAULT_FILENAME)
+        @except         = []
+        @only           = []
+      end
+
+      # @param [String] value
+      def berksfile_path=(value)
+        @berksfile_path = File.expand_path(value)
+      end
+
+      def to_hash
+        {
+          :berksfile_path => @berksfile_path,
+          :only => @only,
+          :except => @except
+        }
+      end
+
+    end
+  end
+end

data/lib/caterer/config/group.rb

@@ -18,6 +18,7 @@ module Caterer
       def member(name)
         @members[name] ||= Member.new(name)
         yield @members[name] if block_given?
+        @members[name]
       end
     end
   end

data/lib/caterer/config/image.rb

@@ -13,6 +13,7 @@ module Caterer
         raise ":#{type} is not a valida provisioner" if not provisioner_klass
         @provisioner = provisioner_klass.new
         yield @provisioner if block_given?
+        @provisioner
       end
 
     end

data/lib/caterer/config.rb

@@ -1,6 +1,7 @@
 module Caterer
   module Config
     autoload :Base,       'caterer/config/base'
+    autoload :Berkshelf,  'caterer/config/berkshelf'
     autoload :Cluster,    'caterer/config/cluster'
     autoload :Group,      'caterer/config/group'
     autoload :Member,     'caterer/config/member'

data/lib/caterer/environment.rb

@@ -33,11 +33,16 @@ module Caterer
       @action_runner ||= Vli::Action::Runner.new(action_registry) do
         {
           :action_runner  => action_runner,
-          :ui             => @ui
+          :ui             => @ui,
+          :uuid           => uuid
         }
       end
     end
 
+    def uuid
+      @uuid ||= Digest::MD5.hexdigest(@cwd.to_s)
+    end
+
     def action_registry
       Caterer.actions
     end

data/lib/caterer/provisioner/base.rb

@@ -12,7 +12,8 @@ module Caterer
       def install(server); end
       def prepare(server); end
       def provision(server); end
-
+      def uninstall(server); end
+        
     end
   end
 end

data/lib/caterer/provisioner/chef_solo.rb

@@ -202,6 +202,12 @@ module Caterer
         # for now, leave cookbooks, roles, and data bags for faster provisioning
       end
 
+      def uninstall(server)
+        server.ui.info "Uninstalling..."
+
+        server.ssh.sudo "rm -rf #{target_base_path}", :stream => true
+      end
+
       protected
 
       def with_bootstrap_scripts
@@ -258,6 +264,16 @@ module Caterer
         {:run_list => run_list}.merge(json)
       end
 
+      def final_cookbook_paths
+        cookbooks_path.inject([]) do |res, path|
+          # make sure they actually contain recipes, otherwise chef-solo will freak
+          if Dir.entries(path).length > 2
+            res << "#{target_cookbooks_path}/#{Digest::MD5.hexdigest(path)}"
+          end
+          res
+        end
+      end
+
       def command_string
         "chef-solo -c #{target_solo_path} -j #{target_json_config_path}"
       end

data/lib/caterer/server.rb

@@ -72,6 +72,11 @@ module Caterer
       run_action(:unlock, opts)
     end
 
+    def clean(opts={})
+      ui.info "*** Cleaning ***"
+      run_action(:clean, opts)
+    end
+
     def reboot!
       ui.info "Rebooting..."
       ssh.sudo "shutdown -r now", :stream => true

data/lib/caterer/version.rb

@@ -1,3 +1,3 @@
 module Caterer
-  VERSION = "0.6.6"
+  VERSION = "0.7.0"
 end

data/lib/caterer.rb

@@ -4,6 +4,7 @@ require 'caterer/logger'
 
 module Caterer
   autoload :Action,         'caterer/action'
+  autoload :Berkshelf,      'caterer/berkshelf'
   autoload :Cli,            'caterer/cli'
   autoload :Command,        'caterer/command'
   autoload :Communication,  'caterer/communication'
@@ -27,6 +28,10 @@ module Caterer
     @provisioners ||= Vli::Registry.new
   end
 
+  def config_keys
+    @config_keys  ||= Vli::Registry.new
+  end
+
   def config
     @config ||= Config::Base.new
   end

data/lib/templates/provisioner/chef_solo/solo.erb

@@ -1,5 +1,5 @@
 file_cache_path "<%= target_base_path %>"
 node_name "<%= server.host %>"
-cookbook_path <%= cookbooks_path.map { |path| "#{target_cookbooks_path}/#{Digest::MD5.hexdigest(path)}" }.inspect %>
+cookbook_path <%= final_cookbook_paths.inspect %>
 data_bag_path "<%= target_data_bags_path %>"
 role_path "<%= target_roles_path %>"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caterer
 version: !ruby/object:Gem::Version
-  version: 0.6.6
+  version: 0.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-28 00:00:00.000000000 Z
+date: 2013-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: log4r
@@ -182,6 +182,10 @@ files:
 - lib/caterer.rb
 - lib/caterer/action.rb
 - lib/caterer/action/base.rb
+- lib/caterer/action/berkshelf.rb
+- lib/caterer/action/berkshelf/clean.rb
+- lib/caterer/action/berkshelf/install.rb
+- lib/caterer/action/berkshelf/ui.rb
 - lib/caterer/action/config.rb
 - lib/caterer/action/config/validate.rb
 - lib/caterer/action/config/validate/image.rb
@@ -193,6 +197,7 @@ files:
 - lib/caterer/action/provisioner/load.rb
 - lib/caterer/action/provisioner/prepare.rb
 - lib/caterer/action/provisioner/provision.rb
+- lib/caterer/action/provisioner/uninstall.rb
 - lib/caterer/action/provisioner/validate.rb
 - lib/caterer/action/provisioner/validate/bootstrapped.rb
 - lib/caterer/action/provisioner/validate/engine.rb
@@ -204,10 +209,12 @@ files:
 - lib/caterer/action/server/validate/ssh.rb
 - lib/caterer/action/server/validate/unlocked.rb
 - lib/caterer/actions.rb
+- lib/caterer/berkshelf.rb
 - lib/caterer/cli.rb
 - lib/caterer/command.rb
 - lib/caterer/command/base.rb
 - lib/caterer/command/bootstrap.rb
+- lib/caterer/command/clean.rb
 - lib/caterer/command/lock.rb
 - lib/caterer/command/provision.rb
 - lib/caterer/command/reboot.rb
@@ -220,6 +227,7 @@ files:
 - lib/caterer/communication/ssh.rb
 - lib/caterer/config.rb
 - lib/caterer/config/base.rb
+- lib/caterer/config/berkshelf.rb
 - lib/caterer/config/group.rb
 - lib/caterer/config/image.rb
 - lib/caterer/config/member.rb