ruco 0.0.24 → 0.0.25

data/Rakefile

@@ -28,11 +28,13 @@ task :key do
   Curses.raw # give us all other keys
   Curses.stdscr.nodelay = 1 # do not block -> we can use timeouts
   Curses.init_screen
+  nothing = (2**32 - 1)
+
 
   count = 0
   loop do
-    key = Curses.getch || 4294967295
-    next if key == 4294967295
+    key = Curses.getch || nothing
+    next if key >= nothing
     exit if key == 3 # Ctrl+c
     count = (count + 1) % 20
     Curses.setpos(count,0)
@@ -53,4 +55,4 @@ begin
   Jeweler::GemcutterTasks.new
 rescue LoadError
   puts "Jeweler, or one of its dependencies, is not available. Install it with: gem install jeweler"
-end
+end

data/VERSION

@@ -1 +1 @@
-0.0.24
+0.0.25

data/bin/ruco

@@ -21,6 +21,11 @@ Options:
 BANNER
     opts.on("--debug-cache","Show caching in action") { options[:debug_cache] = true }
     opts.on("--debug-keys", "Show pressed keys") { options[:debug_keys] = true }
+    opts.on('-v', '--version','Show Version'){
+      require 'ruco/version'
+      puts Ruco::VERSION
+      exit
+    }
     opts.on("-h", "--help","Show this.") { puts opts; exit }
   end
   parser.parse!
@@ -101,7 +106,7 @@ end
 def debug_key(key)
   @key_line ||= -1
   @key_line = (@key_line + 1) % Curses.stdscr.maxy
-  write(@key_line, 0, "#{key}---")
+  write(@key_line, 0, "#{key.inspect}---")
 end
 
 def log(stuff)

data/lib/ruco.rb

@@ -1,3 +1,5 @@
+require 'ruco/version'
+
 require 'ruco/core_ext/object'
 require 'ruco/core_ext/string'
 require 'ruco/core_ext/array'
@@ -19,7 +21,6 @@ require 'ruco/text_field'
 module Ruco
   autoload :Clipboard, 'clipboard' # can crash when loaded -> load if needed
 
-  VERSION = File.read( File.join(File.dirname(__FILE__),'..','VERSION') ).strip
   TAB_SIZE = 2
 
   class << self

data/lib/ruco/keyboard.rb

@@ -5,7 +5,7 @@ class Keyboard
   ENTER = 13
   IS_18 = RUBY_VERSION =~ /^1\.8/
   SEQUENCE_TIMEOUT = 0.01
-  NOTHING = 4294967295 # getch returns this as 'nothing' on 1.8 but nil on 1.9.2
+  NOTHING = (2**32 - 1) # getch returns this as 'nothing' on 1.8 but nil on 1.9.2
   A_TO_Z = ('a'..'z').to_a
 
   def self.input(&block)
@@ -22,11 +22,18 @@ class Keyboard
         if needs_paste_fix?(@sequence)
           yield bytes_to_string(@sequence)
         else
-          bytes_to_key_codes(@sequence).each{|c| yield c }
+          # weird stuff that happens when connected via ssh
+          if @sequence == [27, 91, 49, 59, 50, 65]
+            yield :"Shift+up"
+          elsif @sequence == [27, 91, 49, 59, 50, 66]
+            yield :"Shift+down"
+          else
+            bytes_to_key_codes(@sequence).each{|c| yield c }
+          end
         end
         @sequence = nil
       end
-      next if key == NOTHING
+      next unless key
       start_or_append_sequence key
     end
   end
@@ -75,8 +82,8 @@ class Keyboard
   end
 
   def self.fetch_user_input
-    key = @input.call || NOTHING
-    key = NOTHING if key > NOTHING # strange key codes when starting via ssh
+    key = @input.call
+    return if key.nil? or key >= NOTHING
     key = key.ord if key.is_a?(String) # ruby 1.9 fix
     key
   end

data/lib/ruco/version.rb

@@ -0,0 +1,3 @@
+module Ruco
+  VERSION = File.read( File.join(File.dirname(__FILE__),'..','..','VERSION') ).strip
+end

data/ruco.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ruco}
-  s.version = "0.0.24"
+  s.version = "0.0.25"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]
-  s.date = %q{2011-01-23}
+  s.date = %q{2011-01-25}
   s.default_executable = %q{ruco}
   s.email = %q{michael@grosser.it}
   s.executables = ["ruco"]
@@ -35,6 +35,7 @@ Gem::Specification.new do |s|
     "lib/ruco/status_bar.rb",
     "lib/ruco/text_area.rb",
     "lib/ruco/text_field.rb",
+    "lib/ruco/version.rb",
     "ruco.gemspec",
     "spec/ruco/application_spec.rb",
     "spec/ruco/command_bar_spec.rb",

data/spec/ruco/keyboard_spec.rb

@@ -85,4 +85,11 @@ describe Keyboard do
     type [11121, 324234]
     output.should == [11121, 324234]
   end
+
+  it "recognises weird key combos" do
+    type [27, 91, 49, 59, 50, 65]
+    output.should == [:"Shift+up"]
+    type [27, 91, 49, 59, 50, 66]
+    output.should == [:"Shift+down"]
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruco
 version: !ruby/object:Gem::Version 
-  hash: 47
+  hash: 45
   prerelease: 
   segments: 
   - 0
   - 0
-  - 24
-  version: 0.0.24
+  - 25
+  version: 0.0.25
 platform: ruby
 authors: 
 - Michael Grosser
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-23 00:00:00 +01:00
+date: 2011-01-25 00:00:00 +01:00
 default_executable: ruco
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -64,6 +64,7 @@ files:
 - lib/ruco/status_bar.rb
 - lib/ruco/text_area.rb
 - lib/ruco/text_field.rb
+- lib/ruco/version.rb
 - ruco.gemspec
 - spec/ruco/application_spec.rb
 - spec/ruco/command_bar_spec.rb