td 0.10.74 → 0.10.75

data/ChangeLog

@@ -1,3 +1,9 @@
+== 2013-04-09 version 0.10.75
+
+* Fix unparsed regexp pattern in Ruby 1.8
+* Move gems directory into under vendor directory
+
+
 == 2013-03-29 version 0.10.74
 
 * Include zsh and bash completion

data/Gemfile

@@ -1,3 +1,3 @@
-source :rubygems
+source 'https://rubygems.org'
 
 gemspec

data/Rakefile

@@ -33,11 +33,24 @@ def install_use_gems(target_dir)
     puts "** RVM surely breaks the package. Use rbenv instead."
     puts "**"
   end
+
+  require 'rubygems/gem_runner'
+
   # system(env, cmd) doesn't work with ruby 1.8
   ENV['GEM_HOME'] = target_dir
   ENV['GEM_PATH'] = ''
   USE_GEMS.each {|gem|
-    system "gem install '#{gem}' --no-rdoc --no-ri" || (exit 1)
+    begin
+      Gem::GemRunner.new.run ["install", gem, "--no-rdoc", "--no-ri"]
+    rescue Gem::SystemExitException => e
+      unless e.exit_code.zero?
+        raise e
+      end
+    end
+  }
+  FileUtils.mv Dir.glob("#{target_dir}/gems/*"), target_dir
+  %W(bin cache doc gems specifications).each { |dir|
+    FileUtils.remove_dir("#{target_dir}/#{dir}", true)
   }
 end
 

data/dist/exe.rake

@@ -15,7 +15,7 @@ task 'exe:build' => :build do
 
     # create ./td/
     mkchdir("td") do
-      mkchdir('gems') do
+      mkchdir('vendor/gems') do
         install_use_gems(Dir.pwd)
       end
       install_resource 'exe/td', 'bin/td', 0755

data/dist/pkg.rake

@@ -9,7 +9,7 @@ task 'pkg:build' => :build do
 
     # create ./bundle/td-client.pkg/Payload
     mkchdir('td-client.build') do
-      mkchdir('gems') do
+      mkchdir('vendor/gems') do
         install_use_gems(Dir.pwd)
       end
       install_resource 'pkg/td', 'bin/td', 0755

data/dist/resources/exe/td

@@ -16,7 +16,7 @@ require "pathname"
 here = File.dirname(Pathname.new(__FILE__).realpath)
 
 # add locally installed gems to libpath
-gem_dir = File.expand_path("../gems", here)
+gem_dir = File.expand_path("../vendor/gems", here)
 Dir["#{gem_dir}/**/lib"].each do |libdir|
   $:.unshift libdir
 end

data/dist/resources/pkg/td

@@ -16,7 +16,7 @@ require "pathname"
 here = File.dirname(Pathname.new(__FILE__).realpath)
 
 # add locally installed gems to libpath
-gem_dir = File.expand_path("../gems", here)
+gem_dir = File.expand_path("../vendor/gems", here)
 Dir["#{gem_dir}/**/lib"].each do |libdir|
   $:.unshift libdir
 end

data/lib/td/command/job.rb

@@ -126,13 +126,13 @@ module Command
 
     if wait && !job.finished?
       wait_job(job)
-      if job.success? && job.type == :hive
+      if job.success? && [:hive, :pig].include?(job.type)
         puts "Result       :"
         show_result(job, output, format, render_opts)
       end
 
     else
-      if job.success? && job.type == :hive
+      if job.success? && [:hive, :pig].include?(job.type)
         puts "Result       :"
         show_result(job, output, format, render_opts)
       end

data/lib/td/command/query.rb

@@ -16,6 +16,7 @@ module Command
     retry_limit = nil
     query = nil
     sampling_all = nil
