ruco 0.0.26 → 0.0.27

data/VERSION

@@ -1 +1 @@
-0.0.26
+0.0.27

data/bin/ruco

@@ -19,9 +19,10 @@ Usage:
 
 Options:
 BANNER
+    opts.on("-c", "--convert-tabs","Convert tabs to spaces") { options[:convert_tabs] = true }
     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'){
+    opts.on("-v", "--version","Show Version"){
       require 'ruco/version'
       puts Ruco::VERSION
       exit
@@ -117,7 +118,10 @@ end
 
 require 'ruco'
 
-app = Ruco::Application.new(ARGV[0], :lines => Curses.stdscr.maxy, :columns => Curses.stdscr.maxx)
+app = Ruco::Application.new(ARGV[0],
+  :convert_tabs => @options[:convert_tabs],
+  :lines => Curses.stdscr.maxy, :columns => Curses.stdscr.maxx
+)
 
 init_screen do
   show_app app

data/lib/ruco/application.rb

@@ -183,7 +183,7 @@ module Ruco
 
     def create_components
       @status_lines = 1
-      @editor ||= Ruco::Editor.new(@file, :lines => editor_lines, :columns => @options[:columns])
+      @editor ||= Ruco::Editor.new(@file, :lines => editor_lines, :columns => @options[:columns], :convert_tabs => @options[:convert_tabs])
       @status = Ruco::StatusBar.new(@editor, :columns => @options[:columns])
       @command = Ruco::CommandBar.new(:columns => @options[:columns])
       command.cursor_line = editor_lines

data/lib/ruco/core_ext/string.rb

@@ -12,6 +12,10 @@ class String
     found
   end
 
+  def tabs_to_spaces!
+    gsub!("\t",' ' * Ruco::TAB_SIZE)
+  end
+
   # stub for 1.8
   unless method_defined?(:force_encoding)
     def force_encoding(encoding)

data/lib/ruco/editor.rb

@@ -8,6 +8,13 @@ module Ruco
     def initialize(file, options)
       @file = file
       content = (File.exist?(@file) ? File.read(@file) : '')
+      if content.include?("\t")
+        if options[:convert_tabs]
+          content.tabs_to_spaces!
+        else
+          raise "#{@file} contains tabs.\nRuco atm does not support tabs, but will happily convert them to spaces if started with --convert-tabs or -c"
+        end
+      end
       @text_area = TextArea.new(content, options)
       @modified = false
     end

data/lib/ruco/keyboard.rb

@@ -19,7 +19,7 @@ class Keyboard
     loop do
       key = fetch_user_input
       if sequence_finished?
-        sequence_to_keys(@sequence).each{|key| yield key }
+        sequence_to_keys(@sequence).each{|k| yield k }
         @sequence = []
       end
       next unless key
@@ -71,9 +71,9 @@ class Keyboard
   end
 
   def self.fetch_user_input
-    key = @input.call
-    return if key.nil? or key >= NOTHING
+    key = @input.call or return
     key = key.ord if key.is_a?(String) # ruby 1.9 fix
+    return if key >= NOTHING
     key
   end
 
@@ -129,7 +129,7 @@ class Keyboard
     if needs_paste_fix?(sequence)
       [bytes_to_string(sequence)]
     else
-      # weird stuff that happens when connected via ssh
+      # when connected via ssh escape sequences are used
       if escape_sequence?(sequence)
         [escape_sequence_to_key(sequence)]
       else

data/lib/ruco/text_area.rb

@@ -3,7 +3,7 @@ module Ruco
     attr_reader :lines, :selection
 
     def initialize(content, options)
-      @lines = tabs_to_spaces(content).naive_split("\n")
+      @lines = content.naive_split("\n")
       @options = options
       @line = 0
       @column = 0
@@ -91,7 +91,7 @@ module Ruco
     def insert(text)
       delete_content_in_selection if @selection
 
-      text = tabs_to_spaces(text)
+      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]
@@ -277,10 +277,6 @@ module Ruco
       end
     end
 
-    def tabs_to_spaces(text)
-      text.gsub("\t",' ' * Ruco::TAB_SIZE)
-    end
-
     def delete_content_in_selection
       with_lines_as_string do |content|
         start = index_for_position(*@selection.first)

data/ruco.gemspec

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

data/spec/ruco/editor_spec.rb

@@ -11,9 +11,18 @@ describe Ruco::Editor do
     @file = 'spec/temp.txt'
   end
 
-  it "reads tab as spaces" do
-    write("\t\ta")
-    editor.view.should == "    a\n\n\n"
+  describe 'convert tabs' do
+    it "reads tab as spaces when option is set" do
+      write("\t\ta")
+      editor = Ruco::Editor.new(@file, :lines => 3, :columns => 5, :convert_tabs => true)
+      editor.view.should == "    a\n\n\n"
+    end
+
+    it "raises when tabs are in content and option is not set" do
+      lambda{
+        editor = Ruco::Editor.new(@file, :lines => 3, :columns => 5)
+      }.should raise_error
+    end
   end
 
   describe :move do

data/spec/ruco/keyboard_spec.rb

@@ -86,10 +86,18 @@ describe Keyboard do
     output.should == [11121, 324234]
   end
 
-  it "recognises weird key combos" do
-    type [27, 91, 49, 59, 50, 65]
-    output.should == [:"Shift+up"]
+  it "recognises escape sequence for Shift+down" do
     type [27, 91, 49, 59, 50, 66]
     output.should == [:"Shift+down"]
   end
+
+  it "recognises escape sequence for Shift+up" do
+    type [27, 91, 49, 59, 50, 65]
+    output.should == [:"Shift+up"]
+  end
+
+  it "can handle strings from 1.9" do
+    type ['a']
+    output.should == ["a"]
+  end
 end

metadata

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