mandy 0.4.993 → 0.4.994

data/VERSION

@@ -1 +1 @@
-0.4.993
+0.4.994

data/bin/mandy-map

@@ -11,9 +11,11 @@ def absolute_path(path)
   path =~ /^\// ? path : File.join(Dir.pwd, path)
 end
 
-file   = absolute_path(ARGV[0])
+file = absolute_path(ARGV[0])
 job_name = ARGV[1]
 
 require file
 
+STDOUT.sync = true
+
 Mandy::Job.find_by_name(job_name).run_map

data/lib/mandy.rb

@@ -2,6 +2,7 @@ require "rubygems"
 require "json"
 require "uri"
 require "cgi"
+require "fileutils"
 
 %w(
   support/formatting
@@ -45,6 +46,11 @@ module Mandy
     job
   end
   module_function :job
+  
+  def parameter(name)
+    Mandy::Job.parameter(name)
+  end
+  module_function :parameter
 end
 
 Mandy.autorun = true
@@ -71,9 +77,15 @@ at_exit do
     out = File.join(output_folder, "#{i+1}-#{job.name.downcase.gsub(/\W/, '-')}")
     puts "Running #{job.name}..."
     reduce_phase = job.reducer_defined? ? %(| sort | mandy-reduce #{file} "#{job.name}") : ''
-    `cat #{input} | mandy-map #{file} "#{job.name}" #{reduce_phase} > #{out}`
+    command = %(cat #{input} | mandy-map #{file} "#{job.name}" #{reduce_phase})
+    if Mandy::Job.jobs.last==job
+       IO.popen(command) do |stdout|
+         stdout.each_line { |out| STDOUT << out }
+       end
+    else
+      `#{command} > #{out}`
+    end
     input = out
   end
-
-  puts File.read(out)
+  FileUtils.rm_rf(output_folder)
 end

data/lib/mandy/job.rb

@@ -1,5 +1,7 @@
 module Mandy
   class Job
+    JSON_PAYLOAD_KEY = "json"
+    
     class << self
       def jobs
         @jobs ||= []
@@ -8,6 +10,22 @@ module Mandy
       def find_by_name(name)
         jobs.find {|job| job.name == name }
       end
+      
+      def parameter(name)
+        return find_json_param(name) if json_provided?
+        ENV[name.to_s]
+      end
+
+      private
+
+      def find_json_param(name)
+        json_args = JSON.parse(CGI.unescape(ENV[JSON_PAYLOAD_KEY]))
+        json_args[name.to_s]
+      end
+
+      def json_provided?
+        !ENV[JSON_PAYLOAD_KEY].nil?
+      end
     end
     
     attr_reader :settings

data/lib/mandy/task.rb

@@ -1,6 +1,5 @@
 module Mandy
   class Task
-    JSON_PAYLOAD_KEY = "json"
     KEY_VALUE_SEPERATOR = "\t" unless defined?(KEY_VALUE_SEPERATOR)
     NUMERIC_PADDING = 16
     DEFAULT_COUNTER_GROUP = 'Mandy Counters'
@@ -14,7 +13,7 @@ module Mandy
 
     def emit(key, value=nil)
       data = value.nil? ? key.to_s : "#{output_serialize_key(key)}\t#{output_serialize_value(value)}"
-      @output.puts(data)
+      @output.puts data.chomp
     end
     
     def get(store, key)
@@ -44,17 +43,7 @@ module Mandy
     end
     
     def parameter(name)
-      return find_json_param(name) if json_provided?
-      ENV[name.to_s]
-    end
-    
-    def find_json_param(name)
-      @json_args ||= JSON.parse(CGI.unescape(ENV[JSON_PAYLOAD_KEY]))
-      @json_args[name.to_s]
-    end
-    
-    def json_provided?
-      !ENV[JSON_PAYLOAD_KEY].nil?
+      Job.parameter(name)
     end
     
     def deserialize_key(key)

data/lib/mandy/test_runner.rb

@@ -3,7 +3,7 @@ module Mandy
     attr_reader :job
     
     def initialize(job=Mandy::Job.jobs.first.name, opts={})
-      ENV[Mandy::Task::JSON_PAYLOAD_KEY] = opts[:parameters].to_json
+      ENV[Mandy::Job::JSON_PAYLOAD_KEY] = opts[:parameters].to_json
       @job = Mandy::Job.find_by_name(job)
     end
     

metadata

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