embulk 0.7.2 → 0.7.3

data/lib/embulk/decoder_plugin.rb

@@ -9,18 +9,16 @@ module Embulk
 
     # TODO
 
-    if Embulk.java?
-      # TODO new_java
+    # TODO new_java
 
-      def self.from_java(java_class)
-        JavaPlugin.ruby_adapter_class(java_class, DecoderPlugin, RubyAdapter)
-      end
+    def self.from_java(java_class)
+      JavaPlugin.ruby_adapter_class(java_class, DecoderPlugin, RubyAdapter)
+    end
 
-      module RubyAdapter
-        module ClassMethods
-        end
-        # TODO
+    module RubyAdapter
+      module ClassMethods
       end
+      # TODO
     end
   end
 

data/lib/embulk/encoder_plugin.rb

@@ -9,18 +9,16 @@ module Embulk
 
     # TODO
 
-    if Embulk.java?
-      # TODO new_java
+    # TODO new_java
 
-      def self.from_java(java_class)
-        JavaPlugin.ruby_adapter_class(java_class, EncoderPlugin, RubyAdapter)
-      end
+    def self.from_java(java_class)
+      JavaPlugin.ruby_adapter_class(java_class, EncoderPlugin, RubyAdapter)
+    end
 
-      module RubyAdapter
-        module ClassMethods
-        end
-        # TODO
+    module RubyAdapter
+      module ClassMethods
       end
+      # TODO
     end
   end
 

data/lib/embulk/error.rb

@@ -23,4 +23,7 @@ module Embulk
       end
     end
   end
+
+  class PluginLoadError < ConfigError
+  end
 end

data/lib/embulk/exec.rb

@@ -2,7 +2,7 @@
 module Embulk
   module Exec
     def self.preview?
-      Java::Exec.isPreview
+      Java::SPI::Exec.isPreview
     end
   end
 end

data/lib/embulk/executor_plugin.rb

@@ -5,18 +5,16 @@ module Embulk
   class ExecutorPlugin
     # TODO
 
-    if Embulk.java?
-      # TODO new_java
+    # TODO new_java
 
-      def self.from_java(java_class)
-        JavaPlugin.ruby_adapter_class(java_class, ExecutorPlugin, RubyAdapter)
-      end
+    def self.from_java(java_class)
+      JavaPlugin.ruby_adapter_class(java_class, ExecutorPlugin, RubyAdapter)
+    end
 
-      module RubyAdapter
-        module ClassMethods
-        end
-        # TODO
+    module RubyAdapter
+      module ClassMethods
       end
+      # TODO
     end
   end
 

data/lib/embulk/file_input_plugin.rb

@@ -4,23 +4,21 @@ module Embulk
     # TODO transaction, resume, cleanup
     # TODO run
 
-    if Embulk.java?
-      # TODO to_java
+    # TODO to_java
 
-      def self.from_java(java_class)
-        JavaPlugin.ruby_adapter_class(java_class, FileInputPlugin, RubyAdapter)
-      end
+    def self.from_java(java_class)
+      JavaPlugin.ruby_adapter_class(java_class, FileInputPlugin, RubyAdapter)
+    end
 
-      module RubyAdapter
-        module ClassMethods
-          def new_java
-            Java::FileInputRunner.new(Java.injector.getInstance(java_class))
-          end
-          # TODO transaction, resume, cleanup
+    module RubyAdapter
+      module ClassMethods
+        def new_java
+          Java::FileInputRunner.new(Java.injector.getInstance(java_class))
         end
-
-        # TODO run
+        # TODO transaction, resume, cleanup
       end
+
+      # TODO run
     end
   end
 

data/lib/embulk/file_output_plugin.rb

@@ -4,23 +4,21 @@ module Embulk
     # TODO transaction, resume, cleanup
     # TODO add, finish, close, abort, commit
 
-    if Embulk.java?
-      # TODO to_java
+    # TODO to_java
 
-      def self.from_java(java_class)
-        JavaPlugin.ruby_adapter_class(java_class, FileOutputPlugin, RubyAdapter)
-      end
+    def self.from_java(java_class)
+      JavaPlugin.ruby_adapter_class(java_class, FileOutputPlugin, RubyAdapter)
+    end
 
-      module RubyAdapter
-        module ClassMethods
-          def new_java
-            Java::FileOutputRunner.new(Java.injector.getInstance(java_class))
-          end
-          # TODO transaction, resume, cleanup
+    module RubyAdapter
+      module ClassMethods
+        def new_java
+          Java::FileOutputRunner.new(Java.injector.getInstance(java_class))
         end
-
-        # TODO add, finish, close, abort, commit
+        # TODO transaction, resume, cleanup
       end
+
+      # TODO add, finish, close, abort, commit
     end
   end
 

data/lib/embulk/filter_plugin.rb

@@ -34,72 +34,70 @@ module Embulk
     def close
     end
 
