jamie 0.1.0.beta2 → 0.1.0.beta3

data/lib/jamie.rb

@@ -58,11 +58,20 @@ module Jamie
     end
 
     def default_logger
-      env_log = ENV['JAMIE_LOG'] && ENV['JAMIE_LOG'].downcase.to_sym
-      env_log = Util.to_logger_level(env_log) unless env_log.nil?
-
       Logger.new(:stdout => STDOUT, :level => env_log)
     end
+
+    def default_file_logger
+      logfile = File.expand_path(File.join(".jamie", "logs", "jamie.log"))
+      Logger.new(:stdout => STDOUT, :logdev => logfile, :level => env_log)
+    end
+
+    private
+
+    def env_log
+      level = ENV['JAMIE_LOG'] && ENV['JAMIE_LOG'].downcase.to_sym
+      level = Util.to_logger_level(level) unless level.nil?
+    end
   end
 
   module Error ; end
@@ -256,7 +265,6 @@ module Jamie
         :logger   => new_instance_logger(index)
       }
 
-      FileUtils.mkdir_p(log_root)
       new_instance_supervised_or_not(actor_name, opts)
     end
 
@@ -389,11 +397,13 @@ module Jamie
 
     include ::Logger::Severity
 
+    attr_reader :logdev
+
     def initialize(options = {})
       color = options[:color] || :bright_white
 
       @loggers = []
-      @loggers << logdev_logger(options[:logdev]) if options[:logdev]
+      @loggers << @logdev = logdev_logger(options[:logdev]) if options[:logdev]
       @loggers << stdout_logger(options[:stdout], color) if options[:stdout]
       @loggers << stdout_logger(STDOUT, color) if @loggers.empty?
 
@@ -433,11 +443,12 @@ module Jamie
     end
 
     def logdev_logger(filepath_or_logdev)
-      LogdevLogger.new(logdev(filepath_or_logdev))
+      LogdevLogger.new(resolve_logdev(filepath_or_logdev))
     end
 
-    def logdev(filepath_or_logdev)
+    def resolve_logdev(filepath_or_logdev)
       if filepath_or_logdev.is_a? String
+        FileUtils.mkdir_p(File.dirname(filepath_or_logdev))
         file = File.open(File.expand_path(filepath_or_logdev), "ab")
         file.sync = true
         file
@@ -754,7 +765,7 @@ module Jamie
         verify
         destroy if destroy_mode == :passing
       end
-      info "Finished testing #{to_str} (#{elapsed.real} seconds)."
+      info "Finished testing #{to_str} #{Util.duration(elapsed.real)}."
       Actor.current
     ensure
       destroy if destroy_mode == :always
@@ -827,7 +838,7 @@ module Jamie
       banner "#{output_verb} #{to_str}"
       elapsed = action(verb) { |state| driver.public_send(verb, state) }
       info("Finished #{output_verb.downcase} #{to_str}" +
-           " (#{elapsed.real} seconds).")
+           " #{Util.duration(elapsed.real)}.")
       yield if block_given?
       Actor.current
     end
@@ -884,6 +895,11 @@ module Jamie
       ))
     end
 
+    def banner(*args)
+      Jamie.logger.logdev && Jamie.logger.logdev.banner(*args)
+      super
+    end
+
     # The simplest finite state machine pseudo-implementation needed to manage
     # an Instance.
     #
@@ -1106,6 +1122,12 @@ module Jamie
         obj
       end
     end
+
+    def self.duration(total)
+      minutes = (total / 60).to_i
+      seconds = (total - (minutes * 60))
+      "(%dm%.2fs)" % [ minutes, seconds ]
+    end
   end
 
   # Mixin that wraps a command shell out invocation, providing a #run_command
@@ -1132,7 +1154,7 @@ module Jamie
       info("#{subject} BEGIN (#{display_cmd(cmd)})")
       sh = Mixlib::ShellOut.new(cmd, :live_stream => logger, :timeout => 60000)
       sh.run_command
-      info("#{subject} END (#{sh.execution_time} seconds)")
+      info("#{subject} END #{Util.duration(sh.execution_time)}")
       sh.error!
     rescue Mixlib::ShellOut::ShellCommandFailed => ex
       raise ShellCommandFailed, ex.message
@@ -1164,10 +1186,10 @@ module Jamie
       str_const = Util.to_camel_case(plugin)
       klass = self.const_get(str_const)
       klass.new(config)
+    rescue UserError
+      raise
     rescue LoadError
       raise ClientError, "Could not require '#{plugin}' plugin from load path"
-    rescue NameError
-      raise ClientError, "No class 'Jamie::Driver::#{str_const}' could be found"
     rescue
       raise ClientError, "Failed to create a driver for '#{plugin}' plugin"
     end
@@ -1193,6 +1215,9 @@ module Jamie
         self.class.defaults.each do |attr, value|
           @config[attr] = value unless @config[attr]
         end
