jrubysql 0.1.4 → 0.1.5

data/CHANGELOG.md

@@ -1,6 +1,13 @@
 JRubySQL Changelog
 ==================
 
+0.1.5
+-----
+* Supports Cassandra CQL3
+* Configurable color
+ * Edit color codes in ~/.jrubysqlrc
+* Remembers commands for connection
+
 0.1.4
 -----
 * Invalid error message on Oracle connection

data/README.md

@@ -17,7 +17,7 @@ usage: jrubysql [options]
        jrubysql -t DBMS_TYPE -h HOSTNAME [-u USERNAME] [-p [PASSWORD]] [-d DATABASE]
        jrubysql -c CLASSNAME -j JDBC_URL [-u USERNAME] [-p [PASSWORD]] [-d DATABASE]
 
-    -t, --type DBMS_TYPE             Database type: mysql/oracle/postgres/sqlserver
+    -t, --type DBMS_TYPE             Database type: mysql/oracle/postgres/sqlserver/cassandra
     -h, --host HOST                  DBMS host address
 
     -c, --class-name CLASSNAME       Class name of the JDBC driver
@@ -48,14 +48,17 @@ export CLASSPATH=$CLASSPATH:~/lib/mysql-connector-java-5.1.17-bin.jar:~/lib/ojdb
 ### With type (-t) and hostname (-h)
 
 ```
-# Supports MySQL/Oracle/PostgreSQL/MSSQL/SQLite
+# Supports MySQL/Oracle/PostgreSQL/MSSQL/SQLite/Cassandra CQL3
 
 jrubysql -t mysql -h localhost -d test -u user -p
 jrubysql -t oracle -h localhost:1521/orcl -u user -p password
 jrubysql -t postgres -h localhost -u root
 jrubysql -t sqlserver -h localhost -u user -p password
-jrubysql -t sqlite -h my.db
-   # In case of SQLite, Host = DB file
+
+jrubysql -t sqlite -h my.db                     # For SQLite, host = DB file
+
+jrubysql -t cassandra -h localhost
+jrubysql -t cassandra -h localhost -d keyspace  # Optional keyspace
 ```
 
 ### Connect with class name of JDBC driver (-c) and JDBC URL (-j)

data/jrubysql.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |s|
   s.authors     = ["Junegunn Choi"]
   s.email       = ["junegunn.c@gmail.com"]
   s.homepage    = "https://github.com/junegunn/jrubysql"
-  s.summary     = %q{An SQL client for any JDBC-compliant database.}
-  s.description = %q{An SQL client for any JDBC-compliant database. Written in JRuby.}
+  s.summary     = %q{SQL client for any JDBC-compliant database.}
+  s.description = %q{SQL client for any JDBC-compliant database. Written in JRuby.}
 
   s.rubyforge_project = "jrubysql"
 
@@ -20,13 +20,13 @@ Gem::Specification.new do |s|
 
   # specify any dependencies here; for example:
   s.add_development_dependency "test-unit"
-  s.add_development_dependency "mocha"
+  s.add_development_dependency "mocha", '~> 0.11.0'
   s.add_development_dependency "guard"
   s.add_development_dependency "guard-test"
 
-  s.add_runtime_dependency "jdbc-helper", '~> 0.7.2'
-  s.add_runtime_dependency "insensitive_hash", '~> 0.2.3'
-  s.add_runtime_dependency "tabularize", '~> 0.1.1'
+  s.add_runtime_dependency "jdbc-helper", '~> 0.7.4'
+  s.add_runtime_dependency "insensitive_hash", '~> 0.2.4'
+  s.add_runtime_dependency "tabularize", '~> 0.2.0'
   s.add_runtime_dependency "each_sql", '~> 0.3.1'
   s.add_runtime_dependency "highline", '~> 1.6.11'
   s.add_runtime_dependency "ansi", '~> 1.4.2'

data/lib/jrubysql/constants.rb

@@ -1,11 +1,11 @@
 module JRubySQL
 module Constants
