mandy 0.5.9 → 0.5.10

data/VERSION

@@ -1 +1 @@
-0.5.9
+0.5.10

data/bin/mandy

@@ -2,24 +2,8 @@
 require "rubygems"
 require "mandy"
 
-# Hadoop Home Detection
-hadoop_home = `echo $HADOOP_HOME`.chomp
-
-if hadoop_home== ''
-  puts "You need to set the HADOOP_HOME environment variable to point to your hadoop install    :("
-  puts "Try setting 'export HADOOP_HOME=/my/hadoop/path' in your ~/.profile maybe?"
-  exit(1)
-end
-
-# Hadoop Version Detection
-hadoop_version = `$HADOOP_HOME/bin/hadoop version 2>&1`
-
-if hadoop_version =~ /No such file or directory/
-  puts("Mandy failed to find Hadoop in #{hadoop_home}     :(")
-  puts
-  puts hadoop_version
-  exit(1)
-end
+hadoop_home = HadoopConfiguration.check_home
+hadoop_version = HadoopConfiguration.check_version
 
 # Status & Help Message
 puts "\nYou are running Mandy!"

data/bin/mandy-cat

@@ -2,6 +2,12 @@
 require 'optparse'
 require 'ostruct'
 
+require "rubygems"
+require "mandy"
+
+HadoopConfiguration.check_home_and_version
+
+
 exec('mandy-cat -h') unless ARGV.size >= 2
 
 options = OpenStruct.new

data/bin/mandy-cp

@@ -2,6 +2,11 @@
 require 'optparse'
 require 'ostruct'
 
+require "rubygems"
+require "mandy"
+
+HadoopConfiguration.check_home_and_version
+
 exec('mandy-cp -h') unless ARGV.size >= 2
 
 

data/bin/mandy-exists

@@ -2,6 +2,11 @@
 require 'optparse'
 require 'ostruct'
 
+require "rubygems"
+require "mandy"
+
+HadoopConfiguration.check_home_and_version
+
 exec('mandy-exists -h') unless ARGV.size >= 2
 
 

data/bin/mandy-get

@@ -2,6 +2,11 @@
 require 'optparse'
 require 'ostruct'
 
+require "rubygems"
+require "mandy"
+
+HadoopConfiguration.check_home_and_version
+
 exec('mandy-get -h') unless ARGV.size >= 2
 
 options = OpenStruct.new

data/bin/mandy-hadoop

@@ -5,6 +5,11 @@ require 'optparse'
 require 'ostruct'
 require 'cgi'
 
+require "rubygems"
+require "mandy"
+
+HadoopConfiguration.check_home_and_version
+
 errors = false
 options = OpenStruct.new
 

data/bin/mandy-install

@@ -1,5 +1,10 @@
 #!/usr/bin/env ruby
 
+require "rubygems"
+require "mandy"
+
+HadoopConfiguration.check_home_and_version
+
 if ARGV.size==0
   puts "USAGE: mandy-install user@server1.com [user@server2.com ...]"
   exit

data/bin/mandy-kill

@@ -2,6 +2,11 @@
 require 'optparse'
 require 'ostruct'
 
+require "rubygems"
+require "mandy"
+
+HadoopConfiguration.check_home_and_version
+
 exec('mandy-kill -h') unless ARGV.size >= 1
 
 

data/bin/mandy-local

@@ -3,6 +3,11 @@ require 'optparse'
 require 'ostruct'
 require 'cgi'
 
+require "rubygems"
+require "mandy"
+
+HadoopConfiguration.check_home_and_version
+
 options = OpenStruct.new
 
 OptionParser.new do |opts|

data/bin/mandy-map

@@ -2,6 +2,8 @@
 require "rubygems"
 require "mandy"
 
+HadoopConfiguration.check_home_and_version
+
 if ARGV.size==0
   puts "USAGE: mandy-map my_script.rb 'Job Name'"
   exit

data/bin/mandy-mkdir

@@ -2,6 +2,11 @@
 require 'optparse'
 require 'ostruct'
 
+require "rubygems"
+require "mandy"
+
+HadoopConfiguration.check_home_and_version
+
 exec('mandy-mkdir -h') unless ARGV.size >= 2
 
 

data/bin/mandy-mv

@@ -2,6 +2,11 @@
 require 'optparse'
 require 'ostruct'
 
