jrubysql 0.1.6 → 0.1.7

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 JRubySQL Changelog
 ==================
 
+0.1.7
+-----
+* Fixed NoMethodError in JRuby 1.7+
+
 0.1.6
 -----
 * Bug fix: Fails to render data type with no assigned color

data/jrubysql.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "guard-test"
 
   s.add_runtime_dependency "jdbc-helper", '~> 0.7.4'
-  s.add_runtime_dependency "insensitive_hash", '~> 0.2.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'

data/lib/jrubysql/messages.rb

@@ -14,10 +14,10 @@ module Messages
   end
 
 private
-  MESSAGES = 
+  MESSAGES =
     InsensitiveHash[
       YAML.load(File.read File.join( File.dirname(__FILE__), 'messages.yml' ))
-    ].tap { |ih| ih.underscore = true }
+    ]
 end#Messages
 end#JRubySQL
 

data/lib/jrubysql/output/term.rb

@@ -11,8 +11,22 @@ class Term
 
   def initialize
     # Make use of JLine included in JRuby
-    java_import 'jline.Terminal'
-    @terminal = Terminal.getTerminal
+    terminal =
+      case JRUBY_VERSION
+      when /^1\.7/
+        Java::jline.console.ConsoleReader.new.getTerminal
+      when /^1\.6/
+        Java::jline.ConsoleReader.new.getTerminal
+      end
+
+    @get_terminal_size = lambda {
+      case JRUBY_VERSION
+      when /^1\.7/
+        [ terminal.width, terminal.height ]
+      when /^1\.6/
+        [ terminal.getTerminalWidth, terminal.getTerminalHeight ]
+      end
+    }
     trap 'INT' do
       Thread.main.raise Interrupt
     end
@@ -79,9 +93,10 @@ class Term
 private
   def print_table ret, tabularize_opts = {}
     cnt = 0
-    lines = [(@terminal.getTerminalHeight rescue JRubySQL::Constants::MAX_SCREEN_ROWS) - 5, 
+    term_size = @get_terminal_size.call
+    lines = [(term_size.call[1] rescue JRubySQL::Constants::MAX_SCREEN_ROWS) - 5,
              JRubySQL::Constants::MIN_SCREEN_ROWS].max
-    cols = (@terminal.getTerminalWidth rescue nil)
+    cols = (term_size.call[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.6"
+  VERSION = "0.1.7"
 end

data/test/helper.rb

@@ -23,7 +23,7 @@ module JRubySQLTestHelper
 
       return {
         :stdout => $stdout.string,
-        :stderr => $stderr.string, 
+        :stderr => $stderr.string,
         :return => ret
       }
     ensure

data/test/test_jrubysql.rb

@@ -45,7 +45,7 @@ class TestJRubySQL < Test::Unit::TestCase
       create table if not exists jrubysql (a int) engine=innodb;
       autocommit
 
-      insert 
+      insert
         into /* ;;; */
       jrubysql
         values (1);
@@ -176,7 +176,7 @@ class TestJRubySQL < Test::Unit::TestCase
       drop table jrubysql;
       exit
     "
-    ret = capture { JRubySQL.launch [] } 
+    ret = capture { JRubySQL.launch [] }
     assert_equal '999', ret[:stdout].lines.map(&:chomp)[-1]
 
     assert_prev_conn /csv/

metadata

@@ -2,14 +2,14 @@
 name: jrubysql
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Junegunn Choi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-07-23 00:00:00.000000000 Z
+date: 2013-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
@@ -17,13 +17,15 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: !binary |-
+          MA==
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: !binary |-
+          MA==
     none: false
   prerelease: false
   type: :development
@@ -49,13 +51,15 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: !binary |-
+          MA==
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: !binary |-
+          MA==
     none: false
   prerelease: false
   type: :development
@@ -65,13 +69,15 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: !binary |-
+          MA==
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: !binary |-
+          MA==
     none: false
   prerelease: false
   type: :development
@@ -97,13 +103,13 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.4
+        version: 0.3.0
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.4
+        version: 0.3.0
     none: false
   prerelease: false
   type: :runtime
@@ -235,13 +241,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: !binary |-
+        MA==
   none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: !binary |-
+        MA==
   none: false
 requirements: []
 rubyforge_project: jrubysql
@@ -254,4 +262,3 @@ test_files:
 - test/helper.rb
 - test/test_jrubysql.rb
 - test/test_option_parser.rb
-...