embulk 0.7.2-java → 0.7.3-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f134c6937fe0926c4f18a31c4bc43b0180673bfd
-  data.tar.gz: 0075a441e60c60291e38a607565036579286e9db
+  metadata.gz: dcb703697162b5a2914a16080bd8de7451901c16
+  data.tar.gz: 90be92f711d748415cc73c6f92ad0004dac67ac5
 SHA512:
-  metadata.gz: 1f8a1361a31eaf2a44c27bce626ac0a408b7d2f0f282614807e75e90ad8fb4791fb27ff5673be5b952559b0220147ed68b48e2f9a242aaf01ffab6dfa998dc0f
-  data.tar.gz: 4a5532254234c25eaeadde47e7c17aed6771551f0aa0030bcb134f3d10fb7e7d45f882529438a899342327fa539e508169fdff889cd9911831ff5b557a58cf8b
+  metadata.gz: f7103a37b583f96b2b1113d2add98acb8b346c053e91c2576bd8a6acae65d3390d4caa53fa8ed3ad863a93a8e5cc1b063cae8ba1bdf66692a273b087b1cc3b1a
+  data.tar.gz: f6154d43fb57162af37fa741e136a67baabde33ac479093fc00d8547f2aec69064763b60ee6f4c1fded88494f2d3cb92106e38f605a1a4518ed3b601bc0494a8

data/build.gradle

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

data/embulk-docs/src/release.rst

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

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

@@ -0,0 +1,21 @@
+Release 0.7.3
+==================================
+
+General Changes
+------------------
+
+* ``embulk selfupdate`` command gets optoinal ``<version>`` argument to upgrade or downgrade to specific version (@cosmo0920++).
+* ``embulk migrate`` command assumes that source code file encoding is UTF-8. This fixes encoding exception on Windows environment.
+
+
+Java Plugin API
+------------------
+
+* Fixed ``Embulk::Exec.preview?``.
+* Fixed ``raise ConfigException``.
+* added missing ``PluginLoadError`` class.
+
+
+Release Date
+------------------
+2015-08-23

data/lib/embulk/buffer.rb

@@ -1,22 +1,20 @@
 
 module Embulk
   class Buffer < String
-    if Embulk.java?
-      def self.from_java(java_buffer)
-        byte_list = org.jruby.util.ByteList.new(java_buffer.array(), java_buffer.offset(), java_buffer.limit(), false)
-        buffer = new
-        buffer.replace(org.jruby.RubyString.new(JRuby.runtime, self, byte_list).dup)  # TODO simplify
-        buffer
-      end
+    def self.from_java(java_buffer)
+      byte_list = org.jruby.util.ByteList.new(java_buffer.array(), java_buffer.offset(), java_buffer.limit(), false)
+      buffer = new
+      buffer.replace(org.jruby.RubyString.new(JRuby.runtime, self, byte_list).dup)  # TODO simplify
+      buffer
+    end
 
-      def self.from_ruby_string(string)
-        b = Buffer.new(string)
-        b.force_encoding('ASCII-8BIT')
-      end
+    def self.from_ruby_string(string)
+      b = Buffer.new(string)
+      b.force_encoding('ASCII-8BIT')
+    end
 
-      def to_java
-        Java::Buffer.wrap(to_java_bytes)
-      end
+    def to_java
+      Java::Buffer.wrap(to_java_bytes)
     end
   end
 end

data/lib/embulk/column.rb

@@ -20,49 +20,45 @@ module Embulk
       end
     end
 
-    if Embulk.java?
-      def self.from_java(java_column)
-        type = Type.from_java(java_column.getType)
-        if type == :timestamp
-          format = java_column.getType.getFormat
-        else
-          format = nil
-        end
-
-        Column.new(java_column.getIndex, java_column.getName, type, format)
+    def self.from_java(java_column)
+      type = Type.from_java(java_column.getType)
+      if type == :timestamp
+        format = java_column.getType.getFormat
+      else
+        format = nil
       end
 
-      def to_java
-        if type == :timestamp && format
-          Java::Column.new(index, name, Type.new_java_type(type).withFormat(format))
-        else
-          Java::Column.new(index, name, Type.new_java_type(type))
-        end
+      Column.new(java_column.getIndex, java_column.getName, type, format)
+    end
+
+    def to_java
+      if type == :timestamp && format
+        Java::Column.new(index, name, Type.new_java_type(type).withFormat(format))
+      else
+        Java::Column.new(index, name, Type.new_java_type(type))
       end
     end
   end
 
   module Type
-    if Embulk.java?
-      def self.from_java(java_type)
-        java_type.getName.to_sym
-      end
+    def self.from_java(java_type)
+      java_type.getName.to_sym
+    end
 
-      def self.new_java_type(ruby_type)
-        case ruby_type
-        when :boolean
-          Java::Types::BOOLEAN
-        when :long
-          Java::Types::LONG
-        when :double
-          Java::Types::DOUBLE
-        when :string
-          Java::Types::STRING
-        when :timestamp
-          Java::Types::TIMESTAMP
-        else
-          raise ArgumentError, "Unknown type #{ruby_type.inspect}: supported types are :boolean, :long, :double, :string and :timestamp"
-        end
+    def self.new_java_type(ruby_type)
+      case ruby_type
+      when :boolean
+        Java::Types::BOOLEAN
+      when :long
+        Java::Types::LONG
+      when :double
+        Java::Types::DOUBLE
+      when :string
+        Java::Types::STRING
+      when :timestamp
+        Java::Types::TIMESTAMP
+      else
+        raise ArgumentError, "Unknown type #{ruby_type.inspect}: supported types are :boolean, :long, :double, :string and :timestamp"
       end
     end
   end

data/lib/embulk/command/embulk_migrate_plugin.rb

@@ -96,7 +96,7 @@ module Embulk
 
     def match(glob, pattern)
       ms = Dir[File.join(@path, glob)].map do |file|
-        File.read(file).match(pattern)
+        read(file).match(pattern)
       end.compact
       return nil if ms.empty?
       ms
@@ -104,7 +104,7 @@ module Embulk
 
     def replace(glob, pattern, text=nil)
       ms = Dir[File.join(@path, glob)].map do |file|
-        data = File.read(file)
+        data = read(file)
         first = nil
         pos = 0
         while pos < data.length
@@ -126,7 +126,7 @@ module Embulk
 
     def insert_line(glob, pattern, text=nil)
       ms = Dir[File.join(@path, glob)].map do |file|
-        data = File.read(file)
+        data = read(file)
         if m = data.match(pattern)
           ln = m.pre_match.split("\n").count
           replace = text || yield(m)
@@ -142,7 +142,7 @@ module Embulk
     end
 
     def data(file)
-      File.read(File.join(@path, file))
+      read(File.join(@path, file))
     end
 
     def write(file, data)
@@ -152,7 +152,7 @@ module Embulk
     private
 
     def modify(path, data)
-      orig = File.read(path) rescue nil
+      orig = read(path) rescue nil
       if orig != data
         File.write(path, data)
         unless @modified_files.has_key?(path)
@@ -166,5 +166,11 @@ module Embulk
       end
       nil
     end
+
+    def read(path)
+      # external_encoding: assumes source code is written in UTF-8.
+      # internal_encoding: process files using UTF-8 so that modified data (data written to the file) becomes UTF-8.
+      File.read(path, external_encoding: 'UTF-8', internal_encoding: 'UTF-8')
+    end
   end
 end

data/lib/embulk/command/embulk_run.rb

@@ -175,7 +175,7 @@ examples:
       op.on('-f', "Skip corruption check", TrueClass) do |b|
         options[:force] = true
       end
-      args = 0..0
+      args = 0..1
 
     when :example
       args = 0..1
@@ -253,6 +253,7 @@ examples:
 
     when :selfupdate
       require 'embulk/command/embulk_selfupdate'
+      options[:version] = ARGV[0]
       Embulk.selfupdate(options)
 
     else
@@ -424,16 +425,16 @@ examples:
     STDERR.puts "Embulk v#{Embulk::VERSION}"
     STDERR.puts "usage: <command> [--options]"
     STDERR.puts "commands:"
