pupcap 0.0.5 → 0.1.0

data/lib/pupcap/action/{cook.rb → apply.rb}

@@ -1,14 +1,14 @@
 require 'pupcap/action'
 require 'pupcap/command'
 
-class Pupcap::Action::Cook < Pupcap::Action::Base
+class Pupcap::Action::Apply < Pupcap::Action::Base
   def initialize
     check_puppetfile!
   end
 
   def start
     cap = create_cap_for(parsed_options[:file])
-    cap_load_and_run_task(cap, "cook")
+    cap_load_and_run_task(cap, "apply")
   end
 
   def parsed_options
@@ -42,7 +42,7 @@ class Pupcap::Action::Cook < Pupcap::Action::Base
 
   def default_options
     {
-      :file    => File.expand_path("Puppetfile"),
+      :file    => File.expand_path("Capfile"),
       :debug   => false,
       :noop    => false
     }

data/lib/pupcap/action/apply/Capfile

@@ -0,0 +1,35 @@
+require 'erb'
+
+namespace :apply do
+  task :default do
+    rsync
+    puppet
+    cleanup
+  end
+
+  task :rsync do
+    from = "#{local_root}/puppet"
+    to   = deploy_to
+    upload(from, to, :recursive => true, :via => :scp)
+  end
+
+  task :puppet do
+    remote_command = "#{deploy_to}/apply.sh"
+
+    puppet = "/usr/local/bin/puppet"
+    modules = "--modulepath=#{deploy_to}/modules:#{deploy_to}/site-modules"
+    nook = pupcap_options[:noop] ? " --noop" : ""
+    debug = pupcap_options[:debug] ? " --debug --verbose" : ""
+
+    erb = ERB.new(File.read("#{pupcap_root}/action/apply/puppet.sh.erb"))
+    rs = erb.result(binding)
+
+    put(rs, remote_command)
+    run("chmod +x #{remote_command}")
+    sudo("#{remote_command} \"$CAPISTRANO:HOSTROLES$\"")
+  end
+
+  task :cleanup do
+    run("rm -rf #{deploy_to}")
+  end
+end

data/lib/pupcap/action/{cook/apply.sh.erb → apply/puppet.sh.erb}

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

data/lib/pupcap/action/init.rb

@@ -10,8 +10,10 @@ class Pupcap::Action::Init < Pupcap::Action::Base
   def start
     create_directories
     create_vagrantfile
-    create_puppetfile
+    create_capfile
     create_pp
+    librarian_puppet
+    create_gitignore
   end
 
   def create_vagrantfile
@@ -20,38 +22,52 @@ 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"
     else
-      puts "Skip file #{out}"
+      puts "\t skip #{out}"
     end
   end
 
-  def create_puppetfile
-    out = "#{work_dir}/Puppetfile"
+  def create_capfile
+    out = "#{work_dir}/Capfile"
     if !File.exists?(out) || force?
-      erb = ERB.new(File.read("#{lib_root}/init/Puppetfile.erb"))
+      erb = ERB.new(File.read("#{lib_root}/init/Capfile.erb"))
       rs = erb.result(binding)
       File.open(out, "w+"){ |io| io.write rs }
+      puts "\t create Capfile"
     else
-      puts "Skip file #{out}"
+      puts "\t skip #{out}"
     end
   end
 
   def create_pp
-    out = "#{work_dir}/puppet/manifests/default.pp"
+    out = "#{work_dir}/puppet/manifests/site.pp"
     if !File.exists?(out) || force?
-      erb = ERB.new(File.read("#{lib_root}/init/default.pp.erb"))
+      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"
     else
-      puts "Skip file #{out}"
+      puts "\t skip #{out}"
     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/modules/.gitkeep")
     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
+    unless File.exists?("#{work_dir}.gitignore")
+      FileUtils.copy("#{lib_root}/init/gitignore", "#{work_dir}/.gitignore")
+    end
   end
 
   def work_dir

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

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

data/lib/pupcap/action/init/gitignore

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

data/lib/pupcap/action/noop.rb

@@ -0,0 +1,9 @@
+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/action/prepare.rb

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

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

@@ -6,9 +6,10 @@ then
   exit 0
 fi
 
-if test ! -e /root/.pupcap_prepare_locale_ok -o "x${PUPCAP_FORCE}" = "x1"
+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 && touch /root/pupcap_prepare_locale_ok
+  locale-gen en_US.UTF-8 && update-locale LANG=en_US.UTF-8
 fi
 
 if test -n "${PUPCAP_HOSTNAME}"
@@ -21,7 +22,7 @@ SOURCES_LIST=/etc/apt/sources.list
 
 SOURCES_LIST_MD5=`md5sum ${SOURCES_LIST} | awk '{ print $1 }'`
 
-if test "$SOURCES_LIST_MD5" != "14846cd43a3ef58b204b0807fa4856f8" -o "x${PUPCAP_FORCE}" = "x1"
+if test "$SOURCES_LIST_MD5" != "14846cd43a3ef58b204b0807fa4856f8"
 then
 
   cp -f ${SOURCES_LIST} ${SOURCES_LIST}.pupcap_back
@@ -52,6 +53,8 @@ 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/bin/gem install -q --no-ri --no-rdoc librarian-puppet
+
 /usr/sbin/groupadd -f puppet
 
 touch /root/.pupcap_prepare_ok

data/lib/pupcap/action/ssh.rb

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

data/lib/pupcap/cli.rb

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

data/lib/pupcap/version.rb

@@ -4,8 +4,8 @@ module Pupcap
   class Version
 
     MAJOR = 0
-    MINOR = 0
-    PATCH = 5
+    MINOR = 1
+    PATCH = 0
 
     def self.to_s
       "#{MAJOR}.#{MINOR}.#{PATCH}"

data/pupcap.gemspec

@@ -22,12 +22,15 @@ Gem::Specification.new do |s|
     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"])
     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"])
     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"])
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pupcap
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -43,6 +43,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: librarian-puppet
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.7
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.7
 description: under development description
 email:
 - dima.exe@gmail.com
@@ -58,13 +74,15 @@ files:
 - bin/pupcap
 - lib/pupcap.rb
 - lib/pupcap/action.rb
-- lib/pupcap/action/cook.rb
-- lib/pupcap/action/cook/Capfile
-- lib/pupcap/action/cook/apply.sh.erb
+- 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/Puppetfile.erb
+- lib/pupcap/action/init/Capfile.erb
 - lib/pupcap/action/init/Vagrantfile.erb
-- lib/pupcap/action/init/default.pp.erb
+- lib/pupcap/action/init/gitignore
+- 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

data/lib/pupcap/action/cook/Capfile

@@ -1,41 +0,0 @@
-require 'erb'
-
-namespace :cook do
-  task :default do
-    rsync
-    apply
-    cleanup
-  end
-
-  task :rsync do
-    find_servers.each do |server|
-      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}/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 --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
-    run("rm -rf #{deploy_to}")
-  end
-end

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

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