pupcap 0.3.0 → 0.3.1

data/bin/pupcap

@@ -2,9 +2,6 @@
 
 $:.unshift File.expand_path('../../lib', __FILE__)
 
-#require 'pathname'
-#$:.unshift Pathname.new(File.expand_path(__FILE__)).realpath.join("../../lib")
-
 require 'pupcap/cli'
 
-Pupcap::CLI.start
+Pupcap::CLI.revert_argv_and_start

data/lib/pupcap/action/apply/Capfile

@@ -61,7 +61,7 @@ namespace :apply do
 
   task :cleanup do
     run <<-EOF.compact
-      #{sudo} rm -rf #{deploy_to}/releases ;
+      #{sudo} rm -rf #{deploy_to}/releases/* ;
       #{sudo} rm -rf /etc/puppet/hieradata/*
     EOF
   end

data/lib/pupcap/action/init/prepare.sh.erb

@@ -52,7 +52,7 @@ apt-get -qy update > /dev/null
 apt-get install -qy rsync wget rubygems vim git-core build-essential > /dev/null
 apt-get -qy clean
 
-/usr/bin/gem install -q --no-ri --no-rdoc --version '~> 2.7.1' puppet
+/usr/bin/gem install -q --no-ri --no-rdoc --version '~> 3.0.0' puppet
 /usr/bin/gem install -q --no-ri --no-rdoc librarian-puppet
 
 /usr/sbin/groupadd -f puppet

data/lib/pupcap/cli.rb

@@ -19,7 +19,7 @@ class Pupcap::CLI < Thor
     end
   end
 
-  desc "prepare [TASKS]", "Prepare target host"
+  desc "[TASKS] prepare", "Prepare target host"
   method_option :file, :type => :string, :default => File.expand_path("Capfile"),
                 :desc => "Capfile"
   method_option :script, :type => :string, :default => File.expand_path("prepare.sh.erb"),
@@ -40,14 +40,14 @@ class Pupcap::CLI < Thor
     cap_execute_tasks(capfile("prepare"), tasks << "prepare")
   end
 
-  desc "apply [TASKS]", "Puppet apply"
+  desc "[TASKS] apply", "Puppet apply"
   method_option :file, :type => :string, :default => File.expand_path("Capfile"),
                 :desc => "Capfile"
   def apply(*tasks)
     cap_execute_tasks(capfile("apply"), tasks << "apply")
   end
 
-  desc "noop [TASKS]", "Puppet noop"
+  desc "[TASKS] noop", "Puppet noop"
   method_option :file, :type => :string, :default => File.expand_path("Capfile"),
                 :desc => "Capfile"
   def noop(*tasks)
@@ -55,7 +55,7 @@ class Pupcap::CLI < Thor
     apply(*tasks)
   end
 
-  desc "ssh [TASKS]", "Open remote console"
+  desc "[TASKS] ssh", "Open remote console"
   method_option :file, :type => :string, :default => File.expand_path("Capfile"),
                 :desc => "Capfile"
   def ssh(*tasks)
@@ -66,6 +66,24 @@ class Pupcap::CLI < Thor
     File.dirname(__FILE__)
   end
 
+  def self.revert_argv_and_start(argv = ARGV)
+    need_to_revert = %w{ noop apply init prepare ssh }
+    if need_to_revert.include?(argv.last) || argv.size > 1
+      last = argv.pop
+      argv = [last] + argv
+    end
+    begin
+      start(argv)
+    rescue Exception => e
+      if ENV['THOR_DEBUG'] == '1'
+        raise e
+      else
+        $stderr.puts e.message
+        exit 1
+      end
+    end
+  end
+
   private
     def capfile(name)
       self.class.source_root + "/action/#{name}/Capfile"

data/lib/pupcap/version.rb

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

data/pupcap.gemspec

@@ -20,6 +20,5 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency("capistrano", [">= 2.12.0"])
   s.add_runtime_dependency("vagrant", [">= 1.0.0"])
   s.add_runtime_dependency("librarian-puppet", [">= 0.9.7"])
-  s.add_runtime_dependency("net-ssh-multi", [">= 1.1.0"])
   s.add_runtime_dependency("thor", [">= 0"])
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pupcap
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -59,22 +59,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.9.7
-- !ruby/object:Gem::Dependency
-  name: net-ssh-multi
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.1.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement