capistrano-paratrooper-chef 0.1.0 → 0.1.1

data/lib/capistrano-paratrooper-chef.rb

@@ -1,5 +1,7 @@
+require "find"
 require "json"
 require "tempfile"
+require "capistrano-paratrooper-chef/tarwriter"
 require "capistrano-paratrooper-chef/version"
 
 
@@ -221,16 +223,17 @@ Capistrano::Configuration.instance.load do
       task :upload, :except => { :no_release => true } do
         librarian_chef.fetch
 
-        kitchen_paths = [cookbooks_paths, roles_path, databags_path].flatten.compact.select{|d| File.exists?(d)}
-        tarball = Tempfile.new("kitchen.tar")
-        begin
-          tarball.close
-          system "tar -czf #{tarball.path} #{kitchen_paths.join(' ')}"
-          top.upload tarball.path, remote_path("kitchen.tar"), :via => :scp
-          run "cd #{fetch(:chef_working_dir)} && tar -xzf kitchen.tar"
-        ensure
-          tarball.unlink
+        stream = StringIO.new
+        TarWriter.new(stream) do |writer|
+          kitchen_paths = [cookbooks_paths, roles_path, databags_path].flatten.compact.select{|d| File.exists?(d)}
+          Find.find(*kitchen_paths) do |path|
+            writer.add(path)
+          end
         end
+
+        stream.seek(0)
+        put stream.read, remote_path("kitchen.tar"), :via => :scp
+        run "cd #{fetch(:chef_working_dir)} && tar -xf kitchen.tar"
       end
     end
   end

data/lib/capistrano-paratrooper-chef/omnibus_install.rb

@@ -3,11 +3,13 @@ require 'capistrano-paratrooper-chef'
 Capistrano::Configuration.instance.load do
   namespace :paratrooper do
     namespace :chef do
+      set :chef_solo_path, "/opt/chef/bin/chef-solo"
+
       desc "Installs chef (by omnibus installer)"
       task :install_omnibus_chef do
         run "curl -L http://www.opscode.com/chef/install.sh | #{top.sudo} bash"
       end
-      after "deploy:setup" "paratrooper:chef:install_omnibus_chef"
+      after "deploy:setup", "paratrooper:chef:install_omnibus_chef"
     end
   end
 end

data/lib/capistrano-paratrooper-chef/tarwriter.rb

@@ -0,0 +1,45 @@
+require "rubygems/package"
+
+
+# Add TarHeader::set_mtime() for hack timestamp
+class Gem::Package::TarHeader
+  @@mtime = 0
+
+  def self.set_mtime(mtime)
+    @@mtime = mtime
+  end
+
+  alias :initialize_orig :initialize
+  def initialize(vals)
+    initialize_orig(vals)
+    @mtime = @@mtime
+  end
+end
+
+
+# Add TarWriter#add() to append content from path
+class TarWriter < Gem::Package::TarWriter
+  alias :add_file_orig :add_file
+  def add_file(name, mode, mtime, &block)
+    Gem::Package::TarHeader.set_mtime(mtime)
+    add_file_orig(name, mode, &block)
+  end
+
+  alias :mkdir_orig :mkdir
+  def mkdir(name, mode, mtime)
+    Gem::Package::TarHeader.set_mtime(mtime)
+    mkdir_orig(name, mode)
+  end
+
+  def add(name)
+    stat = File.stat(name)
+
+    if File.directory?(name)
+      mkdir(name, stat.mode, stat.mtime)
+    else
+      add_file(name, stat.mode, stat.mtime) do |file|
+        file.write(File.read(name))
+      end
+    end
+  end
+end

data/lib/capistrano-paratrooper-chef/version.rb

@@ -1,7 +1,7 @@
 module Capistrano
   module Paratrooper
     module Chef
-      VERSION = "0.1.0"
+      VERSION = "0.1.1"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-paratrooper-chef
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -43,6 +43,7 @@ files:
 - lib/capistrano-paratrooper-chef.rb
 - lib/capistrano-paratrooper-chef/install.rb
 - lib/capistrano-paratrooper-chef/omnibus_install.rb
+- lib/capistrano-paratrooper-chef/tarwriter.rb
 - lib/capistrano-paratrooper-chef/version.rb
 homepage: https://github.com/tk0miya/capistrano-paratrooper-chef
 licenses: []