caterer 0.8.0 → 0.9.0

data/Gemfile

@@ -2,3 +2,7 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in caterer.gemspec
 gemspec
+
+gem 'vagrant'
+gem 'vagrant-vbguest'
+gem 'berkshelf'

data/Vagrantfile

@@ -5,7 +5,7 @@ require 'vagrant-vbguest' unless defined? VagrantVbguest::Config
 
 Vagrant::Config.run do |config|
 
-  config.berkshelf.config_path = './knife.rb'
+  # config.berkshelf.config_path = './knife.rb'
 
   config.vm.box = "precise64"
   config.vm.box_url = "http://files.vagrantup.com/precise64.box"

data/config/default.rb

@@ -1,3 +1,5 @@
 Caterer.configure do |config|
-  # nothing to see here... yet
+
+  config.provisioner.default_engine = :chef_solo
+
 end

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

@@ -20,7 +20,7 @@ module Caterer
         end
 
         def default_engine
-          Caterer.config.default_provisioner
+          Caterer.config.provisioner.default_engine
         end
 
       end     

data/lib/caterer/config.rb

@@ -1,12 +1,12 @@
 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'
-    autoload :Node,       'caterer/config/node'
-    autoload :Image,      'caterer/config/image'
-    autoload :Provision,  'caterer/config/provision'
+    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'
+    autoload :Node,         'caterer/config/node'
+    autoload :Image,        'caterer/config/image'
+    autoload :Provisioner,  'caterer/config/provisioner'
   end
 end

data/lib/caterer/config/base.rb

@@ -9,7 +9,6 @@ module Caterer
         @images = {}
         @groups = {}
         @keys   = {}
-        @default_provisioner = :chef_solo
       end
 
       def image(name)
@@ -45,4 +44,6 @@ module Caterer
 
     end
   end
-end
+end
+
+Caterer.config_keys.register(:provisioner) { Caterer::Config::Provisioner::Base }

data/lib/caterer/config/provisioner.rb

@@ -0,0 +1,8 @@
+module Caterer
+  module Config
+    module Provisioner
+      autoload :Base,     'caterer/config/provisioner/base'
+      autoload :ChefSolo, 'caterer/config/provisioner/chef_solo'
+    end
+  end
+end

data/lib/caterer/config/provisioner/base.rb

@@ -0,0 +1,18 @@
+module Caterer
+  module Config
+    module Provisioner
+      class Base
+        attr_accessor :default_engine
+
+        def initialize
+          @keys = {}
+        end
+
+        def chef_solo
+          @keys[:chef_solo] ||= Config::Provisioner::ChefSolo.new
+        end
+
+      end
+    end    
+  end
+end

data/lib/caterer/config/provisioner/chef_solo.rb

@@ -0,0 +1,19 @@
+module Caterer
+  module Config
+    module Provisioner
+      class ChefSolo
+        attr_accessor :dest_dir, :run_list, :json, :cookbooks_path, :roles_path, :data_bags_path, :bootstrap_scripts
+
+        def initialize
+          @dest_dir          = '/opt/cater_chef_solo'
+          @run_list          = []
+          @json              = {}
+          @cookbooks_path    = ['cookbooks', 'vendor/cookbooks']
+          @roles_path        = ['roles']
+          @data_bags_path    = ['data_bags']
+          @bootstrap_scripts = []
+        end
+      end
+    end
+  end
+end

data/lib/caterer/provisioner/chef_solo.rb

@@ -9,16 +9,17 @@ module Caterer
     class ChefSolo < Base
       
       attr_reader :run_list
-      attr_accessor :json, :cookbooks_path, :roles_path
+      attr_accessor :dest_dir, :json, :cookbooks_path, :roles_path
       attr_accessor :data_bags_path, :bootstrap_scripts
 
       def initialize
-        @run_list          = []
-        @json              = {}
-        @cookbooks_path    = ['cookbooks']
-        @roles_path        = ['roles']
-        @data_bags_path    = ['data_bags']
-        @bootstrap_scripts = []
+        @dest_dir          = config.dest_dir
+        @run_list          = config.run_list
+        @json              = config.json
+        @cookbooks_path    = config.cookbooks_path
+        @roles_path        = config.roles_path
+        @data_bags_path    = config.data_bags_path
+        @bootstrap_scripts = config.bootstrap_scripts
       end
 
       # config DSL
@@ -121,8 +122,8 @@ module Caterer
 
       def prepare(server)
         # create base dir
-        server.ssh.sudo "mkdir -p #{target_base_path}", :stream => true
-        server.ssh.sudo "chown -R #{server.username} #{target_base_path}", :stream => true
+        server.ssh.sudo "mkdir -p #{dest_dir}", :stream => true
+        server.ssh.sudo "chown -R #{server.username} #{dest_dir}", :stream => true
       end
 
       def install(server)
@@ -185,7 +186,7 @@ module Caterer
         server.ssh.upload(StringIO.new(json_config(config_data.merge(server.data))), target_json_config_path)
 
         # set permissions on everything
-        server.ssh.sudo "chown -R #{server.username} #{target_base_path}", :stream => true
+        server.ssh.sudo "chown -R #{server.username} #{dest_dir}", :stream => true
 
         # run
         server.ui.info "Running chef-solo..."
@@ -216,47 +217,47 @@ module Caterer
       def uninstall(server)
         server.ui.info "Uninstalling..."
 
-        server.ssh.sudo "rm -rf #{target_base_path}", :stream => true
+        server.ssh.sudo "rm -rf #{dest_dir}", :stream => true
       end
 
       protected
 
+      def config
+        @config ||= Caterer.config.provisioner.chef_solo
+      end
+
       def with_bootstrap_scripts
         bootstrap_scripts.each_with_index do |script, index|
           yield script, index if block_given?
         end
       end
 
-      def target_base_path
-        "/tmp/cater-chef-solo"
-      end
-
       def target_install_path
-        "#{target_base_path}/install"
+        "#{dest_dir}/install"
       end
 
       def target_bootstrap_path
-        "#{target_base_path}/bootstrap"
+        "#{dest_dir}/bootstrap"
       end
 
       def target_cookbooks_path
-        "#{target_base_path}/cookbooks"
+        "#{dest_dir}/cookbooks"
       end
 
       def target_roles_path
-        "#{target_base_path}/roles"
+        "#{dest_dir}/roles"
       end
 
       def target_data_bags_path
-        "#{target_base_path}/data_bags"
+        "#{dest_dir}/data_bags"
       end
 
       def target_solo_path
-        "#{target_base_path}/solo.rb"
+        "#{dest_dir}/solo.rb"
       end
 
       def target_json_config_path
-        "#{target_base_path}/config.json"
+        "#{dest_dir}/config.json"
       end
 
       def install_script

data/lib/caterer/version.rb

@@ -1,3 +1,3 @@
 module Caterer
-  VERSION = "0.8.0"
+  VERSION = "0.9.0"
 end

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

@@ -1,4 +1,4 @@
-file_cache_path "<%= target_base_path %>"
+file_cache_path "<%= dest_dir %>"
 node_name "<%= server.host %>"
 cookbook_path <%= final_cookbook_paths.inspect %>
 data_bag_path "<%= target_data_bags_path %>"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caterer
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-04 00:00:00.000000000 Z
+date: 2013-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: log4r
@@ -231,6 +231,9 @@ files:
 - lib/caterer/config/group.rb
 - lib/caterer/config/image.rb
 - lib/caterer/config/member.rb
+- lib/caterer/config/provisioner.rb
+- lib/caterer/config/provisioner/base.rb
+- lib/caterer/config/provisioner/chef_solo.rb
 - lib/caterer/environment.rb
 - lib/caterer/logger.rb
 - lib/caterer/provisioner.rb