+        Array(self.class.validations).each do |tuple|
+          tuple.last.call(tuple.first, config[tuple.first])
+        end
       end
 
       # Provides hash-like access to configuration keys.
@@ -1277,6 +1302,23 @@ module Jamie
         defaults[attr] = value
       end
 
+      def self.validations
+        @validations
+      end
+
+      def self.required_config(attr, &block)
+        @validations = [] if @validations.nil?
+        if ! block_given?
+          klass = self
+          block = lambda do |attr, value|
+            if value.nil? || value.to_s.empty?
+              raise UserError, "#{klass}#config[:#{attr}] cannot be blank"
+            end
+          end
+        end
+        @validations << [ attr, block ]
+      end
+
       def self.no_parallel_for(*methods)
         Array(methods).each do |meth|
           if ! ACTION_METHODS.include?(meth)
@@ -1357,9 +1399,13 @@ module Jamie
       end
 
       def install_omnibus(ssh_args)
+        flag = config[:require_chef_omnibus]
+        version = flag.is_a?(String) ? "-s -- -v #{flag}" : ""
+
         ssh(ssh_args, <<-INSTALL.gsub(/^ {10}/, ''))
           if [ ! -d "/opt/chef" ] ; then
-            curl -sSL https://www.opscode.com/chef/install.sh | sudo bash
+            curl -sSL https://www.opscode.com/chef/install.sh \
+              | sudo bash #{version}
           fi
         INSTALL
       end
@@ -1608,7 +1654,7 @@ Celluloid.logger = Jamie.logger
 Jamie.crashes = []
 Celluloid.exception_handler do |exception|
   Jamie.logger.debug("An instance crashed because of #{exception.inspect}")
-  Jamie.crashes << exception
+  Jamie.mutex.synchronize { Jamie.crashes << exception }
 end
 
 Jamie.mutex = Mutex.new

data/lib/jamie/cli.rb

@@ -38,6 +38,7 @@ module Jamie
       $stdout.sync = true
       @config = Jamie::Config.new(ENV['JAMIE_YAML'])
       @config.supervised = false
+      Jamie.logger = Jamie.default_file_logger
     end
 
     desc "list [(all|<REGEX>)]", "List all instances"
@@ -98,7 +99,7 @@ module Jamie
           run_serial(results, destroy_mode)
         end
       end
-      banner "Jamie is finished. (#{elapsed.real} seconds)"
+      banner "Jamie is finished. #{Util.duration(elapsed.real)}"
     end
 
     desc "login (['REGEX']|[INSTANCE])", "Log in to one instance"
@@ -158,7 +159,7 @@ module Jamie
         results = parse_subcommand(args.first)
         options[:parallel] ? run_parallel(results) : run_serial(results)
       end
-      banner "Jamie is finished. (#{elapsed.real} seconds)"
+      banner "Jamie is finished. #{Util.duration(elapsed.real)}"
     end
 
     def run_serial(instances, *args)
@@ -458,7 +459,8 @@ module Jamie
         :license => license_comments)
       create_template("plugin/driver.rb",
         "lib/jamie/driver/#{plugin_name}.rb",
-        :klass_name => klass_name, :license => license_comments)
+        :klass_name => klass_name, :license => license_comments,
+        :author => author, :email => email)
     end
 
     def rendered_license

data/lib/jamie/rake_tasks.rb

@@ -33,6 +33,7 @@ module Jamie
     def initialize
       @config = Jamie::Config.new
       @config.supervised = false
+      Jamie.logger = Jamie.default_file_logger
       yield self if block_given?
       define
     end
@@ -45,7 +46,9 @@ module Jamie
       namespace "jamie" do
         config.instances.each do |instance|
           desc "Run #{instance.name} test instance"
-          task instance.name { instance.test(:always) }
+          task instance.name do
+            instance.test(:always)
+          end
         end
 
         desc "Run all test instances"

data/lib/jamie/thor_tasks.rb

@@ -36,6 +36,7 @@ module Jamie
       super
       @config = Jamie::Config.new
       @config.supervised = false
+      Jamie.logger = Jamie.default_file_logger
       yield self if block_given?
       define
     end

data/lib/jamie/version.rb

@@ -18,5 +18,5 @@
 
 module Jamie
 
-  VERSION = "0.1.0.beta2"
+  VERSION = "0.1.0.beta3"
 end

data/templates/plugin/driver.rb.erb

@@ -9,12 +9,14 @@ module Jamie
   module Driver
 
     # <%= klass_name %> driver for Jamie.
+    #
+    # @author <%= author %> <<%= email %>>
     class <%= klass_name %> < Jamie::Driver::SSHBase
 
-      def create(instance, state)
+      def create(state)
       end
 
-      def destroy(instance, state)
+      def destroy(state)
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jamie
 version: !ruby/object:Gem::Version
-  version: 0.1.0.beta2
+  version: 0.1.0.beta3
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-13 00:00:00.000000000 Z
+date: 2013-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid