pupcap 0.0.3 → 0.0.4

data/README

@@ -0,0 +1 @@
+Integrate puppet and capistrano

data/lib/pupcap/action.rb

@@ -16,9 +16,9 @@ module Pupcap::Action
       end
     end
 
-    def check_role!
-      unless parsed_options[:role]
-        $stderr.puts "Please specify role"
+    def check_tasks!
+      if parsed_options[:tasks].empty?
+        $stderr.puts "Please specify tasks"
         exit 1
       end
     end
@@ -28,6 +28,9 @@ module Pupcap::Action
       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
 
@@ -36,7 +39,6 @@ module Pupcap::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)
@@ -48,10 +50,12 @@ module Pupcap::Action
       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 :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/puppet"
+        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

data/lib/pupcap/action/cook.rb

@@ -3,9 +3,7 @@ require 'pupcap/command'
 
 class Pupcap::Action::Cook < Pupcap::Action::Base
   def initialize
-    check_role!
     check_puppetfile!
-    ENV["ROLES"] = parsed_options[:role]
   end
 
   def start
@@ -36,7 +34,7 @@ class Pupcap::Action::Cook < Pupcap::Action::Base
           options[:noop] = true
         end
       end.parse!
-      options[:role] = ARGV.first
+      options[:tasks] = ARGV
       @parsed_options = options
     end
     @parsed_options

data/lib/pupcap/action/cook/Capfile

@@ -1,3 +1,5 @@
+require 'erb'
+
 namespace :cook do
   task :default do
     rsync
@@ -11,17 +13,26 @@ namespace :cook do
       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}"
+      cmd = "rsync #{rsync_options} #{ssh_cmd} #{local_root}/puppet/ #{host}:#{deploy_to}"
       logger.important(cmd)
       system(cmd)
     end
   end
 
   task :apply do
+    remote_command = "#{deploy_to}/apply.sh"
+
+    puppet = "/usr/local/bin/puppet"
     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")
+    nook = pupcap_options[:noop] ? " --noop" : ""
+    debug = pupcap_options[:debug] ? " --debug --verbose" : ""
+
+    erb = ERB.new(File.read("#{pupcap_root}/action/cook/apply.sh.erb"))
+    rs = erb.result(binding)
+
+    put(rs, remote_command)
+    run("chmod +x #{remote_command}")
+    sudo("#{remote_command} \"$CAPISTRANO:HOSTROLES$\"")
   end
 
   task :cleanup do

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

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

data/lib/pupcap/action/init.rb

@@ -0,0 +1,101 @@
+require 'pupcap/action'
+require 'pupcap/command'
+require 'fileutils'
+require 'erb'
+
+class Pupcap::Action::Init < Pupcap::Action::Base
+  def initialize
+  end
+
+  def start
+    create_directories
+    create_vagrantfile
+    create_puppetfile
+    create_pp
+  end
+
+  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 }
+    else
+      puts "Skip file #{out}"
+    end
+  end
+
+  def create_puppetfile
+    out = "#{work_dir}/Puppetfile"
+    if !File.exists?(out) || force?
+      erb = ERB.new(File.read("#{lib_root}/init/Puppetfile.erb"))
+      rs = erb.result(binding)
+      File.open(out, "w+"){ |io| io.write rs }
+    else
+      puts "Skip file #{out}"
+    end
+  end
+
+  def create_pp
+    out = "#{work_dir}/puppet/manifests/default.pp"
+    if !File.exists?(out) || force?
+      erb = ERB.new(File.read("#{lib_root}/init/default.pp.erb"))
+      rs = erb.result(binding)
+      File.open(out, "w+"){ |io| io.write rs }
+    else
+      puts "Skip file #{out}"
+    end
+  end
+
+  def create_directories
+    FileUtils.mkdir_p("#{work_dir}/puppet/modules")
+    FileUtils.mkdir_p("#{work_dir}/puppet/manifests")
+    system("touch #{work_dir}/puppet/modules/.gitkeep")
+    system("touch #{work_dir}/puppet/manifests/.gitkeep")
+  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/Puppetfile.erb

@@ -0,0 +1,3 @@
+task :vagrant do
+  role :vagrant, "<%= ip %>", :user => "vagrant", :port => 22
+end

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

