caterer 0.9.6 → 0.10.0

data/.gitignore

@@ -2,7 +2,7 @@
 *.rbc
 .bundle
 .config
-.vagrant
+.vagrant*
 .yardoc
 Gemfile.lock
 InstalledFiles

data/Vagrantfile

@@ -1,22 +1,17 @@
 #!/usr/bin/env ruby
 
-# require 'berkshelf/vagrant'
-require 'vagrant-vbguest' unless defined? VagrantVbguest::Config
+Vagrant.configure("2") do |config|
 
-Vagrant::Config.run do |config|
+  # ubuntu
+  config.vm.box     = 'precise'
+  config.vm.box_url = 'http://files.vagrantup.com/precise64.box'
 
-  # config.berkshelf.config_path = './knife.rb'
+  config.vm.provider "virtualbox" do |v|
+    v.customize ["modifyvm", :id, "--cpus", "2", "--memory", "1024", "--cpuexecutioncap", "75"]
+  end
 
-  config.vm.box = "precise64"
-  config.vm.box_url = "http://files.vagrantup.com/precise64.box"
-  config.vm.customize ["modifyvm", :id, "--cpus", 1, "--memory", 512]
-  config.vm.network :hostonly, "33.33.33.10"
-  config.vm.share_folder("v-root", "/vagrant", ".")
-  config.vbguest.auto_update = true
+  config.vm.network :private_network, ip: "33.33.33.10"
 
-  config.vm.provision :chef_solo do |chef|
-    chef.cookbooks_path = ['cookbooks']    
-    chef.add_recipe 'users'
-  end
+  config.ssh.forward_agent = true
 
 end

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

@@ -1,3 +1,5 @@
+require 'digest'
+
 module Caterer
   module Action
     module Berkshelf
@@ -5,12 +7,14 @@ module Caterer
         
         attr_reader :shelf
         attr_reader :berksfile
+        attr_reader :cachefile
 
         def initialize(app, env)
           super
 
           @shelf     = Caterer::Berkshelf.shelf_for(env)
           @berksfile = ::Berkshelf::Berksfile.from_file(env[:config].berkshelf.berksfile_path)
+          @cachefile = "#{shelf}/.cache"
         end
 
 
@@ -18,7 +22,13 @@ module Caterer
 
           if env[:provisioner].is_a? Caterer::Provisioner::ChefSolo
             configure_cookbooks_path(env[:provisioner])
-            install(env)
+            if needs_update?
+              ::Berkshelf.formatter.msg "installing cookbooks..."
+              install(env)
+              update_cache
+            else
+              ::Berkshelf.formatter.msg "up-to-date"
+            end
           end
 
           @app.call(env)
@@ -26,12 +36,22 @@ module Caterer
 
         protected
 
+        def shelf_digest
+          berks_content = ::File.read(berksfile.filepath) rescue nil
+          shelf_content = ::Dir.glob("#{shelf}/[^\.]*")
+          ::Digest::MD5.hexdigest("#{berks_content}/#{shelf_content}")
+        end
+
+        def needs_update?
+          !(::File.exists?(cachefile) and ::File.read(cachefile) == shelf_digest)
+        end
+
+        def update_cache
+          ::File.write(cachefile, shelf_digest)
+        end
+
         def install(env)
-          ::Berkshelf.formatter.msg "installing cookbooks..."
-          opts = {
-            path: shelf
-          }.merge(env[:config].berkshelf.to_hash).symbolize_keys!
-          berksfile.install(opts)
+          berksfile.install({path: shelf}.merge(env[:config].berkshelf.to_hash).symbolize_keys!)
         end
 
         def configure_cookbooks_path(provisioner)

data/lib/caterer/action/environment/setup.rb

@@ -0,0 +1,13 @@
+module Caterer
+  module Action
+    module Environment
+      class Setup < Base
+        
+        def call(env)
+          @app.call(env)
+        end
+
+      end
+    end
+  end
+end

data/lib/caterer/action/environment.rb

@@ -0,0 +1,7 @@
+module Caterer
+  module Action
+    module Environment
+      autoload :Setup, 'caterer/action/environment/setup'
+    end
+  end
+end

data/lib/caterer/action.rb

@@ -3,6 +3,7 @@ module Caterer
     autoload :Base,         'caterer/action/base'
     autoload :Berkshelf,    'caterer/action/berkshelf'
     autoload :Config,       'caterer/action/config'
+    autoload :Environment,  'caterer/action/environment'
     autoload :Runner,       'caterer/action/runner'
     autoload :Provisioner,  'caterer/action/provisioner'
     autoload :Server,       'caterer/action/server'

data/lib/caterer/actions.rb

@@ -11,6 +11,7 @@ end
 
 Caterer.actions.register(:lock) do
   Vli::Action::Builder.new do
+    use Caterer::Action::Environment::Setup
     use Caterer::Action::Server::Validate::SSH
     use Caterer::Action::Server::Lock
   end
@@ -18,6 +19,7 @@ end
 
 Caterer.actions.register(:unlock) do
   Vli::Action::Builder.new do
+    use Caterer::Action::Environment::Setup
     use Caterer::Action::Server::Validate::SSH
     use Caterer::Action::Server::Unlock
   end
@@ -25,6 +27,7 @@ end
 
 Caterer.actions.register(:bootstrap) do
   Vli::Action::Builder.new do
+    use Caterer::Action::Environment::Setup
     use Caterer.actions.get(:validate)
     use Caterer::Action::Provisioner::Load
     use Caterer::Action::Provisioner::Prepare
@@ -38,6 +41,7 @@ end
 
 Caterer.actions.register(:provision) do
   Vli::Action::Builder.new do
+    use Caterer::Action::Environment::Setup
     use Caterer.actions.get(:validate)
     use Caterer::Action::Provisioner::Load
     use Caterer::Action::Provisioner::Prepare
@@ -51,6 +55,7 @@ end
 
 Caterer.actions.register(:up) do
   Vli::Action::Builder.new do
+    use Caterer::Action::Environment::Setup
     use Caterer.actions.get(:validate)
     use Caterer::Action::Provisioner::Load
     use Caterer::Action::Provisioner::Prepare
@@ -65,6 +70,7 @@ end
 
 Caterer.actions.register(:reboot) do
   Vli::Action::Builder.new do
+    use Caterer::Action::Environment::Setup
     use Caterer::Action::Server::Validate::SSH
     use Caterer::Action::Server::Reboot
   end
@@ -72,6 +78,7 @@ end
 
 Caterer.actions.register(:clean) do
   Vli::Action::Builder.new do
+    use Caterer::Action::Environment::Setup
     use Caterer.actions.get(:validate)
     use Caterer::Action::Provisioner::Load
     use Caterer::Action::Provisioner::Uninstall

data/lib/caterer/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caterer
 version: !ruby/object:Gem::Version
-  version: 0.9.6
+  version: 0.10.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-17 00:00:00.000000000 Z
+date: 2013-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: log4r
@@ -175,7 +175,6 @@ files:
 - bin/cater
 - caterer.gemspec
 - config/default.rb
-- cookbooks/users/recipes/default.rb
 - example/Caterfile
 - example/bootstrap.sh
 - knife.rb
@@ -190,6 +189,8 @@ files:
 - lib/caterer/action/config/validate.rb
 - lib/caterer/action/config/validate/image.rb
 - lib/caterer/action/config/validate/provisioner.rb
+- lib/caterer/action/environment.rb
+- lib/caterer/action/environment/setup.rb
 - lib/caterer/action/provisioner.rb
 - lib/caterer/action/provisioner/bootstrap.rb
 - lib/caterer/action/provisioner/cleanup.rb
@@ -261,7 +262,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4326016804323478888
+      hash: -4253641693695072200
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -270,7 +271,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4326016804323478888
+      hash: -4253641693695072200
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23

data/cookbooks/users/recipes/default.rb

@@ -1,18 +0,0 @@
-
-package "build-essential" do
-  action :nothing
-end.run_action(:install)
-
-package 'whois'
-chef_gem 'ruby-shadow'
-
-[['bert', 'password'], ['ernie', 'password'], ['tylerflint', 'password']].each do |u, pass|
-  user u do
-    supports :manage_home => true
-    home "/home/#{u}"
-    gid "admin"
-    shell "/bin/bash"
-    password `echo #{pass} | mkpasswd -s -m sha-512`.chomp
-  end
-end
-