ruco 0.0.27 → 0.0.28

data/Readme.md

@@ -7,7 +7,7 @@ Finished:
  - viewing / scrolling / editing / saving / creating
  - selecting via Shift+left/right/up/down and Ctrl+a(all)
  - Home/End + Page up/down
- - basic Tab support (tab == 2 space)
+ - Tab -> indent / Shift+Tab -> unindent (tab == 2 space)
  - change-indicator (*)
  - writable indicator (!)
  - backspace / delete
@@ -60,6 +60,7 @@ TIPS
 ====
  - [Ruby1.9] Unicode support -> install libncursesw5-dev before installing ruby (does not work for 1.8)
  - [ssh vs clipboard] access your desktops clipboard by installing `xauth` on the server and then using `ssh -X`
+ - [Alt key] if Alt does not work try your Meta/Win/Cmd key
 
 TODO
 =====

data/VERSION

@@ -1 +1 @@
-0.0.27
+0.0.28

data/lib/ruco/application.rb

@@ -64,7 +64,13 @@ module Ruco
         end
 
       # modify
-      when :tab then @focused.insert("\t")
+      when :tab then
+        if @editor.selection
+          @editor.indent
+        else
+          @focused.insert("\t")
+        end
+      when :"Shift+tab" then @editor.unindent
       when :enter then
         @focused.insert("\n")
       when :backspace then @focused.delete(-1)

data/lib/ruco/core_ext/string.rb

@@ -16,10 +16,20 @@ class String
     gsub!("\t",' ' * Ruco::TAB_SIZE)
   end
 
+  def leading_whitespace
+    match(/^\s*/)[0]
+  end
+
   # stub for 1.8
   unless method_defined?(:force_encoding)
     def force_encoding(encoding)
       self
     end
   end
+
+  unless method_defined?(:ord)
+    def ord
+      bytes.first
+    end
+  end
 end

data/lib/ruco/editor.rb

@@ -3,7 +3,10 @@ module Ruco
     attr_reader :file
     attr_reader :text_area
     private :text_area
-    delegate :view, :selection, :text_in_selection, :color_mask, :selecting, :move, :cursor, :resize, :to => :text_area
+    delegate :view, :color_mask, :cursor,
+      :selecting, :selection, :text_in_selection,
+      :move, :resize,
+      :to => :text_area
 
     def initialize(file, options)
       @file = file
@@ -33,6 +36,16 @@ module Ruco
       @modified = true
     end
 
+    def indent(*args)
+      text_area.indent(*args)
+      @modified = true
+    end
+
+    def unindent(*args)
+      text_area.unindent(*args)
+      @modified = true
+    end
+
     def delete(*args)
       text_area.delete(*args)
       @modified = true

data/lib/ruco/keyboard.rb

@@ -56,6 +56,7 @@ class Keyboard
 
     # modify
     when 9 then :tab
+    when 353 then :"Shift+tab"
     when ENTER then :enter # shadows Ctrl+m
     when 263, 127 then :backspace # ubuntu / mac
     when Curses::KEY_DC then :delete

data/lib/ruco/text_area.rb

@@ -93,8 +93,8 @@ module Ruco
 
       text.tabs_to_spaces!
       if text == "\n" and @column >= after_last_word
-        current_whitespace = current_line.match(/^\s*/)[0]
-        next_whitespace = lines[@line+1].to_s.match(/^\s*/)[0]
+        current_whitespace = current_line.leading_whitespace
+        next_whitespace = lines[@line+1].to_s.leading_whitespace
         text = text + [current_whitespace, next_whitespace].max
       end
       insert_into_content text
@@ -120,11 +120,34 @@ module Ruco
       end
     end
 
+    # TODO should be on editor
     def delete_line
       lines.slice!(@line, 1)
       adjust_view
     end
 
+    # TODO should be on editor
+    def indent
+      selected_lines.each do |line|
+        @lines[line].insert(0, ' ' * Ruco::TAB_SIZE)
+      end
+      adjust_to_indentation Ruco::TAB_SIZE
+      adjust_view
+    end
+
+    # TODO should be on editor
+    def unindent
+      lines_to_unindent = (selection ? selected_lines : [@line])
+      removed = lines_to_unindent.map do |line|
+        remove = [@lines[line].leading_whitespace.size, Ruco::TAB_SIZE].min
+        @lines[line].slice!(0, remove)
+        remove
+      end
+
+      adjust_to_indentation -removed.first, -removed.last
+      adjust_view
+    end
+
     def cursor
       Cursor.new @cursor_line, @cursor_column
     end
@@ -294,5 +317,21 @@ module Ruco
       end_of_line = [line, last_visible_column]
       start_of_line..end_of_line
     end
