pupcap 0.0.1 → 0.0.2

data/lib/pupcap/action.rb

@@ -5,49 +5,57 @@ require 'capistrano/cli'
 module Pupcap::Action
   class Base
 
-    def initialize(file, options = {})
-      @file = file
-      @options = options
-      set_default_vars
-      ENV["ROLES"] = @options[:role]
+    def parsed_options
+      {}
     end
 
-
-    class << self
-      def ensure_local_dir(dir, mode = "0755")
-        run_local("mkdir -p #{dir} && chmod #{mode} #{dir}")
+    def check_puppetfile!
+      unless File.exists?(parsed_options[:file])
+        $stderr.puts "File #{parsed_options[:file]} does not exists"
+        exit 1
       end
+    end
 
-      def run_local(cmd)
-        system cmd
-        fail "#{cmd} fail" if $?.to_i != 0
+    def check_role!
+      unless parsed_options[:role]
+        $stderr.puts "Please specify role"
+        exit 1
       end
     end
 
-    def load_recipes(config) #:nodoc:
-      # load the standard recipe definition
-      cap.load "standard"
+    def create_cap_for(file)
+      cap = Capistrano::Configuration.new
+      cap.logger.level = Capistrano::Logger::DEBUG
+      set_cap_vars!(cap, file)
+      cap.load file
+      cap
+    end
+
+    def lib_root
+      File.dirname(File.expand_path __FILE__) + "/action"
+    end
+
+    def cap_load_and_run_task(cap, task)
+      cap.set :pupcap_options, parsed_options
+      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_default_vars
-        app = ENV['app'] || File.basename(File.dirname(@file))
+
+      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 :local_root,         File.dirname(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/puppet"
         cap.ssh_options[:keys]          = cap.provision_key
         cap.ssh_options[:forward_agent] = true
         cap.default_run_options[:pty]   = true
-        cap.load @file
-      end
-
-      def cap
-        unless @cap
-          @cap = Capistrano::Configuration.new
-          @cap.logger.level = Capistrano::Logger::DEBUG
-        end
-        @cap
+        cap
       end
   end
 end

data/lib/pupcap/action/cook.rb

@@ -1,14 +1,52 @@
 require 'pupcap/action'
+require 'pupcap/command'
 
 class Pupcap::Action::Cook < Pupcap::Action::Base
+  def initialize
+    check_role!
+    check_puppetfile!
+    ENV["ROLES"] = parsed_options[:role]
+  end
+
   def start
-    cap.load "#{root}/cook/Capfile"
-    cap.trigger(:load)
-    cap.find_and_execute_task("cook", :before => :start, :after => :finish)
-    cap.trigger(:exit)
+    cap = create_cap_for(parsed_options[:file])
+    cap_load_and_run_task(cap, "cook")
+  end
+
+  def parsed_options
+    unless @parsed_options
+      options = default_options.dup
+      OptionParser.new do |opts|
+        opts.banner = "Usage: #{File.basename($0)} [options] <role> cook"
+
+        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
+      end.parse!
+      options[:role] = ARGV.first
+      @parsed_options = options
+    end
+    @parsed_options
   end
 
-  def root
-    File.dirname(File.expand_path __FILE__)
+  def default_options
+    {
+      :file    => File.expand_path("Puppetfile"),
+      :debug   => false,
+      :noop    => false
+    }
   end
 end

data/lib/pupcap/action/cook/Capfile

@@ -1,26 +1,30 @@
 namespace :cook do
   task :default do
-    remote_path = "/tmp/puppet"
+    rsync
+    apply
+    cleanup
+  end
+
+  task :rsync do
     find_servers.each do |server|
-      ssh_cmd = "-e \"ssh -p #{cook_ssh_port(server)} -i #{provision_key}\""
-      rsync_options = "-p --chmod=o+r,g+r -az --exclude=\".keys/\""
-      rsync_path = "--rsync-path=\"sudo rsync\""
-      cmd = "rsync #{rsync_options} #{ssh_cmd} #{local_root}/ #{rsync_path} #{cook_rsync_host(server)}:#{remote_path}"
+      port = Pupcap::Command.server_port(self, server)
+      host = Pupcap::Command.server_host(self, server)
+      ssh_cmd = "-e \"ssh -p #{port} -i #{provision_key}\""
+      rsync_options = "-p --chmod=o+r,g+r -az"
+      cmd = "rsync #{rsync_options} #{ssh_cmd} #{local_root}/ #{host}:#{deploy_to}"
       logger.important(cmd)
       system(cmd)
     end
-    modules = "--modulepath=#{remote_path}/modules:#{remote_path}/manifests"
-    nook = ENV["try"] ? "--noop" : ""
-    debug = ENV["debug"] ? "--debug" : ""
-    sudo("/usr/local/bin/puppet apply --detailed-exitcodes #{nook} #{debug} #{modules} #{remote_path}/manifests/#{ENV["ROLES"]}.pp || true")
   end
 
-  def cook_ssh_port(server)
-    server.port || ssh_options[:port] || 22
+  task :apply do
+    modules = "--modulepath=#{deploy_to}/modules:#{deploy_to}/manifests"
+    nook = pupcap_options[:noop] ? "--noop" : ""
+    debug = pupcap_options[:debug] ? "--debug" : ""
+    sudo("/usr/local/bin/puppet apply --detailed-exitcodes #{nook} #{debug} #{modules} #{deploy_to}/manifests/#{ENV["ROLES"]}.pp || true")
   end
 
-  def cook_rsync_host(server)
-    u = server.user || fetch(:user)
-    u ? "#{u}@#{server.host}" : server.host
+  task :cleanup do
+    run("rm -rf #{deploy_to}")
   end
 end

data/lib/pupcap/action/prepare.rb

@@ -1,28 +1,54 @@
 require 'pupcap/action'
+require 'pupcap/lsb_release'
 
 class Pupcap::Action::Prepare < Pupcap::Action::Base
-  def start
-    cap.load "#{root}/prepare/Capfile"
-    cap.trigger(:load)
-    cap.find_and_execute_task("prepare", :before => :start, :after => :finish)
-    prepare_dist
-    cap.trigger(:exit)
+  def initialize
+    check_role!
+    check_puppetfile!
+    ENV["ROLES"] = parsed_options[:role]
   end
 
-  def root
-    File.dirname(File.expand_path __FILE__)
+  def start
+    cap = create_cap_for(parsed_options[:file])
+    lsb = Pupcap::LsbRelease.new(cap)
+    prepare_script = "#{lib_root}/prepare/#{lsb.name.downcase}/#{lsb.codename.downcase}.sh"
+    if File.exists?(prepare_script)
+      cap.set :pupcap_prepare_script, prepare_script
+    end
+    cap_load_and_run_task(cap, "prepare")
   end
 
-  def prepare_dist
-    rel = cap.capture("lsb_release -d")
-    codename = rel.match(/^.*:\s(.*)$/)
-    if codename && codename[1]
-      codename = codename[1].to_s.strip[0...12]
-      case codename
-      when 'Ubuntu 12.04'
-        cap.load "#{root}/prepare/ubuntu/precise.rb"
-        cap.find_and_execute_task("prepare:ubuntu:precise")
-      end
+  def parsed_options
+    unless @parsed_options
+      options = default_options.dup
+      OptionParser.new do |opts|
+        opts.banner = "Usage: #{File.basename($0)} [options] <role> prepare"
+
+        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
+      end.parse!
+      options[:role] = ARGV.first
+      @parsed_options = options
     end
+    @parsed_options
+  end
+
+  def default_options
+    {
+      :file    => File.expand_path("Puppetfile"),
+      :force   => false,
+      :upgrade => false
+    }
   end
 end
+

data/lib/pupcap/action/prepare/Capfile

@@ -2,6 +2,7 @@ namespace :prepare do
   task :default do
     generate_keys
     ssh_copy_id
+    run_script
   end
 
   task :ssh_copy_id do
@@ -15,10 +16,21 @@ namespace :prepare do
   task :generate_keys do
     unless File.exists?(provision_key)
       logger.important("Generate keys")
-      Pupcap::Action.ensure_local_dir("#{local_root}/.keys", "0700")
-      Pupcap::Action.run_local("ssh-keygen -q -b 1024 -t rsa -C \"#{application} provision key\" -f #{provision_key}")
-      Pupcap::Action.run_local("chmod 0600 #{provision_key}")
-      Pupcap::Action.run_local("chmod 0600 #{provision_key_pub}")
+      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}")
+    end
+  end
+
+  task :run_script do
+    if exists?(:pupcap_prepare_script)
+      remote_script_name = "/tmp/pupcap_prepare.#{Time.now.to_i}.sh"
+      upload(pupcap_prepare_script, remote_script_name)
+      run("chmod 0755 #{remote_script_name}")
+      force = pupcap_options[:force] ? "1" : "0"
+      sudo("env PUPCAP_FORCE=#{force} #{remote_script_name}")
+      run("rm #{remote_script_name}")
     end
   end
 end

data/lib/pupcap/action/prepare/ubuntu/precise.sh

@@ -0,0 +1,42 @@
+set -e
+
+test -e /root/.pupcap_prepare_ok -a ${PUPCAP_FORCE} = "0" && exit 0
+
+if [ ! -e /root/.pupcap_prepare_locale_ok -o ${PUPCAP_FORCE} = "1"  ]; then
+  locale-gen && update-locale LANG=en_US.UTF8 && touch /root/pupcap_prepare_locale_ok
+fi
+
+SOURCES_LIST=/etc/apt/sources.list
+
+SOURCES_LIST_MD5=`md5sum ${SOURCES_LIST} | awk '{ print $1 }'`
+
+if [ "$SOURCES_LIST_MD5" != "0af83b87b34bcdebf8a81a7ccc523e26" -o ${PUPCAP_FORCE} = "1" ]; then
+
+  cat <<EOF > ${SOURCES_LIST}
+#############################################################
+################### OFFICIAL UBUNTU REPOS ###################
+#############################################################
+
+###### Ubuntu Main Repos
+deb mirror://mirrors.ubuntu.com/mirrors.txt precise main
+deb-src mirror://mirrors.ubuntu.com/mirrors.txt precise main
+
+###### Ubuntu Update Repos
+deb mirror://mirrors.ubuntu.com/mirrors.txt precise-security main
+deb mirror://mirrors.ubuntu.com/mirrors.txt precise-updates main
+deb-src mirror://mirrors.ubuntu.com/mirrors.txt precise-security main
+deb-src mirror://mirrors.ubuntu.com/mirrors.txt precise-updates main
+EOF
+  echo >> ${SOURCES_LIST} # new line
+
+  chown root:root ${SOURCES_LIST}
+  chmod 0644 ${SOURCES_LIST}
+fi
+
+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
+touch /root/.pupcap_prepare_ok
+

