embulk 0.8.39-java → 0.10.24-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: e5e2c9aab6d9b8e2978251ab9137ac74f1eff007e19a6b791a9c09e947c2ff90
-  data.tar.gz: b33cab64b71744693ce05f7110427985719e11aa309da49eb3064bdf72406c8e
+SHA1:
+  metadata.gz: c7fcb1a8f1e94112700f6f4593f4038fc9861c4a
+  data.tar.gz: 8eb07cb5694b38a1937ecbd62d3c193a124a1253
 SHA512:
-  metadata.gz: c7d83d9bdef928ff4bd3d0291d3bdc34b588c7062e6cd0514338b2a8904bd21b84361581ddfe750a4ebe48aa106abcb4ce5bcdedc8f97c5853194a6604662232
-  data.tar.gz: abe661ae8c053ff0ac2c8caafd3736c2225c07192fb9d2a4672dcb81d31418eb62e4e4ed07ea5adb758c65ba9e7ad6d1527dc0f6d4ff90862238f5591d393929
+  metadata.gz: 9aac5551600bee7e5d0836b5f75d956cbcfc657793a062c9849129e6444505b24c38d3f9f9f2d1ce5a6c85a46e44bfa7059890c2a42b57f584ae03eb8712fc4c
+  data.tar.gz: 584c660fdcd24878c985ca63e55bc606eaad660cc7ed30e208641c08ec6ebe83573200b2f40d8bb908168abe86ea04e6ea9b07f8c87f39252465063cb473e8d4

data/Gemfile

@@ -1,2 +1,2 @@
-source 'https://rubygems.org/'
+source "https://www.rubygems.org"
 gemspec

data/LICENSE

@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

data/embulk.gemspec

@@ -1,41 +1,42 @@
-# 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_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."
-  gem.authors       = ["Sadayuki Furuhashi"]
-  gem.email         = ["frsyuki@gmail.com"]
-  gem.license       = "Apache 2.0"
-  gem.homepage      = "https://github.com/embulk/embulk"
-
-  provided_classpath = Dir["classpath/jruby-complete-*.jar"] + Dir["classpath/icu4j-*.jar"]
-  gem.files         = `git ls-files`.split("\n") + Dir["classpath/*.jar"] - provided_classpath
-  gem.test_files    = gem.files.grep(%r"^(test|spec)/")
-  gem.executables   = gem.files.grep(%r"^bin/").map{ |f| File.basename(f) }
-  gem.require_paths = ["lib"]
-  gem.has_rdoc      = false
+  gem.name = "embulk"
+  gem.version = "0.10.24"
+  gem.license = "Apache-2.0"
+
+  gem.summary = "Embulk's runtime library for Ruby."
+  gem.description = "Embulk's runtime library for Ruby. Embulk users need to install it when running a gem-packaged plugin."
 
-  if RUBY_PLATFORM =~ /java/i
-    gem.add_dependency "bundler", '>= 1.10.6'
-    gem.add_dependency "msgpack", '~> 1.1.0'
-    gem.add_dependency "liquid", '~> 4.0.0'
+  gem.authors = [
+    "Sadayuki Furuhashi",
+    "Muga Nishizawa",
+    "Dai MIKURUBE",
+  ]
+  gem.email = "frsyuki@gmail.com"
 
-    # For embulk/guess/charset.rb. See also embulk-core/build.gradle
-    gem.add_dependency "rjack-icu", '~> 4.54.1.1'
+  # Always with JRuby.
+  gem.platform = "java"
 
-    gem.platform = 'java'
+  # https://github.com/rubygems/rubygems/issues/1263
+  gem.required_ruby_version = ">= 2.3.0"  # JRuby 9.1.* is for Ruby 2.3.x support.
+
+  gem.files = ["embulk.gemspec", "Gemfile", "LICENSE"]
+  gem.files += Dir.glob("lib/**/*")
+
+  gem.require_paths = ["lib"]
 
