pupcap 0.2.3 → 0.3.0

data/Gemfile

@@ -8,5 +8,5 @@ gemspec
 # are merged here.
 #
 group :development do
-  gem 'rake', '0.8.7'
+  gem 'rake'
 end

data/README

@@ -1 +1,5 @@
-Integrate puppet and capistrano
+Masterless puppet with capistrano
+=================================
+
+Under development
+

data/bin/pupcap

@@ -1,6 +1,9 @@
 #!/usr/bin/env ruby
 
-$:.unshift File.expand_path("../../lib", __FILE__)
+$:.unshift File.expand_path('../../lib', __FILE__)
+
+#require 'pathname'
+#$:.unshift Pathname.new(File.expand_path(__FILE__)).realpath.join("../../lib")
 
 require 'pupcap/cli'
 

data/lib/pupcap/action/apply.rb

@@ -10,46 +10,4 @@ class Pupcap::Action::Apply < Pupcap::Action::Base
     cap = create_cap_for(parsed_options[:file])
     cap_load_and_run_task(cap, "apply")
   end
-
-  def parsed_options
-    unless @parsed_options
-      options = default_options.dup
-      OptionParser.new do |opts|
-        opts.banner = "Usage: #{File.basename($0)} apply [options] <tasks>"
-
-        opts.on("-f", "--file FILE", "A recipe file to load") do |file|
-          options[:file] = File.expand_path(file)
-        end
-
-        opts.on("-h", "--help", "Displays this help info") do
-          puts opts
-          exit 0
-        end
-
-        opts.on("-d", "--debug", "Debug output") do
-          options[:debug] = true
-        end
-
-        opts.on("-n", "--noop", "Noop") do |file|
-          options[:noop] = true
-        end
-
-        opts.on("-w", "--without-librarian-puppet", "Deploy without librarian-puppet") do
-          options[:without_librarian_puppet] = true
-        end
-      end.parse!
-      options[:tasks] = ARGV
-      @parsed_options = options
-    end
-    @parsed_options
-  end
-
-  def default_options
-    {
-      :file    => File.expand_path("Pupcapfile"),
-      :debug   => false,
-      :noop    => false,
-      :without_librarian_puppet => false
-    }
-  end
 end

data/lib/pupcap/action/apply/Capfile

@@ -1,47 +1,68 @@
-require 'erb'
+_cset(:pupcap_apply_cmd)         { "/usr/local/bin/puppet apply" }
+_cset(:pupcap_librarian_cache)   { "#{shared_path}/cache" }
+_cset(:pupcap_librarian_install) { "/usr/local/bin/librarian-puppet install" }
+_cset(:pupcap_path)              { "#{latest_release}" }
+_cset(:pupcap_hiera_config)      { "#{pupcap_path}/hiera.yaml" }
+_cset(:environment, 'production')
 
 namespace :deploy do
   task :finalize_update do
-    if !pupcap_options[:without_librarian_puppet]
-      debug = pupcap_options[:debug] ? " --verbose" : ""
-      run("ln -sf #{shared_path}/librarian-puppet-cache #{release_path}/puppet/.tmp")
-      run("cd #{release_path}/puppet ; /usr/local/bin/librarian-puppet install #{debug} --destructive; true")
-    end
-  end
-
-  task :restart do
   end
 end
 
 namespace :apply do
   task :default do
     try_create_dirs
-    find_and_execute_task("deploy")
-    find_and_execute_task("deploy:cleanup")
-    puppet
+    find_and_execute_task("deploy:update_code")
+    find_and_execute_task("deploy:create_symlink")
+    prepare
+    apply
+    cleanup
   end
 
   task :try_create_dirs do
-    run("mkdir -p #{deploy_to}/releases ; mkdir -p #{deploy_to}/shared/librarian-puppet-cache ; chmod 0700 #{deploy_to}")
+    run <<-EOF.compact
+      mkdir -p #{deploy_to}/releases ;
+      mkdir -p #{pupcap_librarian_cache} ;
+      chmod 0700 #{deploy_to} ;
+      mkdir -p #{shared_path}/confdir ;
+    EOF
   end
 