@@ -0,0 +1,99 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+Vagrant::Config.run do |config|
+  # All Vagrant configuration is done here. The most common configuration
+  # options are documented and commented below. For a complete reference,
+  # please see the online documentation at vagrantup.com.
+
+  # Every Vagrant virtual environment requires a box to build off of.
+  config.vm.box = "precise64"
+
+  # The url from where the 'config.vm.box' box will be fetched if it
+  # doesn't already exist on the user's system.
+  config.vm.box_url = "http://files.vagrantup.com/precise64.box"
+
+  # Boot with a GUI so you can see the screen. (Default is headless)
+  # config.vm.boot_mode = :gui
+
+  # Assign this VM to a host-only network IP, allowing you to access it
+  # 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 %>"
+
+  # 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
+  # physical device on your network.
+  # config.vm.network :bridged
+
+  # Forward a port from the guest to the host, which allows for outside
+  # computers to access the VM, whereas host only networking does not.
+  # config.vm.forward_port 80, 8080
+
+  # Share an additional folder to the guest VM. The first argument is
+  # an identifier, the second is the path on the guest to mount the
+  # folder, and the third is the path on the host to the actual folder.
+  config.vm.share_folder("v-root", "/vagrant", ".", :disabled => true)
+
+  # Enable provisioning with Puppet stand alone.  Puppet manifests
+  # are contained in a directory path relative to this Vagrantfile.
+  # You will need to create the manifests directory and a manifest in
+  # the file base.pp in the manifests_path directory.
+  #
+  # An example Puppet manifest to provision the message of the day:
+  #
+  # # group { "puppet":
+  # #   ensure => "present",
+  # # }
+  # #
+  # # File { owner => 0, group => 0, mode => 0644 }
+  # #
+  # # file { '/etc/motd':
+  # #   content => "Welcome to your Vagrant-built virtual machine!
+  # #               Managed by Puppet.\n"
+  # # }
+  #
+  # config.vm.provision :puppet do |puppet|
+  #   puppet.manifests_path = "manifests"
+  #   puppet.manifest_file  = "base.pp"
+  # end
+
+  # Enable provisioning with chef solo, specifying a cookbooks path, roles
+  # path, and data_bags path (all relative to this Vagrantfile), and adding
+  # some recipes and/or roles.
+  #
+  # config.vm.provision :chef_solo do |chef|
+  #   chef.cookbooks_path = "../my-recipes/cookbooks"
+  #   chef.roles_path = "../my-recipes/roles"
+  #   chef.data_bags_path = "../my-recipes/data_bags"
+  #   chef.add_recipe "mysql"
+  #   chef.add_role "web"
+  #
+  #   # You may also specify custom JSON attributes:
+  #   chef.json = { :mysql_password => "foo" }
+  # end
+
+  # Enable provisioning with chef server, specifying the chef server URL,
+  # and the path to the validation key (relative to this Vagrantfile).
+  #
+  # The Opscode Platform uses HTTPS. Substitute your organization for
+  # ORGNAME in the URL and validation key.
+  #
+  # If you have your own Chef Server, use the appropriate URL, which may be
+  # HTTP instead of HTTPS depending on your configuration. Also change the
+  # validation key to validation.pem.
+  #
+  # config.vm.provision :chef_client do |chef|
+  #   chef.chef_server_url = "https://api.opscode.com/organizations/ORGNAME"
+  #   chef.validation_key_path = "ORGNAME-validator.pem"
+  # end
+  #
+  # If you're using the Opscode platform, your validator client is
+  # ORGNAME-validator, replacing ORGNAME with your organization name.
+  #
+  # IF you have your own Chef Server, the default validation client name is
+  # chef-validator, unless you changed the configuration.
+  #
+  #   chef.validation_client_name = "ORGNAME-validator"
+end

data/lib/pupcap/action/init/default.pp.erb

@@ -0,0 +1,2 @@
+node default {
+}

data/lib/pupcap/action/prepare.rb

@@ -1,20 +1,17 @@
 require 'pupcap/action'
+require 'pupcap/command'
 require 'pupcap/lsb_release'
 
 class Pupcap::Action::Prepare < Pupcap::Action::Base
   def initialize
-    check_role!
     check_puppetfile!
-    ENV["ROLES"] = parsed_options[:role]
   end
 
   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
+    prepare_proc = lambda{ "#{lib_root}/prepare/#{lsb.name.downcase}/#{lsb.codename.downcase}.sh" }
+    cap.set :pupcap_prepare_command, prepare_proc
     cap_load_and_run_task(cap, "prepare")
   end
 
@@ -22,7 +19,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)} prepare [options] <role>"
+        opts.banner = "Usage: #{File.basename($0)} prepare [options] <tasks>"
 
         opts.on("-h", "--help", "Displays this help info") do
           puts opts
@@ -36,8 +33,12 @@ class Pupcap::Action::Prepare < Pupcap::Action::Base
         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[:role] = ARGV.first
+      options[:tasks] = ARGV
       @parsed_options = options
     end
     @parsed_options

data/lib/pupcap/action/prepare/Capfile

@@ -1,10 +1,22 @@
+require 'net/ssh/multi'
+
 namespace :prepare do
   task :default do
     generate_keys
-    ssh_copy_id
+    try_ssh_copy_id
     run_script
   end
 
+  task :try_ssh_copy_id do
+    begin
+      run("true")
+    rescue Capistrano::ConnectionError => e
+      pass = Capistrano::CLI.password_prompt("SSH Password: ")
+      set :password, pass
+      ssh_copy_id
+    end
+  end
+
   task :ssh_copy_id do
     remote_key_path = "/tmp/#{application}_id.pub.#{Time.now.to_i}"
     upload(provision_key_pub, remote_key_path)
@@ -24,12 +36,15 @@ namespace :prepare do
   end
 
   task :run_script do