-    if Embulk.java?
-      def self.new_java
-        JavaAdapter.new(self)
-      end
+    def self.new_java
+      JavaAdapter.new(self)
+    end
 
-      class JavaAdapter
-        include Java::FilterPlugin
+    class JavaAdapter
+      include Java::FilterPlugin
 
-        def initialize(ruby_class)
-          @ruby_class = ruby_class
-        end
+      def initialize(ruby_class)
+        @ruby_class = ruby_class
+      end
 
-        def transaction(java_config, java_in_schema, java_control)
-          config = DataSource.from_java(java_config)
-          in_schema = Schema.from_java(java_in_schema)
-          @ruby_class.transaction(config, in_schema) do |task_source_hash, out_columns|
-            java_task_source = DataSource.from_ruby_hash(task_source_hash).to_java
-            java_out_schemas = Schema.new(out_columns).to_java
-            java_control.run(java_task_source, java_out_schemas)
-          end
-          nil
+      def transaction(java_config, java_in_schema, java_control)
+        config = DataSource.from_java(java_config)
+        in_schema = Schema.from_java(java_in_schema)
+        @ruby_class.transaction(config, in_schema) do |task_source_hash, out_columns|
+          java_task_source = DataSource.from_ruby_hash(task_source_hash).to_java
+          java_out_schemas = Schema.new(out_columns).to_java
+          java_control.run(java_task_source, java_out_schemas)
         end
+        nil
+      end
 
-        def open(java_task_source, java_in_schema, java_out_schema, java_output)
-          task_source = DataSource.from_java(java_task_source)
-          in_schema = Schema.from_java(java_in_schema)
-          out_schema = Schema.from_java(java_out_schema)
-          page_builder = PageBuilder.new(out_schema, java_output)
-          ruby_object = @ruby_class.new(task_source, in_schema, out_schema, page_builder)
-          return OutputAdapter.new(ruby_object, in_schema, page_builder)
-        end
+      def open(java_task_source, java_in_schema, java_out_schema, java_output)
+        task_source = DataSource.from_java(java_task_source)
+        in_schema = Schema.from_java(java_in_schema)
+        out_schema = Schema.from_java(java_out_schema)
+        page_builder = PageBuilder.new(out_schema, java_output)
+        ruby_object = @ruby_class.new(task_source, in_schema, out_schema, page_builder)
+        return OutputAdapter.new(ruby_object, in_schema, page_builder)
+      end
 
-        class OutputAdapter
-          include Java::TransactionalPageOutput
+      class OutputAdapter
+        include Java::TransactionalPageOutput
 
-          def initialize(ruby_object, in_schema, page_builder)
-            @ruby_object = ruby_object
-            @in_schema = in_schema
-            @page_builder = page_builder
-          end
+        def initialize(ruby_object, in_schema, page_builder)
+          @ruby_object = ruby_object
+          @in_schema = in_schema
+          @page_builder = page_builder
+        end
 
-          def add(java_page)
-            @ruby_object.add Page.new(java_page, @in_schema)
-          end
+        def add(java_page)
+          @ruby_object.add Page.new(java_page, @in_schema)
+        end
 
-          def finish
-            @ruby_object.finish
-          end
+        def finish
+          @ruby_object.finish
+        end
 
-          def close
-            @ruby_object.close
-          ensure
-            @page_builder.close
-          end
+        def close
+          @ruby_object.close
+        ensure
+          @page_builder.close
         end
       end
+    end
 
-      def self.from_java(java_class)
-        JavaPlugin.ruby_adapter_class(java_class, FilterPlugin, RubyAdapter)
-      end
+    def self.from_java(java_class)
+      JavaPlugin.ruby_adapter_class(java_class, FilterPlugin, RubyAdapter)
+    end
 
-      module RubyAdapter
-        module ClassMethods
-        end
-        # TODO
+    module RubyAdapter
+      module ClassMethods
       end
+      # TODO
     end
   end
 end

data/lib/embulk/formatter_plugin.rb

@@ -33,72 +33,70 @@ module Embulk
     def close
     end
 
-    if Embulk.java?
-      def self.new_java
-        JavaAdapter.new(self)
+    def self.new_java
+      JavaAdapter.new(self)
+    end
+
+    class JavaAdapter
+      include Java::FormatterPlugin
+
+      def initialize(ruby_class)
+        @ruby_class = ruby_class
+      end
+
+      def transaction(java_config, java_schema, java_control)
+        config = DataSource.from_java(java_config)
+        schema = Schema.from_java(java_schema)
+        @ruby_class.transaction(config, schema) do |task_source_hash|
+          java_task_source = DataSource.from_ruby_hash(task_source_hash).to_java
+          java_control.run(java_task_source)
+        end
+        nil
       end
 
