mandy 0.4.92 → 0.4.93

data/Rakefile

@@ -10,13 +10,17 @@ Spec::Rake::SpecTask.new(:spec) do |t|
   t.spec_opts = %w{-f s -c -L mtime}
 end
 
-task :build do
-  `gem build mandy.gemspec`
-  `mkdir pkg; mv mandy-*.gem pkg/`
-end
-
-task :install do
-  `sudo gem install pkg/mandy-*.gem`
-end
+namespace :gem do
+  task :build do
+    `gem build mandy.gemspec`
+    `mkdir pkg; mv mandy-*.gem pkg/`
+  end
 
-task :gem => [:build, :install]
+  task :install => :build do
+    `sudo gem install pkg/mandy-*.gem`
+  end
+  
+  task :push => :build do
+    `gem push pkg/mandy-#{File.read(File.join(File.dirname(__FILE__), 'VERSION'))}.gem`
+  end
+end

data/bin/mandy

@@ -1,5 +1,4 @@
 #!/usr/bin/env ruby
-
 require "rubygems"
 require "mandy"
 

data/bin/mandy-hadoop

@@ -26,7 +26,7 @@ OptionParser.new do |opts|
     options.cmdenv = "json=#{CGI.escape(config)}"
   end
   
-  opts.on("-g", '--gemfile filepath', "Path to your jobs Gemfile (defaults to ./Gemfile)") do |config|
+  opts.on("-g", '--gemfile filepath', "Path to your jobs gem yml file (defaults to ./gems.yml)") do |config|
     options.gemfile = config
   end
   
@@ -43,8 +43,8 @@ def absolute_path(path)
 end
 
 def gemfile(file)
-  path = absolute_path(file || 'Gemfile')
-  File.exist?(path) ? path : File.expand_path(File.join(File.dirname(__FILE__), '..', 'Gemfile'))
+  path = absolute_path(file || 'gems.yml')
+  File.exist?(path) ? path : nil
 end
 
 file   = ARGV[0]

data/bin/mandy-map

@@ -1,7 +1,5 @@
 #!/usr/bin/env ruby
-throw File.dirname(__FILE__)
-environment = File.expand_path(File.join(File.dirname(__FILE__), '..', 'vendor', 'gems', 'environment.rb'))
-require File.exist?(environment) ? environment : "rubygems"
+require "rubygems"
 require "mandy"
 
 if ARGV.size==0

data/bin/mandy-reduce

@@ -1,6 +1,5 @@
 #!/usr/bin/env ruby
-environment = File.expand_path(File.join(File.dirname(__FILE__), '..', 'vendor', 'gems', 'environment.rb'))
-require File.exist?(environment) ? environment : "rubygems"
+require "rubygems"
 require "mandy"
 
 if ARGV.size==0

data/bootstrap.rb

@@ -5,7 +5,7 @@ module Mandy
     def self.unpack(file)
       return false unless File.extname(file) == '.tar'
       `tar -xf #{file}`
-      `gem bundle`
+      `geminstaller --sudo --silent --exceptions`
     end
   end
 end

data/lib/packer.rb

@@ -3,19 +3,17 @@ require "fileutils"
 module Mandy
   class Packer
     TMP_DIR = '/tmp/mandy'
+    MANDY_DIR = File.expand_path(File.join(File.dirname(__FILE__), '..'))
     
-    def self.pack(script, dir, gemfile)
+    def self.pack(script, dir, gemfile=nil)
       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(script, tmp_path)
       FileUtils.cp_r(Dir.glob(to_be_copied), tmp_path)
-      FileUtils.cp_r(gemfile, tmp_path)
-      Dir.chdir(tmp_path) do 
-        `gem bundle`
-        `rm -r vendor/gems/gems`
-        `tar -cf bundle.tar *`
-      end
+      FileUtils.cp(File.join(MANDY_DIR, 'geminstaller.yml'), tmp_path)
+      FileUtils.cp(gemfile, File.join(tmp_path, 'gems.yml')) if gemfile and File.exists?(gemfile)
+      Dir.chdir(tmp_path) { `tar -cf bundle.tar *` }
       File.join(tmp_path, 'bundle.tar')
     end
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mandy
 version: !ruby/object:Gem::Version 
-  version: 0.4.92
+  version: 0.4.93
 platform: ruby
 authors: 
 - Andy Kent
@@ -13,16 +13,6 @@ cert_chain: []
 date: 2009-10-19 00:00:00 +01:00
 default_executable: 
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: bundler
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
 - !ruby/object:Gem::Dependency 
   name: json
   type: :runtime
@@ -55,17 +45,23 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- bin/mandy
 - bin/mandy-hadoop
 - bin/mandy-local
 - bin/mandy-map
+- bin/mandy-put
 - bin/mandy-get
 - bin/mandy-cat
-- bin/mandy-put
 - bin/mandy-reduce
+- bin/mandy-rm
+- bin/mandy-mv
+- bin/mandy-cp
+- bin/mandy-mkdir
+- bin/mandy-exists
+- bin/mandy-install
 - readme.md
 - Rakefile
 - bootstrap.rb
-- Gemfile
 - lib/mandy.rb
 - lib/support/tuple.rb
 - lib/support/formatting.rb

data/Gemfile

@@ -1,2 +0,0 @@
-source "http://gemcutter.org"
-gem 'mandy'