-  task :puppet do
-    remote_command = "#{deploy_to}/apply.sh"
+  task :prepare do
+    run <<-EOF.compact
+      test -d /etc/puppet || (#{sudo} mkdir -p /etc/puppet && #{sudo} chown root:puppet /ect/puppet) ;
+      test -f #{pupcap_hiera_config} && #{sudo} ln -nsf #{pupcap_hiera_config} /etc/puppet/hiera.yaml ;
+      #{sudo} rsync -as --delete #{pupcap_path}/hieradata/ /etc/puppet/hieradata/ ;
 
-    puppet = "/usr/local/bin/puppet"
-    modules = "--modulepath=#{current_path}/puppet/modules:#{current_path}/puppet/site-modules"
-    nook = pupcap_options[:noop] ? " --noop" : ""
-    debug = pupcap_options[:debug] ? " --debug --verbose" : ""
+      ln -sf #{pupcap_librarian_cache} #{pupcap_path}/.tmp ;
+      cd #{pupcap_path} && #{pupcap_librarian_install} #{ENV['DEBUG'] && '--verbose'} --destructive ;
+      true
+    EOF
+  end
 
-    erb = ERB.new(File.read("#{pupcap_root}/action/apply/puppet.sh.erb"))
-    rs = erb.result(binding)
+  task :apply do
+    modules    = "--modulepath=#{pupcap_path}/modules:#{pupcap_path}/site-modules"
+    env        = "--environment=#{environment}"
+    noop       = ENV['NOOP'] ? " --noop" : ""
+    debug      = ENV['DEBUG'] ? " --debug --verbose" : ""
+    config     = "--confdir=/etc/puppet/"
 
-    put(rs, remote_command)
-    run("chmod +x #{remote_command}")
-    sudo("#{remote_command} \"$CAPISTRANO:HOSTROLES$\"")
+    cmd =<<-EOF.gsub(/\n/, ' ').gsub(/ +/, ' ')
+    for role in $(echo $CAPISTRANO:HOSTROLES$ | tr "," "\n") ;
+    do
+      echo "*** For: ${role}:#{environment} ***" &&
+      #{sudo} #{pupcap_apply_cmd} #{noop}#{debug} #{config} #{env} #{modules} #{pupcap_path}/manifests/${role}.pp ||
+      true ;
+    done
+    EOF
+    run(cmd)
   end
 
   task :cleanup do
-    run("rm -rf #{deploy_to}")
+    run <<-EOF.compact
+      #{sudo} rm -rf #{deploy_to}/releases ;
+      #{sudo} rm -rf /etc/puppet/hieradata/*
+    EOF
   end
 end

data/lib/pupcap/action/init.rb

@@ -1,131 +1,37 @@
+require 'thor'
+require 'thor/actions'
+require 'thor/group'
+
 require 'pupcap/action'
-require 'pupcap/command'
-require 'fileutils'
-require 'erb'
 
-class Pupcap::Action::Init < Pupcap::Action::Base
-  def initialize
-  end
+class Pupcap::Action::Init < Thor::Group
 
-  def start
-    create_directories
-    create_vagrantfile
-    create_capfile
-    create_pp
-    librarian_puppet
-    create_gitignore
-    create_prepare_script
-  end
+  include Thor::Actions
 
-  def create_prepare_script
-    out = "#{work_dir}/prepare.sh.erb"
-    if !File.exists?(out) || force?
-      FileUtils.copy("#{lib_root}/init/prepare.sh.erb", "#{work_dir}/prepare.sh.erb")
-      puts "create prepare.sh.erb"
-    else
-      puts "skip prepare.sh.erb"
-    end
-  end
+  argument :dir, :type => :string, :desc => "The directory"
+  desc "Initializes in the DIR"
+  class_option :ip, :type => :string, :default => "192.168.44.10"
 
-  def create_vagrantfile
-    out = "#{work_dir}/Vagrantfile"
-    if !File.exists?(out) || force?
-      erb = ERB.new(File.read("#{lib_root}/init/Vagrantfile.erb"))
-      rs = erb.result(binding)
-      File.open(out, "w+"){ |io| io.write rs }
-      puts "create Vagrantfile"
-    else
-      puts "skip #{out}"
-    end
+  def create_pupcap_directories
+    directory("action/init", dir)
   end
 
-  def create_capfile
-    out = "#{work_dir}/Pupcapfile"
-    if !File.exists?(out) || force?
-      erb = ERB.new(File.read("#{lib_root}/init/Pupcapfile.erb"))
-      rs = erb.result(binding)
-      File.open(out, "w+"){ |io| io.write rs }
-      puts "create Capfile"
-    else
-      puts "skip #{out}"
+  def initialize_librarian_puppet
+    inside(dir) do
+      run("librarian-puppet init")
     end
   end
 
-  def create_pp
-    out = "#{work_dir}/puppet/manifests/site.pp"
-    if !File.exists?(out) || force?
-      erb = ERB.new(File.read("#{lib_root}/init/site.pp.erb"))
-      rs = erb.result(binding)
-      File.open(out, "w+"){ |io| io.write rs }
-      puts "create puppet/manifests/site.pp"
-    else
-      puts "skip #{out}"
+  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 create_directories
-    FileUtils.mkdir_p("#{work_dir}/puppet/modules")
-    FileUtils.mkdir_p("#{work_dir}/puppet/site-modules")
-    FileUtils.mkdir_p("#{work_dir}/puppet/manifests")
-    system("touch #{work_dir}/puppet/manifests/.gitkeep")
-    system("touch #{work_dir}/puppet/site-modules/.gitkeep")
-  end
-
-  def librarian_puppet
-    Pupcap::Command.run_local("(cd #{work_dir}/puppet && librarian-puppet init)")
-  end
-
-  def create_gitignore
-    if !File.exists?("#{work_dir}.gitignore")
-      FileUtils.copy("#{lib_root}/init/gitignore", "#{work_dir}/.gitignore")
-      puts "create .gitignore"
-    else
-      puts "skip .gitignore"
+  private
+    def ip
+      options["ip"]
     end
-  end
 
-  def work_dir
-    parsed_options[:directory]
-  end
-
-  def ip
-    parsed_options[:ip]
-  end
-
-  def force?
-    parsed_options[:force]
-  end
-
-  def parsed_options
-    unless @parsed_options
-      options = default_options.dup
-      OptionParser.new do |opts|
-        opts.banner = "Usage: #{File.basename($0)} init [options] <directory>"
-        opts.on("-h", "--help", "Displays this help info") do
-          puts opts
-          exit 0
-        end
-        opts.on("-i", "--ip IP", "Address for vagrant host, default 192.168.44.10") do |ip|
-          options[:ip] = ip
-        end
-        opts.on("-f", "--force", "Always create a Vagrantfile and Puppetfile") do
-          options[:force] = true
-        end
-      end.parse!
-      options[:directory] = ARGV[0]
-      unless options[:directory]
-        $stderr.puts "You must specify a directory"
-        exit 1
-      end
-      @parsed_options = options
-    end
-    @parsed_options
-  end
-
-  def default_options
-    {
-      :ip => "192.168.44.10",
-      :force => false
-    }
-  end
 end

data/lib/pupcap/action/init/Capfile.tt

@@ -0,0 +1,8 @@
+task :production do
+  role :site, 'example.com'
+end
+
+task :vagrant do
+  set  :environment, "development"
+  role :site, "vagrant@<%= options[:ip] %>"
+end

data/lib/pupcap/action/init/{Vagrantfile.erb → Vagrantfile.tt}

@@ -20,7 +20,7 @@ Vagrant::Config.run do |config|
   # via the IP. Host-only networks can talk to the host machine as well as
   # any other machines on the same network, but cannot be accessed (through this
   # network interface) by any external networks.
-  config.vm.network :hostonly, "<%= ip %>"
+  config.vm.network :hostonly, "<%= options[:ip] %>"
 
   # Assign this VM to a bridged network, allowing you to connect directly to a
   # network using the host's network device. This makes the VM appear as another

data/lib/pupcap/action/init/hiera.yaml

@@ -0,0 +1,8 @@
+---
+:hierarchy:
+  - %{environment}
+  - common
+:backends:
+  - yaml
+:yaml:
+  :datadir: '/etc/puppet/hieradata'

data/lib/pupcap/action/init/hieradata/common.yaml

@@ -0,0 +1,2 @@
+---
+example::key: "I am example key"

data/lib/pupcap/action/init/hieradata/development.yaml

@@ -0,0 +1,2 @@
+---
+example::key: "I am example development key"

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

@@ -15,15 +15,6 @@ then
   locale-gen en_US.UTF-8 && update-locale LANG=en_US.UTF-8
 fi
 
-#
-# set hostname
-#
-if test -n "${PUPCAP_HOSTNAME}"
-then
-  echo ${PUPCAP_HOSTNAME} > /etc/hostname
-  cat /etc/hosts | grep ${PUPCAP_HOSTNAME} || echo "127.0.0.1  ${PUPCAP_HOSTNAME}" >> /etc/hosts && /usr/sbin/service hostname start
-fi
-
 #
 # update sources.list
 #

data/lib/pupcap/action/prepare.rb

@@ -1,62 +1,40 @@
+require 'thor'
+require 'thor/actions'
+require 'thor/group'
+
 require 'pupcap/action'
-require 'pupcap/command'
-require 'pupcap/lsb_release'
 
-class Pupcap::Action::Prepare < Pupcap::Action::Base
-  def initialize
-    check_puppetfile!
-    check_prepare_script!
-  end
+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 start
-    cap = create_cap_for(parsed_options[:file])
-    #lsb = Pupcap::LsbRelease.new(cap)
-    cap_load_and_run_task(cap, "prepare")
+  def create_pupcap_directories
+    directory("init", dir)
   end
 
-  def check_prepare_script!
-    unless File.exists?(parsed_options[:script])
-      $stderr.puts "File #{parsed_options[:script]} does not exists"
-      exit 1
+  def initialize_librarian_puppet
+    inside(dir) do
+      run("librarian-puppet init")
     end
   end
 
-  def parsed_options
-    unless @parsed_options
-      options = default_options.dup
-      OptionParser.new do |opts|
-        opts.banner = "Usage: #{File.basename($0)} prepare [options] <tasks>"
-
-        opts.on("-h", "--help", "Displays this help info") do
-          puts opts
-          exit 0
-        end
-
-        opts.on("-F", "--force", "Force prepare") do
-          options[:force] = true
-        end
-
-        opts.on("-f", "--file FILE", "A recipe file to load") do |file|
-          options[:file] = File.expand_path(file)
-        end
-
-        opts.on("-n", "--hostname NAME", "Set hostname") do |name|
-          options[:hostname] = name
-        end
-      end.parse!
-      options[:tasks] = ARGV
-      @parsed_options = options
+  def inject_into_giignore
+    inside(dir) do
+      append_to_file(".gitignore", ".vagrant\n", :verbose => false)
+      append_to_file(".gitignore", "*.swp\n", :verbose => false)
     end
-    @parsed_options
   end
 
-  def default_options
-    {
-      :file    => File.expand_path("Pupcapfile"),
-      :script  => File.expand_path("prepare.sh.erb"),
-      :force   => false,
-      :upgrade => false
-    }
+  def self.source_root
+    File.dirname(__FILE__)
   end
-end
 
+  private
+    def ip
+      options["ip"]
+    end
+
+end

data/lib/pupcap/action/prepare/Capfile

@@ -1,10 +1,9 @@
-require 'net/ssh/multi'
+_cset(:pupcap_prepare_script, "/tmp/pupcap_prepare.sh")
 
 namespace :prepare do
   task :default do
-    generate_keys
     try_ssh_copy_id
-    run_script
+    script
   end
 
   task :try_ssh_copy_id do
@@ -18,35 +17,27 @@ namespace :prepare do
   end
 
   task :ssh_copy_id do
-    remote_key_path = "/tmp/#{application}_id.pub.#{Time.now.to_i}"
-    upload(provision_key_pub, remote_key_path)
-    run("mkdir -p ~/.ssh && chmod 0700 ~/.ssh")
-    run("cat #{remote_key_path} >> ~/.ssh/authorized_keys && chmod 0600 ~/.ssh/authorized_keys")
-    run("rm -f #{remote_key_path}")
-  end
+    key_content = File.read(provision_key_pub).strip
+    content = capture("test -d ~/.ssh && cat ~/.ssh/authorized_keys || echo")
 
-  task :generate_keys do
-    unless File.exists?(provision_key)
-      logger.important("Generate keys")
-      Pupcap::Command.ensure_local_dir("#{local_root}/.keys", "0700")
-      Pupcap::Command.run_local("ssh-keygen -q -b 1024 -t rsa -C \"#{application} provision key\" -f #{provision_key}")
-      Pupcap::Command.run_local("chmod 0600 #{provision_key}")
-      Pupcap::Command.run_local("chmod 0600 #{provision_key_pub}")
+    unless content.include?(key_content)
+      remote_key_path = "/tmp/#{application}_id.pub.#{Time.now.to_i}"
+      put(key_content, remote_key_path)
+      run <<-EOF.compact
+      mkdir -p ~/.ssh && chmod 0700 ~/.ssh ;
+      cat #{remote_key_path} >> ~/.ssh/authorized_keys && chmod 0600 ~/.ssh/authorized_keys ;
+      rm -f #{remote_key_path}
+      EOF
     end
   end
 
-  task :run_script do
+  task :script do
     template = pupcap_options[:script]
-    prepare_script = ERB.new(File.read template).result(binding)
-
-    set :use_sudo, true
+    content = ERB.new(File.read template).result(binding)
 
-    remote_script_name = "/tmp/pupcap_prepare.sh"
-    put(prepare_script, remote_script_name)
-    run("chmod 0755 #{remote_script_name}")
-    force = pupcap_options[:force] ? "1" : "0"
-    hostname = pupcap_options[:hostname] ? " PUPCAP_HOSTNAME=#{pupcap_options[:hostname]}" : ""
-    sudo("env PUPCAP_FORCE=#{force}#{hostname} #{remote_script_name}")
-    run("rm #{remote_script_name}")
+    put(content, pupcap_prepare_script)
+    run("chmod 0700 #{pupcap_prepare_script}")
+    force = ENV['FORCE'] ? "1" : "0"
+    run("#{sudo} env PUPCAP_FORCE=#{force} #{pupcap_prepare_script}; rm -f #{pupcap_prepare_script}")
   end
 end

data/lib/pupcap/action/ssh.rb

@@ -10,31 +10,4 @@ class Pupcap::Action::Ssh < Pupcap::Action::Base
     cap = create_cap_for(parsed_options[:file])
     cap_load_and_run_task(cap, "ssh")
   end
-
-  def parsed_options
-    unless @parsed_options
-      options = default_options.dup
-      OptionParser.new do |opts|
-        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)
-        end
-
-        opts.on("-h", "--help", "Displays this help info") do
-          puts opts
-          exit 0
-        end
-      end.parse!
-      options[:tasks] = ARGV
-      @parsed_options = options
-    end
-    @parsed_options
-  end
-
-  def default_options
-    {
-      :file    => File.expand_path("Pupcapfile"),
-    }
-  end
 end

data/lib/pupcap/action/ssh/Capfile

@@ -2,9 +2,7 @@ namespace :ssh do
   task :default do
     server = find_servers_for_task(current_task).first
     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'"
+      exec "ssh #{server} -A -t -i #{ssh_options[:keys]} '${SHELL} -l'"
     end
   end
 end

data/lib/pupcap/capistrano.rb

@@ -0,0 +1,39 @@
+require 'pupcap'
+require 'capistrano'
+require 'capistrano/cli'
+
+module Pupcap::Capistrano
+  def cap_execute_tasks(file, tasks)
+    cap = cap_create_instance
+    cap = yield(cap) if block_given?
+    ["deploy", pupcap_capfile, file].each{|f| cap.load f }
+    tasks.each do |task|
+      cap.find_and_execute_task(task)
+    end
+    cap
+  end
+
+  def cap_create_instance
+    cap = Capistrano::Configuration.new
+
+    cap.logger.level                = Capistrano::Logger::DEBUG
+
+    cap.set :application,             application
+    cap.set :pupcap_root,             pupcap_root
+    cap.set :provision_key,           provision_key
+    cap.set :provision_key_pub,       provision_key_pub
+    cap.set :deploy_to,               "/tmp/pupcap"
+    cap.set :use_sudo,                false
+    cap.set :pupcap_options,          options
+    cap.ssh_options[:keys]          = cap.provision_key
+    cap.ssh_options[:forward_agent] = true
+    cap.default_run_options[:pty]   = true
+
+    cap.set :repository,              "."
+    cap.set :scm,                     :none
+    cap.set :deploy_via,              :copy
+
+    cap.set :copy_exclude,            [".git", ".keys"]
+    cap
+  end
+end

data/lib/pupcap/cli.rb

@@ -1,23 +1,93 @@
-require 'optparse'
+require 'thor'
+require 'thor/actions'
 require 'pupcap'
+require 'pupcap/capistrano'
 
-class Pupcap::CLI
-  class << self
-    def start
-      action = ARGV.shift
-      if !action || !valid_actions.include?(action)
-        $stderr.puts "Please specify a action to run: #{valid_actions.join("|")}"
-        exit 1
-      end
+class Pupcap::CLI < Thor
+  include Thor::Actions
+  include Pupcap::Capistrano
 
-      require "pupcap/action/#{action}"
-      klass = Pupcap::Action.const_get(action.capitalize)
-      inst = klass.new
-      inst.start
+  desc "init DIR", "Initialize pupcap into DIR"
+  method_option :ip, :type => :string, :default => "192.168.44.11", :alias => "-i",
+                :desc => "Generate Vagrantfile with that ip address"
+  def init(dir)
+    directory("action/init", dir)
+    inside(dir) do
+      append_to_file(".gitignore", ".vagrant\n", :verbose => false)
+      append_to_file(".gitignore", "*.swp\n", :verbose => false)
+      run("librarian-puppet init")
     end
+  end
+
+  desc "prepare [TASKS]", "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"),
+                :desc => "The shell script who be execute in target host"
+  def prepare(*tasks)
+    error "#{options[:file]} does not exists"   unless File.exists?(options[:file])
+    error "#{options[:script]} does not exists" unless File.exists?(options[:script])
 