-      class JavaAdapter
-        include Java::FormatterPlugin
+      def open(java_task_source, java_schema, java_file_output)
+        task_source = DataSource.from_java(java_task_source)
+        schema = Schema.from_java(java_schema)
+        file_output = FileOutput.new(java_file_output)
+        ruby_object = @ruby_class.new(task_source, schema, file_output)
+        return OutputAdapter.new(ruby_object, schema, file_output)
+      end
+
+      class OutputAdapter
+        include Java::TransactionalPageOutput
 
-        def initialize(ruby_class)
-          @ruby_class = ruby_class
+        def initialize(ruby_object, schema, file_output)
+          @ruby_object = ruby_object
+          @schema = schema
+          @file_output = file_output
         end
 
-        def transaction(java_config, java_schema, java_control)
-          config = DataSource.from_java(java_config)
-          schema = Schema.from_java(java_schema)
-          @ruby_class.transaction(config, schema) do |task_source_hash|
-            java_task_source = DataSource.from_ruby_hash(task_source_hash).to_java
-            java_control.run(java_task_source)
-          end
-          nil
+        def add(java_page)
+          # TODO reuse page reader
+          @ruby_object.add Page.new(java_page, @schema)
         end
 
-        def open(java_task_source, java_schema, java_file_output)
-          task_source = DataSource.from_java(java_task_source)
-          schema = Schema.from_java(java_schema)
-          file_output = FileOutput.new(java_file_output)
-          ruby_object = @ruby_class.new(task_source, schema, file_output)
-          return OutputAdapter.new(ruby_object, schema, file_output)
+        def finish
+          @ruby_object.finish
         end
 
-        class OutputAdapter
-          include Java::TransactionalPageOutput
-
-          def initialize(ruby_object, schema, file_output)
-            @ruby_object = ruby_object
-            @schema = schema
-            @file_output = file_output
-          end
-
-          def add(java_page)
-            # TODO reuse page reader
-            @ruby_object.add Page.new(java_page, @schema)
-          end
-
-          def finish
-            @ruby_object.finish
-          end
-
-          def close
-            @ruby_object.close
-          ensure
-            @file_output.close
-          end
+        def close
+          @ruby_object.close
+        ensure
+          @file_output.close
         end
       end
+    end
 
-      def self.from_java(java_class)
-        JavaPlugin.ruby_adapter_class(java_class, FormatterPlugin, RubyAdapter)
-      end
+    def self.from_java(java_class)
+      JavaPlugin.ruby_adapter_class(java_class, FormatterPlugin, RubyAdapter)
+    end
 
-      module RubyAdapter
-        module ClassMethods
-          # TODO transaction, resume, cleanup
-        end
-        # TODO add, finish, close
+    module RubyAdapter
+      module ClassMethods
+        # TODO transaction, resume, cleanup
       end
+      # TODO add, finish, close
     end
   end
 

data/lib/embulk/guess_plugin.rb

@@ -7,40 +7,38 @@ module Embulk
       raise NotImplementedError, "GuessPlugin#guess(config, sample_buffer) must be implemented"
     end
 
-    if Embulk.java?
-      def self.new_java
-        JavaAdapter.new(new)
-      end
-
-      class JavaAdapter
-        include Java::GuessPlugin
+    def self.new_java
+      JavaAdapter.new(new)
+    end
 
-        def initialize(ruby_guess)
-          @ruby_guess = ruby_guess
-        end
+    class JavaAdapter
+      include Java::GuessPlugin
 
-        def guess(java_config, java_sample)
-          config = DataSource.from_java(java_config)
-          sample = Buffer.from_java(java_sample)
-          config_diff_hash = @ruby_guess.guess(config, sample)
-          return DataSource.from_ruby_hash(config_diff_hash).to_java
-        end
+      def initialize(ruby_guess)
+        @ruby_guess = ruby_guess
       end
 
-      def self.from_java(java_class)
-        JavaPlugin.ruby_adapter(java_class, GuessPlugin, RubyAdapter)
+      def guess(java_config, java_sample)
+        config = DataSource.from_java(java_config)
+        sample = Buffer.from_java(java_sample)
+        config_diff_hash = @ruby_guess.guess(config, sample)
+        return DataSource.from_ruby_hash(config_diff_hash).to_java
       end
+    end
 
-      module RubyAdapter
-        module ClassMethods
-        end
+    def self.from_java(java_class)
+      JavaPlugin.ruby_adapter(java_class, GuessPlugin, RubyAdapter)
+    end
 
-        def guess(config, sample)
-          java_config = config.to_java
-          java_sample = sample.to_java
-          java_config_diff = java_object.guess(java_config, java_sample)
-          return DataSource.from_java(java_config_diff)
-        end
+    module RubyAdapter
+      module ClassMethods
+      end
+
+      def guess(config, sample)
+        java_config = config.to_java
+        java_sample = sample.to_java
+        java_config_diff = java_object.guess(java_config, java_sample)
+        return DataSource.from_java(java_config_diff)
       end
     end
   end