jrubysql 0.1.7 → 0.1.8

data/jrubysql.gemspec

@@ -24,11 +24,11 @@ Gem::Specification.new do |s|
   s.add_development_dependency "guard"
   s.add_development_dependency "guard-test"
 
-  s.add_runtime_dependency "jdbc-helper", '~> 0.7.4'
-  s.add_runtime_dependency "insensitive_hash", '~> 0.3.0'
-  s.add_runtime_dependency "tabularize", '~> 0.2.4'
-  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'
+  s.add_runtime_dependency "jdbc-helper", '~> 0.8.0'
+  s.add_runtime_dependency "insensitive_hash", '~> 0.3.3'
+  s.add_runtime_dependency "tabularize", '~> 0.2.9'
+  s.add_runtime_dependency "each_sql", '~> 0.4.0'
+  s.add_runtime_dependency "highline", '~> 1.6.19'
+  s.add_runtime_dependency "ansi", '~> 1.4.3'
   s.add_runtime_dependency "erubis", '~> 2.7.0'
 end

data/lib/jrubysql/controller.rb

@@ -160,6 +160,15 @@ private
       else
         @output.error m(:invalid_autocommit, params)
       end
+    when :display
+      params = params.downcase
+      if %w[table pairs].include? params
+        if @output.respond_to?(:display_mode=)
+          @output.display_mode = params.to_sym
+        end
+      else
+        @output.error m(:invalid_display)
+      end
     else
       # TODO
       @output.error m(:unknown_command)

data/lib/jrubysql/doc/help.txt.erb

@@ -6,5 +6,6 @@
   <SQL>                  Execute the SQL.
   autocommit [<on|off>]  Show/enable/disable autocommit. (default: on)
   delimiter <DELIMITER>  Change SQL delimiter.
+  display [table|pairs]  Change display style.
   now                    Display current timestamp.
   exit                   Exit JRubySQL.

data/lib/jrubysql/input/console.rb

@@ -77,6 +77,8 @@ private
       { :autocommit => $1 }
     when 'now'
       { :now => nil }
+    when /^display (\S+)(#{Regexp.escape delimiter})?$/
+      { :display => $1 }
     when /^(exit|quit)(#{Regexp.escape delimiter})?$/
       { :quit => nil }
     else

data/lib/jrubysql/messages.yml

@@ -19,6 +19,9 @@ file not found:
 both script and filename:
   Cannot specify both filename and script.
 
+invalid display:
+  "Invalid display type: must be table or pairs"
+
 connecting:
   Connecting to the database ...
 connected:

data/lib/jrubysql/output/cterm.rb

@@ -18,7 +18,7 @@ class CTerm < Term
             File.join(
               File.dirname(__FILE__), "color_scheme/default.yml"))).merge(colors || {})
 
-    @ccode = @colors.inject(Hash.new('')) { |h, pair| 
+    @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
@@ -31,7 +31,7 @@ class CTerm < Term
 
   def cursor empty
     if empty
-      wrap('jrubysql', @ccode[:prompt1]) + 
+      wrap('jrubysql', @ccode[:prompt1]) +
             wrap('> ', @ccode[:prompt2])
     else
       wrap('       -', @ccode[:prompt3]) +
@@ -100,7 +100,7 @@ private
   def wrap text, color
     color + text + (color.empty? ? '' : reset)
   end
-    
+
 end#CTerm
 end#Output
 end#JRubySQL

data/lib/jrubysql/output/term.rb

@@ -27,6 +27,7 @@ class Term
         [ terminal.getTerminalWidth, terminal.getTerminalHeight ]
       end
     }
+    self.display_mode = :table
     trap 'INT' do
       Thread.main.raise Interrupt
     end
@@ -76,7 +77,7 @@ class Term
 
     if ret[:set?]
       begin
-        cnt = print_table ret[:result]
+        cnt = send(@printer, ret[:result])
         result m(:rows_returned, cnt, cnt > 1 ? 's' : '', elapsed)
       rescue Interrupt
         warn m(:interrupted)
@@ -90,13 +91,35 @@ class Term
     puts
   end
 
+  def display_mode= mode
+    @printer = "print_#{mode}".to_sym
+  end
+
 private
