td 0.10.76 → 0.10.77

data/ChangeLog

@@ -1,3 +1,11 @@
+== 2013-05-06 version 0.10.77
+
+* Fix 'invalid byte sequence in UTF-8' at job result writing to CSV
+* Fix installed version check mechanizm of auto updater
+* Remove using curses to detect terminal height for Windows unexpected behaviour
+* Set User-Agent header
+
+
 == 2013-04-22 version 0.10.76
 
 * Add auto update feature for td-toolbelt

data/lib/td/command/common.rb

@@ -1,3 +1,4 @@
+require 'td/version'
 
 module TreasureData
 
@@ -23,6 +24,7 @@ module Command
     unless apikey
       raise ConfigError, "Account is not configured."
     end
+    opts[:user_agent] = "TD: #{TreasureData::VERSION}"
     Client.new(apikey, opts)
   end
 

data/lib/td/command/job.rb

@@ -251,7 +251,7 @@ module Command
       require 'csv'
       CSV.open(output, "w") {|writer|
         job.result_each {|row|
-          writer << row.map {|col| col.is_a?(String) ? col.to_s : Yajl.dump(col) }
+          writer << row.map {|col| dump_column(col) }
         }
       }
 
@@ -266,7 +266,7 @@ module Command
             else
               f.write "\t"
             end
-            f.write col.is_a?(String) ? col.to_s : Yajl.dump(col)
+            f.write dump_column(col)
           }
           f.write "\n"
         }
@@ -283,18 +283,7 @@ module Command
     job.result_each {|row|
       # TODO limit number of rows to show
       rows << row.map {|v|
-        if v.is_a?(String)
-          s = v.to_s
-        else
-          s = Yajl.dump(v)
-        end
-        # Here does UTF-8 -> UTF-16LE -> UTF8 conversion:
-        #   a) to make sure the string doesn't include invalid byte sequence
-        #   b) to display multi-byte characters as it is
-        #   c) encoding from UTF-8 to UTF-8 doesn't check/replace invalid chars
-        #   d) UTF-16LE was slightly faster than UTF-16BE, UTF-32LE or UTF-32BE
-        s = s.encode('UTF-16LE', 'UTF-8', :invalid=>:replace, :undef=>:replace).encode!('UTF-8') if s.respond_to?(:encode)
-        s
+        dump_column(v)
       }
     }
 
@@ -306,6 +295,19 @@ module Command
     puts cmd_render_table(rows, opts)
   end
 
+  def dump_column(v)
+    require 'yajl'
+
+    s = v.is_a?(String) ? v.to_s : Yajl.dump(v)
+    # Here does UTF-8 -> UTF-16LE -> UTF8 conversion:
+    #   a) to make sure the string doesn't include invalid byte sequence
+    #   b) to display multi-byte characters as it is
+    #   c) encoding from UTF-8 to UTF-8 doesn't check/replace invalid chars
+    #   d) UTF-16LE was slightly faster than UTF-16BE, UTF-32LE or UTF-32BE
+    s = s.encode('UTF-16LE', 'UTF-8', :invalid=>:replace, :undef=>:replace).encode!('UTF-8') if s.respond_to?(:encode)
+    s
+  end
+
   def job_priority_name_of(id)
     PRIORITY_FORMAT_MAP[id] || 'NORMAL'
   end

data/lib/td/command/table.rb

@@ -175,7 +175,7 @@ module Command
   def table_tail(op)
     from = nil
     to = nil
-    count = nil
+    count = 10
     pretty = nil
 
     op.on('-t', '--to TIME', 'end time of logs to get') {|s|
@@ -201,21 +201,6 @@ module Command
       pretty = b
     }
 
-    if count == nil
-      # smart count calculation
-      begin
-        require "curses"
-	      if Curses.stdscr.maxy - 1 <= 40
-          count = 5
-        else
-          count = 10
-        end
-	      Curses.close_screen
-      rescue Exception
-        count = 5
-      end
-    end
-
     db_name, table_name = op.cmd_parse
 
     client = get_client

data/lib/td/updater.rb

@@ -29,7 +29,7 @@ module TreasureData
     end
 
     def self.installed_client_path
-      File.expand_path("../../..", __FILE__)
+      File.expand_path("../../../../../..", __FILE__)
     end
 
     def self.updated_client_path
@@ -49,7 +49,7 @@ module TreasureData
     def self.get_client_version_file(path)
       td_gems = Dir[File.join(path, "vendor/gems/td-*")]
       td_gems.each { |td_gem|
-        if td_gem =~ /#{"#{path}\/vendor\/gems\/td-\\d*.\\d*.\\d*"}/
+        if td_gem =~ /#{"#{Regexp.escape(path)}\/vendor\/gems\/td-\\d*.\\d*.\\d*"}/
           return File.join(td_gem, "/lib/td/version.rb")
         end
       }

data/lib/td/version.rb

@@ -1,5 +1,5 @@
 module TreasureData
 
-VERSION = '0.10.76'
+VERSION = '0.10.77'
 
 end

data/td.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency "yajl-ruby", "~> 1.1.0"
   gem.add_dependency "hirb", ">= 0.4.5"
   gem.add_dependency "parallel", "~> 0.5.19"
-  gem.add_dependency "td-client", "~> 0.8.48"
+  gem.add_dependency "td-client", "~> 0.8.49"
   gem.add_dependency "td-logger", "~> 0.3.16"
   gem.add_dependency "rubyzip", "~> 0.9.9"
   gem.add_development_dependency "rake", "~> 0.9"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: td
 version: !ruby/object:Gem::Version
-  version: 0.10.76
+  version: 0.10.77
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-23 00:00:00.000000000 Z
+date: 2013-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -82,7 +82,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.48
+        version: 0.8.49
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +90,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.48
+        version: 0.8.49
 - !ruby/object:Gem::Dependency
   name: td-logger
   requirement: !ruby/object:Gem::Requirement
@@ -262,7 +262,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1565388258148285832
+      hash: 1119082453187569045
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -271,7 +271,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1565388258148285832
+      hash: 1119082453187569045
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23