data/lib/pupcap/action/ssh.rb

@@ -0,0 +1,42 @@
+require 'pupcap/action'
+require 'pupcap/command'
+
+class Pupcap::Action::Ssh < Pupcap::Action::Base
+  def initialize
+    check_role!
+    check_puppetfile!
+    ENV["ROLES"] = parsed_options[:role]
+  end
+
+  def start
+    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] <role> ssh"
+
+        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[:role] = ARGV.first
+      @parsed_options = options
+    end
+    @parsed_options
+  end
+
+  def default_options
+    {
+      :file    => File.expand_path("Puppetfile"),
+    }
+  end
+end

data/lib/pupcap/action/ssh/Capfile

@@ -0,0 +1,9 @@
+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'"
+  end
+end
+

data/lib/pupcap/cli.rb

@@ -4,60 +4,21 @@ require 'pupcap'
 class Pupcap::CLI
   class << self
     def start
-      get_action
-      require "pupcap/action/#{options[:action]}"
-      klass = Pupcap::Action.const_get(options[:action].capitalize)
-      inst = klass.new(options[:file], options)
-      inst.start
-    end
-
-    private
-      def get_action
-        options_parser
-
-        action = ARGV[1]
-        role   = ARGV[0]
-        if !action || !valid_actions.include?(action)
-          $stderr.puts "Please specify a action to run: #{valid_actions.join("|")}"
-          exit 1
-        end
-
-        if !role
-          $stderr.puts "Please specify a role to run"
-          exit 1
-        end
-
-        unless File.exists?(options[:file])
-          $stderr.puts "A file #{options[:file]} does not exists"
-          exit 1
-        end
-
-        options.merge!(:action => action, :role => role)
-      end
-
-      def valid_actions
-        @valid_actions ||= %w{ prepare cook }
-      end
-
-      def options
-        @options ||= {
-          :file => File.expand_path("Puppetfile")
-        }
+      action = ARGV.last
+      if !action || !valid_actions.include?(action)
+        $stderr.puts "Please specify a action to run: #{valid_actions.join("|")}"
+        exit 1
       end
 
