embulk 0.6.21 → 0.6.22

data/lib/embulk/error.rb

@@ -1,6 +1,12 @@
 
 module Embulk
-  class ConfigError < StandardError
+  if java?
+    config_exception = org.embulk.config.ConfigException
+  else
+    config_exception = StandardError
+  end
+
+  class ConfigError < config_exception
   end
 
   class PluginLoadError < StandardError

data/lib/embulk/gems.rb

@@ -0,0 +1,29 @@
+module Embulk
+  def self.add_embedded_gem_path
+    begin
+      resource_class = org.embulk.command.Runner.java_class
+    rescue NameError
+      begin
+        Embulk.require_classpath
+        resource_class = org.embulk.command.Runner.java_class
+      rescue NameError
+        return nil
+      end
+    end
+
+    gem_path = resource_class.resource("/embulk/gems").to_s.sub(/^jar:/, '')
+    unless gem_path.empty?
+      # GEM_PATH can't include ':'
+      gem_path = gem_path.gsub(/\w{0,5}:(?:\/(?=\/))*/, "")
+      orig = ENV['GEM_PATH'].to_s
+      if orig.empty?
+        ENV['GEM_PATH'] = gem_path
+      elsif !orig.split(Gem.path_separator).include?(gem_path)
+        ENV['GEM_PATH'] = "#{gem_path}:#{orig}"
+      end
+      Gem.clear_paths
+      return ENV['GEM_PATH']
+    end
+    return nil
+  end
+end

data/lib/embulk/java/bootstrap.rb

@@ -1,7 +1,11 @@
 module Embulk
   module Java
+    require 'embulk/gems'
+    Embulk.add_embedded_gem_path
+
     require 'embulk/java/imports'
     require 'embulk/java/time_helper'
+    require 'embulk/java/liquid_helper'
 
     module Injected
       # Following constats are set by org.embulk.jruby.JRubyScriptingModule:

data/lib/embulk/java/liquid_helper.rb

@@ -0,0 +1,17 @@
+module Embulk
+  module Java
+    require 'liquid'
+
+    class LiquidTemplateHelper
+      include org.embulk.command.LiquidTemplate
+
+      def render(source, params)
+        template = Liquid::Template.parse(source)
+        data = {
+          "env" => ENV.to_h,
+        }.merge(params)
+        template.render(data)
+      end
+    end
+  end
+end

data/lib/embulk/version.rb

@@ -1,3 +1,3 @@
 module Embulk
-  VERSION = '0.6.21'
+  VERSION = '0.6.22'
 end

data/test/helper.rb

@@ -6,7 +6,16 @@ jars.each do |jar|
   require File.join(classpath_dir, jar)
 end
 
+require 'simplecov'
+# fix inaccurate coverage
+# see: https://github.com/colszowka/simplecov/blob/82920ca1502be78ccde4fd315634066093bb855d/lib/simplecov.rb#L7
+ENV['JRUBY_OPTS'] = '-Xcli.debug=true --debug'
+SimpleCov.profiles.define 'embulk' do
+  add_filter 'test/'
+
+  add_group 'Libraries', 'lib'
+end
+SimpleCov.start 'embulk'
+
 require 'embulk/java/bootstrap'
 require 'embulk'
-
-# TODO simplecov

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk
 version: !ruby/object:Gem::Version
-  version: 0.6.21
+  version: 0.6.22
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-08-05 00:00:00.000000000 Z
+date: 2015-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -97,13 +97,45 @@ files:
 - Rakefile
 - bin/embulk
 - build.gradle
+- classpath/annotations-3.0.0.jar
+- classpath/aopalliance-1.0.jar
+- classpath/bval-core-0.5.jar
+- 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.22.jar
+- classpath/embulk-standards-0.6.22.jar
+- classpath/guava-18.0.jar
+- classpath/guice-4.0.jar
+- classpath/guice-multibindings-4.0.jar
+- classpath/icu4j-54.1.1.jar
+- classpath/jackson-annotations-2.5.3.jar
+- classpath/jackson-core-2.5.3.jar
+- classpath/jackson-databind-2.5.3.jar
+- classpath/jackson-datatype-guava-2.5.3.jar
+- classpath/jackson-datatype-joda-2.5.3.jar
+- classpath/jackson-module-guice-2.5.3.jar
+- classpath/jansi-1.11.jar
+- classpath/javax.inject-1.jar
+- classpath/joda-time-2.8.1.jar
+- classpath/jruby-complete-1.7.21.jar
+- classpath/logback-classic-1.1.3.jar
+- classpath/logback-core-1.1.3.jar
+- classpath/netty-buffer-5.0.0.Alpha1.jar
+- classpath/netty-common-5.0.0.Alpha1.jar
+- classpath/slf4j-api-1.7.12.jar
+- classpath/slice-0.9.jar
+- classpath/snakeyaml-1.14.jar
+- classpath/validation-api-1.1.0.Final.jar
 - embulk-cli/build.gradle
 - embulk-cli/src/main/java/org/embulk/cli/Main.java
 - embulk-cli/src/main/sh/selfrun.sh
 - embulk-cli/src/test/java/org/embulk/cli/DummyMain.java
 - embulk-cli/src/test/java/org/embulk/cli/SelfrunTest.java
 - embulk-core/build.gradle
