mandy 0.3.5 → 0.3.6

data/bin/mandy-hadoop

@@ -51,7 +51,7 @@ input  = ARGV[1]
 output_folder = ARGV[2]
 config = options.config || 'cluster.xml'
 puts "Packaging Gems for distribution..."
-payload = Mandy::Packer.pack(options.payload || ARGV[0], gemfile(options.gemfile))
+payload = Mandy::Packer.pack(file, options.payload || ARGV[0], gemfile(options.gemfile))
 cmdenv = options.cmdenv
 
 at_exit do 

data/bootstrap.rb

@@ -2,25 +2,10 @@ require "fileutils"
 
 module Mandy
   class Packer
-    TMP_DIR = '/tmp/mandy'
-    
-    def self.pack(dir)
-      return dir if File.file?(dir)
-      FileUtils.mkdir_p(TMP_DIR)
-      tmp_path = "#{TMP_DIR}/packed-job-#{Time.now.to_i}.tar"
-      Dir.chdir(dir) { `tar -cf #{tmp_path} *` }
-      tmp_path
-    end
-    
     def self.unpack(file)
       return false unless File.extname(file) == '.tar'
       `tar -xf #{file}`
     end
-    
-    def self.cleanup!(file)
-      return false unless File.extname(file) == '.tar'
-      `rm #{file}`
-    end
   end
 end
 

data/lib/packer.rb

@@ -4,10 +4,11 @@ module Mandy
   class Packer
     TMP_DIR = '/tmp/mandy'
     
-    def self.pack(dir, gemfile)
+    def self.pack(script, dir, gemfile)
       tmp_path = "#{TMP_DIR}/packed-job-#{Time.now.to_i}"
       FileUtils.mkdir_p(tmp_path)
       to_be_copied = File.file?(dir) ? dir : File.join(dir, '*')
+      FileUtils.cp_r(script, tmp_path)
       FileUtils.cp_r(Dir.glob(to_be_copied), tmp_path)
       FileUtils.cp_r(gemfile, tmp_path)
       Dir.chdir(tmp_path) { `gem bundle` }
@@ -15,11 +16,6 @@ module Mandy
       File.join(tmp_path, 'bundle.tar')
     end
     
-    def self.unpack(file)
-      return false unless File.extname(file) == '.tar'
-      `tar -xf #{file}`
-    end
-    
     def self.cleanup!(file)
       return false unless File.extname(file) == '.tar'
       `rm #{file}`

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mandy
 version: !ruby/object:Gem::Version 
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors: 
 - Andy Kent