ruco 0.0.48 → 0.0.49

data/Readme.md

@@ -4,6 +4,7 @@ Features:
 
  - **Intuitive interface**
  - selecting via Shift+left/right/up/down (only on Linux) and Ctrl+a(all)
+ - move line up/down (Alt+Ctrl+up/down)
  - Tab -> indent / Shift+Tab -> unindent
  - keeps indentation (+ paste-detection e.g. via Cmd+v)
  - change (*) + writable (!) indicators

data/VERSION

@@ -1 +1 @@
-0.0.48
+0.0.49

data/lib/ruco/application.rb

@@ -209,6 +209,8 @@ module Ruco
 
       action(:undo){ @editor.undo if @focused == @editor }
       action(:redo){ @editor.redo if @focused == @editor }
+      action(:move_line_up){ @editor.move_line(-1) if @focused == @editor }
+      action(:move_line_down){ @editor.move_line(1) if @focused == @editor }
     end
 
     def setup_keys
@@ -226,6 +228,8 @@ module Ruco
       bind :"Ctrl+v", :paste
       bind :"Ctrl+z", :undo
       bind :"Ctrl+y", :redo
+      bind :"Alt+Ctrl+down", :move_line_down
+      bind :"Alt+Ctrl+up", :move_line_up
     end
 
     def load_user_config
@@ -269,4 +273,4 @@ module Ruco
       [file, go_to_line]
     end
   end
-end
+end

data/lib/ruco/core_ext/string.rb

@@ -20,6 +20,10 @@ class String
     match(/^\s*/)[0]
   end
 
+  def leading_whitespace=(whitespace)
+    sub!(/^\s*/, whitespace)
+  end
+
   # stub for 1.8
   unless method_defined?(:force_encoding)
     def force_encoding(encoding)
@@ -44,4 +48,4 @@ class String
     end
     found
   end
-end
+end

data/lib/ruco/editor.rb

@@ -7,7 +7,7 @@ module Ruco
       :insert, :indent, :unindent, :delete, :delete_line,
       :redo, :undo,
       :selecting, :selection, :text_in_selection, :reset,
-      :move, :resize,
+      :move, :resize, :move_line,
       :to => :text_area
 
     def initialize(file, options)

data/lib/ruco/editor_area.rb

@@ -27,6 +27,16 @@ module Ruco
       sanitize_position
     end
 
+    def move_line(direction)
+      old = line
+      new = line + direction
+      return if new < 0
+      return if new >= lines.size
+      lines[old].leading_whitespace = lines[new].leading_whitespace
+      lines[old], lines[new] = lines[new], lines[old]
+      @line += direction
+    end
+
     def indent
       selected_lines.each do |line|
         lines[line].insert(0, ' ' * Ruco::TAB_SIZE)
@@ -88,4 +98,4 @@ module Ruco
       selection.first.line.upto(selection.last.line)
     end
   end
-end
+end

data/lib/ruco/keyboard.rb

@@ -38,16 +38,37 @@ class Keyboard
     when Curses::Key::DOWN then :down
     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"
     when 402, '^[1;2C' then :"Shift+right"
-    when 554, '^[1;5C' then :"Ctrl+right"
-    when 555, '^[1;6C' then :"Ctrl+Shift+right"
     when 393, '^[1;2D' then :"Shift+left"
-    when 539, '^[1;5D' then :"Ctrl+left"
-    when 540, '^[1;6D' then :"Ctrl+Shift+left"
-    when 337, '^[1;2A' then :"Shift+up"
+
+    when 558, '^[1;3A' then :"Alt+up"
+    when 517, '^[1;3B' then :"Alt+down"
+    when 552, '^[1;3C' then :"Alt+right"
+    when 537, '^[1;3D' then :"Alt+left"
+
     when 560, '^[1;5A' then :"Ctrl+up"
-    when 336, '^[1;2B' then :"Shift+down"
     when 519, '^[1;5B' then :"Ctrl+down"
+    when 554, '^[1;5C' then :"Ctrl+right"
+    when 539, '^[1;5D' then :"Ctrl+left"
+
+    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 562, '^[1;7A' then :"Alt+Ctrl+up"
+    when 521, '^[1;7B' then :"Alt+Ctrl+down"
+    when 556, '^[1;7C' then :"Alt+Ctrl+right"
+    when 541, '^[1;7D' then :"Alt+Ctrl+left"
+
+    when      '^[1;8A' then :"Alt+Ctrl+Shift+up"
+    when      '^[1;8B' then :"Alt+Ctrl+Shift+down"
+    when      '^[1;8C' then :"Alt+Ctrl+Shift+right"
+    when      '^[1;8D' then :"Alt+Ctrl+Shift+left"
+
     when Curses::KEY_END then :end
     when Curses::KEY_HOME then :home
     when Curses::KEY_NPAGE then :page_down
@@ -154,4 +175,4 @@ class Keyboard
   def self.is_alt_key_code?(key)
     key.slice(0,1) == "^" and key.size == 2
   end
-end
+end

data/ruco.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ruco}
-  s.version = "0.0.48"
+  s.version = "0.0.49"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]
-  s.date = %q{2011-02-19}
+  s.date = %q{2011-02-20}
   s.default_executable = %q{ruco}
   s.email = %q{michael@grosser.it}
   s.executables = ["ruco"]
@@ -63,7 +63,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = %q{http://github.com/grosser/ruco}
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.4.2}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Commandline editor written in ruby}
   s.test_files = [
     "spec/ruco/application_spec.rb",
@@ -85,6 +85,7 @@ Gem::Specification.new do |s|
   ]
 
   if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

data/spec/ruco/application_spec.rb

@@ -347,4 +347,4 @@ describe Ruco::Application do
       end
     end
   end
-end
+end

data/spec/ruco/editor_spec.rb

@@ -323,6 +323,48 @@ describe Ruco::Editor do
     end
   end
 
+  describe :move_line do
+    before do
+      write("0\n1\n2\n")
+    end
+
+    it "moves the line" do
+      editor.move_line(1)
+      editor.view.should == "1\n0\n2\n"
+    end
+
+    it "keeps the cursor at the moved line" do
+      editor.move_line(1)
+      editor.cursor.should == [1,0]
+    end
+
+    it "keeps the cursor at current column" do
+      editor.move(:to, 0,1)
+      editor.move_line(1)
+      editor.cursor.should == [1,1]
+    end
+
+    it "uses indentation of moved-to-line" do
+      write("  0\n    1\n 2\n")
+      editor.move_line(1)
+      editor.view.should == "    1\n    0\n 2\n"
+    end
+
+    it "cannot move past start of file" do
+      editor.move_line(-1)
+      editor.view.should == "0\n1\n2\n"
+    end
+
+    it "cannot move past end of file" do
+      write("0\n1\n")
+      editor.move_line(1)
+      editor.move_line(1)
+      editor.move_line(1)
+      editor.move_line(1)
+      editor.view.should == "1\n\n0\n"
+    end
+  end
+
   describe :selecting do
     before do
       write('012345678')

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: ruco
 version: !ruby/object:Gem::Version 
-  hash: 127
-  prerelease: 
+  prerelease: false
   segments: 
   - 0
   - 0
-  - 48
-  version: 0.0.48
+  - 49
+  version: 0.0.49
 platform: ruby
 authors: 
 - Michael Grosser
@@ -15,25 +14,24 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-19 00:00:00 +01:00
+date: 2011-02-20 00:00:00 +01:00
 default_executable: ruco
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  name: clipboard
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 51
         segments: 
         - 0
         - 9
         - 4
         version: 0.9.4
+  type: :runtime
   prerelease: false
   version_requirements: *id001
-  type: :runtime
-  name: clipboard
 description: 
 email: michael@grosser.it
 executables: 
@@ -103,7 +101,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: -100213919
       segments: 
       - 0
       version: "0"
@@ -112,14 +110,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.4.2
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Commandline editor written in ruby