td 0.9.2 → 0.9.3

data/ChangeLog

@@ -1,4 +1,9 @@
 
+== 2011-09-13 version 0.9.3
+
+* Fixed import subcommand
+
+
 == 2011-09-08 version 0.9.2
 
 * Added job:kill subcommand

data/lib/td/command/import.rb

@@ -50,8 +50,7 @@ module Command
       time_key = s
     }
 
-    table_ident, *paths = op.cmd_parse
-    db_name, table_name = parse_table_ident(table_ident)
+    db_name, table_name, *paths = op.cmd_parse
 
     client = get_client
 

data/lib/td/command/list.rb

@@ -190,6 +190,11 @@ module List
   add_list 'schema:add', %w[db table columns_], 'Add new columns to a table'
   add_list 'schema:remove', %w[db table columns_], 'Remove columns from a table'
 
+  #add_list 'sched:list', %w[], 'Show list of schedules'
+  #add_list 'sched:create', %w[name cron sql], 'Create a schedule'
+  #add_list 'sched:delete', %w[name], 'Delete a schedule'
+  #add_list 'sched:history', %w[name max?], 'Show history of scheduled queries'
+
   add_list 'query', %w[sql], 'Issue a query'
 
   add_list 'job:show', %w[job_id], 'Show status and result of a job'
@@ -220,6 +225,16 @@ module List
 
   add_alias 'schema', 'schema:show'
 
+  #add_alias 'schedule:list', 'sched:list'
+  #add_alias 'schedule:create', 'sched:create'
+  #add_alias 'schedule:delete', 'sched:delete'
+  #add_alias 'schedule:history', 'sched:history'
+  #add_alias 'schedule:hist', 'sched:history'
+  #add_alias 'sched:hist', 'sched:history'
+  #add_alias 'sched', 'sched:history'
+  #add_alias 'scheds', 'sched:list'
+  #add_alias 'schedules', 'sched:list'
+
   add_alias 'job', 'job:show'
   add_alias 'jobs', 'job:list'
   add_alias 'kill', 'job:kill'

data/lib/td/command/query.rb

@@ -26,18 +26,19 @@ module Command
 
     sql = op.cmd_parse
 
-    client = get_client
-
     unless db_name
       $stderr.puts "-d, --database DB_NAME option is required."
       exit 1
     end
 
+    client = get_client
+
+    # local existance check
     get_database(client, db_name)
 
     job = client.query(db_name, sql)
 
-    $stderr.puts "Job #{job.job_id} is started."
+    $stderr.puts "Job #{job.job_id} is queued."
     $stderr.puts "Use '#{$prog} job:show #{job.job_id}' to show the status."
     $stderr.puts "See #{job.url} to see the progress."
 

data/lib/td/command/sched.rb

@@ -0,0 +1,109 @@
+
+module TreasureData
+module Command
+
+  def sched_list(op)
+    op.cmd_parse
+
+    client = get_client
+
+    scheds = client.schedules
+
+    rows = []
+    scheds.each {|sched|
+      rows << {:Name => sched.name, :Cron => sched.cron, :Query => sched.query}
+    }
+    rows = rows.sort_by {|map|
+      map[:Name]
+    }
+
+    puts cmd_render_table(rows, :fields => [:Name, :Cron, :Query])
+  end
+
+  def sched_create(op)
+    db_name = nil
+
+    op.on('-d', '--database DB_NAME', 'use the database (required)') {|s|
+      db_name = s
+    }
+
+    name, cron, sql = op.cmd_parse
+
+    unless db_name
+      $stderr.puts "-d, --database DB_NAME option is required."
+      exit 1
+    end
+
+    client = get_client
+
+    # local existance check
+    get_database(client, db_name)
+
+    begin
+      first_time = client.create_schedule(name, :cron=>cron, :query=>sql, :database=>db_name)
+    rescue AlreadyExistsError
+      cmd_debug_error $!
+      $stderr.puts "Schedule '#{name}' already exists."
+      exit 1
+    end
+
+    $stderr.puts "Schedule '#{name}' is created. It starts at #{first_time}."
+  end
+
+  def sched_delete(op)
+    name = op.cmd_parse
+
+    client = get_client
+
+    begin
+      client.delete_schedule(name)
+    rescue NotFoundError
+      cmd_debug_error $!
+      $stderr.puts "Schedule '#{name}' does not exist."
+      $stderr.puts "Use '#{$prog} sched:list' to show list of the schedules."
+      exit 1
+    end
+
+    $stderr.puts "Schedule '#{name}' is deleted."
+  end
+
+  def sched_history(op)
+    page = 0
+    skip = 0
+
+    op.on('-p', '--page PAGE', 'skip N pages', Integer) {|i|
+      page = i
+    }
+    op.on('-s', '--skip N', 'skip N schedules', Integer) {|i|
+      skip = i
+    }
+
+    name, max = op.cmd_parse
+
+    max = (max || 20).to_i
+
+    if page
+      skip += max * page
+    end
+
+    client = get_client
+
+    begin
+      history = client.history(name, skip, skip+max-1)
+    rescue NotFoundError
+      cmd_debug_error $!
+      $stderr.puts "Schedule '#{name}' does not exist."
+      $stderr.puts "Use '#{$prog} sched:list' to show list of the schedules."
+      exit 1
+    end
+
+    rows = []
+    history.each {|j|
+      rows << {:Time => j.scheduled_at, :JobID => j.job_id, :Status => j.status}
+    }
+
+    puts cmd_render_table(rows, :fields => [:Time, :JobID, :Status])
+  end
+
+end
+end

data/lib/td/version.rb

@@ -1,5 +1,5 @@
 module TreasureData
 
-VERSION = '0.9.2'
+VERSION = '0.9.3'
 
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: td
 version: !ruby/object:Gem::Version 
-  hash: 63
+  hash: 61
   prerelease: false
   segments: 
   - 0
   - 9
-  - 2
-  version: 0.9.2
+  - 3
+  version: 0.9.3
 platform: ruby
 authors: 
 - Sadayuki Furuhashi
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-09 00:00:00 +09:00
+date: 2011-09-13 00:00:00 +09:00
 default_executable: td
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -118,6 +118,7 @@ files:
 - lib/td/command/job.rb
 - lib/td/command/list.rb
 - lib/td/command/query.rb
+- lib/td/command/sched.rb
 - lib/td/command/schema.rb
 - lib/td/command/server.rb
 - lib/td/command/table.rb