-  SUPPORTED_DBMS_TYPES = [ :mysql, :oracle, :postgres, :sqlserver, :sqlite ]
+  SUPPORTED_DBMS_TYPES = [ :mysql, :oracle, :postgres, :sqlserver, :sqlite, :cassandra ]
 
   # .jrubysqlrc
   DEFAULT_RC_PATH        = File.join(ENV['HOME'], '.jrubysqlrc')
   MAX_CONNECTION_HISTORY = 10
-  # MAX_COMMAND_HISTORY    = 100
+  MAX_COMMAND_HISTORY    = 20
 
   # Terminal (TBD)
   # MAX_COLUMN_WIDTH = 80

data/lib/jrubysql/controller.rb

@@ -8,6 +8,8 @@ class Controller
 
   def initialize options, argv_str
     @config = JRubySQL::Config.new
+    upgrade_jrubysqlrc!
+
     histories = @config['connections']
 
     if options.nil?
@@ -16,16 +18,16 @@ class Controller
       else
         # FIXME: Output
         puts m(:choose_parameter)
-        histories.each_with_index do |history, idx|
-          puts "[#{idx + 1}] #{history.first}"
+        histories.each_with_index do |entry, idx|
+          puts "[#{idx + 1}] #{entry.keys.first}"
         end
         print '> '
         select = JRubySQL::Controller.get_console_input
         select = select && select.chomp
         if (1..(histories.length)).include?(select.to_i)
-          history = histories[select.to_i - 1]
-          @options = history.last
-          @argv_str = history.first
+          entry     = histories[select.to_i - 1]
+          @options  = entry.values.first[:options]
+          @argv_str = entry.keys.first
         else
           puts
           JRubySQL::OptionParser.parse []
@@ -50,7 +52,8 @@ class Controller
     # Setting up output: Colored terminal 
     case @options[:output]
     when 'cterm'
-      @output = JRubySQL::Output::CTerm.new
+      @output = JRubySQL::Output::CTerm.new @config['colors']
+      @config['colors'] = @output.colors
     when 'term'
       @output = JRubySQL::Output::Term.new
     when 'csv'
@@ -69,28 +72,40 @@ class Controller
     end
     @output.info m(:connected)
 
-    history = @config['connections'] || []
-    history.unshift [@argv_str, @options]
-    history.uniq!
-    if history.length > JRubySQL::Constants::MAX_CONNECTION_HISTORY
-      history = history[0, JRubySQL::Constants::MAX_CONNECTION_HISTORY]
-    end
+    history   = @config['connections'] || []
+    entry_idx = history.index { |h| h.keys.first == @argv_str }
+    entry     = entry_idx ? history.delete_at(entry_idx) : { @argv_str => {} }
+    entry[@argv_str][:options] = @options
+    commands = entry[@argv_str][:commands] ||= []
+    @input.prepare commands
+
+    history.unshift entry
+    history.pop while history.length > JRubySQL::Constants::MAX_CONNECTION_HISTORY
     @config['connections'] = history
 
+    add_cmd = lambda do |c|
+      commands.push c unless commands.last == c
+      commands.shift while commands.length > JRubySQL::Constants::MAX_COMMAND_HISTORY
+      @config['connections'] = history
+    end
+
     loop do
       ret = @input.get
 
       ret[:sqls].each do |sql|
         begin
+          add_cmd.call sql + ret[:delimiter] if ret[:history]
           output @rdbms.execute(sql)
         rescue Exception => e
           @output.error e.to_s
         end
       end if ret.has_key?(:sqls)
 
-      ret[:commands].each do |command|
+      if ret.has_key?(:commands) && ret[:commands].first
+        command, line = ret[:commands]
+        add_cmd.call line unless command.keys.first == :quit
         process_command command.keys.first, command.values.first
-      end if ret.has_key?(:commands)
+      end
     end
   end
 
@@ -107,6 +122,19 @@ private
     $stdin.gets
   end
 
+  def upgrade_jrubysqlrc!
+    history = @config['connections'] || []
+
+    # Convert (0.1.5)
+    if !history.empty? && history[0].is_a?(Array)
+      history = history.map { |h|
+        { h.first => {:options => h.last} }
+      }
+      @config['connections'] = history
+      puts m(:converting_jrubysqlrc)
+    end
+  end
+
   def output result
     @output.print_result result
   end

