ruco 0.2.12 → 0.2.13

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ruco (0.2.12)
+    ruco (0.2.13)
       clipboard (>= 0.9.8)
       language_sniffer
       textpow1x (>= 1.2.5)

data/Readme.md

@@ -126,6 +126,7 @@ To build the commandline output Editor/CommandBar return:
 
 TODO
 =====
+ - Shift+up and Alt+up emit the same keycodes in iTerm
  - ctrl+right should jump to line end and then to the next line even if the line ends in a "
  - only do syntax parsing for changed lines + selected lines <-> will not be redrawn anyhow
  - try to use complete file coloring as removed in 26d6da4
@@ -159,6 +160,5 @@ Authors
 
 [Michael Grosser](http://grosser.it)<br/>
 grosser.michael@gmail.com<br/>
-Hereby placed under public domain, do what you want, just do not hold me accountable...<br/>
-[![Flattr](http://api.flattr.com/button/flattr-badge-large.png)](https://flattr.com/submit/auto?user_id=grosser&url=https://github.com/grosser/ruco&title=ruco&language=en_GB&tags=github&category=software)
+License: MIT<br/>
 [![Build Status](https://secure.travis-ci.org/grosser/ruco.png)](http://travis-ci.org/grosser/ruco)

data/lib/ruco/application.rb

@@ -49,16 +49,16 @@ module Ruco
       when :left then move_with_select_mode :relative, 0,-1
       when :page_up then move_with_select_mode :page_up
       when :page_down then move_with_select_mode :page_down
-      when :"Ctrl+right" then move_with_select_mode :jump, :right
-      when :"Ctrl+left" then move_with_select_mode :jump, :left
+      when :"Ctrl+right", :"Alt+f" then move_with_select_mode :jump, :right
+      when :"Ctrl+left", :"Alt+b" then move_with_select_mode :jump, :left
 
       # select
       when :"Shift+down" then @focused.selecting { move(:relative, 1, 0) }
       when :"Shift+right" then @focused.selecting { move(:relative, 0, 1) }
       when :"Shift+up" then @focused.selecting { move(:relative, -1, 0) }
       when :"Shift+left" then @focused.selecting { move(:relative, 0, -1) }
-      when :"Ctrl+Shift+left" then @focused.selecting{ move(:jump, :left) }
-      when :"Ctrl+Shift+right" then @focused.selecting{ move(:jump, :right) }
+      when :"Ctrl+Shift+left", :"Alt+Shift+left" then @focused.selecting{ move(:jump, :left) }
+      when :"Ctrl+Shift+right", :"Alt+Shift+right" then @focused.selecting{ move(:jump, :right) }
 
 
       # modify

data/lib/ruco/keyboard.rb

@@ -39,8 +39,9 @@ class Keyboard
     when Curses::Key::RIGHT then :right
     when Curses::Key::LEFT then :left
 
-    when 337, '^[1;2A' then :"Shift+up"
-    when 336, '^[1;2B' then :"Shift+down"
+    # code, unix, iTerm
+    when 337, '^[1;2A', "^[A" then :"Shift+up"
+    when 336, '^[1;2B', "^[B" then :"Shift+down"
     when 402, '^[1;2C' then :"Shift+right"
     when 393, '^[1;2D' then :"Shift+left"
 
@@ -56,8 +57,8 @@ class Keyboard
 
     when 561, '^[1;6A' then :"Ctrl+Shift+up"
     when 520, '^[1;6B' then :"Ctrl+Shift+down"
-    when 555, '^[1;6C' then :"Ctrl+Shift+right"
-    when 540, '^[1;6D' then :"Ctrl+Shift+left"
+    when 555, '^[1;6C', "^[C" then :"Ctrl+Shift+right"
+    when 540, '^[1;6D', "^[D" then :"Ctrl+Shift+left"
 
     when 562, '^[1;7A' then :"Alt+Ctrl+up"
     when 521, '^[1;7B' then :"Alt+Ctrl+down"
@@ -69,6 +70,11 @@ class Keyboard
     when      '^[1;8C' then :"Alt+Ctrl+Shift+right"
     when      '^[1;8D' then :"Alt+Ctrl+Shift+left"
 
+    when      '^[1;10A' then :"Alt+Shift+up"
+    when      '^[1;10B' then :"Alt+Shift+down"
+    when      '^[1;10C' then :"Alt+Shift+right"
+    when      '^[1;10D' then :"Alt+Shift+left"
+
     when Curses::KEY_END then :end
     when Curses::KEY_HOME then :home
     when Curses::KEY_NPAGE then :page_down
@@ -173,10 +179,10 @@ class Keyboard
   end
 
   def self.escape_sequence?(sequence)
-    sequence[0] == ESCAPE and sequence.size.between?(2,6) # Esc
+    sequence[0] == ESCAPE and sequence.size.between?(2,7) # Esc
   end
 
-  def self.is_alt_key_code?(key)
-    key.slice(0,1) == "^" and key.size == 2
+  def self.is_alt_key_code?(sequence)
+    sequence.slice(0,1) == "^" and sequence.size == 2
   end
 end

data/lib/ruco/version.rb

@@ -1,3 +1,3 @@
 module Ruco
-  VERSION = Version = "0.2.12"
+  VERSION = Version = "0.2.13"
 end

data/ruco.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new name, Ruco::VERSION do |s|
   s.email = "michael@grosser.it"
   s.homepage = "http://github.com/grosser/#{name}"
   s.files = `git ls-files`.split("\n")
-  s.license = 'MIT'
+  s.license = "MIT"
   s.add_runtime_dependency "clipboard", ">= 0.9.8"
   s.add_runtime_dependency "textpow1x", ">= 1.2.5"
   s.add_runtime_dependency "language_sniffer"

data/spec/ruco/application_spec.rb

@@ -1,5 +1,5 @@
 # encoding: UTF-8
-require File.expand_path('spec/spec_helper')
+require "spec_helper"
 
 describe Ruco::Application do
   before do

data/spec/ruco/array_processor_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('spec/spec_helper')
+require "spec_helper"
 
 describe Ruco::ArrayProcessor do
   let(:p){ Ruco::ArrayProcessor.new }

data/spec/ruco/command_bar_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('spec/spec_helper')
+require "spec_helper"
 
 describe Ruco::CommandBar do
   let(:default_view){ "^W Exit    ^S Save    ^F Find" }

data/spec/ruco/core_ext/array_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('spec/spec_helper')
+require "spec_helper"
 
 describe Array do
   it "is bigger" do
@@ -28,4 +28,4 @@ describe Array do
     [1].between?([0],[0]).should == false
     [1].between?([2],[2]).should == false
   end
-end
+end

data/spec/ruco/core_ext/range_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('spec/spec_helper')
+require "spec_helper"
 
 describe Range do
   describe :last_element do

data/spec/ruco/core_ext/string_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('spec/spec_helper')
+require "spec_helper"
 
 describe String do
   describe :naive_split do

data/spec/ruco/editor_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('spec/spec_helper')
+require "spec_helper"
 
 describe Ruco::Editor do
   def write(content)

data/spec/ruco/file_store_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('spec/spec_helper')
+require "spec_helper"
 
 describe Ruco::FileStore do
   def mark_all_as_old

data/spec/ruco/form_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('spec/spec_helper')
+require "spec_helper"
 
 describe Ruco::Form do
   let(:form){ Ruco::Form.new('Test', :columns => 30){|value| @result = value } }

data/spec/ruco/history_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('spec/spec_helper')
+require "spec_helper"
 
 describe Ruco::History do
   let(:history){ Ruco::History.new(:state => {:x => 1}, :track => [:x], :entries => 3) }
@@ -140,4 +140,4 @@ describe Ruco::History do
     end
   end
 
-end
+end

data/spec/ruco/keyboard_spec.rb

@@ -1,5 +1,5 @@
 # encoding: UTF-8
-require File.expand_path('spec/spec_helper')
+require "spec_helper"
 
 describe Keyboard do
   def output
@@ -91,6 +91,11 @@ describe Keyboard do
     output.should == [:"Shift+down"]
   end
 
+  it "ignores to long escape sequences" do
+    type [27, 91, 49, 59, 50, 66, 59, 50, 66, 59, 50, 66]
+    output.should == [:escape, "[", "1", ";", "2", "B", ";", "2", "B", ";", "2", "B"]
+  end
+
   it "recognises escape sequence for Shift+up" do
     type [27, 91, 49, 59, 50, 65]
     output.should == [:"Shift+up"]

data/spec/ruco/option_accessor_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('spec/spec_helper')
+require "spec_helper"
 
 describe Ruco::OptionAccessor do
   let(:options){ Ruco::OptionAccessor.new }
@@ -23,4 +23,4 @@ describe Ruco::OptionAccessor do
   it "has empty hash for nested key" do
     options.nested(:history).should == {}
   end
-end
+end

data/spec/ruco/screen_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('spec/spec_helper')
+require "spec_helper"
 
 describe Ruco::Screen do
   describe :curses_style do

data/spec/ruco/status_bar_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('spec/spec_helper')
+require "spec_helper"
 
 describe Ruco::StatusBar do
   let(:file){ 'spec/temp.txt' }

data/spec/ruco/style_map_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('spec/spec_helper')
+require "spec_helper"
 
 describe Ruco::StyleMap do
   let(:map){ Ruco::StyleMap.new(3) }

data/spec/ruco/syntax_parser_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('spec/spec_helper')
+require "spec_helper"
 
 describe Ruco::SyntaxParser do
   def parse(text, languages=['ruby'])

data/spec/ruco/text_area_spec.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require File.expand_path('spec/spec_helper')
+require "spec_helper"
 
 describe Ruco::TextArea do
   describe :move do

data/spec/ruco/tm_theme_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('spec/spec_helper')
+require "spec_helper"
 
 describe Ruco::TMTheme do
   let(:theme){ Ruco::TMTheme.new('spec/fixtures/test.tmTheme') }

data/spec/ruco/window_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('spec/spec_helper')
+require "spec_helper"
 
 describe Ruco::Window do
   let(:window){ Ruco::Window.new(10,10) }
@@ -167,4 +167,4 @@ describe Ruco::Window do
       window.left.should == 0
     end
   end
-end
+end

data/spec/ruco_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('spec/spec_helper')
+require "spec_helper"
 
 describe Ruco do
   it "has a VERSION" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruco
 version: !ruby/object:Gem::Version
-  version: 0.2.12
+  version: 0.2.13
   prerelease: 
 platform: ruby
 authors:
@@ -144,7 +144,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1038646721571340969
+      hash: -3565397175029942433
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -153,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1038646721571340969
+      hash: -3565397175029942433
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24