embulk 0.6.16 → 0.6.17

data/lib/embulk/data/new/java/input.java.erb

@@ -1,6 +1,7 @@
-package org.embulk.<%= embulk_category %>;
+package <%= java_package_name %>;
 
 import java.util.List;
+import com.google.common.base.Optional;
 import org.embulk.config.CommitReport;
 import org.embulk.config.Config;
 import org.embulk.config.ConfigDefault;
@@ -20,14 +21,21 @@ public class <%= java_class_name %>
     public interface PluginTask
             extends Task
     {
-        @Config("property1")
-        public String getProperty1();
+        // configuration option 1 (required integer)
+        @Config("option1")
+        public int getOption1();
 
-        @Config("property2")
-        @ConfigDefault("0")
-        public int getProperty2();
+        // configuration option 2 (optional string, null is not allowed)
+        @Config("optoin2")
+        @ConfigDefault("\"myvalue\"")
+        public String getOption2();
 
-        // TODO get schema from config or data source
+        // configuration option 3 (optional string, null is allowed)
+        @Config("optoin3")
+        @ConfigDefault("null")
+        public Optional<String> getOption3();
+
+        // if you get schema from config
         @Config("columns")
         public SchemaConfig getColumns();
     }
@@ -67,17 +75,13 @@ public class <%= java_class_name %>
     {
         PluginTask task = taskSource.loadTask(PluginTask.class);
 
-        // TODO
-        throw new UnsupportedOperationException("The 'run' method needs to be implemented");
+        // Write your code here :)
+        throw new UnsupportedOperationException("<%= java_class_name %>.run method is not implemented yet");
     }
 
     @Override
     public ConfigDiff guess(ConfigSource config)
     {
-        // TODO
-        throw new UnsupportedOperationException("'<%= name %>' input plugin does not support guessing.");
-        //ConfigDiff diff = Exec.newConfigDiff();
-        //diff.set("property1", "value");
-        //return diff;
+        return Exec.newConfigDiff();
     }
 }

data/lib/embulk/data/new/java/output.java.erb

@@ -1,6 +1,7 @@
-package org.embulk.<%= embulk_category %>;
+package <%= java_package_name %>;
 
 import java.util.List;
+import com.google.common.base.Optional;
 import org.embulk.config.CommitReport;
 import org.embulk.config.Config;
 import org.embulk.config.ConfigDefault;
@@ -20,12 +21,19 @@ public class <%= java_class_name %>
     public interface PluginTask
             extends Task
     {
-        @Config("property1")
-        public String getProperty1();
+        // configuration option 1 (required integer)
+        @Config("option1")
+        public int getOption1();
 
-        @Config("property2")
-        @ConfigDefault("0")
-        public int getProperty2();
+        // configuration option 2 (optional string, null is not allowed)
+        @Config("optoin2")
+        @ConfigDefault("\"myvalue\"")
+        public String getOption2();
+
+        // configuration option 3 (optional string, null is allowed)
+        @Config("optoin3")
+        @ConfigDefault("null")
+        public Optional<String> getOption3();
     }
 
     @Override
@@ -63,7 +71,7 @@ public class <%= java_class_name %>
     {
         PluginTask task = taskSource.loadTask(PluginTask.class);
 
-        // TODO
-        throw new UnsupportedOperationException("The 'open' method needs to be implemented");
+        // Write your code here :)
+        throw new UnsupportedOperationException("<%= java_class_name %>.run method is not implemented yet");
     }
 }

data/lib/embulk/data/new/java/parser.java.erb

@@ -1,5 +1,6 @@
-package org.embulk.<%= embulk_category %>;
+package <%= java_package_name %>;
 
+import com.google.common.base.Optional;
 import org.embulk.config.Config;
 import org.embulk.config.ConfigDefault;
 import org.embulk.config.ConfigDiff;
@@ -18,14 +19,21 @@ public class <%= java_class_name %>
     public interface PluginTask
             extends Task
     {
-        @Config("property1")
-        public String getProperty1();
+        // configuration option 1 (required integer)
+        @Config("option1")
+        public int getOption1();
 
-        @Config("property2")
-        @ConfigDefault("0")
-        public int getProperty2();
+        // configuration option 2 (optional string, null is not allowed)
+        @Config("optoin2")
+        @ConfigDefault("\"myvalue\"")
+        public String getOption2();
 
-        // TODO get schema from config or data source
+        // configuration option 3 (optional string, null is allowed)
+        @Config("optoin3")
+        @ConfigDefault("null")
+        public Optional<String> getOption3();
+
+        // if you get schema from config or data source
         @Config("columns")
         public SchemaConfig getColumns();
     }
@@ -46,6 +54,7 @@ public class <%= java_class_name %>
     {
         PluginTask task = taskSource.loadTask(PluginTask.class);
 
-        // TODO
+        // Write your code here :)
+        throw new UnsupportedOperationException("<%= java_class_name %>.run method is not implemented yet");
     }
 }