-    def valid_actions
-      %w{ prepare apply ssh init noop }
+    unless File.exists?(provision_key)
+      inside pupcap_root do
+        empty_directory(".keys")
+        chmod(".keys", 0700)
+        run("ssh-keygen -q -b 1024 -t rsa -C \"#{application} provision key\" -f #{provision_key}")
+        chmod(provision_key, 0600)
+        chmod(provision_key_pub, 0600)
+      end
     end
+    cap_execute_tasks(capfile("prepare"), tasks << "prepare")
+  end
+
+  desc "apply [TASKS]", "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"
+  method_option :file, :type => :string, :default => File.expand_path("Capfile"),
+                :desc => "Capfile"
+  def noop(*tasks)
+    ENV['NOOP'] = '1'
+    apply(*tasks)
+  end
+
+  desc "ssh [TASKS]", "Open remote console"
+  method_option :file, :type => :string, :default => File.expand_path("Capfile"),
+                :desc => "Capfile"
+  def ssh(*tasks)
+    cap_execute_tasks(capfile("ssh"), tasks << "ssh")
+  end
+
+  def self.source_root
+    File.dirname(__FILE__)
   end
+
+  private
+    def capfile(name)
+      self.class.source_root + "/action/#{name}/Capfile"
+    end
+
+    def pupcap_capfile
+      options[:file]
+    end
+
+    def pupcap_root
+      Pathname.new(File.dirname(pupcap_capfile))
+    end
+
+    def provision_key
+      pupcap_root.join(".keys/provision").to_s
+    end
+
+    def application
+      pupcap_root.basename.to_s
+    end
+
+    def provision_key_pub
+      "#{provision_key}.pub"
+    end
 end

data/lib/pupcap/version.rb

@@ -1,11 +1,11 @@
 require 'scanf'
 module Pupcap
 
-  class Version
+  class VERSION
 
     MAJOR = 0
-    MINOR = 2
-    PATCH = 3
+    MINOR = 3
+    PATCH = 0
 
     def self.to_s
       "#{MAJOR}.#{MINOR}.#{PATCH}"

data/pupcap.gemspec

@@ -5,7 +5,7 @@ require "pupcap/version"
 Gem::Specification.new do |s|
 
   s.name        = "pupcap"
-  s.version     = Pupcap::Version.to_s
+  s.version     = Pupcap::VERSION.to_s
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Dmitry Galinsky"]
   s.email       = ["dima.exe@gmail.com"]
@@ -17,23 +17,9 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<capistrano>, [">= 2.12.0"])
-      s.add_runtime_dependency(%q<vagrant>, [">= 1.0.0"])
-      s.add_runtime_dependency(%q<librarian-puppet>, [">= 0.9.7"])
-      s.add_runtime_dependency(%q<net-ssh-multi>, [">= 1.1.0"])
-    else
-      s.add_dependency(%q<capistrano>, [">= 2.12.0"])
-      s.add_dependency(%q<vagrant>, [">= 1.0.0"])
-      s.add_dependency(%q<librarian-puppet>, [">= 0.9.7"])
-      s.add_dependency(%q<net-ssh-multi>, [">= 1.1.0"])
-    end
-  else
-    s.add_dependency(%q<capistrano>, [">= 2.12.0"])
-    s.add_dependency(%q<vagrant>, [">= 1.0.0"])
-    s.add_dependency(%q<librarian-puppet>, [">= 0.9.7"])
-    s.add_dependency(%q<net-ssh-multi>, [">= 1.1.0"])
-  end
+  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.2.3
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-20 00:00:00.000000000 Z
+date: 2012-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -75,6 +75,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.1.0
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: under development description
 email:
 - dima.exe@gmail.com