-  else
-    gem.add_dependency "jruby-jars", '= 9.1.13.0'
+  gem.homepage = "https://www.embulk.org/"
+
+  if gem.respond_to? :metadata=
+    gem.metadata = {
+      "bug_tracker_uri" => "https://github.com/embulk/embulk/issues",
+      "changelog_uri" => "https://github.com/embulk/embulk/releases",
+      "documentation_uri" => "https://www.embulk.org/",
+      "homepage_uri" => gem.homepage,
+      # "mailing_list_uri"  => "",
+      "source_code_uri" => "https://github.com/embulk/embulk/tree/v0.10.24",
+      # "wiki_uri" => "",
+    }
   end
 
-  gem.add_development_dependency "rake", [">= 0.10.0"]
-  gem.add_development_dependency "test-unit", ["~> 3.0.9"]
-  gem.add_development_dependency "yard", ["~> 0.8.7"]
-  gem.add_development_dependency "kramdown", ["~> 1.5.0"]
+  gem.add_runtime_dependency "msgpack", ">= 1.1.0"
 end

data/lib/embulk.rb

@@ -1,72 +1,16 @@
 module Embulk
-  # logger should be setup first
+  # logger still should be setup first
   require 'embulk/logger'
 
   def self.lib_path(path)
-    path = '' if path == '/'
-    jar, resource = __FILE__.split("!", 2)
-    if resource
-      lib = resource.split("/")[0..-2].join("/")
-      "#{jar}!#{lib}/#{path}"
-    elsif __FILE__ =~ /^(?:classpath|uri:classloader):/
-      lib = __FILE__.split("/")[0..-2].join("/")
-      "#{lib}/#{path}"
-    else
-      lib = File.expand_path File.dirname(__FILE__)
-      File.join(lib, *path.split("/"))
-    end
+    raise NotImplementedError.new("Embulk.lib_path is removed in v0.9.")
   end
 
-  def self.require_classpath(already_warned=false)
-    if __FILE__.include?("!")
-      # single jar. __FILE__ should point path/to/embulk.jar!/embulk.rb
-      # which means that embulk.jar is already loaded in this JVM.
-
-    elsif __FILE__ =~ /^(?:classpath|uri:classloader):/
-      # already in classpath
-
-    else
-      # gem package. __FILE__ should point path/to/embulk/lib/embulk.rb
-      # that requires here to load ../classpath/*.jar to start EmbulkEmbed.
-
-      unless already_warned
-        STDERR.puts "################################################################################"
-        STDERR.puts "[WARN] Embulk's gem package is deprecated, and will be removed from v0.9."
-        STDERR.puts "[WARN] Use the jar version installed from http://dl.embulk.org/ instead."
-        STDERR.puts "[WARN] See the issue and comment at: https://github.com/embulk/embulk/issues/628"
-        STDERR.puts "################################################################################"
-        STDERR.puts ""
-      end
-
-      gem_root = File.expand_path('..', File.dirname(__FILE__))
-      classpath_dir = File.join(gem_root, "classpath")
-      jars = Dir.entries(classpath_dir).select{|f| f =~ /\.jar$/ }.sort
-      jars.each do |jar|
-        require File.join(classpath_dir, jar)
-      end
-    end
+  def self.require_classpath()
+    raise NotImplementedError.new("Embulk.require_classpath is removed in v0.9.")
   end
 
   def self.setup(system_config={})
-    STDERR.puts "################################################################################"
-    STDERR.puts "[WARN] Embulk's gem package is deprecated, and will be removed from v0.9."
-    STDERR.puts "[WARN] Use the jar version installed from http://dl.embulk.org/ instead."
-    STDERR.puts "[WARN] See the issue and comment at: https://github.com/embulk/embulk/issues/628"
-    STDERR.puts "################################################################################"
-    STDERR.puts ""
-
-    unless RUBY_PLATFORM =~ /java/i
-      raise "Embulk.setup works only with JRuby."
-    end
-
-    # require 'json' -- was required to format the system config into a JSON string.
-
-    require_classpath(true)
-
-    require 'embulk/runner'
-
-    # see also embulk/java/bootstrap.rb loaded by JRubyScriptingModule
-    runner_java = EmbulkRunner.new(Java::org.embulk.EmbulkSetup::setup(Java::java.util.HashMap.new(system_config)))
-    Embulk.const_set :Runner, runner_java
+    raise NotImplementedError.new("Embulk.setup is removed in v0.9.")
   end
 end

data/lib/embulk/buffer.rb

@@ -1,4 +1,3 @@
-
 module Embulk
   class Buffer < String
     def self.from_java(java_buffer)
@@ -14,7 +13,7 @@ module Embulk
     end
 
     def to_java
-      Java::Buffer.wrap(to_java_bytes)
+      Java::org.embulk.spi.BufferImpl.wrap(to_java_bytes)
     end
   end
 end

data/lib/embulk/guess/charset.rb

@@ -15,17 +15,8 @@ module Embulk
       }
 
       def guess(config, sample_buffer)
-        # ICU4J
-        begin
-          detector_class = com.ibm.icu.text.CharsetDetector
-        rescue NameError
-          # icu4j is removed from embulk.gem package explicitly at embulk.gemspec
-          # if gem is packaged for JRuby to reduce binary size. Instead, if it's
-          # packaged for JRuby, embulk.gemspec adds rjack-icu to its dependency.
-          require 'rjack-icu'
-          detector_class = com.ibm.icu.text.CharsetDetector
-        end
-        detector = detector_class.new
+        detector_class = org.embulk.deps.guess.CharsetDetector
+        detector = detector_class.create
         detector.setText(sample_buffer.to_java_bytes)
         best_match = detector.detect
         if best_match.getConfidence < 50

data/lib/embulk/java/bootstrap.rb

@@ -19,6 +19,5 @@ module Embulk
     require 'embulk/buffer'
     require 'embulk/data_source'
     require 'embulk/plugin'
-    require 'embulk/runner'
   end
 end

data/lib/embulk/java_plugin.rb

@@ -6,7 +6,15 @@ module Embulk
     def self.classloader(dir)
       jars = Dir["#{dir}/**/*.jar"]
       urls = jars.map {|jar| java.io.File.new(File.expand_path(jar)).toURI.toURL }
-      factory = Java.injector.getInstance(Java::PluginClassLoaderFactory.java_class)
+      begin
+        expected_temporary_variable_name = Java::org.embulk.jruby.JRubyPluginSource::PLUGIN_CLASS_LOADER_FACTORY_VARIABLE_NAME
+      rescue => e
+        raise PluginLoadError.new "Java's org.embulk.jruby.JRubyPluginSource does not define PLUGIN_CLASS_LOADER_FACTORY_VARIABLE_NAME unexpectedly."
+      end
+      if expected_temporary_variable_name != "$temporary_internal_plugin_class_loader_factory__"
+        raise PluginLoadError.new "Java's org.embulk.jruby.JRubyPluginSource does not define PLUGIN_CLASS_LOADER_FACTORY_VARIABLE_NAME correctly."
+      end
+      factory = $temporary_internal_plugin_class_loader_factory__
       factory.create(urls, JRuby.runtime.getJRubyClassLoader())
     end
 

data/lib/embulk/page_builder.rb

@@ -14,8 +14,8 @@ module Embulk
       elsif ruby_object.kind_of?(String)
         self.java_send(:set, [::Java::java.lang.String], ruby_object.to_java(::Java::java.lang.String))
       elsif ruby_object.kind_of?(Time)
-        self.java_send(:set, [::Java::org.embulk.spi.time.Timestamp],
-                       ::Java::org.embulk.spi.time.Timestamp.ofEpochSecond(ruby_object.to_i, ruby_object.nsec))
+        self.java_send(:set, [::Java::java.time.Instant],
+                       ::Java::java.time.Instant.ofEpochSecond(ruby_object.to_i, ruby_object.nsec))
       else
         self.java_send(:set, [::Java::org.msgpack.value.Value],
                        ::Java::org.msgpack.core.MessagePack.newDefaultUnpacker(ruby_object.to_msgpack.to_java_bytes).unpackValue())

data/lib/embulk/plugin.rb

@@ -220,12 +220,12 @@ module Embulk
   end
 
   module Plugin
+    INSTANCE = PluginManager.new
     class <<self
-      INSTANCE = PluginManager.new
 
       extend Forwardable
 
-      def_delegators 'INSTANCE',
+      def_delegators :'Embulk::Plugin::INSTANCE',
         :register_input, :get_input, :register_java_input, :new_java_input,
         :register_output, :get_output, :register_java_output, :new_java_output,
         :register_filter, :get_filter, :register_java_filter, :new_java_filter,