jrubysql 0.1.5 → 0.1.6

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 JRubySQL Changelog
 ==================
 
+0.1.6
+-----
+* Bug fix: Fails to render data type with no assigned color
+
 0.1.5
 -----
 * Supports Cassandra CQL3

data/jrubysql.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
 
   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 "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'

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

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

data/lib/jrubysql/output/cterm.rb

@@ -71,6 +71,7 @@ private
       :hborder => @ccode[:border] + '-',
       :vborder => wrap('|', @ccode[:border]),
       :iborder => wrap('+', @ccode[:border]),
+      :ellipsis => wrap('>', @ccode[:ellipsis])
     }
   end
 
@@ -97,7 +98,7 @@ private
   end
 
   def wrap text, color
-    color + text + (reset unless color.empty?)
+    color + text + (color.empty? ? '' : reset)
   end
     
 end#CTerm

data/lib/jrubysql/output/term.rb

@@ -81,6 +81,7 @@ private
     cnt = 0
     lines = [(@terminal.getTerminalHeight rescue JRubySQL::Constants::MAX_SCREEN_ROWS) - 5, 
              JRubySQL::Constants::MIN_SCREEN_ROWS].max
+    cols = (@terminal.getTerminalWidth 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.5"
+  VERSION = "0.1.6"
 end

metadata

@@ -2,14 +2,14 @@
 name: jrubysql
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Junegunn Choi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-07-11 00:00:00.000000000 Z
+date: 2012-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
@@ -113,13 +113,13 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.2.4
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.2.4
     none: false
   prerelease: false
   type: :runtime