rubydoop 1.0.4 → 1.0.5

data/lib/rubydoop/dsl.rb

@@ -89,7 +89,11 @@ module Rubydoop
     # @option options [JavaClass] :format The input format to use, defaults to `TextInputFormat`
     def input(paths, options={})
       paths = paths.join(',') if paths.is_a?(Enumerable)
-      format = options[:format] || Hadoop::Mapreduce::Lib::Input::TextInputFormat
+      format = options.fetch(:format, :text)
+      unless format.is_a?(Class)
+        class_name = format.to_s.gsub(/^.|_./) {|x| x[-1,1].upcase } + "InputFormat"
+        format = Hadoop::Mapreduce::Lib::Input.const_get(class_name)
+      end
       format.set_input_paths(@job, paths)
       @job.set_input_format_class(format)
     end
@@ -105,7 +109,11 @@ module Rubydoop
     # @param [Hash] options
     # @option options [JavaClass] :format The output format to use, defaults to `TextOutputFormat`
     def output(dir, options={})
-      format = options[:format] || Hadoop::Mapreduce::Lib::Output::TextOutputFormat
+      format = options.fetch(:format, :text)
+      unless format.is_a?(Class)
+        class_name = format.to_s.gsub(/^.|_./) {|x| x[-1,1].upcase } + "OutputFormat"
+        format = Hadoop::Mapreduce::Lib::Output.const_get(class_name)
+      end
       format.set_output_path(@job, Hadoop::Fs::Path.new(dir))
       @job.set_output_format_class(format)
     end

data/lib/rubydoop/package.rb

@@ -5,6 +5,7 @@ require 'open-uri'
 require 'ant'
 require 'fileutils'
 require 'set'
+require 'tmpdir'
 
 
 module Rubydoop
@@ -98,6 +99,7 @@ module Rubydoop
     end
 
     def build_jar!
+      @tmpdir =  Dir.mktmpdir('rubydoop')
       # the ant block is instance_exec'ed so instance variables and methods are not in scope
       options = @options
       bundled_gems = load_path
@@ -112,11 +114,17 @@ module Rubydoop
           lib_jars.each { |extra_jar| zipfileset :dir => File.dirname(extra_jar), :includes => File.basename(extra_jar), :prefix => 'lib' }
         end
       end
+    ensure
+      FileUtils.rm_rf(@tmpdir)
     end
 
     def load_path
       Bundler.definition.specs_for(@options[:gem_groups]).flat_map do |spec|
-        if spec.full_name !~ /^(?:bundler|rubydoop)-\d+/
+        if spec.full_name =~ /^jruby-openssl-\d+/
+          Dir.chdir(@tmpdir) do
+            repackage_openssl(spec)
+          end
+        elsif spec.full_name !~ /^(?:bundler|rubydoop)-\d+/
           spec.require_paths.map do |rp| 
             "#{spec.full_gem_path}/#{rp}"
           end
@@ -125,5 +133,19 @@ module Rubydoop
         end
       end
     end
+
+    def repackage_openssl(spec)
+      FileUtils.cp_r(spec.full_gem_path, 'jruby-openssl')
+      FileUtils.mv('jruby-openssl/lib/shared', 'jruby-openssl/new_lib')
+      FileUtils.mv('jruby-openssl/lib/1.8', 'jruby-openssl/new_lib/openssl/1.8')
+      FileUtils.mv('jruby-openssl/lib/1.9', 'jruby-openssl/new_lib/openssl/1.9')
+      main_file = File.read('jruby-openssl/new_lib/openssl.rb')
+      main_file.gsub!('../1.8', 'openssl/1.8')
+      main_file.gsub!('../1.9', 'openssl/1.9')
+      File.open('jruby-openssl/new_lib/openssl.rb', 'w') { |io| io.write(main_file) }
+      FileUtils.rm_r('jruby-openssl/lib')
+      FileUtils.mv('jruby-openssl/new_lib', 'jruby-openssl/lib')
+      ["#{@tmpdir}/jruby-openssl/lib"]
+    end
   end
 end

data/lib/rubydoop/version.rb

@@ -1,4 +1,4 @@
 module Rubydoop
   # @private
-  VERSION = '1.0.4'
+  VERSION = '1.0.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubydoop
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
   prerelease:
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-11-29 00:00:00.000000000 Z
+date: 2012-12-10 00:00:00.000000000 Z
 dependencies: []
 description: Rubydoop embeds a JRuby runtime in Hadoop, letting you write map reduce code in Ruby without using the streaming APIs
 email: