jamie 0.1.0.alpha19 → 0.1.0.alpha20

data/lib/jamie/cli.rb

@@ -36,21 +36,21 @@ module Jamie
       @config = Jamie::Config.new(ENV['JAMIE_YAML'])
     end
 
-    desc "list (all ['REGEX']|[INSTANCE])", "List all instances"
+    desc "list [(all|<REGEX>)]", "List all instances"
     def list(*args)
-      result = parse_subcommand(args[0], args[1])
+      result = parse_subcommand(args.first)
       say Array(result).map{ |i| i.name }.join("\n")
     end
 
     [:create, :converge, :setup, :verify, :destroy].each do |action|
       desc(
-        "#{action} (all ['REGEX']|[INSTANCE])",
+        "#{action} [(all|<REGEX>)]",
         "#{action.capitalize} one or more instances"
       )
       define_method(action) { |*args| exec_action(action) }
     end
 
-    desc "test (all ['REGEX']|[INSTANCE]) [opts]", "Test one or more instances"
+    desc "test [all|<REGEX>)] [opts]", "Test one or more instances"
     long_desc <<-DESC
       Test one or more instances
 
@@ -68,10 +68,22 @@ module Jamie
       if ! %w{passing always never}.include?(options[:destroy])
         raise ArgumentError, "Destroy mode must be passing, always, or never."
       end
-      result = parse_subcommand(args[0], args[1])
+      result = parse_subcommand(args.first)
       Array(result).each { |instance| instance.test(destroy_mode.to_sym) }
     end
 
+    desc "login (['REGEX']|[INSTANCE])", "Log in to one instance"
+    def login(regexp)
+      results = get_filtered_instances(regexp)
+      if results.size > 1
+        die task, "Argument `#{regexp}' returned multiple results:\n" +
+          results.map{ |i| "  * #{i.name}" }.join("\n")
+      end
+      instance = results.pop
+
+      instance.login
+    end
+
     desc "version", "Print Jamie's version information"
     def version
       say "Jamie version #{Jamie::VERSION}"
@@ -108,20 +120,12 @@ module Jamie
 
     def exec_action(action)
       @task = action
-      result = parse_subcommand(args[0], args[1])
+      result = parse_subcommand(args.first)
       Array(result).each { |instance| instance.send(task) }
     end
 
-    def parse_subcommand(name_or_all, regexp)
-      if name_or_all.nil? || (name_or_all == "all" && regexp.nil?)
-        get_all_instances
-      elsif name_or_all == "all" && regexp
-        get_filtered_instances(regexp)
-      elsif name_or_all != "all" && regexp.nil?
-        get_instance(name_or_all)
-      else
-        die task, "Invalid invocation."
-      end
+    def parse_subcommand(arg = nil)
+      arg == "all" ? get_all_instances : get_filtered_instances(arg)
     end
 
     def get_all_instances

data/lib/jamie/version.rb

@@ -18,5 +18,5 @@
 
 module Jamie
 
-  VERSION = "0.1.0.alpha19"
+  VERSION = "0.1.0.alpha20"
 end

data/lib/jamie.rb

@@ -31,8 +31,8 @@ require 'net/ssh'
 require 'pathname'
 require 'socket'
 require 'stringio'
-require 'yaml'
 require 'vendor/hash_recursive_merge'
+require 'yaml'
 
 require 'jamie/version'
 
@@ -660,6 +660,20 @@ module Jamie
       destroy if destroy_mode == :always
     end
 
+    # Logs in to this instance by invoking a system command, provided by the
+    # instance's driver. This could be an SSH command, telnet, or serial
+    # console session.
+    #
+    # **Note** This method calls exec and will not return.
+    #
+    # @see Driver::Base#login_command
+    def login
+      command, *args = driver.login_command(load_state)
+
+      debug("Login command: #{command} #{args.join(' ')}")
+      Kernel.exec(command, *args)
+    end
+
     private
 
     def validate_options(opts)
@@ -1028,7 +1042,7 @@ module Jamie
 
       attr_writer :instance
 
-      def initialize(config)
+      def initialize(config = {})
         @config = config
         self.class.defaults.each do |attr, value|
           @config[attr] = value unless @config[attr]
@@ -1073,6 +1087,16 @@ module Jamie
       # @raise [ActionFailed] if the action could not be completed
       def destroy(state) ; end
 
+      # Returns the shell command array that will log into an instance.
+      #
+      # @param state [Hash] mutable instance and driver state
+      # @return [Array] an array of command line tokens to be used in a
+      #   fork/exec
+      # @raise [ActionFailed] if the action could not be completed
+      def login_command(state)
+        raise ActionFailed, "Remote login is not supported in this driver."
+      end
+
       protected
 
       attr_reader :config, :instance
@@ -1147,6 +1171,15 @@ module Jamie
         raise NotImplementedError, "#destroy must be implemented by subclass."
       end
 
+      def login_command(state)
+        args  = %W{ -o UserKnownHostsFile=/dev/null }
+        args += %W{ -o StrictHostKeyChecking=no }
+        args += %W{ -i #{config['ssh_key']}} if config['ssh_key']
+        args += %W{ #{config['username']}@#{state['hostname']}}
+
+        ["ssh", *args]
+      end
+
       protected
 
       def build_ssh_args(state)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jamie
 version: !ruby/object:Gem::Version
-  version: 0.1.0.alpha19
+  version: 0.1.0.alpha20
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-03 00:00:00.000000000 Z
+date: 2013-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor