td-client 0.8.47 → 0.8.48

data/ChangeLog

@@ -1,3 +1,9 @@
+== 2012-04-22 version 0.8.48
+
+* create_schedule now takes :type option
+* Fix wrong error messages
+* Ues 'api-import' instead of 'api' on data import
+
 == 2012-04-09 version 0.8.47
 
 * Fix HTTP proxy handlig issue which is overwritten with ENV['HTTP_PROXY']

data/lib/td/client/api.rb

@@ -16,6 +16,9 @@ end
 
 
 class API
+  DEFAULT_ENDPOINT = 'api.treasure-data.com'
+  DEFAULT_IMPORT_ENDPOINT = 'api-import.treasure-data.com'
+
   def initialize(apikey, opts={})
     require 'json'
     require 'time'
@@ -26,7 +29,7 @@ class API
 
     @apikey = apikey
 
-    endpoint = opts[:endpoint] || ENV['TD_API_SERVER'] || 'api.treasure-data.com'
+    endpoint = opts[:endpoint] || ENV['TD_API_SERVER'] || DEFAULT_ENDPOINT
     uri = URI.parse(endpoint)
 
     case uri.scheme
@@ -303,7 +306,7 @@ class API
   def delete_table(db, table)
     code, body, res = post("/v3/table/delete/#{e db}/#{e table}")
     if code != "200"
-      raise_error("Drop table failed", res)
+      raise_error("Delete table failed", res)
     end
     js = checked_json(body, %w[])
     type = (js['type'] || '?').to_sym
@@ -465,7 +468,7 @@ class API
   def kill(job_id)
     code, body, res = post("/v3/job/kill/#{e job_id}")
     if code != "200"
-      raise_error("Get job result failed", res)
+      raise_error("Kill job failed", res)
     end
     js = checked_json(body, %w[])
     former_status = js['former_status']
@@ -677,7 +680,7 @@ class API
 
   # => start:String
   def create_schedule(name, opts)
-    params = opts.update({'type'=>'hive'})
+    params = opts.update({:type=> opts[:type] || opts['type'] || 'hive'})
     code, body, res = post("/v3/schedule/create/#{e name}", params)
     if code != "200"
       raise_error("Create schedule failed", res)
@@ -784,7 +787,11 @@ class API
     else
       path = "/v3/table/import/#{e db}/#{e table}/#{format}"
     end
-    code, body, res = put(path, stream, size)
+    opts = {}
+    if @host == DEFAULT_ENDPOINT
+      opts[:host] = DEFAULT_IMPORT_ENDPOINT
+    end
+    code, body, res = put(path, stream, size, opts)
     if code[0] != ?2
       raise_error("Import failed", res)
     end
@@ -882,7 +889,7 @@ class API
   def show_aggregation_schema(name)
     code, body, res = get("/v3/aggr/show/#{e name}")
     if code != "200"
-      raise_error("Show job failed", res)
+      raise_error("Show aggregation schema failed", res)
     end
     js = checked_json(body, %w[relation_key logs attrs])
     relation_key = js['relation_key']
@@ -969,7 +976,7 @@ class API
   def list_organizations
     code, body, res = get("/v3/organization/list")
     if code != "200"
-      raise_error("List aggregation schema failed", res)
+      raise_error("List organizations failed", res)
     end
     js = checked_json(body, %w[organizations])
     result = js["organizations"].map {|orginfo|
@@ -1079,7 +1086,7 @@ class API
   def list_users
     code, body, res = get("/v3/user/list")
     if code != "200"
-      raise_error("List aggregation schema failed", res)
+      raise_error("List users failed", res)
     end
     js = checked_json(body, %w[users])
     result = js["users"].map {|roleinfo|
@@ -1373,8 +1380,8 @@ class API
     return [response.code, response.body, response]
   end
 
-  def put(url, stream, size)
-    http, header = new_http
+  def put(url, stream, size, opts = {})
+    http, header = new_http(opts)
 
     http.read_timeout = 600
 
@@ -1398,8 +1405,9 @@ class API
     return [response.code, response.body, response]
   end
 
-  def new_http
-    http = @http_class.new(@host, @port)
+  def new_http(opts = {})
+    host = opts[:host] || @host
+    http = @http_class.new(host, @port)
     http.open_timeout = 60
     if @ssl
       http.use_ssl = true

data/lib/td/client/version.rb

@@ -1,5 +1,5 @@
 module TreasureData
 
-VERSION = '0.8.47'
+VERSION = '0.8.48'
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: td-client
 version: !ruby/object:Gem::Version
-  version: 0.8.47
+  version: 0.8.48
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-09 00:00:00.000000000 Z
+date: 2013-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack