embulk 0.7.3-java → 0.7.4-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dcb703697162b5a2914a16080bd8de7451901c16
-  data.tar.gz: 90be92f711d748415cc73c6f92ad0004dac67ac5
+  metadata.gz: a30e0a1ff4c4748f58b0539ec4c6b9e47acb850b
+  data.tar.gz: 3b6ca27d414f7c07be5d202dce02dc633d0f4438
 SHA512:
-  metadata.gz: f7103a37b583f96b2b1113d2add98acb8b346c053e91c2576bd8a6acae65d3390d4caa53fa8ed3ad863a93a8e5cc1b063cae8ba1bdf66692a273b087b1cc3b1a
-  data.tar.gz: f6154d43fb57162af37fa741e136a67baabde33ac479093fc00d8547f2aec69064763b60ee6f4c1fded88494f2d3cb92106e38f605a1a4518ed3b601bc0494a8
+  metadata.gz: 16685804e873f6982886ada5f52f3dfb28b52de7adb98da4db8dcc42f09895c85e09235f02bf21d4413ebd0c60d9aa066d3213ae11802b00cb8b9e17e10fe3ad
+  data.tar.gz: 6a4f2599c7855ad4db74f7e4b91335689820062d3a098a21411e81756d43bd52d329646c4b656bcbca240dd64704c716d5b7bb9cedba0c7fefc23736695e0d4c

data/build.gradle

@@ -16,7 +16,7 @@ def release_projects = [project(":embulk-core"), project(":embulk-standards")]
 
 allprojects {
     group = 'org.embulk'
-    version = '0.7.3'
+    version = '0.7.4'
 
     ext {
         jrubyVersion = '9.0.0.0'

data/embulk-cli/src/main/java/org/embulk/cli/Main.java

@@ -8,6 +8,23 @@ public class Main
     {
         // $ java -jar jruby-complete.jar embulk-core.jar!/embulk/command/embulk_bundle.rb "$@"
         String[] jrubyArgs = new String[args.length + 1];
+        int i;
+        for (i = 0; i < args.length; i++) {
+            if (args[i].startsWith("-R")) {
+                jrubyArgs[i] = args[i].substring(2);
+            } else {
+                break;
+            }
+        }
+        jrubyArgs[i] = getScriptPath();
+        for (; i < args.length; i++) {
+            jrubyArgs[i+1] = args[i];
+        }
+        org.jruby.Main.main(jrubyArgs);
+    }
+
+    private static String getScriptPath()
+    {
         String resourcePath;
         try {
             resourcePath = Main.class.getProtectionDomain().getCodeSource().getLocation().toURI().toString() + "!/";
@@ -15,8 +32,6 @@ public class Main
         catch (URISyntaxException ex) {
             resourcePath = "classpath:";
         }
-        jrubyArgs[0] = resourcePath + "embulk/command/embulk_bundle.rb";
-        System.arraycopy(args, 0, jrubyArgs, 1, args.length);
-        org.jruby.Main.main(jrubyArgs);
+        return resourcePath + "embulk/command/embulk_bundle.rb";
     }
 }

data/embulk-cli/src/main/sh/selfrun.sh

@@ -76,7 +76,7 @@ if "%status%" == "rest" (
     )
 
 ) else if "%arg:~0,2%" == "-R" (
-    set jruby_args=%jruby_args% %arg:~2%
+    set jruby_args=%jruby_args% %arg%
 
 ) else if "%arg%" == "run" (
     set default_optimize=true
@@ -134,8 +134,7 @@ while true; do
             shift
             ;;
         -R*)
-            v="${1#-R}"
-            jruby_args="$jruby_args $v"
+            jruby_args="$jruby_args $1"
             shift
             ;;
         run)

data/embulk-cli/src/test/java/org/embulk/cli/SelfrunTest.java

@@ -125,7 +125,7 @@ public class SelfrunTest {
                 "-Xverify:none",
                 "-jar",
                 testSelfrun.getAbsolutePath(),
-                "r1",
+                "-Rr1",
                 "a1",
                 "a2"),
                 args);
@@ -141,8 +141,8 @@ public class SelfrunTest {
                 "-Xverify:none",
                 "-jar",
                 testSelfrun.getAbsolutePath(),
-                "r1=v1",
-                "r2=v2",
+                "-Rr1=v1",
+                "-Rr2=v2",
                 "a1",
                 "a2"),
                 args);
