embulk 0.6.6 → 0.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06d9d42d47c71ddd9c290abc3fd90eae09756157
-  data.tar.gz: 4a1104ff4fb9657b5a2305120d8ffe0f2992c9ff
+  metadata.gz: c812083e751a2593484a749af8ac7f0519cbe5f7
+  data.tar.gz: d7d74ec957f1cbb9951850199524a3e039be4640
 SHA512:
-  metadata.gz: 9df10a5c5d6a0c77b38352f96d5f1cedbd658c0ac5a41e1720a3c8baa9f65685c742a34d0e6569d6bbb3d2c2e43423b48e3cc8d167dd4f8982568ea92f29d4eb
-  data.tar.gz: 75887fa0b97bc9750cca1d4abdeb500d0f8e83fd0ede84f467e671c83754acf0e3abb1a82a18c106d9e1250587f5b286a1c598fadeb7249d0c4320df0279f47c
+  metadata.gz: 9f727dfbf18ab2dc4e768b7ea132413c30fc63330a6aa3c0d5ffc4285623c7f03eaa66c177ed9c4c57d1232f59e582583cb2255c73d8f0a4045831f126f040de
+  data.tar.gz: a0218b10b993ad8cb09afc3fc7f94454da50410979e70a74375d2c3d739077e20ae16b27e0fb30d369137cc8c29b6bddaace9955746f66fcb3ae8c72c7a39e82

data/build.gradle