data/lib/embulk/data/new/java/plugin_loader.rb.erb

@@ -1,3 +1,3 @@
 Embulk::JavaPlugin.register_<%= embulk_category %>(
-  <%= name.dump %>, <%= "org.embulk.#{embulk_category}.#{java_class_name}".dump %>,
+  <%= name.dump %>, <%= "#{java_package_name}.#{java_class_name}".dump %>,
   File.expand_path('../../../../classpath', __FILE__))

data/lib/embulk/data/new/java/test.java.erb

@@ -1,4 +1,4 @@
-package org.embulk.<%= embulk_category %>;
+package <%= java_package_name %>;
 
 public class Test<%= java_class_name %>
 {

data/lib/embulk/data/new/ruby/filter.rb.erb

@@ -7,8 +7,9 @@ module Embulk
       def self.transaction(config, in_schema, &control)
         # configuration code:
         task = {
-          "property1" => config.param("property1", :string),
-          "property2" => config.param("property2", :integer, default: 0),
+          "option1" => config.param("option1", :integer),                     # integer, required
+          "option2" => config.param("option2", :string, default: "myvalue"),  # string, optional
+          "option3" => config.param("option3", :string, default: nil),        # string, optional
         }
 
         yield(task, out_columns)
@@ -16,8 +17,9 @@ module Embulk
 
       def init
         # initialization code:
-        @property1 = task["property1"]
-        @property2 = task["property2"]
+        @option1 = task["option1"]
+        @option2 = task["option2"]
+        @option3 = task["option3"]
       end
 
       def close

data/lib/embulk/data/new/ruby/formatter.rb.erb

@@ -7,8 +7,9 @@ module Embulk
       def self.transaction(config, schema, &control)
         # configuration code:
         task = {
-          "property1" => config.param("property1", :string),
-          "property2" => config.param("property2", :integer, default: 0),
+          "option1" => config.param("option1", :integer),                     # integer, required
+          "option2" => config.param("option2", :string, default: "myvalue"),  # string, optional
+          "option3" => config.param("option3", :string, default: nil),        # string, optional
         }
 
         yield(task)
@@ -16,8 +17,9 @@ module Embulk
 
       def init
         # initialization code:
-        @property1 = task["property1"]
-        @property2 = task["property2"]
+        @option1 = task["option1"]
+        @option2 = task["option2"]
+        @option3 = task["option3"]
 
         # your data
         @current_file == nil

data/lib/embulk/data/new/ruby/gemspec.erb

@@ -1,13 +1,13 @@
 
 Gem::Specification.new do |spec|
-  spec.name          = "<%= project_name %>"
+  spec.name          = "<%= full_project_name %>"
   spec.version       = "0.1.0"
   spec.authors       = [<%= author.dump %>]
   spec.summary       = <%= "#{display_name} #{display_category} plugin for Embulk".dump %>
   spec.description   = <%= "#{description}".dump %>
   spec.email         = [<%= email.dump %>]
   spec.licenses      = ["MIT"]
-  # TODO set this: spec.homepage      = "https://github.com/<%= email[/([^@]*)/] %>/<%= project_name %>"
+  # TODO set this: spec.homepage      = "https://github.com/<%= email[/([^@]*)/] %>/<%= full_project_name %>"
 
   spec.files         = `git ls-files`.split("\n") + Dir["classpath/*.jar"]
   spec.test_files    = spec.files.grep(%r{^(test|spec)/})

data/lib/embulk/data/new/ruby/input.rb.erb

@@ -7,8 +7,9 @@ module Embulk
       def self.transaction(config, &control)
         # configuration code:
         task = {
-          "property1" => config.param("property1", :string),
-          "property2" => config.param("property2", :integer, default: 0),
+          "option1" => config.param("option1", :integer),                     # integer, required
+          "option2" => config.param("option2", :string, default: "myvalue"),  # string, optional
+          "option3" => config.param("option3", :string, default: nil),        # string, optional
         }
 
         columns = [
@@ -39,8 +40,9 @@ module Embulk
 
       def init
         # initialization code:
-        @property1 = task["property1"]
-        @property2 = task["property2"]
+        @option1 = task["option1"]
+        @option2 = task["option2"]
+        @option3 = task["option3"]
       end
 
       def run

data/lib/embulk/data/new/ruby/output.rb.erb

@@ -7,8 +7,9 @@ module Embulk
       def self.transaction(config, schema, count, &control)
         # configuration code:
         task = {
-          "property1" => config.param("property1", :string),
-          "property2" => config.param("property2", :integer, default: 0),
+          "option1" => config.param("option1", :integer),                     # integer, required
+          "option2" => config.param("option2", :string, default: "myvalue"),  # string, optional
+          "option3" => config.param("option3", :string, default: nil),        # string, optional
         }
 
         # resumable output:
@@ -29,8 +30,9 @@ module Embulk
 
       def init
         # initialization code:
-        @property1 = task["property1"]
-        @property2 = task["property2"]
+        @option1 = task["option1"]
+        @option2 = task["option2"]
+        @option3 = task["option3"]
       end
 
       def close

data/lib/embulk/data/new/ruby/parser.rb.erb

@@ -7,8 +7,9 @@ module Embulk
       def self.transaction(config, &control)
         # configuration code:
         task = {
-          "property1" => config.param("property1", :string),
-          "property2" => config.param("property2", :integer, default: 0),
+          "option1" => config.param("option1", :integer),                     # integer, required
+          "option2" => config.param("option2", :string, default: "myvalue"),  # string, optional
+          "option3" => config.param("option3", :string, default: nil),        # string, optional
         }
 
         columns = [
@@ -22,8 +23,9 @@ module Embulk
 
       def init
         # initialization code:
-        @property1 = task["property1"]
-        @property2 = task["property2"]
+        @option1 = task["option1"]
+        @option2 = task["option2"]
+        @option3 = task["option3"]
       end
 
       def run(file_input)

data/lib/embulk/file_input.rb

@@ -79,5 +79,9 @@ module Embulk
     def close
       @java_file_input.close
     end
+
+    def to_java
+      @java_file_input
+    end
   end
 end

data/lib/embulk/file_output.rb

@@ -47,6 +47,10 @@ module Embulk
     def close
       @java_file_output.close
     end
+
+    def to_java
+      @java_file_output
+    end
   end
 
 end

data/lib/embulk/version.rb

@@ -1,3 +1,3 @@
 module Embulk
-  VERSION = '0.6.16'
+  VERSION = '0.6.17'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk
 version: !ruby/object:Gem::Version
-  version: 0.6.16
+  version: 0.6.17
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-07-02 00:00:00.000000000 Z
+date: 2015-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -234,6 +234,7 @@ files:
 - embulk-core/src/main/java/org/embulk/spi/util/FileOutputOutputStream.java
 - embulk-core/src/main/java/org/embulk/spi/util/Filters.java
 - embulk-core/src/main/java/org/embulk/spi/util/InputStreamFileInput.java
+- embulk-core/src/main/java/org/embulk/spi/util/InputStreamTransactionalFileInput.java
 - embulk-core/src/main/java/org/embulk/spi/util/Inputs.java
 - embulk-core/src/main/java/org/embulk/spi/util/LineDecoder.java
 - embulk-core/src/main/java/org/embulk/spi/util/LineEncoder.java
@@ -244,6 +245,7 @@ files:
 - embulk-core/src/main/java/org/embulk/spi/util/Pages.java
 - embulk-core/src/main/java/org/embulk/spi/util/ResumableInputStream.java
 - embulk-core/src/main/java/org/embulk/spi/util/RetryExecutor.java
+- embulk-core/src/main/java/org/embulk/spi/util/Timestamps.java
 - embulk-core/src/main/java/org/embulk/spi/util/dynamic/AbstractDynamicColumnSetter.java
 - embulk-core/src/main/java/org/embulk/spi/util/dynamic/BooleanColumnSetter.java
 - embulk-core/src/main/java/org/embulk/spi/util/dynamic/DefaultValueSetter.java
@@ -290,6 +292,7 @@ files:
 - embulk-docs/push-gh-pages.sh
 - embulk-docs/src/_static/embulk-architecture.png
 - embulk-docs/src/_static/embulk-logo.png
+- embulk-docs/src/_static/embulk-logo.svg
 - embulk-docs/src/built-in.rst
 - embulk-docs/src/conf.py
 - embulk-docs/src/customization.rst
@@ -329,6 +332,7 @@ files:
 - embulk-docs/src/release/release-0.6.14.rst
 - embulk-docs/src/release/release-0.6.15.rst
 - embulk-docs/src/release/release-0.6.16.rst
+- embulk-docs/src/release/release-0.6.17.rst
 - embulk-docs/src/release/release-0.6.2.rst
 - embulk-docs/src/release/release-0.6.3.rst
 - embulk-docs/src/release/release-0.6.4.rst
@@ -445,8 +449,8 @@ files:
 - classpath/bval-jsr303-0.5.jar
 - classpath/commons-beanutils-core-1.8.3.jar
 - classpath/commons-lang3-3.1.jar
-- classpath/embulk-core-0.6.16.jar
-- classpath/embulk-standards-0.6.16.jar
+- classpath/embulk-core-0.6.17.jar
+- classpath/embulk-standards-0.6.17.jar
 - classpath/guava-18.0.jar
 - classpath/guice-4.0.jar
 - classpath/guice-multibindings-4.0.jar