pupcap 0.3.1 → 0.3.2

data/lib/pupcap/cli.rb

@@ -68,7 +68,7 @@ class Pupcap::CLI < Thor
 
   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
+    if need_to_revert.include?(argv.last) && argv.size > 1
       last = argv.pop
       argv = [last] + argv
     end

data/lib/pupcap/version.rb

@@ -5,7 +5,7 @@ module Pupcap
 
     MAJOR = 0
     MINOR = 3
-    PATCH = 1
+    PATCH = 2
 
     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.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-22 00:00:00.000000000 Z
+date: 2012-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -89,9 +89,7 @@ files:
 - Rakefile
 - bin/pupcap
 - lib/pupcap.rb
-- lib/pupcap/action/apply.rb
 - lib/pupcap/action/apply/Capfile
-- lib/pupcap/action/init.rb
 - lib/pupcap/action/init/Capfile.tt
 - lib/pupcap/action/init/Vagrantfile.tt
 - lib/pupcap/action/init/hiera.yaml
@@ -101,9 +99,7 @@ files:
 - lib/pupcap/action/init/modules/.empty_directory
 - lib/pupcap/action/init/prepare.sh.erb
 - lib/pupcap/action/init/site-modules/.empty_directory
-- lib/pupcap/action/prepare.rb
 - lib/pupcap/action/prepare/Capfile
-- lib/pupcap/action/ssh.rb
 - lib/pupcap/action/ssh/Capfile
 - lib/pupcap/capistrano.rb
 - lib/pupcap/cli.rb

data/lib/pupcap/action/apply.rb

@@ -1,13 +0,0 @@
-require 'pupcap/action'
-require 'pupcap/command'
-
-class Pupcap::Action::Apply < Pupcap::Action::Base
-  def initialize
-    check_puppetfile!
-  end
-
-  def start
-    cap = create_cap_for(parsed_options[:file])
-    cap_load_and_run_task(cap, "apply")
-  end
-end

data/lib/pupcap/action/init.rb

@@ -1,37 +0,0 @@
-require 'thor'
-require 'thor/actions'
-require 'thor/group'
-
-require 'pupcap/action'
-
-class Pupcap::Action::Init < Thor::Group
-
-  include Thor::Actions
-
-  argument :dir, :type => :string, :desc => "The directory"
-  desc "Initializes in the DIR"
-  class_option :ip, :type => :string, :default => "192.168.44.10"
-
-  def create_pupcap_directories
-    directory("action/init", dir)
-  end
-
-  def initialize_librarian_puppet
-    inside(dir) do
-      run("librarian-puppet init")
-    end
-  end
-
-  def inject_into_giignore
-    inside(dir) do
-      append_to_file(".gitignore", ".vagrant\n", :verbose => false)
-      append_to_file(".gitignore", "*.swp\n", :verbose => false)
-    end
-  end
-
-  private
-    def ip
-      options["ip"]
-    end
-
-end

data/lib/pupcap/action/prepare.rb

@@ -1,40 +0,0 @@
-require 'thor'
-require 'thor/actions'
-require 'thor/group'
-
-require 'pupcap/action'
-
-class Pupcap::Action::Prepare < Thor::Group
-
-  include Thor::Actions
-
-  desc "Prepare host"
-  class_option :pupcapfile, :type => :string, :default => -> { File.expand_path("Capfile") }, :aliases => "-f"
-
-  def create_pupcap_directories
-    directory("init", dir)
-  end
-
-  def initialize_librarian_puppet
-    inside(dir) do
-      run("librarian-puppet init")
-    end
-  end
-
-  def inject_into_giignore
-    inside(dir) do
-      append_to_file(".gitignore", ".vagrant\n", :verbose => false)
-      append_to_file(".gitignore", "*.swp\n", :verbose => false)
-    end
-  end
-
-  def self.source_root
-    File.dirname(__FILE__)
-  end
-
-  private
-    def ip
-      options["ip"]
-    end
-
-end

data/lib/pupcap/action/ssh.rb

@@ -1,13 +0,0 @@
-require 'pupcap/action'
-require 'pupcap/command'
-
-class Pupcap::Action::Ssh < Pupcap::Action::Base
-  def initialize
-    check_puppetfile!
-  end
-
-  def start
-    cap = create_cap_for(parsed_options[:file])
-    cap_load_and_run_task(cap, "ssh")
-  end
-end