embulk 0.3.0 → 0.3.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    N2ZlNTcxZjM0ZjA4MDE5YmM0NmU2ZTQ3ZmZkM2ZkZDM5OWFkNjRiNA==
+    MjA1Mzc3ZGRhMDY2ZWI5N2NkZjM1ZDg4Yzc4MGE0MjljM2Q0ZjYxYw==
   data.tar.gz: !binary |-
-    NzU2NjYzOTQzM2ExYzdiNzc0YzUzYWZiNzcwZTU2ZmFkZmUxYjMzOQ==
+    Y2JhZDM0MTk2YzliZGIzYmUwNzM1ZjFmNmU0OGRiYzNiM2IwYjUwMw==
 SHA512:
   metadata.gz: !binary |-
-    NWM5ZjJiNjhkNDQwZDgyZGU4MzhiMmNmYjI5OGZhMjk2OTAyM2FlOWM4YzYy
-    ZTczZTgzMDBkYjY3ZmZmODM0NGU0NmM2MTBjYmRiNDY1ZDliY2QzZmM2OTZi
-    ZmIzZjZmYzc4MTJkOWE2ODM5ODAxYTZhMzgzNzE0NzM5YzgyODU=
+    MDEyYjU0YjM0OWNlZjA1NmMzMWI2NTZhMTFiMjM0MGU5M2VkZjA2ODQyNzBk
+    M2NiNzJiYzJhMTcxYzFhZjQ3ZGRhM2IyZDI4NzVhYzU5MjBmMGFhNWQ2NGEw
+    NmRhZTdkYWIzZGY3NmQ1Mzg0YWNkMzZkYjYzN2ZlMDU4NzYwZmY=
   data.tar.gz: !binary |-
-    NTg3MjdiZWNjNGYzN2MzZTM0YzY0OTRmNGJlYmI5ODY3ZmY5ZWFiY2RkN2Yy
-    NjI0ZmIzOWJjNDU0NzM4ZDhlYTJjZTBkODc3MmRjYjI5Mzc5OWUyZDQwYzA5
-    MTRiMGE1NmU4YmI1MWU1Yjk1ZmJlZTU3Y2Y0NDY5YTFjN2EzOTQ=
+    MThhMzNlNjgxYjEwY2Q0NDA2MWMzOTlhZjEyZDA4OTM0ODQ3MzkwZWYzMjdh
+    OTFlNGZjNGMzZTZhNDE1ZWI1MzFmMjBiZGUwODY1Yjc4YjNjNGU0ZmExMTA0
+    ZDlkNzhiZDZiZTM3OWEyYmI4ODFlYjY2OWI1OTBkODgyNDZjZTk=

data/ChangeLog

@@ -1,4 +1,9 @@
 
+2015-02-04 version 0.3.1:
+
+* Added -C, --classpath option to add java classpath
+
+
 2015-02-03 version 0.3.0:
 
 * Added resume functionality. InputPlugin and OutputPlugin needs to implement

data/README.md