data/lib/jrubysql/input/console.rb

@@ -8,6 +8,12 @@ class Console
     @esql = JRubySQL::Input.get_parser @controller.db_type
   end
 
+  def prepare sqls
+    sqls.each do |sql|
+      Readline::HISTORY << sql
+    end
+  end
+
   def get
     empty_response = { :sqls => [], :commands => [] }
     line = Readline::readline(@controller.cursor(@esql.empty?), false)
@@ -23,7 +29,7 @@ class Console
         empty_response
       # Console commands
       elsif @esql.empty? && cmd = process_command(line)
-        { :commands => [cmd].compact }
+        { :commands => [cmd, line] }
       # Line with delimiters
       elsif line.include?(@esql.delimiter)
         @esql << line + $/
@@ -31,7 +37,7 @@ class Console
         result[:sqls].each do |sql|
           Readline::HISTORY << sql + @esql.delimiter
         end
-        { :sqls => result[:sqls] }
+        { :sqls => result[:sqls], :delimiter => @esql.delimiter, :history => true }
       # SQL without delimiter
       else
         @esql << line + $/

data/lib/jrubysql/input/script.rb

@@ -6,11 +6,15 @@ class Script
   def initialize controller, script
     @controller = controller
     sqls  = EachSQL(script, JRubySQL::Input.get_each_sql_type(@controller.db_type))
-    @ret = { :sqls => sqls }
+    @ret = { :sqls => sqls, :history => false }
+  end
+
+  def prepare sqls
+    # No-op
   end
 
   def get
-    @ret.tap { @ret = { :commands => [{ :quit => nil }] } }
+    @ret.tap { @ret = { :commands => [{ :quit => nil }, nil] } }
   end
 end#Console
 end#Input

data/lib/jrubysql/messages.yml

@@ -1,4 +1,6 @@
 ---
+converting jrubysqlrc:
+  ".jrubysqlrc upgraded."
 choose parameter:
   "Parameter not given. Choose one:"
 ask password:

data/lib/jrubysql/option_parser.rb

@@ -18,7 +18,7 @@ module OptionParser
           ].join($/)
         opts.separator ''
 
-        opts.on('-t', '--type DBMS_TYPE', 'Database type: mysql/oracle/postgres/sqlserver/sqlite') do |v|
+        opts.on('-t', '--type DBMS_TYPE', 'Database type: mysql/oracle/postgres/sqlserver/sqlite/cassandra') do |v|
           options[:type] = v.downcase.to_sym
         end
 

data/lib/jrubysql/output/color_scheme/default.yml

@@ -0,0 +1,20 @@
+---
+info:    bold blue
+warning: yellow
+error:   bold red
+help:    bold blue
+
+prompt1: bold
+prompt2: bold green
+prompt3: bold yellow
+prompt4: bold red
+result:  green
+
+border:  blue
+label:   bold
+
+number:  cyan
+string:  yellow
+time:    magenta
+nil:     bold red
+

data/lib/jrubysql/output/cterm.rb

@@ -6,7 +6,24 @@ module JRubySQL
 module Output
 class CTerm < Term
   include ANSI::Code
-  HELP = Erubis::Eruby.new(File.read File.join(File.dirname(__FILE__), '../doc/help.txt.erb')).result(binding)
+
+  attr_reader :colors
+
+  def initialize colors
+    super()
+
+    @colors =
+        YAML.load(
+          File.read(
+            File.join(
+              File.dirname(__FILE__), "color_scheme/default.yml"))).merge(colors || {})
+
+    @ccode = @colors.inject(Hash.new('')) { |h, pair| 
+      k, v = pair
+      h[k.to_sym] = v.strip.split(/\s+/).map { |code| ANSI::Code.send(code) rescue '' }.join
+      h
+    }
+  end
 
   def welcome!
     puts bold + JRubySQL.name + reset
@@ -14,11 +31,11 @@ class CTerm < Term
 
   def cursor empty
     if empty
-      wrap('jrubysql', bold) + 
-            wrap('> ', bold + green)
+      wrap('jrubysql', @ccode[:prompt1]) + 
+            wrap('> ', @ccode[:prompt2])
     else
-      wrap('       -', bold + yellow) +
-            wrap('> ', bold + red)
+      wrap('       -', @ccode[:prompt3]) +
+            wrap('> ', @ccode[:prompt4])
     end
   end
 
@@ -28,66 +45,59 @@ class CTerm < Term
 
   def print_help
     puts
-    puts wrap(HELP, blue + bold)
+    puts wrap(HELP, @ccode[:help])
     puts
   end
 
   def info message
-    col = blue + bold
-    puts wrap(message, col)
+    puts wrap(message, @ccode[:info])
   end
 
   def result message
-    col = green
-    puts wrap(message, green)
+    puts wrap(message, @ccode[:result])
   end
 
   def warn message
-    col = yellow + bold
-    puts wrap(message, col)
+    puts wrap(message, @ccode[:warning])
   end
 
   def error message
-    col = red + bold
-    puts wrap(message, col)
+    puts wrap(message, @ccode[:error])
   end
 
 private
-  def separator_for row
-    # 13-bytes for ANSI codes
-    # - bold/reset: 4
-    # - colors: 5
-    '+-' + row.map { |e| '-' * (e.length - 13) }.join('-+-') + '-+'
+  def print_table ret
+    super ret, {
+      :hborder => @ccode[:border] + '-',
+      :vborder => wrap('|', @ccode[:border]),
+      :iborder => wrap('+', @ccode[:border]),
+    }
   end
 
   def decorate_label label
-    white + bold + label + reset
+    wrap(label, @ccode[:label])
   end
 
   # This looks stupid though.
   def decorate value
     case value
     when BigDecimal
-      cyan + value.to_s('F') + reset + reset
+      wrap(value.to_s('F'), @ccode[:number])
     when Numeric
-      cyan + value.to_s + reset + reset
+      wrap(value.to_s, @ccode[:number])
     when String
-      yellow + value + reset + reset
+      wrap(value, @ccode[:string])
     when Time, Java::JavaSql::Timestamp
-      magenta + value.to_s + reset + reset
+      wrap(value.to_s, @ccode[:time])
     when NilClass
-      bold + red + '(null)' + reset
+      wrap('(null)', @ccode[:nil])
     else
-      white + reset + value.to_s + reset
+      wrap(value.to_s, @ccode[:default])
     end
   end
 
-  def cnow
-    green + now + reset
-  end
-
   def wrap text, color
-    color + text + reset
+    color + text + (reset unless color.empty?)
   end
     
 end#CTerm

data/lib/jrubysql/output/term.rb

@@ -77,29 +77,24 @@ class Term
   end
 
 private
-  def print_table ret
+  def print_table ret, tabularize_opts = {}
     cnt = 0
     lines = [(@terminal.getTerminalHeight rescue JRubySQL::Constants::MAX_SCREEN_ROWS) - 5, 
              JRubySQL::Constants::MIN_SCREEN_ROWS].max
     ret.each_slice(lines) do |slice|
       cnt += slice.length
 
-      table = [slice.first.labels.map { |l| decorate_label l }] + 
-          slice.map { |row| row.to_a.map { |v| decorate v } }
-
-      output = Tabularize.it(table, :unicode_display => true)
-      separator = separator_for(output.first)
-      output_strs = output.map { |r| '| ' + r.join(' | ') + ' |' }
-      [0, 2, -1].each { |l| output_strs.insert l, separator }
-      puts output_strs
+      table = Tabularize.new tabularize_opts
+      table << slice.first.labels.map { |l| decorate_label l }
+      table.separator!
+      slice.each do |row|
+        table << row.to_a.map { |v| decorate v }
+      end
+      puts table
     end
     cnt
   end
 
-  def separator_for row
-    '+-' + row.map { |e| '-' * e.length }.join('-+-') + '-+'
-  end
-
   def decorate_label label
     label
   end
@@ -112,10 +107,6 @@ private
       value.to_s
     end
   end
