pupcap 0.1.0 → 0.2.0

data/lib/pupcap/action.rb

@@ -39,6 +39,7 @@ module Pupcap::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)
@@ -54,11 +55,18 @@ module Pupcap::Action
         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 :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 :deploy_via,    :copy
+        cap.set :copy_cache,    true
+        cap.set :copy_exclude,  [".git", ".keys"]
+        cap.set :repository,    "."
+        cap.set :keep_releases, 2
+        cap.set :use_sudo,      false
         cap
       end
   end

data/lib/pupcap/action/apply.rb

@@ -42,7 +42,7 @@ class Pupcap::Action::Apply < Pupcap::Action::Base
 
   def default_options
     {
-      :file    => File.expand_path("Capfile"),
+      :file    => File.expand_path("Pupcapfile"),
       :debug   => false,
       :noop    => false
     }

data/lib/pupcap/action/apply/Capfile

@@ -1,23 +1,32 @@
 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")
+  end
+
+  task :restart do
+  end
+end
+
 namespace :apply do
   task :default do
-    rsync
+    try_create_dirs
+    find_and_execute_task("deploy")
+    find_and_execute_task("deploy:cleanup")
     puppet
-    cleanup
   end
 
-  task :rsync do
-    from = "#{local_root}/puppet"
-    to   = deploy_to
-    upload(from, to, :recursive => true, :via => :scp)
+  task :try_create_dirs do
+    run("mkdir -p #{deploy_to}/releases ; mkdir -p #{deploy_to}/shared/librarian-puppet-cache ; chmod 0700 #{deploy_to}")
   end
 
   task :puppet do
     remote_command = "#{deploy_to}/apply.sh"
 
     puppet = "/usr/local/bin/puppet"
-    modules = "--modulepath=#{deploy_to}/modules:#{deploy_to}/site-modules"
+    modules = "--modulepath=#{current_path}/puppet/modules:#{current_path}/puppet/site-modules"
     nook = pupcap_options[:noop] ? " --noop" : ""
     debug = pupcap_options[:debug] ? " --debug --verbose" : ""
 

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

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

data/lib/pupcap/action/init.rb

@@ -29,9 +29,9 @@ class Pupcap::Action::Init < Pupcap::Action::Base
   end
 
   def create_capfile
-    out = "#{work_dir}/Capfile"
+    out = "#{work_dir}/Pupcapfile"
     if !File.exists?(out) || force?
-      erb = ERB.new(File.read("#{lib_root}/init/Capfile.erb"))
+      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"

data/lib/pupcap/action/prepare.rb

@@ -46,7 +46,7 @@ class Pupcap::Action::Prepare < Pupcap::Action::Base
 
   def default_options
     {
-      :file    => File.expand_path("Capfile"),
+      :file    => File.expand_path("Pupcapfile"),
       :force   => false,
       :upgrade => false
     }

data/lib/pupcap/action/ssh.rb

@@ -34,7 +34,7 @@ class Pupcap::Action::Ssh < Pupcap::Action::Base
 
   def default_options
     {
-      :file    => File.expand_path("Capfile"),
+      :file    => File.expand_path("Pupcapfile"),
     }
   end
 end

data/lib/pupcap/version.rb

@@ -4,7 +4,7 @@ module Pupcap
   class Version
 
     MAJOR = 0
-    MINOR = 1
+    MINOR = 2
     PATCH = 0
 
     def self.to_s

data/pupcap.gemspec

@@ -23,14 +23,17 @@ Gem::Specification.new do |s|
       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
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pupcap
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -59,6 +59,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.9.7
+- !ruby/object:Gem::Dependency
+  name: net-ssh-multi
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.1.0
 description: under development description
 email:
 - dima.exe@gmail.com
@@ -78,7 +94,7 @@ files:
 - lib/pupcap/action/apply/Capfile
 - lib/pupcap/action/apply/puppet.sh.erb
 - lib/pupcap/action/init.rb
-- lib/pupcap/action/init/Capfile.erb
+- lib/pupcap/action/init/Pupcapfile.erb
 - lib/pupcap/action/init/Vagrantfile.erb
 - lib/pupcap/action/init/gitignore
 - lib/pupcap/action/init/site.pp.erb