pupcap 0.2.0 → 0.2.1

data/lib/pupcap/action/apply.rb

@@ -15,7 +15,7 @@ class Pupcap::Action::Apply < Pupcap::Action::Base
     unless @parsed_options
       options = default_options.dup
       OptionParser.new do |opts|
-        opts.banner = "Usage: #{File.basename($0)} cook [options] <role>"
+        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)
@@ -33,6 +33,10 @@ class Pupcap::Action::Apply < Pupcap::Action::Base
         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

data/lib/pupcap/action/apply/Capfile

@@ -2,8 +2,11 @@ require 'erb'
 
 namespace :deploy do
   task :finalize_update do
-    run("ln -sf #{shared_path}/librarian-puppet-cache #{release_path}/puppet/.tmp")
-    run("cd #{release_path}/puppet &&  test -f #{release_path}/puppet/Puppetfile && /usr/local/bin/librarian-puppet install ; true")
+    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 &&  test -f #{release_path}/puppet/Puppetfile && /usr/local/bin/librarian-puppet install #{debug}; true")
+    end
   end
 
   task :restart do

data/lib/pupcap/action/init.rb

@@ -14,6 +14,17 @@ class Pupcap::Action::Init < Pupcap::Action::Base
     create_pp
     librarian_puppet
     create_gitignore
+    create_prepare_script
+  end
+
+  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
 
   def create_vagrantfile
@@ -22,9 +33,9 @@ class Pupcap::Action::Init < Pupcap::Action::Base
       erb = ERB.new(File.read("#{lib_root}/init/Vagrantfile.erb"))
       rs = erb.result(binding)
       File.open(out, "w+"){ |io| io.write rs }
-      puts "\t create Vagrantfile"
+      puts "create Vagrantfile"
     else
-      puts "\t skip #{out}"
+      puts "skip #{out}"
     end
   end
 
@@ -34,9 +45,9 @@ class Pupcap::Action::Init < Pupcap::Action::Base
       erb = ERB.new(File.read("#{lib_root}/init/Pupcapfile.erb"))
       rs = erb.result(binding)
       File.open(out, "w+"){ |io| io.write rs }
-      puts "\t create Capfile"
+      puts "create Capfile"
     else
-      puts "\t skip #{out}"
+      puts "skip #{out}"
     end
   end
 
@@ -46,9 +57,9 @@ class Pupcap::Action::Init < Pupcap::Action::Base
       erb = ERB.new(File.read("#{lib_root}/init/site.pp.erb"))
       rs = erb.result(binding)
       File.open(out, "w+"){ |io| io.write rs }
-      puts "\t create puppet/manifests/site.pp"
+      puts "create puppet/manifests/site.pp"
     else
-      puts "\t skip #{out}"
+      puts "skip #{out}"
     end
   end
 
@@ -65,8 +76,11 @@ class Pupcap::Action::Init < Pupcap::Action::Base
   end
 
   def create_gitignore
-    unless File.exists?("#{work_dir}.gitignore")
+    if !File.exists?("#{work_dir}.gitignore")
       FileUtils.copy("#{lib_root}/init/gitignore", "#{work_dir}/.gitignore")
+      puts "create .gitignore"
+    else
+      puts "skip .gitignore"
     end
   end
 

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

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

data/lib/pupcap/action/{prepare/ubuntu/precise.sh → init/prepare.sh.erb}

@@ -6,18 +6,27 @@ then
   exit 0
 fi
 
+#
+# fix may be broken locale
+#
 CURRENT_LANG=`locale | awk '/LANG=/{ split($1, a, "=") ; print a[2] }'`
 if test "x${CURRENT_LANG}" != "xen_US.UTF-8"
 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
+#
 SOURCES_LIST=/etc/apt/sources.list
 
 SOURCES_LIST_MD5=`md5sum ${SOURCES_LIST} | awk '{ print $1 }'`

data/lib/pupcap/action/prepare.rb

@@ -5,16 +5,22 @@ require 'pupcap/lsb_release'
 class Pupcap::Action::Prepare < Pupcap::Action::Base
   def initialize
     check_puppetfile!
+    check_prepare_script!
   end
 
   def start
     cap = create_cap_for(parsed_options[:file])
-    lsb = Pupcap::LsbRelease.new(cap)
-    prepare_proc = lambda{ "#{lib_root}/prepare/#{lsb.name.downcase}/#{lsb.codename.downcase}.sh" }
-    cap.set :pupcap_prepare_command, prepare_proc
+    #lsb = Pupcap::LsbRelease.new(cap)
     cap_load_and_run_task(cap, "prepare")
   end
 
+  def check_prepare_script!
+    unless File.exists?(parsed_options[:script])
+      $stderr.puts "File #{parsed_options[:script]} does not exists"
+      exit 1
+    end
+  end
+
   def parsed_options
     unless @parsed_options
       options = default_options.dup
@@ -47,6 +53,7 @@ class Pupcap::Action::Prepare < Pupcap::Action::Base
   def default_options
     {
       :file    => File.expand_path("Pupcapfile"),
+      :script  => File.expand_path("prepare.sh.erb"),
       :force   => false,
       :upgrade => false
     }

data/lib/pupcap/action/prepare/Capfile

@@ -36,16 +36,17 @@ namespace :prepare do
   end
 
   task :run_script do
-    prepare_script = fetch(:pupcap_prepare_command)
+    template = pupcap_options[:script]
+    prepare_script = ERB.new(File.read template).result(binding)
+
     set :use_sudo, true
-    if File.exists?(prepare_script)
-      remote_script_name = "/tmp/pupcap_prepare.#{Time.now.to_i}.sh"
-      upload(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}")
-    end
+
+    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}")
   end
 end

data/lib/pupcap/version.rb

@@ -5,7 +5,7 @@ module Pupcap
 
     MAJOR = 0
     MINOR = 2
-    PATCH = 0
+    PATCH = 1
 
     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.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-17 00:00:00.000000000 Z
+date: 2012-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -97,11 +97,11 @@ files:
 - lib/pupcap/action/init/Pupcapfile.erb
 - lib/pupcap/action/init/Vagrantfile.erb
 - lib/pupcap/action/init/gitignore
+- lib/pupcap/action/init/prepare.sh.erb
 - lib/pupcap/action/init/site.pp.erb
 - lib/pupcap/action/noop.rb
 - lib/pupcap/action/prepare.rb
 - lib/pupcap/action/prepare/Capfile
-- lib/pupcap/action/prepare/ubuntu/precise.sh
 - lib/pupcap/action/ssh.rb
 - lib/pupcap/action/ssh/Capfile
 - lib/pupcap/cli.rb