-
-  def now
-    Time.now.strftime('%Y/%m/%d %H:%M:%S')
-  end
 end#Term
 end#Output
 end#JRubySQL

data/lib/jrubysql/rdbms.rb

@@ -16,6 +16,8 @@ class RDBMS
       :sqlserver
     when /sqlite/
       :sqlite
+    when /cassandra/
+      :cassandra
     else
       :unknown
     end
@@ -26,7 +28,7 @@ class RDBMS
       if options[:type]
         case options[:type]
         when :mysql
-          JDBCHelper::MySQLConnector.connect(
+          JDBCHelper::MySQL.connect(
             options[:host], options[:user], options[:password], options[:database])
         when :oracle
           host, svc = options[:host].split('/')
@@ -34,14 +36,17 @@ class RDBMS
             # FIXME
             raise ArgumentError.new m(:oracle_service_name_required)
           end
-          JDBCHelper::OracleConnector.connect(
+          JDBCHelper::Oracle.connect(
             host, options[:user], options[:password], svc)
         when :postgres
-          JDBCHelper::PostgresConnector.connect(
+          JDBCHelper::Postgres.connect(
             options[:host], options[:user], options[:password], options[:database])
         when :sqlserver
-          JDBCHelper::SqlServerConnector.connect(
+          JDBCHelper::SqlServer.connect(
             options[:host], options[:user], options[:password], options[:database])
+        when :cassandra
+          JDBCHelper::Cassandra.connect(
+            options[:host], options[:database])
         when :sqlite
           JDBCHelper::Connection.new(
             {

data/lib/jrubysql/version.rb

@@ -1,3 +1,3 @@
 module JRubySQL
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

data/test/test_jrubysql.rb

@@ -193,11 +193,11 @@ private
     prev_conn = JRubySQL::Config.new['connections'].first
     # assert_equal :sqlite,   prev_conn.last[:type]
     # assert_match 'test.db', prev_conn.last[:host]
-    assert_equal :mysql,      prev_conn.last[:type]
-    assert_match 'localhost', prev_conn.last[:host]
+    assert_equal :mysql,      prev_conn.values.first[:options][:type]
+    assert_match 'localhost', prev_conn.values.first[:options][:host]
 
     if command
-      assert_match command,     prev_conn.first
+      assert_match command, prev_conn.keys.first
     end
   end
 

metadata

@@ -2,14 +2,14 @@
 name: jrubysql
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Junegunn Choi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-04-23 00:00:00.000000000 Z
+date: 2012-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
@@ -31,15 +31,15 @@ dependencies:
   name: mocha
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.11.0
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.11.0
     none: false
   prerelease: false
   type: :development
@@ -81,13 +81,13 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: 0.7.4
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: 0.7.4
     none: false
   prerelease: false
   type: :runtime
@@ -97,13 +97,13 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: 0.2.4
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: 0.2.4
     none: false
   prerelease: false
   type: :runtime
@@ -113,13 +113,13 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.2.0
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.2.0
     none: false
   prerelease: false
   type: :runtime
@@ -187,7 +187,7 @@ dependencies:
     none: false
   prerelease: false
   type: :runtime
-description: An SQL client for any JDBC-compliant database. Written in JRuby.
+description: SQL client for any JDBC-compliant database. Written in JRuby.
 email:
 - junegunn.c@gmail.com
 executables:
@@ -215,6 +215,7 @@ files:
 - lib/jrubysql/messages.rb
 - lib/jrubysql/messages.yml
 - lib/jrubysql/option_parser.rb
+- lib/jrubysql/output/color_scheme/default.yml
 - lib/jrubysql/output/csv.rb
 - lib/jrubysql/output/cterm.rb
 - lib/jrubysql/output/term.rb
@@ -244,10 +245,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
 requirements: []
 rubyforge_project: jrubysql
-rubygems_version: 1.8.21
+rubygems_version: 1.8.24
 signing_key:
 specification_version: 3
-summary: An SQL client for any JDBC-compliant database.
+summary: SQL client for any JDBC-compliant database.
 test_files:
 - test/bin_helper.rb
 - test/helper.rb