+
+    def adjust_to_indentation(first, last=nil)
+      last ||= first
+      if selection
+        adjust_cursor = selection.first == position ? first : last
+        selection.first[1] = [selection.first[1] + first, 0].max
+        selection.last[1] = [selection.last[1] + last, 0].max
+        @column += adjust_cursor
+      else
+        @column += first
+      end
+    end
+
+    def selected_lines
+      selection.first[0].upto(selection.last[0])
+    end
   end
 end

data/ruco.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ruco}
-  s.version = "0.0.27"
+  s.version = "0.0.28"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]

data/spec/ruco/application_spec.rb

@@ -154,6 +154,19 @@ describe Ruco::Application do
       app.key('c')
       editor_part(app.view).should == "a\ncb\n  b"
     end
+
+    it "indents when tabbing on selection" do
+      write("ab")
+      app.key(:"Shift+right")
+      app.key(:tab)
+      editor_part(app.view).should == "  ab\n\n"
+    end
+
+    it "unindents on Shift+tab" do
+      write("  ab\n  cd\n")
+      app.key(:"Shift+tab")
+      editor_part(app.view).should == "ab\n  cd\n"
+    end
   end
 
   describe '.ruco.rb' do

data/spec/ruco/editor_spec.rb

@@ -463,6 +463,121 @@ describe Ruco::Editor do
     end
   end
 
+  describe :indent do
+    it "indents selected lines" do
+      write("a\nb\nc\n")
+      editor.selecting{move(:to, 1,1)}
+      editor.indent
+      editor.view.should == "  a\n  b\nc\n"
+    end
+
+    it "moves the selection" do
+      write("a\nb\nc\n")
+      editor.selecting{move(:to, 1,1)}
+      editor.indent
+      editor.selection.should == ([0,2]..[1,3])
+    end
+
+    it "moves the cursor" do
+      write("a\nb\nc\n")
+      editor.selecting{move(:to, 1,1)}
+      editor.indent
+      editor.cursor.should == [1,3]
+    end
+
+    it "moves the cursor when selecting backward" do
+      write("a\nb\nc\n")
+      editor.move(:to, 1,1)
+      editor.selecting{move(:to, 0,1)}
+      editor.indent
+      editor.cursor.should == [0,3]
+    end
+
+    it "marks as modified" do
+      editor.selecting{move(:to, 0,1)}
+      editor.indent
+      editor.modified?.should == true
+    end
+  end
+
+  describe :unindent do
+    it "unindents single lines" do
+      write("   a\n\n")
+      editor.unindent
+      editor.view.should == " a\n\n\n"
+    end
+
+    it "unindents single lines by one" do
+      write(" a\n\n")
+      editor.unindent
+      editor.view.should == "a\n\n\n"
+    end
+
+    it "does not unindents single lines when not unindentable" do
+      write("a\n\n")
+      editor.unindent
+      editor.view.should == "a\n\n\n"
+    end
+
+    it "move the cursor when unindenting single line" do
+      write(" a\n\n")
+      editor.move(:to, 0,1)
+      editor.unindent
+      editor.cursor.should == [0,0]
+    end
+
+    it "unindents selected lines" do
+      write("a\n b\n   c")
+      editor.selecting{ move(:to, 2,1) }
+      editor.unindent
+      editor.view.should == "a\nb\n c\n"
+    end
+
+    it "moves the selection" do
+      write("   abcd\n b\n   c")
+      editor.move(:to, 0,3)
+      editor.selecting{ move(:to, 2,1) }
+      editor.unindent
+      editor.selection.should == ([0,1]..[2,0])
+    end
+
+    it "moves the selection when unindenting one space" do
+      write(" abcd\n b\n   c")
+      editor.move(:to, 0,3)
+      editor.selecting{ move(:to, 2,1) }
+      editor.unindent
+      editor.selection.should == ([0,2]..[2,0])
+    end
+
+    it "does not move the selection when unindent is not possible" do
+      write("abcd\n b\n   c")
+      editor.move(:to, 0,3)
+      editor.selecting{ move(:to, 2,1) }
+      editor.unindent
+      editor.selection.should == ([0,3]..[2,0])
+    end
+
+    it "moves the cursor when selecting forward" do
+      write("\n abcd\n")
+      editor.selecting{ move(:to, 1,3) }
+      editor.unindent
+      editor.cursor.should == [1,2]
+    end
+
+    it "moves the cursor when selecting backward" do
+      write(" x\n  abcd\n")
+      editor.move(:to, 1,3)
+      editor.selecting{ move(:to, 0,1) }
+      editor.unindent
+      editor.cursor.should == [0,0]
+    end
+
+    it "marks as modified" do
+      editor.unindent
+      editor.modified?.should == true
+    end
+  end
+
   describe :save do
     it 'stores the file' do
       write('xxx')

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 27
-  version: 0.0.27
+  - 28
+  version: 0.0.28
 platform: ruby
 authors: 
 - Michael Grosser
@@ -89,7 +89,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 926649455
+      hash: 712420077
       segments: 
       - 0
       version: "0"