@@ -11,7 +11,7 @@ def release_projects = [project(":embulk-core"), project(":embulk-standards")]
 
 allprojects {
     group = 'org.embulk'
-    version = '0.6.6'
+    version = '0.6.7'
 
     ext {
         jrubyVersion = '1.7.19'
@@ -40,7 +40,7 @@ allprojects {
         }
 
         dryRun = false
-        publish = false  // TODO automate uploading embulk.jar and make this true
+        publish = true
 
         pkg {
             userOrg = 'embulk'

data/embulk-core/build.gradle

@@ -15,15 +15,15 @@ configurations {
 // determine which dependencies have updates: $ gradle dependencyUpdates
 dependencies {
     compile 'com.google.guava:guava:18.0'
-    compile 'com.google.inject:guice:3.0'
-    compile 'com.google.inject.extensions:guice-multibindings:3.0'
+    compile 'com.google.inject:guice:4.0'
+    compile 'com.google.inject.extensions:guice-multibindings:4.0'
     compile 'javax.inject:javax.inject:1'
-    compile 'com.fasterxml.jackson.core:jackson-annotations:2.5.0'
-    compile 'com.fasterxml.jackson.core:jackson-core:2.5.0'
-    compile 'com.fasterxml.jackson.core:jackson-databind:2.5.0'
-    compile 'com.fasterxml.jackson.datatype:jackson-datatype-guava:2.5.0'
-    compile 'com.fasterxml.jackson.datatype:jackson-datatype-joda:2.5.0'
-    compile 'com.fasterxml.jackson.module:jackson-module-guice:2.5.0'
+    compile 'com.fasterxml.jackson.core:jackson-annotations:2.5.3'
+    compile 'com.fasterxml.jackson.core:jackson-core:2.5.3'
+    compile 'com.fasterxml.jackson.core:jackson-databind:2.5.3'
+    compile 'com.fasterxml.jackson.datatype:jackson-datatype-guava:2.5.3'
+    compile 'com.fasterxml.jackson.datatype:jackson-datatype-joda:2.5.3'
+    compile 'com.fasterxml.jackson.module:jackson-module-guice:2.5.3'
     compile 'log4j:log4j:1.2.17'
     compile 'org.slf4j:slf4j-api:1.7.10'
     compile 'org.slf4j:slf4j-log4j12:1.7.10'

data/embulk-docs/src/release.rst

@@ -4,6 +4,7 @@ Release Notes
 .. toctree::
     :maxdepth: 1
 
+    release/release-0.6.7
     release/release-0.6.6
     release/release-0.6.5
     release/release-0.6.4

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

@@ -0,0 +1,17 @@
+Release 0.6.7
+==================================
+
+Built-in plugins
+------------------
+
+* ``guess-csv`` guesses "t" and "f" as a boolean value.
+
+General Changes
+------------------
+
+* Added ``selfupdate`` subcommand. This command updates embulk itself to the released latest version.
+* Upgraded library dependency of Guice from 3.0 to 4.0.
+
+Release Date
+------------------
+2015-05-06

data/embulk-standards/src/main/java/org/embulk/standards/CsvParserPlugin.java

@@ -30,7 +30,7 @@ public class CsvParserPlugin
         ImmutableSet.of(
                 "true", "True", "TRUE",
                 "yes", "Yes", "YES",
-                "y", "Y",
+                "t", "T", "y", "Y",
                 "on", "On", "ON",
                 "1");
 

data/lib/embulk/command/embulk_run.rb

@@ -173,6 +173,13 @@ examples:
 ]
       args = 2..2
 
+    when :selfupdate
+      op.remove  # remove --bundle
+      op.on('-f', "Skip corruption check", TrueClass) do |b|
+        options[:force] = true
+      end
+      args = 0..0
+
     when :gem
       require 'rubygems/gem_runner'
       Gem::GemRunner.new.run argv
@@ -297,6 +304,10 @@ examples:
       require 'embulk/command/embulk_new_plugin'
       Embulk.new_plugin(name, language, category)
 
+    when :selfupdate
+      require 'embulk/command/embulk_selfupdate'
+      Embulk.selfupdate(options)
+
     else
       require 'json'
 
@@ -327,8 +338,14 @@ examples:
   end
 
   def self.home(dir)
-    home = File.expand_path('../../..', File.dirname(__FILE__))
-    File.join(home, dir)
+    jar, resource = __FILE__.split("!")
+    if resource
+      home = resource.split("/")[0..-3].join("/")
+      "#{jar}!#{home}/#{dir}"
+    else
+      home = File.expand_path('../../..', File.dirname(__FILE__))
+      File.join(home, dir)
+    end
   end
 
   def self.default_gem_home
@@ -395,6 +412,7 @@ examples:
     STDERR.puts "                                                      # plugin path is #{ENV['GEM_HOME']}"
     STDERR.puts "   new       <category> <name>                        # generates new plugin template"
     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 ""
     if message
       STDERR.puts "error: #{message}"

data/lib/embulk/command/embulk_selfupdate.rb

@@ -0,0 +1,84 @@
+module Embulk
+  def self.selfupdate(options={})
+    require 'uri'
+
+    jar, resource = __FILE__.split("!", 2)
+    jar_path = URI.parse(jar).path rescue jar
+    unless resource && File.file?(jar_path)
+      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: "
+      STDERR.puts ""
+      STDERR.puts "  $ gem install embulk"
+      STDERR.puts ""
+      raise SystemExit.new(1)
+    end
+
+    puts "Checking the latest version..."
+    latest_version = check_latest_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
+
+    puts "Found new version #{latest_version}."
+
+    unless File.writable?(jar_path)
+      STDERR.puts ""
+      STDERR.puts "Installation path #{jar_path} is not writable."
+      STDERR.puts "Dou you need to run with sudo?"
+      STDERR.puts ""
+      raise SystemExit.new(1)
+    end
+
+    url = "https://dl.bintray.com/embulk/maven/embulk-#{latest_version}.jar"
+    puts "Downloading #{url} ..."
+
+    require 'open-uri'
+    require 'tempfile'
+    Tempfile.open(["embulk-selfupdate", ".jar"]) do |tmp|
+      tmp.chmod(File.stat(jar_path).mode)
+      OpenURI.open_uri(url) do |f|
+        IO.copy_stream(f, tmp)
+      end
+      tmp.close(false)
+
+      # check corruption
+      unless options[:force]
+        begin
+          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}"
+          end
+        rescue => e
+          STDERR.puts "Corruption checking failed (#{e})."
+          STDERR.puts "This version might include incompatible changes."
+          STDERR.puts "Please add '-f' argument to selfupdate command to skip checking."
+          raise SystemExit.new(1, e.to_s)
+        end
+      end
+
+      File.rename(tmp.path, jar_path)
+    end
+
+    puts "Updated to #{latest_version}."
+  end
+
+  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"
+      location = response["Location"].to_s
+      m = /(\d+\.\d+[^\/]+)/.match(location)
+      raise "Cound not find version number in Location header '#{location}'" unless m
+      return m[1]
+    end
+  end
+end

data/lib/embulk/guess/schema_guess.rb

@@ -64,13 +64,17 @@ module Embulk::Guess
           end
         end
 
+        if str.empty?
+          return nil
+        end
+
         return "string"
       end
 
       def merge_types(types)
         t = types.inject(nil) {|r,t| merge_type(r,t) } || "string"
         if t.is_a?(TimestampTypeMatch)
-          format = TimeFormatGuess.guess(types.map {|type| type.format })
+          format = TimeFormatGuess.guess(types.map {|type| type.is_a?(TimestampTypeMatch) ? type.format : nil }.compact)
           return TimestampTypeMatch.new(format)
         else
           return t
@@ -81,7 +85,7 @@ module Embulk::Guess
       TRUE_STRINGS = Hash[%w[
         true True TRUE
         yes Yes YES
-        y Y
+        t T y Y
         on On ON
         1
       ].map {|k| [k, true] }]
@@ -90,7 +94,7 @@ module Embulk::Guess
       FALSE_STRINGS = Hash[%w[
         false False FALSE
         no No NO
-        n N
+        f N n N
         off Off OFF
         0
       ].map {|k| [k, true] }]

data/lib/embulk/version.rb

@@ -1,3 +1,3 @@
 module Embulk
-  VERSION = '0.6.6'
+  VERSION = '0.6.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk
 version: !ruby/object:Gem::Version
-  version: 0.6.6
+  version: 0.6.7
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-05-04 00:00:00.000000000 Z
+date: 2015-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -296,6 +296,7 @@ files:
 - embulk-docs/src/release/release-0.6.4.rst
 - embulk-docs/src/release/release-0.6.5.rst
 - embulk-docs/src/release/release-0.6.6.rst
+- embulk-docs/src/release/release-0.6.7.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
@@ -324,6 +325,7 @@ files:
 - lib/embulk/command/embulk_generate_bin.rb
 - lib/embulk/command/embulk_new_plugin.rb
 - lib/embulk/command/embulk_run.rb
+- lib/embulk/command/embulk_selfupdate.rb
 - lib/embulk/data/bundle/.bundle/config
 - lib/embulk/data/bundle/Gemfile
 - lib/embulk/data/bundle/Gemfile.lock
@@ -401,18 +403,18 @@ 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.6.6.jar
-- classpath/embulk-standards-0.6.6.jar
+- classpath/embulk-core-0.6.7.jar
+- classpath/embulk-standards-0.6.7.jar
 - classpath/guava-18.0.jar
-- classpath/guice-3.0.jar
-- classpath/guice-multibindings-3.0.jar
+- classpath/guice-4.0.jar
+- classpath/guice-multibindings-4.0.jar
 - classpath/icu4j-54.1.1.jar
-- classpath/jackson-annotations-2.5.0.jar
-- classpath/jackson-core-2.5.0.jar
-- classpath/jackson-databind-2.5.0.jar
-- classpath/jackson-datatype-guava-2.5.0.jar
-- classpath/jackson-datatype-joda-2.5.0.jar
-- classpath/jackson-module-guice-2.5.0.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/javax.inject-1.jar
 - classpath/joda-time-2.7.jar
 - classpath/jruby-complete-1.7.19.jar