@@ -156,7 +156,7 @@ public class SelfrunTest {
                 "-XX:+UseConcMarkSweepGC",
                 "-jar",
                 testSelfrun.getAbsolutePath(),
-                "r1",
+                "-Rr1",
                 "run",
                 "a1"),
                 args);
@@ -206,7 +206,7 @@ public class SelfrunTest {
                 "j1",
                 "-jar",
                 testSelfrun.getAbsolutePath(),
-                "r1",
+                "-Rr1",
                 "a1",
                 "a2"),
                 args);

data/embulk-core/src/main/java/org/embulk/exec/LoggerProvider.java

@@ -35,11 +35,19 @@ public class LoggerProvider
         configurator.setContext(context);
         context.reset();
 
+        String logPath = systemConfig.get(String.class, "log_path", "-");
+
         String name;
-        if (System.console() != null) {
-            name = "/embulk/logback-color.xml";
+        if (logPath.equals("-")) {
+            if (System.console() != null) {
+                name = "/embulk/logback-color.xml";
+            } else {
+                name = "/embulk/logback-console.xml";
+            }
         } else {
-            name = "/embulk/logback-console.xml";
+            // logback uses system property to embed variables in XML file
+            System.setProperty("embulk.logPath", logPath);
+            name = "/embulk/logback-file.xml";
         }
         try {
             configurator.doConfigure(getClass().getResource(name));

data/embulk-core/src/main/resources/embulk/logback-file.xml

@@ -1,16 +1,14 @@
 <configuration>
-  <property name="embulk.logFile" value="embulk.log" />
-
   <appender name="file" class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <file>${embulk.logFile}</file>
-    <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-      <maxFileSize>5kB</maxFileSize>
-    </triggeringPolicy>
+    <file>${embulk.logPath}</file>
     <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-      <fileNamePattern>${embulk.logFile}.%i</fileNamePattern>
+      <fileNamePattern>${embulk.logPath}.%i.gz</fileNamePattern>
       <minIndex>1</minIndex>
       <maxIndex>5</maxIndex>
     </rollingPolicy>
+    <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
+      <maxFileSize>10MB</maxFileSize>
+    </triggeringPolicy>
     <encoder>
       <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS Z} [%level] (%thread\): %m%n</pattern>
     </encoder>

data/embulk-docs/src/release.rst

@@ -4,6 +4,7 @@ Release Notes
 .. toctree::
     :maxdepth: 1
 
+    release/release-0.7.4
     release/release-0.7.3
     release/release-0.7.2
     release/release-0.7.1

data/embulk-docs/src/release/release-0.7.4.rst

@@ -0,0 +1,14 @@
+Release 0.7.4
+==================================
+
+General Changes
+------------------
+
+* Added ``--log PATH`` command line option to output log messages to a file.
+* Fixed ``-R`` command line option handling to pass it to JRuby.
+* Fixed gem installation failure when a gem includes native extension.
+
+
+Release Date
+------------------
+2015-08-29

data/lib/embulk/command/embulk_migrate_plugin.rb

@@ -46,7 +46,7 @@ module Embulk
       # gradle < 2.6
       require 'embulk/data/package_data'
       data = PackageData.new("new", migrator.path)
-      migrator.write "gradle/wrapper/gradle-wrapper.jar", data.content("java/gradle/wrapper/gradle-wrapper.jar")
+      migrator.write "gradle/wrapper/gradle-wrapper.jar", data.bincontent("java/gradle/wrapper/gradle-wrapper.jar")
       migrator.write "gradle/wrapper/gradle-wrapper.properties", data.content("java/gradle/wrapper/gradle-wrapper.properties")
     end
 

data/lib/embulk/command/embulk_run.rb

@@ -41,6 +41,9 @@ module Embulk
     java_embed_ops = lambda do
       op.separator ""
       op.separator "  Other options:"
+      op.on('-l', '--log PATH', 'Output log messages to a file (default: -)') do |path|
+        options[:system_config][:log_path] = path
+      end
       op.on('-l', '--log-level LEVEL', 'Log level (error, warn, info, debug or trace)') do |level|
         options[:system_config][:log_level] = level
       end
@@ -297,18 +300,20 @@ examples:
   private
 
   def self.fix_gem_ruby_path
-    ruby_path = File.join(RbConfig::CONFIG["bindir"], RbConfig::CONFIG["ruby_install_name"])
-    jar, resource = ruby_path.split("!")
-
-    if resource && jar =~ /^file:/
-      # java
-      manifest = File.read("#{jar}!/META-INF/MANIFEST.MF") rescue ""
-      m = /Main-Class: ([^\r\n]+)/.match(manifest)
-      if m && m[1] != "org.jruby.Main"
-        # Main-Class is not jruby
-        Gem.define_singleton_method(:ruby) do
-          "java -cp #{jar_path(jar)} org.jruby.Main"
-        end
+    # Oveerride Gem.ruby method so that rubygems can execute ruby command (as another process).
+    # By default, Gem.ruby uses "java -jar jar_path" command. However, it doesn't work because
+    # Main-Class is overwritten to org.embulk.cli.Main. Here fixes it to use
+    # "java -cp jar_path org.jruby.main" instead.
+
+    jar, resource = __FILE__.split("!", 2)
+    jar_uri = URI.parse(jar).path rescue jar
+
+    manifest = File.read("#{jar_uri}!/META-INF/MANIFEST.MF") rescue ""
+    m = /Main-Class: ([^\r\n]+)/.match(manifest)
+    if m && m[1] != "org.jruby.Main"
+      # Main-Class is not jruby
+      Gem.define_singleton_method(:ruby) do
+        "java -cp #{jar_path(jar_uri)} org.jruby.Main"
       end
     end
   end

data/lib/embulk/command/embulk_selfupdate.rb

@@ -3,8 +3,8 @@ module Embulk
     require 'uri'
 
     jar, resource = __FILE__.split("!", 2)
-    jar_path = URI.parse(jar).path rescue jar
-    unless resource && File.file?(jar_path)
+    jar_uri = URI.parse(jar).path rescue jar
+    unless resource && File.file?(jar_uri)
       STDERR.puts ""
       STDERR.puts "Embulk is not installed by a single jar. Selfupdate is not supported."
       STDERR.puts "If you used gem to install embulk, please run: "
@@ -13,6 +13,7 @@ module Embulk
       STDERR.puts ""
       raise SystemExit.new(1)
     end
+    jar_path = jar_uri
 
     if version = options[:version]
       puts "Checking version #{version}..."

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

@@ -12,6 +12,14 @@ module Embulk
           "option3" => config.param("option3", :string, default: nil),        # string, optional
         }
 