@@ -89,23 +105,24 @@ files:
 - Rakefile
 - bin/pupcap
 - lib/pupcap.rb
-- lib/pupcap/action.rb
 - lib/pupcap/action/apply.rb
 - lib/pupcap/action/apply/Capfile
-- lib/pupcap/action/apply/puppet.sh.erb
 - lib/pupcap/action/init.rb
-- lib/pupcap/action/init/Pupcapfile.erb
-- lib/pupcap/action/init/Vagrantfile.erb
-- lib/pupcap/action/init/gitignore
+- lib/pupcap/action/init/Capfile.tt
+- lib/pupcap/action/init/Vagrantfile.tt
+- lib/pupcap/action/init/hiera.yaml
+- lib/pupcap/action/init/hieradata/common.yaml
+- lib/pupcap/action/init/hieradata/development.yaml
+- lib/pupcap/action/init/manifests/site.pp
+- lib/pupcap/action/init/modules/.empty_directory
 - lib/pupcap/action/init/prepare.sh.erb
-- lib/pupcap/action/init/site.pp.erb
-- lib/pupcap/action/noop.rb
+- 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
-- lib/pupcap/command.rb
 - lib/pupcap/lsb_release.rb
 - lib/pupcap/version.rb
 - pupcap.gemspec

data/lib/pupcap/action.rb

