embulk 0.8.18-java → 0.8.19-java

data/embulk.gemspec

@@ -1,9 +1,10 @@
+# TODO(v2)[#566]: Remove this embulk.gemspec.
 $LOAD_PATH.push File.expand_path("../lib", __FILE__)
 require 'embulk/version'
 
 Gem::Specification.new do |gem|
   gem.name          = "embulk"
-  gem.version       = Embulk::VERSION
+  gem.version       = Embulk::VERSION_INTERNAL
 
   gem.summary       = "Embulk, a plugin-based parallel bulk data loader"
   gem.description   = "Embulk is an open-source, plugin-based bulk data loader to scale and simplify data management across heterogeneous data stores. It can collect and ship any kinds of data in high throughput with transaction control."

data/lib/embulk/command/embulk_run.rb

@@ -11,7 +11,7 @@ module Embulk
     i = argv.find_index {|arg| arg !~ /^\-/ }
     unless i
       if argv.include?('--version')
-        puts "embulk #{Embulk::VERSION}"
+        puts "embulk #{org.embulk.EmbulkVersion::VERSION}"
         system_exit_success
       end
       usage nil
@@ -21,9 +21,9 @@ module Embulk
     require 'java'
     require 'optparse'
     op = OptionParser.new
-    op.version = Embulk::VERSION
+    op.version = org.embulk.EmbulkVersion::VERSION
 
-    puts "#{Time.now.strftime("%Y-%m-%d %H:%M:%S.%3N %z")}: Embulk v#{Embulk::VERSION}"
+    puts "#{Time.now.strftime("%Y-%m-%d %H:%M:%S.%3N %z")}: Embulk v#{org.embulk.EmbulkVersion::VERSION}"
 
     plugin_paths = []
     load_paths = []
@@ -226,57 +226,19 @@ examples:
 
     case subcmd
     when :example
-      require 'embulk/command/embulk_example'
-      path = ARGV[0] || "embulk-example"
-      puts "Creating #{path} directory..."
-      Embulk.create_example(path)
-      puts ""
-      puts "Run following subcommands to try embulk:"
-      puts ""
-      puts "   1. embulk guess #{File.join(path, 'seed.yml')} -o config.yml"
-      puts "   2. embulk preview config.yml"
-      puts "   3. embulk run config.yml"
-      puts ""
+      (org.embulk.cli.EmbulkExample.new).createExample(ARGV[0] || "embulk-example")
 
     when :new
-      lang_cate = ARGV[0]
-      name = ARGV[1]
-
-      language, category = case lang_cate
-        when "java-input"       then [:java, :input]
-        when "java-output"      then [:java, :output]
-        when "java-filter"      then [:java, :filter]
-        when "java-file-input"  then [:java, :file_input]
-        when "java-file-output" then [:java, :file_output]
-        when "java-parser"      then [:java, :parser]
-        when "java-formatter"   then [:java, :formatter]
-        when "java-decoder"     then [:java, :decoder]
-        when "java-encoder"     then [:java, :encoder]
-        when "ruby-input"       then [:ruby, :input]
-        when "ruby-output"      then [:ruby, :output]
-        when "ruby-filter"      then [:ruby, :filter]
-        when "ruby-file-input"  then raise "ruby-file-input is not implemented yet. See #21 on github." #[:ruby, :file_input]
-        when "ruby-file-output" then raise "ruby-file-output is not implemented yet. See #22 on github." #[:ruby, :file_output]
-        when "ruby-parser"      then [:ruby, :parser]
-        when "ruby-formatter"   then [:ruby, :formatter]
-        when "ruby-decoder"     then raise "ruby-decoder is not implemented yet. See #31 on github." #[:ruby, :decoder]
-        when "ruby-encoder"     then raise "ruby-decoder is not implemented yet. See #32 on github." #[:ruby, :encoder]
-        else
-          usage_op op, "Unknown category '#{lang_cate}'"
-        end
-
-      require 'embulk/command/embulk_new_plugin'
-      Embulk.new_plugin(name, language, category)
+      (org.embulk.cli.EmbulkNew.new(ARGV[0], ARGV[1], org.embulk.EmbulkVersion::VERSION)).newPlugin()
 
     when :migrate
-      path = ARGV[0]
-      require 'embulk/command/embulk_migrate_plugin'
-      Embulk.migrate_plugin(path)
+      (org.embulk.cli.EmbulkMigrate.new).migratePlugin(ARGV[0], org.embulk.EmbulkVersion::VERSION)
 
     when :selfupdate
-      require 'embulk/command/embulk_selfupdate'
-      options[:version] = ARGV[0]
-      Embulk.selfupdate(options)
+      (org.embulk.cli.EmbulkSelfUpdate.new).updateSelf(org.embulk.EmbulkVersion::VERSION,
+                                                       ARGV[0],
+                                                       __FILE__,
+                                                       options[:force])
 
     when :mkbundle
       new_bundle(argv[0], options[:bundle_path])
@@ -399,7 +361,7 @@ examples:
   end
 
   def self.usage(message)
-    STDERR.puts "Embulk v#{Embulk::VERSION}"
+    STDERR.puts "Embulk v#{org.embulk.EmbulkVersion::VERSION}"
     STDERR.puts "Usage: embulk [-vm-options] <command> [--options]"
     STDERR.puts "Commands:"
     STDERR.puts "   mkbundle   <directory>                             # create a new plugin bundle environment."

data/lib/embulk/data/new/README.md.vm

@@ -0,0 +1,106 @@
+#[[#]]# ${displayName} ${displayCategory} plugin for Embulk
+
+#if (${language} == "ruby")
+TODO: Write short description here and ${fullProjectName}.gemspec file.
+#elseif (${language} == "java")
+TODO: Write short description here and build.gradle file.
+#else
+TODO: Write short description here.
+#end
+
+#[[##]]# Overview
+
+#if (${category} == "output" || ${category} == "file_output")
+* **Plugin type**: ${displayCategory}
+* **Load all or nothing**: no
+* **Resume supported**: no
+* **Cleanup supported**: yes
+#elseif (${category} == "file_input")
+* **Plugin type**: ${displayCategory}
+* **Resume supported**: yes
+* **Cleanup supported**: yes
+#elseif (${category} == "input")
+* **Plugin type**: ${displayCategory}
+* **Resume supported**: yes
+* **Cleanup supported**: yes
+* **Guess supported**: no
+#elseif (${category} == "parser" || ${category} == "decoder")
+* **Plugin type**: ${displayCategory}
+* **Guess supported**: no
+#else
+* **Plugin type**: ${displayCategory}
+#end
+
+#[[##]]# Configuration
+
+- **option1**: description (integer, required)
+- **option2**: description (string, default: `"myvalue"`)
+- **option3**: description (string, default: `null`)
+
+#[[##]]# Example
+
+```yaml
+#if (${category} == "input" || ${category} == "file_input")
+in:
+  type: ${name}
+  option1: example1
+  option2: example2
+#elseif (${category} == "output" || ${category} == "file_output")
+out:
+  type: ${name}
+  option1: example1
+  option2: example2
+#elseif (${category} == "filter")
+filters:
+  - type: ${name}
+    option1: example1
+    option2: example2
+#elseif (${category} == "parser")
+in:
+  type: any file input plugin type
+  parser:
+    type: ${name}
+    option1: example1
+    option2: example2
+#elseif (${category} == "formatter")
+out:
+  type: any output input plugin type
+  formatter:
+    type: ${name}
+    option1: example1
+    option2: example2
+#elseif (${category} == "decoder")
+in:
+  type: any output input plugin type
+  decoders:
+    - type: ${name}
+      option1: example1
+      option2: example2
+#elseif (${category} == "encoder")
+out:
+  type: any output input plugin type
+  encoders:
+    - type: ${name}
+      option1: example1
+      option2: example2
+#end
+```
+
+#if (${category} == "parser" || ${category} == "decoder")
+(If guess supported) you don't have to write `${category}:` section in the configuration file. After writing `in:` section, you can let embulk guess `${category}:` section using this command:
+
+```
+$ embulk gem install ${fullProjectName}
+$ embulk guess -g ${name} config.yml -o guessed.yml
+```
+#end
+
+#[[##]]# Build
+
+```
+#if (${language} == "ruby")
+$ rake
+#elseif (${language} == "java")
+$ ./gradlew gem  # -t to watch change of files and rebuild continuously
+#end
+```

data/lib/embulk/data/new/{gitignore.erb → gitignore.vm}

@@ -1,7 +1,7 @@
 *~
 /pkg/
 /tmp/
-%if language == :java
+#if (${language} == "java")
 *.gemspec
 .gradle/
 /classpath/
@@ -11,7 +11,7 @@ build/
 /.metadata/
 .classpath
 .project
-%elsif language == :ruby
+#elseif (${language} == "ruby")
 /.bundle/
 /Gemfile.lock
-%end
+#end

data/lib/embulk/data/new/java/{build.gradle.erb → build.gradle.vm}

@@ -19,8 +19,8 @@ sourceCompatibility = 1.7
 targetCompatibility = 1.7
 
 dependencies {
-    compile  "org.embulk:embulk-core:<%= Embulk::VERSION %>"
-    provided "org.embulk:embulk-core:<%= Embulk::VERSION %>"
+    compile  "org.embulk:embulk-core:${embulkVersion}"
+    provided "org.embulk:embulk-core:${embulkVersion}"
     // compile "YOUR_JAR_DEPENDENCY_GROUP:YOUR_JAR_DEPENDENCY_MODULE:YOUR_JAR_DEPENDENCY_VERSION"
     testCompile "junit:junit:4.+"
 }
@@ -63,7 +63,7 @@ task gemPush(type: JRubyExec, dependsOn: ["gem"]) {
 task "package"(dependsOn: ["gemspec", "classpath"]) {
     doLast {
         println "> Build succeeded."
-        println "> You can run embulk with '-L ${file(".").absolutePath}' argument."
+        println "> You can run embulk with ${argumentToRunEmbulkJava} argument."
     }
 }
 
@@ -75,12 +75,12 @@ task gemspec {
 Gem::Specification.new do |spec|
   spec.name          = "${project.name}"
   spec.version       = "${project.version}"
-  spec.authors       = [<%= author.dump %>]
-  spec.summary       = %[<%= display_name %> <%= display_category %> plugin for Embulk]
-  spec.description   = %[<%= description %>]
-  spec.email         = [<%= email.dump %>]
+  spec.authors       = ["${author}"]
+  spec.summary       = %[${displayName} ${displayCategory} plugin for Embulk]
+  spec.description   = %[${description}]
+  spec.email         = ["${email}"]
   spec.licenses      = ["MIT"]
-  # TODO set this: spec.homepage      = <%= "https://github.com/#{email[/([^@]*)/]}/#{full_project_name}".dump %>
+  # TODO set this: spec.homepage      = "https://github.com/${expectedGitHubAccount}/${fullProjectName}"
 
   spec.files         = `git ls-files`.split("\n") + Dir["classpath/*.jar"]
   spec.test_files    = spec.files.grep(%r"^(test|spec)/")

data/lib/embulk/data/new/java/{decoder.java.erb → decoder.java.vm}

@@ -1,21 +1,23 @@
-package <%= java_package_name %>;
+package ${javaPackageName};
 
 import java.io.InputStream;
 import java.io.IOException;
+
 import com.google.common.base.Optional;
+
 import org.embulk.config.Config;
 import org.embulk.config.ConfigDefault;
 import org.embulk.config.ConfigInject;
 import org.embulk.config.ConfigSource;
 import org.embulk.config.Task;
 import org.embulk.config.TaskSource;
+import org.embulk.spi.BufferAllocator;
 import org.embulk.spi.DecoderPlugin;
 import org.embulk.spi.FileInput;
-import org.embulk.spi.BufferAllocator;
 import org.embulk.spi.util.FileInputInputStream;
 import org.embulk.spi.util.InputStreamFileInput;
 
-public class <%= java_class_name %>
+public class ${javaClassName}
         implements DecoderPlugin
 {
     public interface PluginTask
@@ -53,7 +55,7 @@ public class <%= java_class_name %>
         final PluginTask task = taskSource.loadTask(PluginTask.class);
 
         // Write your code here :)
-        throw new UnsupportedOperationException("<%= java_class_name %>.open method is not implemented yet");
+        throw new UnsupportedOperationException("${javaClassName}.open method is not implemented yet");
 
         // If expect InputStream, you can use this code:
 

data/lib/embulk/data/new/java/{encoder.java.erb → encoder.java.vm}

@@ -1,21 +1,23 @@
-package <%= java_package_name %>;
+package ${javaPackageName};
 
-import java.io.OutputStream;
 import java.io.IOException;
+import java.io.OutputStream;
+
 import com.google.common.base.Optional;
+
 import org.embulk.config.Config;
 import org.embulk.config.ConfigDefault;
 import org.embulk.config.ConfigInject;
 import org.embulk.config.ConfigSource;
 import org.embulk.config.Task;
 import org.embulk.config.TaskSource;
+import org.embulk.spi.BufferAllocator;
 import org.embulk.spi.EncoderPlugin;
 import org.embulk.spi.FileOutput;
-import org.embulk.spi.BufferAllocator;
 import org.embulk.spi.util.FileOutputOutputStream;
 import org.embulk.spi.util.OutputStreamFileOutput;
 
-public class <%= java_class_name %>
+public class ${javaClassName}
         implements EncoderPlugin
 {
     public interface PluginTask
@@ -53,7 +55,7 @@ public class <%= java_class_name %>
         final PluginTask task = taskSource.loadTask(PluginTask.class);
 
         // Write your code here :)
-        throw new UnsupportedOperationException("<%= java_class_name %>.open method is not implemented yet");
+        throw new UnsupportedOperationException("${javaClassName}.open method is not implemented yet");
 
         // If expect OutputStream, you can use this code:
 

data/lib/embulk/data/new/java/{file_input.java.erb → file_input.java.vm}

@@ -1,24 +1,26 @@
-package <%= java_package_name %>;
+package ${javaPackageName};
 
-import java.util.List;
 import java.util.ArrayList;
+import java.util.List;
+
 import com.google.common.base.Optional;
 import com.google.common.collect.ImmutableList;
-import org.embulk.config.TaskReport;
+
 import org.embulk.config.Config;
 import org.embulk.config.ConfigDefault;
-import org.embulk.config.ConfigInject;
 import org.embulk.config.ConfigDiff;
+import org.embulk.config.ConfigInject;
 import org.embulk.config.ConfigSource;
 import org.embulk.config.Task;
+import org.embulk.config.TaskReport;
 import org.embulk.config.TaskSource;
+import org.embulk.spi.BufferAllocator;
 import org.embulk.spi.Exec;
 import org.embulk.spi.FileInputPlugin;
-import org.embulk.spi.BufferAllocator;
 import org.embulk.spi.TransactionalFileInput;
 import org.embulk.spi.util.InputStreamTransactionalFileInput;
 
-public class <%= java_class_name %>
+public class ${javaClassName}
         implements FileInputPlugin
 {
     public interface PluginTask
@@ -117,7 +119,7 @@ public class <%= java_class_name %>
         final PluginTask task = taskSource.loadTask(PluginTask.class);
 
         // Write your code here :)
-        throw new UnsupportedOperationException("<%= java_class_name %>.open method is not implemented yet");
+        throw new UnsupportedOperationException("${javaClassName}.open method is not implemented yet");
 
         // if you expect InputStream, you can use this code:
 

data/lib/embulk/data/new/java/{file_output.java.erb → file_output.java.vm}

@@ -1,19 +1,21 @@
-package <%= java_package_name %>;
+package ${javaPackageName};
 
 import java.util.List;
+
 import com.google.common.base.Optional;
-import org.embulk.config.TaskReport;
+
 import org.embulk.config.Config;
 import org.embulk.config.ConfigDefault;
 import org.embulk.config.ConfigDiff;
 import org.embulk.config.ConfigSource;
 import org.embulk.config.Task;
+import org.embulk.config.TaskReport;
 import org.embulk.config.TaskSource;
 import org.embulk.spi.Exec;
 import org.embulk.spi.FileOutputPlugin;
 import org.embulk.spi.TransactionalFileOutput;
 
-public class <%= java_class_name %>
+public class ${javaClassName}
         implements FileOutputPlugin
 {
     public interface PluginTask
@@ -69,7 +71,7 @@ public class <%= java_class_name %>
             int taskCount,
             FileOutputPlugin.Control control)
     {
-        throw new UnsupportedOperationException("<%= name %> output plugin does not support resuming");
+        throw new UnsupportedOperationException("${name} output plugin does not support resuming");
     }
 
     @Override
@@ -85,7 +87,7 @@ public class <%= java_class_name %>
         PluginTask task = taskSource.loadTask(PluginTask.class);
 
         // Write your code here :)
-        throw new UnsupportedOperationException("<%= java_class_name %>.open method is not implemented yet");
+        throw new UnsupportedOperationException("${javaClassName}.open method is not implemented yet");
 
         // See LocalFileOutputPlugin as an example implementation:
         // https://github.com/embulk/embulk/blob/master/embulk-standards/src/main/java/org/embulk/standards/LocalFileOutputPlugin.java

data/lib/embulk/data/new/java/{filter.java.erb → filter.java.vm}

@@ -1,6 +1,7 @@
-package <%= java_package_name %>;
+package ${javaPackageName};
 
 import com.google.common.base.Optional;
+
 import org.embulk.config.Config;
 import org.embulk.config.ConfigDefault;
 import org.embulk.config.ConfigDiff;
@@ -12,7 +13,7 @@ import org.embulk.spi.FilterPlugin;
 import org.embulk.spi.PageOutput;
 import org.embulk.spi.Schema;
 
-public class <%= java_class_name %>
+public class ${javaClassName}
         implements FilterPlugin
 {
     public interface PluginTask
@@ -51,6 +52,6 @@ public class <%= java_class_name %>
         PluginTask task = taskSource.loadTask(PluginTask.class);
 
         // Write your code here :)
-        throw new UnsupportedOperationException("<%= java_class_name %>.open method is not implemented yet");
+        throw new UnsupportedOperationException("${javaClassName}.open method is not implemented yet");
     }
 }