-      def options_parser
-        @options_parser ||= OptionParser.new do |opts|
-          opts.banner = "Usage: #{File.basename($0)} [options] role #{valid_actions.join("|")}"
-
-          opts.on("-h", "--help", "Displays this help info") do
-            puts opts
-            exit 0
-          end
+      ARGV.pop
+      require "pupcap/action/#{action}"
+      klass = Pupcap::Action.const_get(action.capitalize)
+      inst = klass.new
+      inst.start
+    end
 
-          opts.on("-f", "--file FILE", "A recipe file to load") do |file|
-            options[:file] = File.expand_path(file)
-          end
-        end.parse!
-      end
+    def valid_actions
+      %w{ prepare cook ssh }
+    end
   end
 end

data/lib/pupcap/command.rb

@@ -0,0 +1,23 @@
+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

data/lib/pupcap/lsb_release.rb

@@ -0,0 +1,19 @@
+class Pupcap::LsbRelease
+  def initialize(cap)
+    @cap = cap
+  end
+
+  def name
+    @name ||= get("i")
+  end
+
+  def codename
+    @release ||= get("c")
+  end
+
+  private
+    def get(code)
+      code = @cap.capture("lsb_release -#{code}")
+      code.split(":")[1].to_s.strip
+    end
+end

data/lib/pupcap/version.rb

@@ -5,7 +5,7 @@ module Pupcap
 
     MAJOR = 0
     MINOR = 0
-    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.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -46,8 +46,12 @@ files:
 - lib/pupcap/action/cook/Capfile
 - lib/pupcap/action/prepare.rb
 - lib/pupcap/action/prepare/Capfile
-- lib/pupcap/action/prepare/ubuntu/precise.rb
+- lib/pupcap/action/prepare/ubuntu/precise.sh
+- lib/pupcap/action/ssh.rb
+- lib/pupcap/action/ssh/Capfile
 - lib/pupcap/cli.rb
+- lib/pupcap/command.rb
+- lib/pupcap/lsb_release.rb
 - lib/pupcap/version.rb
 - pupcap.gemspec
 homepage: http://github.com/dima-exe/pupcap

data/lib/pupcap/action/prepare/ubuntu/precise.rb

@@ -1,48 +0,0 @@
-namespace :prepare do
-  namespace :ubuntu do
-    task :precise do
-      run("#{sudo} [ ! -f /root/.prepare_locale_ok ] && #{sudo} locale-gen && #{sudo} update-locale LANG=en_US.UTF8 && #{sudo} touch /root/.prepare_locale_ok || true")
-
-      tmp_list = "/tmp/sources.list.#{Time.now.to_i}"
-      sources_list = "/etc/apt/sources.list"
-
-      dist_upgraded = false
-      current_list = capture("md5sum #{sources_list}").split(" ")[0].to_s.strip
-      if current_list != "1f722c129d80782e4fa323a6a70dee59"
-        sudo("cp #{sources_list} #{sources_list}.back#{Time.now.to_i}")
-        put(precise_sources_list, tmp_list)
-        sudo("cp #{tmp_list} #{sources_list}")
-        sudo("chown root:root #{sources_list}")
-        sudo("chmod 0644 #{sources_list}")
-        run("rm -f #{tmp_list}")
-        sudo("apt-get -qy update > /dev/null")
-        if ENV['upgrade']
-          run("echo \"grub-pc hold\" | #{sudo} dpkg --set-selections")
-          sudo("apt-get -qy upgrade")
-          run("echo \"grub-pc install\" | #{sudo} dpkg --set-selections")
-          dist_upgraded = true
-        end
-      end
-
-      sudo("apt-get install -qy rsync wget rubygems vim git-core build-essential > /dev/null")
-      sudo("/usr/bin/gem install -q --no-ri --no-rdoc --version '~> 2.7.1' puppet")
-      sudo("reboot") if dist_upgraded
-    end
-  end
-end
-
-UBUNTU_PRECISE_SOURCES_LIST = <<-CODE
-#############################################################
-################### OFFICIAL UBUNTU REPOS ###################
-#############################################################
-
-###### Ubuntu Main Repos
-deb mirror://mirrors.ubuntu.com/mirrors.txt precise main
-deb-src mirror://mirrors.ubuntu.com/mirrors.txt precise main
-
-###### Ubuntu Update Repos
-deb mirror://mirrors.ubuntu.com/mirrors.txt precise-security main
-deb mirror://mirrors.ubuntu.com/mirrors.txt precise-updates main
-deb-src mirror://mirrors.ubuntu.com/mirrors.txt precise-security main
-deb-src mirror://mirrors.ubuntu.com/mirrors.txt precise-updates main
-CODE