+require "rubygems"
+require "mandy"
+
+HadoopConfiguration.check_home_and_version
+
 exec('mandy-mv -h') unless ARGV.size >= 2
 
 

data/bin/mandy-put

@@ -2,6 +2,11 @@
 require 'optparse'
 require 'ostruct'
 
+require "rubygems"
+require "mandy"
+
+HadoopConfiguration.check_home_and_version
+
 exec('mandy-put -h') unless ARGV.size >= 2
 
 

data/bin/mandy-reduce

@@ -2,6 +2,8 @@
 require "rubygems"
 require "mandy"
 
+HadoopConfiguration.check_home_and_version
+
 if ARGV.size==0
   puts "USAGE: mandy-reduce my_script.rb 'Job Name' [payload]"
   exit

data/bin/mandy-rm

@@ -2,6 +2,11 @@
 require 'optparse'
 require 'ostruct'
 
+require "rubygems"
+require "mandy"
+
+HadoopConfiguration.check_home_and_version
+
 exec('mandy-rm -h') unless ARGV.size >= 1
 
 
@@ -13,7 +18,11 @@ OptionParser.new do |opts|
   opts.on("-c", "--conf HADOOP_CONF", "Use this cluster xml config file.") do |config|
     options.config = config
   end
-  
+
+  opts.on("-f", "--force", "Use this paramter to force deletion of a relative folder, root folder or 1st level folder (like /home or /tmp)") do
+    options.force = true
+  end
+
   opts.on_tail("-h", "--help", "Show this message") do
     puts opts
     exit
@@ -23,4 +32,14 @@ end.parse!
 file = ARGV[0]
 config = options.config || 'cluster.xml'
 
+if !options.force and file =~ /^[^\/]/
+  puts "mandy-rm: Cowardly refusing to delete a relative folder. Use -f parameter to force command."
+  exit
+end
+
+if !options.force and File.expand_path(file).split("/").size <= 2
+  puts "mandy-rm: Cowardly refusing to delete a root or 1st level folder. Use -f parameter to force command."
+  exit
+end
+
 `$HADOOP_HOME/bin/hadoop fs -conf #{config} -rmr #{file}`

data/lib/mandy.rb

@@ -10,6 +10,7 @@ require "fileutils"
   dsl 
   job 
   packer
+  configuration/hadoop_configuration
   support/tuple 
   support/array_serializer 
   support/hdfs_location 
@@ -30,6 +31,8 @@ require "fileutils"
   errors
 ).each {|file| require File.join(File.dirname(__FILE__), 'mandy', file) }
 
+include HadoopConfiguration
+
 module Mandy
   class << self
     attr_accessor :local_input

data/lib/mandy/configuration/hadoop_configuration.rb

@@ -0,0 +1,28 @@
+module HadoopConfiguration
+  def check_home
+    hadoop_home = `echo $HADOOP_HOME`.chomp
+    if hadoop_home== ''
+      puts "You need to set the HADOOP_HOME environment variable to point to your hadoop install    :("
+      puts "Try setting 'export HADOOP_HOME=/my/hadoop/path' in your ~/.profile maybe?"
+      exit(1)
+    end
+    hadoop_home
+  end
+  
+  def check_version
+    hadoop_version = `$HADOOP_HOME/bin/hadoop version 2>&1`
+
+    if hadoop_version =~ /No such file or directory/
+      puts("Mandy failed to find Hadoop in #{check_home}     :(")
+      puts
+      puts hadoop_version
+      exit(1)
+    end
+    hadoop_version
+  end
+  
+  def check_home_and_version
+    check_home
+    check_version
+  end
+end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: mandy
 version: !ruby/object:Gem::Version 
-  hash: 25
   prerelease: false
   segments: 
   - 0
   - 5
-  - 9
-  version: 0.5.9
+  - 10
+  version: 0.5.10
 platform: ruby
 authors: 
 - Andy Kent
@@ -27,7 +26,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -78,6 +76,7 @@ files:
 - geminstaller.yml
 - lib/mandy.rb
 - lib/mandy/errors.rb
+- lib/mandy/configuration/hadoop_configuration.rb
 - lib/mandy/support/tuple.rb
 - lib/mandy/support/formatting.rb
 - lib/mandy/support/array_serializer.rb
@@ -118,7 +117,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -127,7 +125,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"