-    STDERR.puts "   bundle    [directory]                              # create or update plugin environment."
-    STDERR.puts "   run       <config.yml>                             # run a bulk load transaction."
-    STDERR.puts "   preview   <config.yml>                             # dry-run the bulk load without output and show preview."
-    STDERR.puts "   guess     <partial-config.yml> -o <output.yml>     # guess missing parameters to create a complete configuration file."
-    STDERR.puts "   gem       <install | list | help>                  # install a plugin or show installed plugins."
+    STDERR.puts "   bundle     [directory]                             # create or update plugin environment."
+    STDERR.puts "   run        <config.yml>                            # run a bulk load transaction."
+    STDERR.puts "   preview    <config.yml>                            # dry-run the bulk load without output and show preview."
+    STDERR.puts "   guess      <partial-config.yml> -o <output.yml>    # guess missing parameters to create a complete configuration file."
+    STDERR.puts "   gem        <install | list | help>                 # install a plugin or show installed plugins."
     STDERR.puts "                                                      # plugin path is #{ENV['GEM_HOME']}"
-    STDERR.puts "   new       <category> <name>                        # generates new plugin template"
-    STDERR.puts "   migrate   <path>                                   # modify plugin code to use the latest Embulk plugin API"
-    STDERR.puts "   example   [path]                                   # creates an example config file and csv file to try embulk."
-    STDERR.puts "   selfupdate                                         # upgrades embulk to the latest released version."
+    STDERR.puts "   new        <category> <name>                       # generates new plugin template"
+    STDERR.puts "   migrate    <path>                                  # modify plugin code to use the latest Embulk plugin API"
+    STDERR.puts "   example    [path]                                  # creates an example config file and csv file to try embulk."
+    STDERR.puts "   selfupdate [version]                               # upgrades embulk to the latest released version or to the specified version."
     STDERR.puts ""
     if message
       system_exit "error: #{message}"

data/lib/embulk/command/embulk_selfupdate.rb

@@ -14,15 +14,27 @@ module Embulk
       raise SystemExit.new(1)
     end
 
-    puts "Checking the latest version..."
-    latest_version = check_latest_version
+    if version = options[:version]
+      puts "Checking version #{version}..."
+      target_version = check_target_version(version)
 
-    if Gem::Version.new(latest_version) <= Gem::Version.new(Embulk::VERSION)
-      puts "Already up-to-date. #{latest_version} is the latest version."
-      return
-    end
+      unless target_version
+        puts "Specified version does not exist: #{version}"
+        raise SystemExit.new(1)
+      end
+      puts "Found version #{target_version}."
+
+    else
+      puts "Checking the latest version..."
+      target_version = check_latest_version
 
-    puts "Found new version #{latest_version}."
+      if Gem::Version.new(target_version) <= Gem::Version.new(Embulk::VERSION)
+        puts "Already up-to-date. #{target_version} is the latest version."
+        return
+      end
+
+      puts "Found new version #{target_version}."
+    end
 
     unless File.writable?(jar_path)
       STDERR.puts ""
@@ -32,7 +44,7 @@ module Embulk
       raise SystemExit.new(1)
     end
 
-    url = "https://dl.bintray.com/embulk/maven/embulk-#{latest_version}.jar"
+    url = "https://dl.bintray.com/embulk/maven/embulk-#{target_version}.jar"
     puts "Downloading #{url} ..."
 
     require 'open-uri'
@@ -50,8 +62,8 @@ module Embulk
           data = File.read("jar:#{java.io.File.new(tmp.path).toURI.toURL}!/embulk/version.rb")
           m = Module.new
           m.module_eval(data)
-          unless m::Embulk::VERSION == latest_version
-            raise "Embulk::VERSION does not match with #{latest_version}"
+          unless m::Embulk::VERSION == target_version
+            raise "Embulk::VERSION does not match with #{target_version}"
           end
         rescue => e
           STDERR.puts "Corruption checking failed (#{e})."
@@ -64,21 +76,44 @@ module Embulk
       File.rename(tmp.path, jar_path)
     end
 
-    puts "Updated to #{latest_version}."
+    puts "Updated to #{target_version}."
   end
 
+  private
+
   def self.check_latest_version
-    require 'net/https'
-    bintray = Net::HTTP.new('bintray.com', 443)
-    bintray.use_ssl = true
-    bintray.verify_mode = OpenSSL::SSL::VERIFY_NONE
-    bintray.start do
-      response = bintray.get('/embulk/maven/embulk/_latestVersion')
-      raise "Expected response code 302 Found but got #{response.code}" if response.code != "302"
+    start_bintray_http do |http|
+      response = http.get('/embulk/maven/embulk/_latestVersion')
+      if response.code != "302"
+        raise "Expected response code 302 Found but got #{response.code}"
+      end
       location = response["Location"].to_s
       m = /(\d+\.\d+[^\/]+)/.match(location)
-      raise "Cound not find version number in Location header '#{location}'" unless m
+      unless m
+        raise "Cound not find version number in Location header '#{location}'"
+      end
       return m[1]
     end
   end
+
+  def self.check_target_version(version=nil)
+    start_bintray_http do |http|
+      response = http.get("/embulk/maven/embulk/#{version}")
+      if response.code == "404"
+        return nil
+      elsif response.code != "200"
+        raise "Unexpected response code: #{response.code}"
+      else
+        return version
+      end
+    end
+  end
+
+  def self.start_bintray_http(&block)
+    require 'net/https'
+    bintray = Net::HTTP.new('bintray.com', 443)
+    bintray.use_ssl = true
+    bintray.verify_mode = OpenSSL::SSL::VERIFY_NONE
+    bintray.start(&block)
+  end
 end

data/lib/embulk/data_source.rb

@@ -145,31 +145,31 @@ module Embulk
             begin
               Integer(v)
             rescue => e
-              raise ConfigError, e
+              raise ConfigError.new e
             end
           when :float
             begin
               Float(v)
             rescue => e
-              raise ConfigError, e
+              raise ConfigError.new e
             end
           when :string
             begin
               String(v).dup
             rescue => e
-              raise ConfigError, e
+              raise ConfigError.new e
             end
           when :bool
             begin
               !!v  # TODO validation
             rescue => e
-              raise ConfigError, e
+              raise ConfigError.new e
             end
           when :hash
-            raise ConfigError, "Invalid value for :hash" unless v.is_a?(Hash)
+            raise ConfigError.new "Invalid value for :hash" unless v.is_a?(Hash)
             DataSource.new.merge!(v)
           when :array
-            raise ConfigError, "Invalid value for :array" unless v.is_a?(Array)
+            raise ConfigError.new "Invalid value for :array" unless v.is_a?(Array)
             v.dup
           else
             unless type.respond_to?(:load)
@@ -178,7 +178,7 @@ module Embulk
             begin
               type.load(v)
             rescue => e
-              raise ConfigError, e
+              raise ConfigError.new e
             end
           end
 
@@ -186,34 +186,32 @@ module Embulk
         value = options[:default]
 
       else
-        raise ConfigError, "Required field #{key.to_s.dump} is not set"
+        raise ConfigError.new "Required field #{key.to_s.dump} is not set"
       end
 
       return value
     end
 
-    if Embulk.java?
-      def self.from_java(java_data_source_impl)
-        json = java_data_source_impl.toString
-        new.merge!(JSON.parse(json))
-      end
+    def self.from_java(java_data_source_impl)
+      json = java_data_source_impl.toString
+      new.merge!(JSON.parse(json))
+    end
 
-      def self.from_ruby_hash(hash)
-        new.merge!(hash)
-      end
+    def self.from_ruby_hash(hash)
+      new.merge!(hash)
+    end
 
-      def to_java
-        json = to_json
-        Java::Injected::ModelManager.readObject(Java::DataSourceImpl.java_class, json.to_java)
-      end
+    def to_java
+      json = to_json
+      Java::Injected::ModelManager.readObject(Java::DataSourceImpl.java_class, json.to_java)
+    end
 
-      def load_config(task_type)
-        Java::Injected::ModelManager.readObjectWithConfigSerDe(task_type.java_class, to_json.to_java)
-      end
+    def load_config(task_type)
+      Java::Injected::ModelManager.readObjectWithConfigSerDe(task_type.java_class, to_json.to_java)
+    end
 
-      def load_task(task_type)
-        Java::Injected::ModelManager.readObject(task_type.java_class, to_json.to_java)
-      end
+    def load_task(task_type)
+      Java::Injected::ModelManager.readObject(task_type.java_class, to_json.to_java)
     end
   end