+  def print_pairs ret
+    cnt = 0
+    ret.each do |row|
+      labels = row.labels.map { |e| e + ': ' }
+      max_label_len = labels.map(&:length).max
+      pairs = labels.zip row.to_a
+      pairs.each_with_index do |pair, idx|
+        print (idx == 0) ? '- ' : '  '
+        l, v = pair
+        print l.ljust(max_label_len, ' ')
+        puts v.to_s
+      end
+      puts
+      cnt += 1
+    end
+    cnt
+  end
+
   def print_table ret, tabularize_opts = {}
     cnt = 0
     term_size = @get_terminal_size.call
-    lines = [(term_size.call[1] rescue JRubySQL::Constants::MAX_SCREEN_ROWS) - 5,
+    lines = [(term_size[1] rescue JRubySQL::Constants::MAX_SCREEN_ROWS) - 5,
              JRubySQL::Constants::MIN_SCREEN_ROWS].max
-    cols = (term_size.call[0] rescue nil)
+    cols = (term_size[0] rescue nil)
     ret.each_slice(lines) do |slice|
       cnt += slice.length
 

data/lib/jrubysql/version.rb

@@ -1,3 +1,3 @@
 module JRubySQL
-  VERSION = "0.1.7"
+  VERSION = "0.1.8"
 end

data/test/bin_helper.rb

@@ -2,7 +2,7 @@
 # encoding: utf-8
 # junegunn.c@gmail.com
 
-# DISCLAIMER: 
+# DISCLAIMER:
 #   Not a real test!
 #   Just a helper script for running scripts with local source
 

metadata

@@ -1,264 +1,207 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: jrubysql
-version: !ruby/object:Gem::Version
-  prerelease:
-  version: 0.1.7
+version: !ruby/object:Gem::Version 
+  prerelease: 
+  version: 0.1.8
 platform: ruby
-authors:
-- Junegunn Choi
-autorequire:
+authors: 
+  - Junegunn Choi
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-03 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: test-unit
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
-    none: false
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
-    none: false
-  prerelease: false
-  type: :development
-- !ruby/object:Gem::Dependency
-  name: mocha
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.11.0
-    none: false
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.11.0
-    none: false
-  prerelease: false
-  type: :development
-- !ruby/object:Gem::Dependency
-  name: guard
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
-    none: false
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
-    none: false
-  prerelease: false
-  type: :development
-- !ruby/object:Gem::Dependency
-  name: guard-test
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
-    none: false
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
-    none: false
-  prerelease: false
-  type: :development
-- !ruby/object:Gem::Dependency
-  name: jdbc-helper
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.7.4
-    none: false
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.7.4
-    none: false
-  prerelease: false
-  type: :runtime
-- !ruby/object:Gem::Dependency
-  name: insensitive_hash
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.3.0
-    none: false
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.3.0
-    none: false
-  prerelease: false
-  type: :runtime
-- !ruby/object:Gem::Dependency
-  name: tabularize
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.2.4
-    none: false
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.2.4
-    none: false
-  prerelease: false
-  type: :runtime
-- !ruby/object:Gem::Dependency
-  name: each_sql
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.3.1
-    none: false
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.3.1
-    none: false
-  prerelease: false
-  type: :runtime
-- !ruby/object:Gem::Dependency
-  name: highline
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.6.11
-    none: false
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.6.11
-    none: false
-  prerelease: false
-  type: :runtime
-- !ruby/object:Gem::Dependency
-  name: ansi
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.4.2
-    none: false
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.4.2
-    none: false
-  prerelease: false
-  type: :runtime
-- !ruby/object:Gem::Dependency
-  name: erubis
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.7.0
-    none: false
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.7.0
-    none: false
-  prerelease: false
-  type: :runtime
+
+date: 2013-09-12 00:00:00 Z
+dependencies: 
+  - !ruby/object:Gem::Dependency 
+    name: test-unit
+    prerelease: false
+    requirement: &id001 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: "0"
+    type: :development
+    version_requirements: *id001
+  - !ruby/object:Gem::Dependency 
+    name: mocha
+    prerelease: false
+    requirement: &id002 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ~>
+          - !ruby/object:Gem::Version 
+            version: 0.11.0
+    type: :development
+    version_requirements: *id002
+  - !ruby/object:Gem::Dependency 
+    name: guard
+    prerelease: false
+    requirement: &id003 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: "0"
+    type: :development
+    version_requirements: *id003
+  - !ruby/object:Gem::Dependency 
+    name: guard-test
+    prerelease: false
+    requirement: &id004 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: "0"
+    type: :development
+    version_requirements: *id004
+  - !ruby/object:Gem::Dependency 
+    name: jdbc-helper
+    prerelease: false
+    requirement: &id005 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ~>
+          - !ruby/object:Gem::Version 
+            version: 0.8.0
+    type: :runtime
+    version_requirements: *id005
+  - !ruby/object:Gem::Dependency 
+    name: insensitive_hash
+    prerelease: false
+    requirement: &id006 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ~>
+          - !ruby/object:Gem::Version 
+            version: 0.3.3
+    type: :runtime
+    version_requirements: *id006
+  - !ruby/object:Gem::Dependency 
+    name: tabularize
+    prerelease: false
+    requirement: &id007 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ~>
+          - !ruby/object:Gem::Version 
+            version: 0.2.9
+    type: :runtime
+    version_requirements: *id007
+  - !ruby/object:Gem::Dependency 
+    name: each_sql
+    prerelease: false
+    requirement: &id008 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ~>
+          - !ruby/object:Gem::Version 
+            version: 0.4.0
+    type: :runtime
+    version_requirements: *id008
+  - !ruby/object:Gem::Dependency 
+    name: highline
+    prerelease: false
+    requirement: &id009 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ~>
+          - !ruby/object:Gem::Version 
+            version: 1.6.19
+    type: :runtime
+    version_requirements: *id009
+  - !ruby/object:Gem::Dependency 
+    name: ansi
+    prerelease: false
+    requirement: &id010 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ~>
+          - !ruby/object:Gem::Version 
+            version: 1.4.3
+    type: :runtime
+    version_requirements: *id010
+  - !ruby/object:Gem::Dependency 
+    name: erubis
+    prerelease: false
+    requirement: &id011 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ~>
+          - !ruby/object:Gem::Version 
+            version: 2.7.0
+    type: :runtime
+    version_requirements: *id011
 description: SQL client for any JDBC-compliant database. Written in JRuby.
-email:
-- junegunn.c@gmail.com
-executables:
-- jrubysql
+email: 
+  - junegunn.c@gmail.com
+executables: 
+  - jrubysql
 extensions: []
+
 extra_rdoc_files: []
-files:
-- .gitignore
-- CHANGELOG.md
-- Gemfile
-- Guardfile
-- LICENSE.txt
-- README.md
-- Rakefile
-- bin/jrubysql
-- jrubysql.gemspec
-- lib/jrubysql.rb
-- lib/jrubysql/config.rb
-- lib/jrubysql/constants.rb
-- lib/jrubysql/controller.rb
-- lib/jrubysql/doc/help.txt.erb
-- lib/jrubysql/input/console.rb
-- lib/jrubysql/input/input.rb
-- lib/jrubysql/input/script.rb
-- 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
-- lib/jrubysql/rdbms.rb
-- lib/jrubysql/version.rb
-- test/bin_helper.rb
-- test/helper.rb
-- test/test_jrubysql.rb
-- test/test_option_parser.rb
+
+files: 
+  - .gitignore
+  - CHANGELOG.md
+  - Gemfile
+  - Guardfile
+  - LICENSE.txt
+  - README.md
+  - Rakefile
+  - bin/jrubysql
+  - jrubysql.gemspec
+  - lib/jrubysql.rb
+  - lib/jrubysql/config.rb
+  - lib/jrubysql/constants.rb
+  - lib/jrubysql/controller.rb
+  - lib/jrubysql/doc/help.txt.erb
+  - lib/jrubysql/input/console.rb
+  - lib/jrubysql/input/input.rb
+  - lib/jrubysql/input/script.rb
+  - 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
+  - lib/jrubysql/rdbms.rb
+  - lib/jrubysql/version.rb
+  - test/bin_helper.rb
+  - test/helper.rb
+  - test/test_jrubysql.rb
+  - test/test_option_parser.rb
 homepage: https://github.com/junegunn/jrubysql
 licenses: []
-post_install_message:
+
+post_install_message: 
 rdoc_options: []
-require_paths:
-- lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: !binary |-
-        MA==
+
+require_paths: 
+  - lib
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-required_rubygems_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: !binary |-
-        MA==
+  requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
+  requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
 requirements: []
+
 rubyforge_project: jrubysql
 rubygems_version: 1.8.24
-signing_key:
+signing_key: 
 specification_version: 3
 summary: SQL client for any JDBC-compliant database.
-test_files:
-- test/bin_helper.rb
-- test/helper.rb
-- test/test_jrubysql.rb
-- test/test_option_parser.rb
+test_files: 
+  - test/bin_helper.rb
+  - test/helper.rb
+  - test/test_jrubysql.rb
+  - test/test_option_parser.rb