-    if exists?(:pupcap_prepare_script)
+    prepare_script = fetch(:pupcap_prepare_command)
+    set :use_sudo, true
+    if File.exists?(prepare_script)
       remote_script_name = "/tmp/pupcap_prepare.#{Time.now.to_i}.sh"
-      upload(pupcap_prepare_script, remote_script_name)
+      upload(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}")
+      hostname = pupcap_options[:hostname] ? " PUPCAP_HOSTNAME=#{pupcap_options[:hostname]}" : ""
+      sudo("env PUPCAP_FORCE=#{force}#{hostname} #{remote_script_name}")
       run("rm #{remote_script_name}")
     end
   end

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

@@ -1,16 +1,30 @@
 set -e
+set -v
 
-test -e /root/.pupcap_prepare_ok -a ${PUPCAP_FORCE} = "0" && exit 0
+if test -e /root/.pupcap_prepare_ok -a "x${PUPCAP_FORCE}" = "x0"
+then
+  exit 0
+fi
+
+if test ! -e /root/.pupcap_prepare_locale_ok -o "x${PUPCAP_FORCE}" = "x1"
+then
+  locale-gen en_US.UTF-8 && update-locale LANG=en_US.UTF-8 && touch /root/pupcap_prepare_locale_ok
+fi
 
-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
+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
 
 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
+if test "$SOURCES_LIST_MD5" != "14846cd43a3ef58b204b0807fa4856f8" -o "x${PUPCAP_FORCE}" = "x1"
+then
+
+  cp -f ${SOURCES_LIST} ${SOURCES_LIST}.pupcap_back
 
   cat <<EOF > ${SOURCES_LIST}
 #############################################################
@@ -18,14 +32,14 @@ if [ "$SOURCES_LIST_MD5" != "0af83b87b34bcdebf8a81a7ccc523e26" -o ${PUPCAP_FORCE
 #############################################################
 
 ###### Ubuntu Main Repos
-deb mirror://mirrors.ubuntu.com/mirrors.txt precise main
-deb-src mirror://mirrors.ubuntu.com/mirrors.txt precise main
+deb http://us.archive.ubuntu.com/ubuntu/ precise main
+deb-src http://us.archive.ubuntu.com/ubuntu/ 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
+deb http://us.archive.ubuntu.com/ubuntu/ precise-security main
+deb http://us.archive.ubuntu.com/ubuntu/ precise-updates main
+deb-src http://us.archive.ubuntu.com/ubuntu/ precise-security main
+deb-src http://us.archive.ubuntu.com/ubuntu/ precise-updates main
 EOF
   echo >> ${SOURCES_LIST} # new line
 
@@ -38,5 +52,7 @@ 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/sbin/groupadd -f puppet
+
 touch /root/.pupcap_prepare_ok
 

data/lib/pupcap/action/ssh.rb

@@ -3,9 +3,7 @@ require 'pupcap/command'
 
 class Pupcap::Action::Ssh < Pupcap::Action::Base
   def initialize
-    check_role!
     check_puppetfile!
-    ENV["ROLES"] = parsed_options[:role]
   end
 
   def start
@@ -28,7 +26,7 @@ class Pupcap::Action::Ssh < Pupcap::Action::Base
           exit 0
         end
       end.parse!
-      options[:role] = ARGV.first
+      options[:tasks] = ARGV
       @parsed_options = options
     end
     @parsed_options

data/lib/pupcap/cli.rb

@@ -17,7 +17,7 @@ class Pupcap::CLI
     end
 
     def valid_actions
-      %w{ prepare cook ssh }
+      %w{ prepare cook ssh init }
     end
   end
 end

data/lib/pupcap/version.rb

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

data/pupcap.gemspec

@@ -21,10 +21,13 @@ Gem::Specification.new do |s|
     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"])
     else
       s.add_dependency(%q<capistrano>, [">= 2.12.0"])
+      s.add_dependency(%q<vagrant>, [">= 1.0.0"])
     end
   else
     s.add_dependency(%q<capistrano>, [">= 2.12.0"])
+    s.add_dependency(%q<vagrant>, [">= 1.0.0"])
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pupcap
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -27,6 +27,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.12.0
+- !ruby/object:Gem::Dependency
+  name: vagrant
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 description: under development description
 email:
 - dima.exe@gmail.com
@@ -37,13 +53,18 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - Gemfile
+- README
 - Rakefile
 - bin/pupcap
 - lib/pupcap.rb
 - lib/pupcap/action.rb
-- lib/pupcap/action/.prepare.rb.swp
 - lib/pupcap/action/cook.rb
 - lib/pupcap/action/cook/Capfile
+- lib/pupcap/action/cook/apply.sh.erb
+- lib/pupcap/action/init.rb
+- lib/pupcap/action/init/Puppetfile.erb
+- lib/pupcap/action/init/Vagrantfile.erb
+- lib/pupcap/action/init/default.pp.erb
 - lib/pupcap/action/prepare.rb
 - lib/pupcap/action/prepare/Capfile
 - lib/pupcap/action/prepare/ubuntu/precise.sh