+- embulk-core/src/main/java/org/embulk/EmbulkEmbed.java
 - embulk-core/src/main/java/org/embulk/EmbulkService.java
+- embulk-core/src/main/java/org/embulk/command/LiquidTemplate.java
 - embulk-core/src/main/java/org/embulk/command/PreviewPrinter.java
 - embulk-core/src/main/java/org/embulk/command/Runner.java
 - embulk-core/src/main/java/org/embulk/command/TablePreviewPrinter.java
@@ -149,6 +181,14 @@ files:
 - embulk-core/src/main/java/org/embulk/exec/SetCurrentThreadName.java
 - embulk-core/src/main/java/org/embulk/exec/SystemConfigModule.java
 - embulk-core/src/main/java/org/embulk/exec/TempFileAllocator.java
+- embulk-core/src/main/java/org/embulk/guice/Bootstrap.java
+- embulk-core/src/main/java/org/embulk/guice/CloseableInjector.java
+- embulk-core/src/main/java/org/embulk/guice/CloseableInjectorProxy.java
+- embulk-core/src/main/java/org/embulk/guice/InjectorProxy.java
+- embulk-core/src/main/java/org/embulk/guice/LifeCycleManager.java
+- embulk-core/src/main/java/org/embulk/guice/LifeCycleMethods.java
+- embulk-core/src/main/java/org/embulk/guice/LifeCycleMethodsMap.java
+- embulk-core/src/main/java/org/embulk/guice/LifeCycleModule.java
 - embulk-core/src/main/java/org/embulk/jruby/JRubyPluginSource.java
 - embulk-core/src/main/java/org/embulk/jruby/JRubyScriptingModule.java
 - embulk-core/src/main/java/org/embulk/plugin/BuiltinPluginSourceModule.java
@@ -341,6 +381,7 @@ files:
 - embulk-docs/src/release/release-0.6.2.rst
 - embulk-docs/src/release/release-0.6.20.rst
 - embulk-docs/src/release/release-0.6.21.rst
+- embulk-docs/src/release/release-0.6.22.rst
 - embulk-docs/src/release/release-0.6.3.rst
 - embulk-docs/src/release/release-0.6.4.rst
 - embulk-docs/src/release/release-0.6.5.rst
@@ -427,6 +468,7 @@ files:
 - lib/embulk/file_output_plugin.rb
 - lib/embulk/filter_plugin.rb
 - lib/embulk/formatter_plugin.rb
+- lib/embulk/gems.rb
 - lib/embulk/guess/charset.rb
 - lib/embulk/guess/csv.rb
 - lib/embulk/guess/gzip.rb
@@ -437,6 +479,7 @@ files:
 - lib/embulk/input_plugin.rb
 - lib/embulk/java/bootstrap.rb
 - lib/embulk/java/imports.rb
+- lib/embulk/java/liquid_helper.rb
 - lib/embulk/java/time_helper.rb
 - lib/embulk/java_plugin.rb
 - lib/embulk/logger.rb
@@ -452,36 +495,6 @@ files:
 - test/guess/test_schema_guess.rb
 - test/guess/test_time_format_guess.rb
 - test/helper.rb
-- classpath/annotations-3.0.0.jar
-- classpath/aopalliance-1.0.jar
-- classpath/bval-core-0.5.jar
-- 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.21.jar
-- classpath/embulk-standards-0.6.21.jar
-- classpath/guava-18.0.jar
-- classpath/guice-4.0.jar
-- classpath/guice-multibindings-4.0.jar
-- classpath/icu4j-54.1.1.jar
-- classpath/jackson-annotations-2.5.3.jar
-- classpath/jackson-core-2.5.3.jar
-- classpath/jackson-databind-2.5.3.jar
-- classpath/jackson-datatype-guava-2.5.3.jar
-- classpath/jackson-datatype-joda-2.5.3.jar
-- classpath/jackson-module-guice-2.5.3.jar
-- classpath/jansi-1.11.jar
-- classpath/javax.inject-1.jar
-- classpath/joda-time-2.8.1.jar
-- classpath/jruby-complete-1.7.19.jar
-- classpath/logback-classic-1.1.3.jar
-- classpath/logback-core-1.1.3.jar
-- classpath/netty-buffer-5.0.0.Alpha1.jar
-- classpath/netty-common-5.0.0.Alpha1.jar
-- classpath/slf4j-api-1.7.12.jar
-- classpath/slice-0.9.jar
-- classpath/snakeyaml-1.14.jar
-- classpath/validation-api-1.1.0.Final.jar
 homepage: https://github.com/embulk/embulk
 licenses:
 - Apache 2.0
@@ -502,7 +515,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.1.9
+rubygems_version: 2.4.8
 signing_key:
 specification_version: 4
 summary: Embulk, a plugin-based parallel bulk data loader