td 0.10.50 → 0.10.51

data/ChangeLog

@@ -1,4 +1,10 @@
 
+== 2012-09-21 version 0.10.51
+
+* job:list and job:show show database name
+* Widened display table size of job:list
+
+
 == 2012-09-20 version 0.10.50
 
 * Changed packaging method from Jeweler to Bundler

data/README.rdoc

@@ -38,9 +38,16 @@ You need to authorize the account, before executing any other commands.
 
 == Windows
 
-First of all, install cygwin.
-Then install gcc and ruby packages using cygwin installer.
+Install following binary packages:
 
+  * MinGW with MSYS Basic System and using mingw-get-inst
+  * Git for Windows, with Windows Command Prompt support
+  * Ruby 1.9.2 using RubyInstaller for Windows, with PATH update
+
+Then run following commands on MinGW Shell:
+
+    $ mingw-get install msys-vim
+    $ mingw-get install msys-wget
     $ gem install bundler
     $ rake exe:build
 

data/Rakefile

@@ -91,7 +91,11 @@ def download_resource(url)
     return path
   end
   FileUtils.mkdir_p File.dirname(path)
-  sh "curl '#{url}' -o '#{path}'"
+  begin
+    sh "curl '#{url}' -o '#{path}'"
+  rescue
+    sh "wget '#{url}' -O '#{path}'"
+  end
   path
 end
 

data/dist/exe.rake

@@ -4,7 +4,7 @@ task 'exe:build' => :build do
   create_build_dir('exe') do |dir|
     # create ./installers/
     FileUtils.mkdir_p "installers"
-    installer_path = download_resource('http://heroku-toolbelt.s3.amazonaws.com/rubyinstaller.exe')
+    installer_path = download_resource('http://rubyforge.org/frs/download.php/76054/rubyinstaller-1.9.3-p194.exe')
     FileUtils.cp installer_path, "installers/rubyinstaller.exe"
 
     variables = {

data/dist/resources/exe/td-cmd.bat

@@ -1 +1,2 @@
+@cd %USERPROFILE%
 @cmd /k td

data/dist/resources/exe/td.bat

@@ -1,29 +1,13 @@
 @ECHO OFF
 
-:: determine if this is x86 or x64
-if "%processor_architecture%" == "IA64"  goto x64
-if "%processor_architecture%" == "AMD64" goto x64
-if "%ProgramFiles%" == "%ProgramW6432%"  goto x64
-goto x86
-
-:x86
-set TDRubyPath=%ProgramFiles%\ruby-1.9.3
-goto launch
-
-:x64
-set TDRubyPath=%ProgramFiles(x86)%\ruby-1.9.3
-goto launch
-
-:launch
-
 :: determine if this is an NT operating system
 if not "%~f0" == "~f0" goto WinNT
 goto Win9x
 
 :Win9x
-@"%TDRubyPath%\bin\ruby.exe" "td" %1 %2 %3 %4 %5 %6 %7 %8 %9
+@"%~dp0\..\ruby-1.9.3\bin\ruby.exe" "td" %1 %2 %3 %4 %5 %6 %7 %8 %9
 goto :EOF
 
 :WinNT
-@"%TDRubyPath%\bin\ruby.exe" "%~dpn0" %*
+@"%~dp0\..\ruby-1.9.3\bin\ruby.exe" "%~dpn0" %*
 goto :EOF

data/dist/resources/exe/td.iss

@@ -21,7 +21,6 @@ Name: custom; Description: "Custom Installation"; flags: iscustom
 [Components]
 Name: "toolbelt"; Description: "Treasure Data Toolbelt"; Types: "client custom"
 Name: "toolbelt/client"; Description: "Treasure Data Client"; Types: "client custom"; Flags: fixed
-<%#Name: "toolbelt/foreman"; Description: "Foreman"; Types: "client custom"%>
 
 [Files]
 Source: "td\*.*"; DestDir: "{app}"; Flags: recursesubdirs; Components: "toolbelt/client"
@@ -31,21 +30,15 @@ Source: "installers\rubyinstaller.exe"; DestDir: "{tmp}"; Components: "toolbelt/
 Name: "{group}\Treasure Data command prompt"; Filename: "{app}\td-cmd.bat"
 
 [Registry]
-Root: HKLM; Subkey: "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"; ValueType: "expandsz"; ValueName: "TreasureDataPath"; \
-  ValueData: "{app}"
 Root: HKLM; Subkey: "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"; ValueType: "expandsz"; ValueName: "Path"; \
   ValueData: "{olddata};{app}\bin"; Check: NeedsAddPath(ExpandConstant('{app}\bin'))
-Root: HKLM; Subkey: "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"; ValueType: "expandsz"; ValueName: "Path"; \
-  ValueData: "{olddata};{pf}\ruby-1.9.3\bin"; Check: NeedsAddPath(ExpandConstant('{pf}\ruby-1.9.3\bin'))
 Root: HKCU; Subkey: "Environment"; ValueType: "expandsz"; ValueName: "HOME"; \
   ValueData: "%USERPROFILE%"; Flags: createvalueifdoesntexist
 
 [Run]
-Filename: "{tmp}\rubyinstaller.exe"; Parameters: "/verysilent /noreboot /nocancel /noicons /dir=""{pf}/ruby-1.9.3"""; \
+Filename: "{tmp}\rubyinstaller.exe"; Parameters: "/verysilent /noreboot /nocancel /noicons /dir=""{app}/ruby-1.9.3"""; \
   Flags: shellexec waituntilterminated; StatusMsg: "Installing Ruby"; Components: "toolbelt/client"
-<%#Filename: "{pf}\ruby-1.9.3\bin\gem.bat"; Parameters: "install foreman --no-rdoc --no-ri"; %>
-<%#  Flags: runhidden shellexec waituntilterminated; StatusMsg: "Installing Foreman"; Components: "toolbelt/foreman"%>
-Filename: "{app}\td-cmd.bat"; Description: "Run command prompt"; Flags: postinstall
+; Filename: "{app}\td-cmd.bat"; Description: "Run command prompt"; Flags: postinstall
 
 [Code]
 

data/lib/td/command/job.rb

@@ -64,11 +64,11 @@ module Command
       start = job.start_at
       elapsed = cmd_format_elapsed(start, job.end_at)
       priority = job_priority_name_of(job.priority)
-      rows << {:JobID => job.job_id, :Status => job.status, :Type => job.type, :Query => job.query.to_s, :Start => (start ? start.localtime : ''), :Elapsed => elapsed, :Priority => priority, :Result => job.result_url, :Organization => job.org_name}
+      rows << {:JobID => job.job_id, :Database => job.db_name, :Status => job.status, :Type => job.type, :Query => job.query.to_s, :Start => (start ? start.localtime : ''), :Elapsed => elapsed, :Priority => priority, :Result => job.result_url, :Organization => job.org_name}
       has_org = true if job.org_name
     }
 
-    puts cmd_render_table(rows, :fields => (has_org ? [:Organization] : [])+[:JobID, :Status, :Start, :Elapsed, :Priority, :Result, :Type, :Query])
+    puts cmd_render_table(rows, :fields => (has_org ? [:Organization] : [])+[:JobID, :Status, :Start, :Elapsed, :Priority, :Result, :Type, :Database, :Query], :max_width => 140)
   end
 
   def job_show(op)
@@ -110,6 +110,7 @@ module Command
     puts "Type         : #{job.type}"
     puts "Priority     : #{job_priority_name_of(job.priority)}"
     puts "Result       : #{job.result_url}"
+    puts "Database     : #{job.db_name}"
     puts "Query        : #{job.query}"
 
     if wait && !job.finished?

data/lib/td/version.rb

@@ -1,5 +1,5 @@
 module TreasureData
 
-VERSION = '0.10.50'
+VERSION = '0.10.51'
 
 end

data/td.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency "msgpack", "~> 0.4.4"
   gem.add_dependency "json", ">= 1.4.3"
   gem.add_dependency "hirb", ">= 0.4.5"
-  gem.add_dependency "td-client", "~> 0.8.29"
+  gem.add_dependency "td-client", "~> 0.8.31"
   gem.add_dependency "td-logger", "~> 0.3.12"
   gem.add_development_dependency "rake", "~> 0.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: td
 version: !ruby/object:Gem::Version
-  version: 0.10.50
+  version: 0.10.51
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-21 00:00:00.000000000 Z
+date: 2012-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.29
+        version: 0.8.31
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.29
+        version: 0.8.31
 - !ruby/object:Gem::Dependency
   name: td-logger
   requirement: !ruby/object:Gem::Requirement