+        columns = [
+          Column.new(nil, "example", :string),
+          Column.new(nil, "column", :long),
+          Column.new(nil, "value", :double),
+        ]
+
+        out_columns = in_schema + columns
+
         yield(task, out_columns)
       end
 
@@ -27,8 +35,9 @@ module Embulk
 
       def add(page)
         # filtering code:
+        add_columns = ["example",1,1.0]
         page.each do |record|
-          page_builder.add(record)
+          page_builder.add(record + add_columns)
         end
       end
 

data/lib/embulk/data/package_data.rb

@@ -16,6 +16,10 @@ module Embulk
       File.read(path(src))
     end
 
+    def bincontent(src)
+      File.binread(path(src))
+    end
+
     def erb(src)
       require 'erb'
       ERB.new(content(src), nil, '%').result(@erb_binding)

data/lib/embulk/version.rb

@@ -1,3 +1,3 @@
 module Embulk
-  VERSION = '0.7.3'
+  VERSION = '0.7.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.7.4
 platform: java
 authors:
 - Sadayuki Furuhashi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-08-23 00:00:00.000000000 Z
+date: 2015-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: liquid
@@ -133,8 +133,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.7.3.jar
-- classpath/embulk-standards-0.7.3.jar
+- classpath/embulk-core-0.7.4.jar
+- classpath/embulk-standards-0.7.4.jar
 - classpath/guava-18.0.jar
 - classpath/guice-4.0.jar
 - classpath/guice-multibindings-4.0.jar
@@ -433,6 +433,7 @@ files:
 - embulk-docs/src/release/release-0.7.1.rst
 - embulk-docs/src/release/release-0.7.2.rst
 - embulk-docs/src/release/release-0.7.3.rst
+- embulk-docs/src/release/release-0.7.4.rst
 - embulk-standards/build.gradle
 - embulk-standards/src/main/java/org/embulk/standards/CsvFormatterPlugin.java
 - embulk-standards/src/main/java/org/embulk/standards/CsvParserPlugin.java