@@ -1,75 +0,0 @@
-require 'pupcap'
-require 'capistrano'
-require 'capistrano/cli'
-
-module Pupcap::Action
-  class Base
-
-    def parsed_options
-      {}
-    end
-
-    def check_puppetfile!
-      unless File.exists?(parsed_options[:file])
-        $stderr.puts "File #{parsed_options[:file]} does not exists"
-        exit 1
-      end
-    end
-
-    def check_tasks!
-      if parsed_options[:tasks].empty?
-        $stderr.puts "Please specify tasks"
-        exit 1
-      end
-    end
-
-    def create_cap_for(file)
-      cap = Capistrano::Configuration.new
-      cap.logger.level = Capistrano::Logger::DEBUG
-      set_cap_vars!(cap, file)
-      cap.load file
-      parsed_options[:tasks].each do |task|
-        cap.find_and_execute_task(task)
-      end
-      cap
-    end
-
-    def lib_root
-      File.dirname(File.expand_path __FILE__) + "/action"
-    end
-
-    def cap_load_and_run_task(cap, task)
-      cap.load "deploy"
-      cap.load "#{lib_root}/#{task}/Capfile"
-      cap.trigger(:load)
-      cap.find_and_execute_task(task, :before => :start, :after => :finish)
-      cap.trigger(:exit)
-    end
-
-    private
-
-      def set_cap_vars!(cap, file)
-        app = ENV['app'] || File.basename(File.dirname(file))
-        cap.set :application,       app
-        cap.set :local_root,        File.dirname(file)
-        cap.set :pupcap_root,       File.dirname(File.expand_path __FILE__)
-        cap.set :provision_key,     "#{cap.local_root}/.keys/provision"
-        cap.set :provision_key_pub, "#{cap.local_root}/.keys/provision.pub"
-        cap.set :deploy_to,         "/tmp/pupcap"
-        cap.set :pupcap_options,    parsed_options
-        cap.ssh_options[:keys]          = cap.provision_key
-        cap.ssh_options[:forward_agent] = true
-        cap.default_run_options[:pty]   = true
-
-        cap.set :repository, "."
-        cap.set :scm, :none
-        cap.set :deploy_via, :copy
-
-        cap.set :copy_exclude,  [".git", ".keys"]
-        cap.set :repository,    "."
-        cap.set :keep_releases, 2
-        cap.set :use_sudo,      false
-        cap
-      end
-  end
-end

data/lib/pupcap/action/apply/puppet.sh.erb

@@ -1,8 +0,0 @@
-set -e
-
-for role in $(echo "${1}" | tr "," "\n")
-do
-  echo "*** Role: ${role} ***"
-  <%= puppet %> apply <%= nook + debug %>  --detailed-exitcodes <%= modules %> <%= current_path %>/puppet/manifests/${role}.pp || true
-done
-

data/lib/pupcap/action/init/Pupcapfile.erb

@@ -1,5 +0,0 @@
-# set :password, "any random string"
-
-task :vagrant do
-  role :site, "vagrant@<%= ip %>"
-end

data/lib/pupcap/action/init/gitignore

@@ -1,2 +0,0 @@
-.vagrant
-*.swp

data/lib/pupcap/action/noop.rb

@@ -1,9 +0,0 @@
-require 'pupcap/action/apply'
-
-class Pupcap::Action::Noop < Pupcap::Action::Apply
-  def start
-    cap = create_cap_for(parsed_options[:file])
-    cap.pupcap_options[:noop] = true
-    cap_load_and_run_task(cap, "apply")
-  end
-end

data/lib/pupcap/command.rb

@@ -1,23 +0,0 @@
-require 'pupcap'
-
-class Pupcap::Command
-  class << self
-    def ensure_local_dir(dir, mode = "0755")
-      run_local("mkdir -p #{dir} && chmod #{mode} #{dir}")
-    end
-
-    def run_local(cmd)
-      system cmd
-      fail "#{cmd} fail" if $?.to_i != 0
-    end
-
-    def server_port(cap, server)
-      server.port || cap.ssh_options[:port] || 22
-    end
-
-    def server_host(cap, server)
-      u = server.user || cap.fetch(:user)
-      u ? "#{u}@#{server.host}" : server.host
-    end
-  end
-end