td 0.7.2 → 0.7.3

data/lib/td/command/import.rb

@@ -1,5 +1,5 @@
 
-module TD
+module TreasureData
 module Command
 
   IMPORT_TEMPLATES = {
@@ -56,7 +56,7 @@ module Command
 
     db_name, table_name, *paths = op.cmd_parse
 
-    api = cmd_api
+    client = get_client
 
     case format
     when 'json', 'msgpack'
@@ -81,7 +81,7 @@ module Command
       parser = TextParser.new(names, regexp, time_format)
     end
 
-    find_table(api, db_name, table_name, :log)
+    find_table(client, db_name, table_name, :log)
 
     require 'zlib'
 
@@ -100,14 +100,14 @@ module Command
     #require 'thread'
 
     files.zip(paths).each {|file,path|
-      import_log_file(file, path, api, db_name, table_name, parser)
+      import_log_file(file, path, client, db_name, table_name, parser)
     }
 
     puts "done."
   end
 
   private
-  def import_log_file(file, path, api, db_name, table_name, parser)
+  def import_log_file(file, path, client, db_name, table_name, parser)
     puts "importing #{path}..."
 
     out = Tempfile.new('td-import')
@@ -131,7 +131,7 @@ module Command
           out.pos = 0
 
           puts "  uploading #{size} bytes..."
-          api.import(db_name, table_name, "msgpack.gz", out, size)
+          client.import(db_name, table_name, "msgpack.gz", out, size)
 
           out.truncate(0)
           out.pos = 0
@@ -151,7 +151,7 @@ module Command
 
       puts "  uploading #{size} bytes..."
       # TODO upload on background thread
-      api.import(db_name, table_name, "msgpack.gz", out, size)
+      client.import(db_name, table_name, "msgpack.gz", out, size)
     end
 
     puts "  imported #{n} entries from #{path}."

data/lib/td/command/list.rb

@@ -1,5 +1,5 @@
 
-module TD
+module TreasureData
 module Command
 module List
 
@@ -107,7 +107,7 @@ end
 
 def version
   require 'td/version'
-  puts "td-#{TD::VERSION}"
+  puts "td-#{TreasureData::VERSION}"
 end
 
 end

data/lib/td/command/query.rb

@@ -1,5 +1,5 @@
 
-module TD
+module TreasureData
 module Command
 
   def query
@@ -30,16 +30,16 @@ module Command
 
     sql = op.cmd_parse
 
-    api = cmd_api
+    client = get_client
 
     unless db_name
       $stderr.puts "-d, --database DB_NAME option is required."
       exit 1
     end
 
-    find_database(api, db_name)
+    find_database(client, db_name)
 
-    job = api.query(db_name, sql)
+    job = client.query(db_name, sql)
 
     $stderr.puts "Job #{job.job_id} is started."
     $stderr.puts "Use '#{$prog} job #{job.job_id}' to show the status."
@@ -62,8 +62,6 @@ module Command
 
     page = 0
     skip = 0
-    from = nil
-    around = nil
 
     op.on('-p', '--page PAGE', 'skip N pages', Integer) {|i|
       page = i
@@ -71,33 +69,17 @@ module Command
     op.on('-s', '--skip N', 'skip N jobs', Integer) {|i|
       skip = i
     }
-    op.on('-f', '--from JOB_ID', 'show jobs from the id', Integer) {|i|
-      from = i
-    }
-    op.on('-a', '--around JOB_ID', 'show jobs around the id', Integer) {|i|
-      around = i
-    }
 
     max = op.cmd_parse
 
     max = (max || 20).to_i
 
-    api = cmd_api
+    client = get_client
 
-    if from || around
-      jobs = api.jobs(0, 1)
-      if last = jobs[0]
-        if from
-          skip += last.job_id.to_i - from - (max-1)
-        else
-          skip += last.job_id.to_i - around - (max-1) + (max-1)/2
-        end
-      end
-    end
     if page
       skip += max * page
     end
-    jobs = api.jobs(skip, skip+max-1)
+    jobs = client.jobs(skip, skip+max-1)
 
     rows = []
     jobs.each {|job|
@@ -161,9 +143,9 @@ module Command
 
     job_id = op.cmd_parse
 
-    api = cmd_api
+    client = get_client
 
-    job = api.job(job_id)
+    job = client.job(job_id)
 
     puts "JobID      : #{job.job_id}"
     puts "URL        : #{job.url}"

data/lib/td/command/server.rb

@@ -1,13 +1,13 @@
 
-module TD
+module TreasureData
 module Command
 
   def server_status
     op = cmd_opt 'server-status'
     op.cmd_parse
 
-    require 'td/api'
-    puts API.server_status
+    require 'td/client'
+    puts Client.server_status
   end
 
 end

data/lib/td/command/table.rb

@@ -1,14 +1,14 @@
 
-module TD
+module TreasureData
 module Command
 
   def create_table_type(type, db_name, table_name)
-    api = cmd_api
+    client = get_client
 
     API.validate_table_name(table_name)
 
     begin
-      api.create_table(db_name, table_name, type)
+      client.create_table(db_name, table_name, type)
     rescue NotFoundError
       cmd_debug_error $!
       $stderr.puts "Database '#{db_name}' does not exist."
@@ -42,10 +42,10 @@ module Command
     op = cmd_opt 'drop-table', :db_name, :table_name
     db_name, table_name = op.cmd_parse
 
-    api = cmd_api
+    client = get_client
 
     begin
-      api.delete_table(db_name, table_name)
+      client.delete_table(db_name, table_name)
     rescue NotFoundError
       cmd_debug_error $!
       $stderr.puts "Table '#{db_name}.#{table_name}' does not exist."
@@ -60,13 +60,13 @@ module Command
     op = cmd_opt 'show-tables', :db_name?
     db_name = op.cmd_parse
 
-    api = cmd_api
+    client = get_client
 
     if db_name
-      db = find_database(api, db_name)
+      db = find_database(client, db_name)
       dbs = [db]
     else
-      dbs = api.databases
+      dbs = client.databases
     end
 
     rows = []

data/lib/td/command/td.rb

@@ -18,7 +18,7 @@ op.summary_indent = "  "
     puts op.to_s
     puts ""
     puts "commands:"
-    puts TD::Command::List.help(op.summary_indent)
+    puts TreasureData::Command::List.help(op.summary_indent)
     puts ""
     puts "Type 'td help COMMAND' for more information on a specific command."
     if errmsg
@@ -58,10 +58,10 @@ begin
 
   require 'td/config'
   if config_path
-    TD::Config.path = config_path
+    TreasureData::Config.path = config_path
   end
   if apikey
-    TD::Config.apikey = apikey
+    TreasureData::Config.apikey = apikey
   end
 rescue
   usage $!.to_s
@@ -69,18 +69,16 @@ end
 
 require 'td/command/list'
 
-method = TD::Command::List.get_method(cmd)
+method = TreasureData::Command::List.get_method(cmd)
 unless method
   $stderr.puts "'#{cmd}' is not a td command. Run '#{$prog}' to show the list."
-  TD::Command::List.show_guess(cmd)
+  TreasureData::Command::List.show_guess(cmd)
   exit 1
 end
 
-require 'td/error'
-
 begin
   method.call
-rescue TD::ConfigError
+rescue TreasureData::ConfigError
   $stderr.puts "TreasureData account is not configured yet."
   $stderr.puts "Run '#{$prog} account' first."
 rescue

data/lib/td/config.rb

@@ -1,6 +1,15 @@
-require 'td/error'
 
-module TD
+module TreasureData
+
+
+class ConfigError < StandardError
+end
+
+class ConfigNotFoundError < ConfigError
+end
+
+class ConfigParseError < ConfigError
+end
 
 
 class Config

data/lib/td/version.rb

@@ -1,4 +1,4 @@
-module TD
+module TreasureData
 
 VERSION = '0.7.2'
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: td
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: false
   segments: 
   - 0
   - 7
-  - 2
-  version: 0.7.2
+  - 3
+  version: 0.7.3
 platform: ruby
 authors: 
 - Sadayuki Furuhashi
@@ -77,7 +77,7 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - lib/td/api.rb
-- lib/td/api_iface.rb
+- lib/td/client.rb
 - lib/td/command/account.rb
 - lib/td/command/common.rb
 - lib/td/command/database.rb
@@ -88,7 +88,6 @@ files:
 - lib/td/command/table.rb
 - lib/td/command/td.rb
 - lib/td/config.rb
-- lib/td/error.rb
 - lib/td/version.rb
 - ChangeLog
 - README.rdoc

data/lib/td/api_iface.rb

@@ -1,374 +0,0 @@
-
-module TD
-
-
-class APIInterface
-  def initialize(apikey)
-    require 'json'
-    @apikey = apikey
-  end
-
-  # TODO error check & raise appropriate errors
-
-  attr_reader :apikey
-
-  ####
-  ## Database API
-  ##
-
-  # => [name:String]
-  def list_databases
-    code, body, res = get("/v3/database/list")
-    if code != "200"
-      raise_error("List databases failed", res)
-    end
-    # TODO format check
-    js = JSON.load(body)
-    names = js["databases"].map {|dbinfo| dbinfo['name'] }
-    return names
-  end
-
-  # => true
-  def delete_database(db)
-    code, body, res = post("/v3/database/delete/#{e db}")
-    if code != "200"
-      raise_error("Delete database failed", res)
-    end
-    return true
-  end
-
-  # => true
-  def create_database(db)
-    code, body, res = post("/v3/database/create/#{e db}")
-    if code != "200"
-      raise_error("Create database failed", res)
-    end
-    return true
-  end
-
-
-  ####
-  ## Table API
-  ##
-
-  # => {name:String => [type:Symbol, count:Integer]}
-  def list_tables(db)
-    code, body, res = get("/v3/table/list/#{e db}")
-    if code != "200"
-      raise_error("List tables failed", res)
-    end
-    # TODO format check
-    js = JSON.load(body)
-    result = {}
-    js["tables"].map {|m|
-      name = m['name']
-      type = (m['type'] || '?').to_sym
-      count = (m['count'] || 0).to_i  # TODO?
-      result[name] = [type, count]
-    }
-    return result
-  end
-
-  # => true
-  def create_table(db, table, type)
-    code, body, res = post("/v3/table/create/#{e db}/#{e table}/#{type}")
-    if code != "200"
-      raise_error("Create #{type} table failed", res)
-    end
-    return true
-  end
-
-  # => true
-  def create_log_table(db, table)
-    create_table(db, table, :log)
-  end
-
-  # => true
-  def create_item_table(db, table)
-    create_table(db, table, :item)
-  end
-
-  # => type:Symbol
-  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)
-    end
-    # TODO format check
-    js = JSON.load(body)
-    type = (js['type'] || '?').to_sym
-    return type
-  end
-
-
-  ####
-  ## Job API
-  ##
-
-  # => [(jobId:String, type:Symbol, status:String, start_at:String, end_at:String)]
-  def list_jobs(from=0, to=nil)
-    params = {}
-    params['from'] = from.to_s if from
-    params['to'] = to.to_s if to
-    code, body, res = get("/v3/job/list", params)
-    if code != "200"
-      raise_error("List jobs failed", res)
-    end
-    # TODO format check
-    js = JSON.load(body)
-    result = []
-    js['jobs'].each {|m|
-      job_id = m['job_id']
-      type = (m['type'] || '?').to_sym
-      status = m['status']
-      query = m['query']
-      start_at = m['start_at']
-      end_at = m['end_at']
-      result << [job_id, type, status, query, start_at, end_at]
-    }
-    return result
-  end
-
-  # => (type:Symbol, status:String, result:String, url:String)
-  def show_job(job_id)
-    code, body, res = get("/v3/job/show/#{e job_id}")
-    if code != "200"
-      raise_error("Show job failed", res)
-    end
-    # TODO format check
-    js = JSON.load(body)
-    # TODO debug
-    type = (js['type'] || '?').to_sym  # TODO
-    query = js['query']
-    status = js['status']
-    debug = js['debug']
-    url = js['url']
-    start_at = js['start_at']
-    end_at = js['end_at']
-    return [type, query, status, url, debug, start_at, end_at]
-  end
-
-  def job_result(job_id)
-    require 'msgpack'
-    code, body, res = get("/v3/job/result/#{e job_id}", {'format'=>'msgpack'})
-    if code != "200"
-      raise_error("Get job result failed", res)
-    end
-    result = []
-    MessagePack::Unpacker.new.feed_each(body) {|row|
-      result << row
-    }
-    return result
-  end
-
-  def job_result_format(job_id, format)
-    # TODO chunked encoding
-    code, body, res = get("/v3/job/result/#{e job_id}", {'format'=>format})
-    if code != "200"
-      raise_error("Get job result failed", res)
-    end
-    return body
-  end
-
-  def job_result_each(job_id, &block)
-    # TODO chunked encoding
-    require 'msgpack'
-    code, body, res = get("/v3/job/result/#{e job_id}", {'format'=>'msgpack'})
-    if code != "200"
-      raise_error("Get job result failed", res)
-    end
-    result = []
-    MessagePack::Unpacker.new.feed_each(body) {|row|
-      yield row
-    }
-    nil
-  end
-
-  def job_result_raw(job_id, format)
-    code, body, res = get("/v3/job/result/#{e job_id}", {'format'=>format})
-    if code != "200"
-      raise_error("Get job result failed", res)
-    end
-    return body
-  end
-
-  # => jobId:String
-  def hive_query(q, db=nil)
-    code, body, res = post("/v3/job/issue/hive/#{e db}", {'query'=>q})
-    if code != "200"
-      raise_error("Query failed", res)
-    end
-    # TODO format check
-    js = JSON.load(body)
-    return js['job_id'].to_s
-  end
-
-
-  ####
-  ## Import API
-  ##
-
-  # => time:Float
-  def import(db, table, format, stream, stream_size=stream.lstat.size)
-    code, body, res = put("/v3/table/import/#{e db}/#{e table}/#{format}", stream, stream_size)
-    if code[0] != ?2
-      raise_error("Import failed", res)
-    end
-    # TODO format check
-    js = JSON.load(body)
-    time = js['time'].to_f
-    return time
-  end
-
-
-  ####
-  ## User API
-  ##
-
-  # apikey:String
-  def authenticate(user, password)
-    code, body, res = post("/v3/user/authenticate", {'user'=>user, 'password'=>password})
-    if code != "200"
-      raise_error("Authentication failed", res)
-    end
-    # TODO format check
-    js = JSON.load(body)
-    apikey = js['apikey']
-    return apikey
-  end
-
-  ####
-  ## Server Status API
-  ##
-
-  # => status:String
-  def server_status
-    code, body, res = get('/v3/system/server_status')
-    if code != "200"
-      return "Server is down (#{code})"
-    end
-    # TODO format check
-    js = JSON.load(body)
-    status = js['status']
-    return status
-  end
-
-  private
-  host = 'api.treasure-data.com'
-  port = 80
-  if e = ENV['TD_API_SERVER']
-    host, port_ = e.split(':',2)
-    port_ = port_.to_i
-    port = port_ if port_ != 0
-  end
-
-  HOST = host
-  PORT = port
-  USE_SSL = false
-  BASE_URL = ''
-
-  def get(url, params=nil)
-    http, header = new_http
-
-    path = BASE_URL + url
-    if params && !params.empty?
-      path << "?"+params.map {|k,v|
-        "#{k}=#{e v}"
-      }.join('&')
-    end
-
-    request = Net::HTTP::Get.new(path, header)
-
-    response = http.request(request)
-    return [response.code, response.body, response]
-  end
-
-  def post(url, params=nil)
-    http, header = new_http
-
-    path = BASE_URL + url
-
-    request = Net::HTTP::Post.new(path, header)
-    request.set_form_data(params) if params
-
-    response = http.request(request)
-    return [response.code, response.body, response]
-  end
-
-  def put(url, stream, stream_size)
-    http, header = new_http
-
-    path = BASE_URL + url
-
-    header['Content-Type'] = 'application/octet-stream'
-    header['Content-Length'] = stream_size.to_s
-
-    request = Net::HTTP::Put.new(url, header)
-    if request.respond_to?(:body_stream=)
-      request.body_stream = stream
-    else  # Ruby 1.8
-      request.body = stream.read
-    end
-
-    response = http.request(request)
-    return [response.code, response.body, response]
-  end
-
-  def new_http
-    require 'net/http'
-    require 'time'
-
-    http = Net::HTTP.new(HOST, PORT)
-    if USE_SSL
-      http.use_ssl = true
-      http.verify_mode = OpenSSL::SSL::VERIFY_PEER
-      store = OpenSSL::X509::Store.new
-      http.cert_store = store
-    end
-
-    #http.read_timeout = options[:read_timeout]
-
-    header = {}
-    if @apikey
-      header['Authorization'] = "TD1 #{apikey}"
-    end
-    header['Date'] = Time.now.rfc2822
-
-    return http, header
-  end
-
-  def raise_error(msg, res)
-    begin
-      js = JSON.load(res.body)
-      msg = js['message']
-      error_code = js['error_code']
-
-      if res.code == "404"
-        raise NotFoundError, "#{error_code}: #{msg}"
-      elsif res.code == "409"
-        raise AlreadyExistsError, "#{error_code}: #{msg}"
-      else
-        raise APIError, "#{error_code}: #{msg}"
-      end
-
-    rescue
-      if res.code == "404"
-        raise NotFoundError, "#{msg}: #{res.body}"
-      elsif res.code == "409"
-        raise AlreadyExistsError, "#{msg}: #{res.body}"
-      else
-        raise APIError, "#{msg}: #{res.body}"
-      end
-    end
-    # TODO error
-  end
-
-  def e(s)
-    require 'cgi'
-    CGI.escape(s.to_s)
-  end
-end
-
-
-end
-