+    type = nil
 
     op.on('-g', '--org ORGANIZATION', "issue the query under this organization") {|s|
       org = s
@@ -59,6 +60,9 @@ module Command
     op.on('-q', '--query PATH', 'use file instead of inline query') {|s|
       query = File.open(s) { |f| f.read.strip }
     }
+    op.on('-t', '--type TYPE', 'set query type (hive or pig)') {|s|
+      type = s.to_sym
+    }
     op.on('--sampling DENOMINATOR', 'enable random sampling to reduce records 1/DENOMINATOR', Integer) {|i|
       sampling_all = i
     }
@@ -94,6 +98,7 @@ module Command
     opts = {}
     opts['organization'] = org if org
     opts['sampling_all'] = sampling_all if sampling_all
+    opts['type'] = type if type
     job = client.query(db_name, sql, result_url, priority, retry_limit, opts)
 
     $stderr.puts "Job #{job.job_id} is queued."

data/lib/td/command/table.rb

@@ -1,3 +1,4 @@
+require 'td/helpers'
 
 module TreasureData
 module Command
@@ -114,8 +115,8 @@ module Command
           "#{f.name}:#{f.type}"
         }.join(', ')
         rows << {
-          :Database => db.name, :Table => table.name, :Type => table.type.to_s, :Count => table.count.to_s.gsub(/(?<=\d)(?=(?:\d{3})+(?!\d))/, ','),
-          :Size => show_size_in_bytes ? table.estimated_storage_size.to_s.gsub(/(?<=\d)(?=(?:\d{3})+(?!\d))/, ',') : table.estimated_storage_size_string,
+          :Database => db.name, :Table => table.name, :Type => table.type.to_s, :Count => TreasureData::Helpers.format_with_delimiter(table.count),
+          :Size => show_size_in_bytes ? TreasureData::Helpers.format_with_delimiter(table.estimated_storage_size) : table.estimated_storage_size_string,
           'Last import' => table.last_import ? table.last_import.localtime : nil,
           :Schema => pschema
         }

data/lib/td/helpers.rb

@@ -2,6 +2,15 @@ module TreasureData
   module Helpers
     module_function
 
+    def format_with_delimiter(number, delimiter = ',')
+      num = number.to_s
+      if formatted = num.gsub!(/(\d)(?=(?:\d{3})+(?!\d))/, "\\1#{delimiter}")
+        formatted
+      else
+        num
+      end
+    end
+
     def on_windows?
       RUBY_PLATFORM =~ /mswin32|mingw32/
     end

data/lib/td/version.rb

@@ -1,5 +1,5 @@
 module TreasureData
 
-VERSION = '0.10.74'
+VERSION = '0.10.75'
 
 end

data/spec/td/helpers_spec.rb

@@ -0,0 +1,16 @@
+require 'spec_helper'
+require 'td/helpers'
+
+module TreasureData
+  describe 'format_with_delimiter' do
+    it "delimits the number with ',' by default" do
+      expect(Helpers.format_with_delimiter(0)).to eq("0")
+      expect(Helpers.format_with_delimiter(10)).to eq("10")
+      expect(Helpers.format_with_delimiter(100)).to eq("100")
+      expect(Helpers.format_with_delimiter(1000)).to eq("1,000")
+      expect(Helpers.format_with_delimiter(10000)).to eq("10,000")
+      expect(Helpers.format_with_delimiter(100000)).to eq("100,000")
+      expect(Helpers.format_with_delimiter(1000000)).to eq("1,000,000")
+    end
+  end
+end

data/td.gemspec

@@ -23,6 +23,6 @@ Gem::Specification.new do |gem|
   gem.add_dependency "td-client", "~> 0.8.46"
   gem.add_dependency "td-logger", "~> 0.3.16"
   gem.add_development_dependency "rake", "~> 0.9"
-  gem.add_development_dependency "rspec", "~> 2.10.0"
+  gem.add_development_dependency "rspec", "~> 2.11.0"
   gem.add_development_dependency "simplecov", "~> 0.5.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: td
 version: !ruby/object:Gem::Version
-  version: 0.10.74
+  version: 0.10.75
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-28 00:00:00.000000000 Z
+date: 2013-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -130,7 +130,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.10.0
+        version: 2.11.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -138,7 +138,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.10.0
+        version: 2.11.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -226,6 +226,7 @@ files:
 - spec/file_reader/shared_context.rb
 - spec/file_reader_spec.rb
 - spec/spec_helper.rb
+- spec/td/helpers_spec.rb
 - spec/td/version_spec.rb
 - td.gemspec
 homepage: http://treasure-data.com/
@@ -242,7 +243,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1161270452810499022
+      hash: 1038070565617120851
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -251,7 +252,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1161270452810499022
+      hash: 1038070565617120851
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -266,4 +267,5 @@ test_files:
 - spec/file_reader/shared_context.rb
 - spec/file_reader_spec.rb
 - spec/spec_helper.rb
+- spec/td/helpers_spec.rb
 - spec/td/version_spec.rb