@@ -24,7 +24,7 @@ You can release plugins to share your efforts of data cleaning, error handling,
 The single-file package is the simplest way to try Embulk. You can download the latest embulk-VERSION.jar from [the releases page](https://bintray.com/embulk/maven/embulk/view#files) and run it with java:
 
 ```
-wget https://bintray.com/artifact/download/embulk/maven/embulk-0.3.0.jar -O embulk.jar
+wget https://bintray.com/artifact/download/embulk/maven/embulk-0.3.1.jar -O embulk.jar
 java -jar embulk.jar --help
 ```
 

data/build.gradle

@@ -28,7 +28,7 @@ allprojects {
     apply plugin: 'com.github.ben-manes.versions'
 
     group = 'org.embulk'
-    version = '0.3.0'
+    version = '0.3.1'
 
     // to upload artifacts to Bintray by gradle-bintray-plugin
     // $ gradle bintrayUpload

data/embulk-cli/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.embulk</groupId>
         <artifactId>embulk-parent</artifactId>
-        <version>0.3.0-SNAPSHOT</version>
+        <version>0.3.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>embulk-cli</artifactId>

data/embulk-core/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.embulk</groupId>
         <artifactId>embulk-parent</artifactId>
-        <version>0.3.0-SNAPSHOT</version>
+        <version>0.3.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>embulk-core</artifactId>

data/embulk-standards/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.embulk</groupId>
         <artifactId>embulk-parent</artifactId>
-        <version>0.3.0-SNAPSHOT</version>
+        <version>0.3.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>embulk-standards</artifactId>

data/lib/embulk/command/embulk_run.rb

@@ -18,15 +18,18 @@ module Embulk
     usage nil unless i
     subcmd = argv.slice!(i)
 
-    load_paths = []
-    options = {}
-
     # to make sure org.embulk.jruby.JRubyScriptingModule can require 'embulk/java/bootstrap'
     $LOAD_PATH << Embulk.home('lib')
 
+    require 'java'
     require 'optparse'
     op = OptionParser.new
 
+    load_paths = []
+    classpaths = []
+    classpath_separator = java.io.File.pathSeparator
+    options = {}
+
     op.on('-b', '--bundle BUNDLE_DIR', 'Path to a Gemfile directory') do |path|
       # only for help message. implemented at lib/embulk/command/embulk.rb
     end
@@ -45,9 +48,12 @@ module Embulk
       op.banner = "Usage: run <config.yml>"
       op.on('-b', '--bundle BUNDLE_DIR', 'Path to a Gemfile directory') do |path|
       end
-      op.on('-I', '--load-path PATH', 'Add ruby script directory path or jar file path') do |load_path|
+      op.on('-I', '--load-path PATH', 'Add ruby script directory path ($LOAD_PATH)') do |load_path|
         load_paths << load_path
       end
+      op.on('-C', '--classpath PATH', "Add java classpath separated by #{classpath_separator} (CLASSPATH)") do |classpath|
+        classpaths.concat classpath.split(classpath_separator)
+      end
       op.on('-o', '--output PATH', 'Path to a file to write the next configuration') do |path|
         options[:nextConfigOutputPath] = path
       end
@@ -60,9 +66,12 @@ module Embulk
       op.banner = "Usage: run <config.yml>"
       op.on('-b', '--bundle BUNDLE_DIR', 'Path to a Gemfile directory') do |path|
       end
-      op.on('-I', '--load-path PATH', 'Add ruby script directory path or jar file path') do |load_path|
+      op.on('-I', '--load-path PATH', 'Add ruby script directory path ($LOAD_PATH)') do |load_path|
         load_paths << load_path
       end
+      op.on('-C', '--classpath PATH', "Add java classpath separated by #{classpath_separator} (CLASSPATH)") do |classpath|
+        classpaths.concat classpath.split(classpath_separator)
+      end
       op.on('-r', '--resume-state PATH', 'Path to a file to write or read resume state') do |path|
         options[:resumeStatePath] = path
       end
@@ -72,9 +81,12 @@ module Embulk
       op.banner = "Usage: preview <config.yml>"
       op.on('-b', '--bundle BUNDLE_DIR', 'Path to a Gemfile directory') do |path|
       end
-      op.on('-I', '--load-path PATH', 'Add ruby script directory path or jar file path') do |load_path|
+      op.on('-I', '--load-path PATH', 'Add ruby script directory path ($LOAD_PATH)') do |load_path|
         load_paths << load_path
       end
+      op.on('-C', '--classpath PATH', "Add java classpath separated by #{classpath_separator} (CLASSPATH)") do |classpath|
+        classpaths.concat classpath.split(classpath_separator)
+      end
       args = 1..1
 
     when :guess
@@ -82,9 +94,12 @@ module Embulk
       op.on('-o', '--output PATH', 'Path to a file to write the guessed configuration') do |path|
         options[:nextConfigOutputPath] = path
       end
-      op.on('-I', '--load-path PATH', 'Add ruby script directory path or jar file path') do |load_path|
+      op.on('-I', '--load-path PATH', 'Add ruby script directory path ($LOAD_PATH)') do |load_path|
         load_paths << load_path
       end
+      op.on('-C', '--classpath PATH', "Add java classpath separated by #{classpath_separator} (CLASSPATH)") do |classpath|
+        classpaths.concat classpath.split(classpath_separator)
+      end
       args = 1..1
 
     #when :generate  # or :new
@@ -122,6 +137,7 @@ module Embulk
       require 'fileutils'
       require 'rubygems/gem_runner'
       setup_load_paths(load_paths)
+      setup_classpaths(classpaths)
 
       unless File.exists?(path)
         puts "Initializing #{path}..."
@@ -206,6 +222,7 @@ module Embulk
       end
 
       setup_load_paths(load_paths)
+      setup_classpaths(classpaths)
 
       org.embulk.command.Runner.new(options.to_json).main(subcmd, argv.to_java(:string))
     end
@@ -226,17 +243,19 @@ module Embulk
   end
 
   def self.setup_load_paths(load_paths)
+    # first $LOAD_PATH has highet priority. later load_paths should have highest priority.
     load_paths.each do |load_path|
-      if File.file?(load_path)
-        # jar files
-        require File.expand_path(load_path)
-      else
-        # ruby script directory (add at the beginning of $LOAD_PATH to make it highest priority)
-        $LOAD_PATH.unshift File.expand_path(load_path)
-      end
+      # ruby script directory (use unshift to make it highest priority)
+      $LOAD_PATH.unshift File.expand_path(load_path)
     end
   end
 
+  def self.setup_classpaths(classpaths)
+    classpaths.each {|classpath|
+      $CLASSPATH << classpath  # $CLASSPATH object doesn't have concat method
+    }
+  end
+
   def self.usage(message)
     STDERR.puts "usage: <command> [--options]"
     STDERR.puts "commands:"

data/lib/embulk/version.rb

@@ -1,3 +1,3 @@
 module Embulk
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/pom.xml

@@ -4,7 +4,7 @@
 
     <groupId>org.embulk</groupId>
     <artifactId>embulk-parent</artifactId>
-    <version>0.3.0-SNAPSHOT</version>
+    <version>0.3.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>Embulk</name>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: embulk
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Sadayuki Furuhashi
@@ -122,9 +122,9 @@ files:
 - classpath/commons-codec-1.3.jar
 - classpath/commons-lang3-3.1.jar
 - classpath/commons-logging-1.2.jar
-- classpath/embulk-cli-0.3.0-SNAPSHOT.jar
-- classpath/embulk-core-0.3.0-SNAPSHOT.jar
-- classpath/embulk-standards-0.3.0-SNAPSHOT.jar
+- classpath/embulk-cli-0.3.1-SNAPSHOT.jar
+- classpath/embulk-core-0.3.1-SNAPSHOT.jar
+- classpath/embulk-standards-0.3.1-SNAPSHOT.jar
 - classpath/guava-17.0.jar
 - classpath/guice-3.0.jar
 - classpath/guice-multibindings-3.0.jar