lib/td/command/common.rb in td-0.8.0 vs lib/td/command/common.rb in td-0.9.0

@@ -7,66 +7,14 @@
 autoload :Table, 'td/client'
 autoload :Schema, 'td/client'
 autoload :Job, 'td/client'
 
 module Command
-  private
-  def cmd_opt(name, *args)
-    if args.last.to_s =~ /_$/
-      multi = true
-      args.push args.pop.to_s[0..-2]+'...'
-    elsif args.last.to_s =~ /_\?$/
-      multi = true
-      args.push args.pop.to_s[0..-3]+'...?'
-    end
 
-    req_args, opt_args = args.partition {|a| a.to_s !~ /\?$/ }
-    opt_args = opt_args.map {|a| a.to_s[0..-2].to_sym }
-    args = req_args + opt_args
-
-    args_line = req_args.map {|a| "<#{a}>" }
-    args_line.concat opt_args.map {|a| "[#{a}]" }
-    args_line = args_line.join(' ')
-
-    description = List.get_description(name)
-
-    op = OptionParser.new
-    op.summary_indent = "  "
-    op.banner = <<EOF
-usage: #{$prog} #{name} #{args_line}
-
-description:
-#{description.split("\n").map {|l| "  #{l}" }.join("\n")}
-EOF
-
-    (class<<op;self;end).module_eval do
-      define_method(:cmd_usage) do |msg|
-        puts op.to_s
-        puts ""
-        puts "error: #{msg}" if msg
-        exit 1
-      end
-
-      define_method(:cmd_parse) do
-        begin
-          parse!(ARGV)
-          if ARGV.length < req_args.length || (!multi && ARGV.length > args.length)
-            cmd_usage nil
-          end
-          if ARGV.length <= 1
-            ARGV[0]
-          else
-            ARGV
-          end
-        rescue
-          cmd_usage $!
-        end
-      end
-
-    end
-
-    op
+  private
+  def get_option(name)
+    List.get_option(name)
   end
 
   def get_client
     apikey = Config.apikey
     unless apikey
@@ -93,34 +41,43 @@
       }
         $stderr.puts ""
     end
   end
 
-  def find_database(client, db_name)
+  def get_database(client, db_name)
     begin
       return client.database(db_name)
     rescue
       cmd_debug_error $!
       $stderr.puts $!
-      $stderr.puts "Use '#{$prog} show-databases' to show the list of databases."
+      $stderr.puts "Use '#{$prog} database:list' to show the list of databases."
       exit 1
     end
     db
   end
 
-  def find_table(client, db_name, table_name, type=nil)
-    db = find_database(client, db_name)
+  def parse_table_ident(table_ident)
+    db_name, table_name = table_ident.split('.', 2)
+    unless table_name
+      $stderr.puts "Invalid table identifier '#{table_ident}'; expected 'DB.TABLE'"
+      exit 1
+    end
+    return db_name, table_name
+  end
+
+  def get_table(client, db_name, table_name)
+    db = get_database(client, db_name)
     begin
       table = db.table(table_name)
     rescue
       $stderr.puts $!
-      $stderr.puts "Use '#{$prog} show-tables #{db_name}' to show the list of tables."
+      $stderr.puts "Use '#{$prog} table:list #{db_name}' to show the list of tables."
       exit 1
     end
-    if type && table.type != type
-      $stderr.puts "Table '#{db_name}.#{table_name} is not a #{type} table but a #{table.type} table"
-    end
+    #if type && table.type != type
+    #  $stderr.puts "Table '#{db_name}.#{table_name} is not a #{type} table but a #{table.type} table"
+    #end
     table
   end
+
 end
 end
-