pigspec 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ff6b83a92486fddcc094dc3b1659ef2c2012b56
-  data.tar.gz: d03df5c39e749ae6f913f9b60a0d36a40c73017a
+  metadata.gz: 208d740c894defd31ca2d2676ea9cefa0db09408
+  data.tar.gz: 30024c138ed78cd9dfa9aa88e5f701a5abe9e407
 SHA512:
-  metadata.gz: 28d0d8443c85e178019daa75120e11b705dbb8e05f3328012880018b35ac72998001f8ab7c1cc9b5f93f832697230949c06e5a547a0d0f318537d31a498c1682
-  data.tar.gz: ef2511893dad84cc351967e91c228df9d42cd2b3686588a52c36ef686ee75672c792332e589f93548f7e6b4bdce4191eefbadc1cb6ac0b6ea3400bb9c66ea403
+  metadata.gz: c4697ee7aa6edee7d9f8cecc4695e58c550a01dd991bada4aa1d50586a24a5ebbd1f8e924ca534396b8385255617c9f2da41fa907996af3cea599ca2162167c8
+  data.tar.gz: 694b32e7286010429e9877343ac30eca05b15814b7d6360dcd6f81b323037837338ba7cba939b0af254ae27e476e2ca2e7334e2c43ae0e63f051b61c02025bf9

data/lib/pigspec/javabridge.rb

@@ -5,18 +5,8 @@ require 'tempfile'
 module PigSpec
   # bridge for java pig classies
   class JavaBridge
-    def initialize(pig_path, pigunit_path)
-      fail ArgumentError, 'pig_path must not be nil.' if pig_path.nil?
-      fail ArgumentError, 'pigunit_path must not be nil.' if pigunit_path.nil?
-
-      Rjb.add_classpath(pig_path)
-      Rjb.add_classpath(pigunit_path)
-
-      Rjb.load '.', ['-Dfile.encoding=UTF-8']
-
-      Rjb.add_jar(pig_path)
-      Rjb.add_jar(pigunit_path)
-
+    def initialize(pig_path, pigunit_path, options)
+      load_pig pig_path, pigunit_path, options
       import_classies
     end
 
@@ -75,6 +65,19 @@ module PigSpec
 
   private
 
+    def load_pig(pig_path, pigunit_path, options)
+      fail ArgumentError, 'pig_path must not be nil.' if pig_path.nil?
+      fail ArgumentError, 'pigunit_path must not be nil.' if pigunit_path.nil?
+
+      Rjb.add_classpath(pig_path)
+      Rjb.add_classpath(pigunit_path)
+
+      Rjb.load '.', options.map { |k, v| "-D#{k}=#{v}" }
+
+      Rjb.add_jar(pig_path)
+      Rjb.add_jar(pigunit_path)
+    end
+
     def import_classies
       require 'rjb/list'
       @pig_test_class = Rjb.import('org.apache.pig.pigunit.PigTest')

data/lib/pigspec/version.rb

@@ -1,4 +1,4 @@
 # PigSpec version constant
 module PigSpec
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 end

data/lib/pigspec.rb

@@ -12,25 +12,28 @@ module PigSpec
 
     class << self
       attr_reader :bridge
-      def construct(pig_path, pigunit_path)
-        @pig_path = pig_path if @pig_path.nil?
-        @pigunit_path = pigunit_path if @pigunit_path.nil?
+      def construct(pig_path, pigunit_path, options)
+        @pig_path ||= pig_path
+        @pigunit_path ||= pigunit_path
+        @options ||= options
 
-        fail ArgumentError, 'This version pigspec only can a unique pig_path for one process.' unless @pig_path == pig_path
-        fail ArgumentError, 'This version pigspec only can a unique pigunit_path for one process.' unless @pigunit_path == pigunit_path
+        fail ArgumentError, 'This version pigspec only can same pig_path for all processes.' unless @pig_path == pig_path
+        fail ArgumentError, 'This version pigspec only can same pigunit_path for all processes.' unless @pigunit_path == pigunit_path
+        fail ArgumentError, 'This version pigspec only can same options for all processes.' unless @options == options
 
-        @bridge ||= JavaBridge.new @pig_path, @pigunit_path
+        @bridge ||= JavaBridge.new @pig_path, @pigunit_path, @options
       end
     end
 
-    def setup(pig_path, pigunit_path)
-      Test.construct pig_path, pigunit_path
+    def setup(pig_path, pigunit_path, options)
+      fail ArgumentError, 'Must needs pig_path. It must point to your installation of Apache Pig/PigUnit jar files.' if pig_path.nil?
+      fail ArgumentError, 'Must needs pigunit_path. It must point to your installation of Apache Pig/PigUnit jar files.' if pigunit_path.nil?
+
+      Test.construct pig_path, pigunit_path, options
       @script = []
       @args = []
       @override = []
       @pickup = nil
-      # rescue ArgumentError
-      # raise 'Must needs pig_path and pigunit_path. It must point to your installation of Apache Pig/PigUnit jar files.'
     end
 
     def shutdown
@@ -97,10 +100,10 @@ module_function
   def pig(
     pig_path = File.join(ENV['PIG_HOME'], 'pig.jar'),
     pigunit_path = File.join(ENV['PIG_HOME'], 'pigunit.jar'),
-    &block
+    options = { 'file.encoding' => 'UTF-8' }, &block
   )
     test = Test.new
-    test.setup(pig_path, pigunit_path)
+    test.setup(pig_path, pigunit_path, options)
     test.evaluate(&block)
     result = test.run
     test.shutdown

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pigspec
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - shiracha
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-08 00:00:00.000000000 Z
+date: 2015-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rjb