td 0.10.90 → 0.10.91

data/ChangeLog

@@ -1,3 +1,8 @@
+== 2013-10-04 version 0.10.91
+
+* Fix import command doesn't work on Windows
+
+
 == 2013-10-02 version 0.10.90
 
 * Fix table:import permission error with sub user

data/lib/td/command/import.rb

@@ -5,7 +5,6 @@ module Command
   BASE_PATH = File.expand_path('../../..', File.dirname(__FILE__))
 
   JAVA_COMMAND = "java"
-  JAVA_COMMAND_CHECK = "#{JAVA_COMMAND} -version >/dev/null 2>&1"
   JAVA_MAIN_CLASS = "com.treasure_data.bulk_import.BulkImportMain"
   JVM_OPTS = ["-Xmx1024m"] # TODO
 
@@ -97,7 +96,13 @@ module Command
 
   private
   def check_java
-    system(JAVA_COMMAND_CHECK)
+    if RbConfig::CONFIG["target_os"].downcase =~ /mswin(?!ce)|mingw|cygwin|bccwin/ # windows
+      cmd = "#{JAVA_COMMAND} -version > NUL 2>&1"
+    else # others
+      cmd = "#{JAVA_COMMAND} -version > /dev/null 2>&1"
+    end
+
+    system(cmd)
 
     unless $?.success?
       $stderr.puts "Java is not installed. 'td import' command requires Java (version 1.6 or later)."

data/lib/td/version.rb

@@ -1,5 +1,5 @@
 module TreasureData
 
-VERSION = '0.10.90'
+VERSION = '0.10.91'
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: td
 version: !ruby/object:Gem::Version
-  version: 0.10.90
+  version: 0.10.91
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-02 00:00:00.000000000 Z
+date: 2013-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -294,7 +294,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 637439873993359334
+      hash: 3403017301161628743
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -303,7 +303,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 637439873993359334
+      hash: 3403017301161628743
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23