pupcap 0.0.2 → 0.0.3

data/lib/pupcap/action/cook.rb

@@ -17,7 +17,7 @@ class Pupcap::Action::Cook < Pupcap::Action::Base
     unless @parsed_options
       options = default_options.dup
       OptionParser.new do |opts|
-        opts.banner = "Usage: #{File.basename($0)} [options] <role> cook"
+        opts.banner = "Usage: #{File.basename($0)} cook [options] <role>"
 
         opts.on("-f", "--file FILE", "A recipe file to load") do |file|
           options[:file] = File.expand_path(file)

data/lib/pupcap/action/prepare.rb

@@ -22,7 +22,7 @@ class Pupcap::Action::Prepare < Pupcap::Action::Base
     unless @parsed_options
       options = default_options.dup
       OptionParser.new do |opts|
-        opts.banner = "Usage: #{File.basename($0)} [options] <role> prepare"
+        opts.banner = "Usage: #{File.basename($0)} prepare [options] <role>"
 
         opts.on("-h", "--help", "Displays this help info") do
           puts opts

data/lib/pupcap/action/ssh.rb

@@ -17,7 +17,7 @@ class Pupcap::Action::Ssh < Pupcap::Action::Base
     unless @parsed_options
       options = default_options.dup
       OptionParser.new do |opts|
-        opts.banner = "Usage: #{File.basename($0)} [options] <role> ssh"
+        opts.banner = "Usage: #{File.basename($0)} [options] ssh <role>"
 
         opts.on("-f", "--file FILE", "A recipe file to load") do |file|
           options[:file] = File.expand_path(file)

data/lib/pupcap/action/ssh/Capfile

@@ -1,9 +1,11 @@
 namespace :ssh do
   task :default do
     server = find_servers_for_task(current_task).first
-    host = Pupcap::Command.server_host(self, server)
-    port = Pupcap::Command.server_port(self, server)
-    exec "ssh #{host} -t -p #{port} -i #{ssh_options[:keys]} '${SHELL} -l'"
+    if server
+      host = Pupcap::Command.server_host(self, server)
+      port = Pupcap::Command.server_port(self, server)
+      exec "ssh #{host} -t -p #{port} -i #{ssh_options[:keys]} '${SHELL} -l'"
+    end
   end
 end
 

data/lib/pupcap/cli.rb

@@ -4,13 +4,12 @@ require 'pupcap'
 class Pupcap::CLI
   class << self
     def start
-      action = ARGV.last
+      action = ARGV.shift
       if !action || !valid_actions.include?(action)
         $stderr.puts "Please specify a action to run: #{valid_actions.join("|")}"
         exit 1
       end
 
-      ARGV.pop
       require "pupcap/action/#{action}"
       klass = Pupcap::Action.const_get(action.capitalize)
       inst = klass.new

data/lib/pupcap/version.rb

@@ -5,7 +5,7 @@ module Pupcap
 
     MAJOR = 0
     MINOR = 0
-    PATCH = 2
+    PATCH = 3
 
     def self.to_s
       "#{MAJOR}.#{MINOR}.#{PATCH}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pupcap
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors: