jamie 0.1.0.alpha15 → 0.1.0.alpha16

data/Rakefile

@@ -19,4 +19,9 @@ end
 
 Tailor::RakeTask.new
 
+desc "yep"
+task :stats do
+  sh "countloc -r lib/jamie lib/jamie.rb"
+end
+
 task :default => [ :cane, :tailor ]

data/jamie.gemspec

@@ -26,4 +26,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'maruku'
   gem.add_development_dependency 'cane'
   gem.add_development_dependency 'tailor'
+  gem.add_development_dependency 'countloc'
 end

data/lib/jamie/cli.rb

@@ -251,38 +251,6 @@ module Jamie
 
       specs = fetcher.find_matching(dep, false, false, false)
     end
-
-    # A rather insane and questionable class to quickly consume a metadata.rb
-    # file and return the cookbook name and version attributes.
-    #
-    # @see https://twitter.com/fnichol/status/281650077901144064
-    # @see https://gist.github.com/4343327
-    class MetadataChopper < Hash
-
-      # Return an Array containing the cookbook name and version attributes,
-      # or nil values if they could not be parsed.
-      #
-      # @param metadata_file [String] path to a metadata.rb file
-      # @return [Array<String>] array containing the cookbook name and version
-      #   attributes or nil values if they could not be determined
-      def self.extract(metadata_file)
-        mc = new(File.expand_path(metadata_file))
-        [ mc[:name], mc[:version] ]
-      end
-
-      # Creates a new instances and loads in the contents of the metdata.rb
-      # file. If you value your life, you may want to avoid reading the
-      # implementation.
-      #
-      # @param metadata_file [String] path to a metadata.rb file
-      def initialize(metadata_file)
-        eval(IO.read(metadata_file), nil, metadata_file)
-      end
-
-      def method_missing(meth, *args, &block)
-        self[meth] = args.first
-      end
-    end
   end
 
   # A generator to create a new Jamie driver plugin.

data/lib/jamie/version.rb

@@ -2,5 +2,5 @@
 
 module Jamie
 
-  VERSION = "0.1.0.alpha15"
+  VERSION = "0.1.0.alpha16"
 end

data/lib/jamie.rb

@@ -365,7 +365,7 @@ module Jamie
     #   to gracfully stop action chaining
     def create
       puts "-----> Creating instance #{name}"
-      platform.driver.create(self)
+      action(:create) { |state| platform.driver.create(self, state) }
       puts "       Creation of instance #{name} complete."
       self
     end
@@ -379,7 +379,7 @@ module Jamie
     #   to gracfully stop action chaining
     def converge
       puts "-----> Converging instance #{name}"
-      platform.driver.converge(self)
+      action(:converge) { |state| platform.driver.converge(self, state) }
       puts "       Convergence of instance #{name} complete."
       self
     end
@@ -393,7 +393,7 @@ module Jamie
     #   to gracfully stop action chaining
     def setup
       puts "-----> Setting up instance #{name}"
-      platform.driver.setup(self)
+      action(:setup) { |state| platform.driver.setup(self, state) }
       puts "       Setup of instance #{name} complete."
       self
     end
@@ -407,7 +407,7 @@ module Jamie
     #   to gracfully stop action chaining
     def verify
       puts "-----> Verifying instance #{name}"
-      platform.driver.verify(self)
+      action(:verify) { |state| platform.driver.verify(self, state) }
       puts "       Verification of instance #{name} complete."
       self
     end
@@ -421,7 +421,8 @@ module Jamie
     #   to gracfully stop action chaining
     def destroy
       puts "-----> Destroying instance #{name}"
-      platform.driver.destroy(self)
+      action(:destroy) { |state| platform.driver.destroy(self, state) }
+      destroy_state
       puts "       Destruction of instance #{name} complete."
       self
     end
@@ -450,6 +451,37 @@ module Jamie
       puts "       Testing of instance #{name} complete."
       self
     end
+
+    private
+
+    def action(what)
+      state = load_state
+      yield state if block_given?
+      state['last_action'] = what.to_s
+    ensure
+      dump_state(state)
+    end
+
+    def load_state
+      File.exists?(statefile) ?  YAML.load_file(statefile) : Hash.new
+    end
+
+    def dump_state(state)
+      dir = File.dirname(statefile)
+
+      FileUtils.mkdir_p(dir) if !File.directory?(dir)
+      File.open(statefile, "wb") { |f| f.write(YAML.dump(state)) }
+    end
+
+    def destroy_state
+      FileUtils.rm(statefile) if File.exists?(statefile)
+    end
+
+    def statefile
+      File.expand_path(File.join(
+        platform.driver['jamie_root'], ".jamie", "#{name}.yml"
+      ))
+    end
   end
 
   # Command string generator to interface with Jamie Runner (jr). The
@@ -686,85 +718,42 @@ module Jamie
       # Creates an instance.
       #
       # @param instance [Instance] an instance
+      # @param state [Hash] mutable instance and driver state
       # @raise [ActionFailed] if the action could not be completed
-      def create(instance)
-        action(:create, instance)
-      end
+      def create(instance, state) ; end
 
       # Converges a running instance.
       #
       # @param instance [Instance] an instance
+      # @param state [Hash] mutable instance and driver state
       # @raise [ActionFailed] if the action could not be completed
-      def converge(instance)
-        action(:converge, instance)
-      end
+      def converge(instance, state) ; end
 
       # Sets up an instance.
       #
       # @param instance [Instance] an instance
+      # @param state [Hash] mutable instance and driver state
       # @raise [ActionFailed] if the action could not be completed
-      def setup(instance)
-        action(:setup, instance)
-      end
+      def setup(instance, state) ; end
 
       # Verifies a converged instance.
       #
       # @param instance [Instance] an instance
+      # @param state [Hash] mutable instance and driver state
       # @raise [ActionFailed] if the action could not be completed
-      def verify(instance)
-        action(:verify, instance)
-      end
+      def verify(instance, state) ; end
 
       # Destroys an instance.
       #
       # @param instance [Instance] an instance
+      # @param state [Hash] mutable instance and driver state
       # @raise [ActionFailed] if the action could not be completed
-      def destroy(instance)
-        action(:destroy, instance)
-        destroy_state(instance)
-      end
+      def destroy(instance, state) ; end
 
       protected
 
       attr_reader :config
 
-      def action(what, instance)
-        state = load_state(instance)
-        public_send("perform_#{what}", instance, state)
-        state['last_action'] = what.to_s
-      ensure
-        dump_state(instance, state)
-      end
-
-      def load_state(instance)
-        statefile = state_filepath(instance)
-
-        if File.exists?(statefile)
-          YAML.load_file(statefile)
-        else
-          { 'name' => instance.name }
-        end
-      end
-
-      def dump_state(instance, state)
-        statefile = state_filepath(instance)
-        dir = File.dirname(statefile)
-
-        FileUtils.mkdir_p(dir) if !File.directory?(dir)
-        File.open(statefile, "wb") { |f| f.write(YAML.dump(state)) }
-      end
-
-      def destroy_state(instance)
-        statefile = state_filepath(instance)
-        FileUtils.rm(statefile) if File.exists?(statefile)
-      end
-
-      def state_filepath(instance)
-        File.expand_path(File.join(
-          config['jamie_root'], ".jamie", "#{instance.name}.yml"
-        ))
-      end
-
       def run_command(cmd, use_sudo = nil, log_subject = nil)
         use_sudo = config['use_sudo'] if use_sudo.nil?
         log_subject = Util.to_snake_case(self.class.to_s)
@@ -783,11 +772,15 @@ module Jamie
 
     # Base class for a driver that uses SSH to communication with an instance.
     # A subclass must implement the following methods:
-    # * #perform_create(instance, state)
-    # * #perform_destroy(instance, state)
+    # * #create(instance, state)
+    # * #destroy(instance, state)
     class SSHBase < Base
 
-      def perform_converge(instance, state)
+      def create(instance, state)
+        raise NotImplementedError, "#create must be implemented by subclass."
+      end
+
+      def converge(instance, state)
         ssh_args = generate_ssh_args(state)
 
         install_omnibus(ssh_args) if config['require_chef_omnibus']
@@ -796,7 +789,7 @@ module Jamie
         run_chef_solo(ssh_args)
       end
 
-      def perform_setup(instance, state)
+      def setup(instance, state)
         ssh_args = generate_ssh_args(state)
 
         if instance.jr.setup_cmd
@@ -804,7 +797,7 @@ module Jamie
         end
       end
 
-      def perform_verify(instance, state)
+      def verify(instance, state)
         ssh_args = generate_ssh_args(state)
 
         if instance.jr.run_cmd
@@ -813,6 +806,10 @@ module Jamie
         end
       end
 
+      def destroy(instance, state)
+        raise NotImplementedError, "#destroy must be implemented by subclass."
+      end
+
       protected
 
       def generate_ssh_args(state)
@@ -988,16 +985,21 @@ module Jamie
     end
 
     def local_cookbooks
+      tmpdir = Dir.mktmpdir("#{instance.name}-cookbooks")
+      prepare_tmpdir(tmpdir)
+      tmpdir
+    end
+
+    def prepare_tmpdir(tmpdir)
       if File.exists?(File.join(jamie_root, "Berksfile"))
-        tmpdir = Dir.mktmpdir(instance.name)
         run_berks(tmpdir)
-        tmpdir
       elsif File.exists?(File.join(jamie_root, "Cheffile"))
-        tmpdir = Dir.mktmpdir(instance.name)
         run_librarian(tmpdir)
-        tmpdir
+      elsif File.directory?(File.join(jamie_root, "cookbooks"))
+        cp_cookbooks(tmpdir)
       else
-        abort "Berksfile or Cheffile must exist in #{jamie_root}"
+        FileUtils.rmtree(tmpdir)
+        abort "Berksfile, Cheffile or cookbooks/ must exist in #{jamie_root}"
       end
     end
 
@@ -1018,6 +1020,50 @@ module Jamie
       end
       run_command "librarian-chef install --path #{tmpdir}"
     end
+
+    def cp_cookbooks(tmpdir)
+      metadata_rb = File.join(jamie_root, "metadata.rb")
+      cb_name = MetadataChopper.extract(metadata_rb).first
+      abort ">>>>>> name attribute must be set in metadata.rb." if cb_name.nil?
+      cb_path = File.join(tmpdir, cb_name)
+      glob = Dir.glob("#{jamie_root}/{metadata.rb,README.*," +
+        "attributes,files,libraries,providers,recipes,resources,templates}")
+
+      FileUtils.cp_r(File.join(jamie_root, "cookbooks", "."), tmpdir)
+      FileUtils.mkdir_p(cb_path)
+      FileUtils.cp_r(glob, cb_path)
+    end
   end
 
+  # A rather insane and questionable class to quickly consume a metadata.rb
+  # file and return the cookbook name and version attributes.
+  #
+  # @see https://twitter.com/fnichol/status/281650077901144064
+  # @see https://gist.github.com/4343327
+  class MetadataChopper < Hash
+
+    # Return an Array containing the cookbook name and version attributes,
+    # or nil values if they could not be parsed.
+    #
+    # @param metadata_file [String] path to a metadata.rb file
+    # @return [Array<String>] array containing the cookbook name and version
+    #   attributes or nil values if they could not be determined
+    def self.extract(metadata_file)
+      mc = new(File.expand_path(metadata_file))
+      [ mc[:name], mc[:version] ]
+    end
+
+    # Creates a new instances and loads in the contents of the metdata.rb
+    # file. If you value your life, you may want to avoid reading the
+    # implementation.
+    #
+    # @param metadata_file [String] path to a metadata.rb file
+    def initialize(metadata_file)
+      eval(IO.read(metadata_file), nil, metadata_file)
+    end
+
+    def method_missing(meth, *args, &block)
+      self[meth] = args.first
+    end
+  end
 end

data/templates/plugin/driver.rb.erb

@@ -11,10 +11,10 @@ module Jamie
     # <%= klass_name %> driver for Jamie.
     class <%= klass_name %> < Jamie::Driver::SSHBase
 
-      def perform_create(instance, state)
+      def create(instance, state)
       end
 
-      def perform_destroy(instance, state)
+      def destroy(instance, state)
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jamie
 version: !ruby/object:Gem::Version
-  version: 0.1.0.alpha15
+  version: 0.1.0.alpha16
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-24 00:00:00.000000000 Z
+date: 2012-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -139,6 +139,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: countloc
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A Chef convergence integration test harness
 email:
 - fnichol@nichol.ca
@@ -183,7 +199,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2338100729257258503
+      hash: -1684640608008309798
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: