ruco 0.0.39 → 0.0.40

data/Readme.md

@@ -64,6 +64,8 @@ TIPS
 
 TODO
 =====
+ - strip whitespace after content / whitespace only lines, without removing intentional whitespace e.g. from markdown
+ - handle \\r and \\r\\n nicely <-> breaks curses output
  - highlight tabs (e.g. strange character or reverse/underline/color)
  - big warning when editing a not-writable file
  - find next (Alt+n)

data/VERSION

@@ -1 +1 @@
-0.0.39
+0.0.40

data/bin/ruco

@@ -20,6 +20,7 @@ Usage:
 Options:
 BANNER
     opts.on("-c", "--convert-tabs","Convert tabs to spaces") { options[:convert_tabs] = true }
+    opts.on("--convert-return","Convert \\r characters to \\n") { options[:convert_return] = 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"){
@@ -121,6 +122,7 @@ require 'ruco'
 
 app = Ruco::Application.new(ARGV[0],
   :convert_tabs => @options[:convert_tabs],
+  :convert_return => @options[:convert_return],
   :lines => Curses.stdscr.maxy, :columns => Curses.stdscr.maxx
 )
 

data/lib/ruco/application.rb

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

data/lib/ruco/editor.rb

@@ -20,6 +20,12 @@ module Ruco
 
       content = (File.exist?(@file) ? File.read(@file) : '')
       content.tabs_to_spaces! if options[:convert_tabs]
+      
+      if options[:convert_return]
+        content.gsub!(/\r\n?/,"\n")
+      else
+        raise "Ruco does not support \\r characters, start with --convert-return to remove them" if content.include?("\r")
+      end
 
       @saved_content = content
       @text_area = EditorArea.new(content, options)

data/ruco.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ruco}
-  s.version = "0.0.39"
+  s.version = "0.0.40"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]
-  s.date = %q{2011-02-02}
+  s.date = %q{2011-02-04}
   s.default_executable = %q{ruco}
   s.email = %q{michael@grosser.it}
   s.executables = ["ruco"]
@@ -56,7 +56,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",
@@ -75,6 +75,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/editor_spec.rb

@@ -11,6 +11,29 @@ describe Ruco::Editor do
     @file = 'spec/temp.txt'
   end
 
+  describe "\\r" do
+    it "raises on \r" do
+      write("\r")
+      lambda{editor}.should raise_error
+    end
+    
+    it "raises on \r\n" do
+      write("\r\n")
+      lambda{editor}.should raise_error
+    end
+    
+    it "converts \\r if flag is given" do
+      write("a\nb\rc\r\n")
+      editor = Ruco::Editor.new(@file, :lines => 3, :columns => 5, :convert_return => true)
+      editor.view.should == "a\nb\nc\n"
+    end
+    
+    it "is happy with \n" do
+      write("\n")
+      editor
+    end
+  end
+  
   describe 'convert tabs' do
     before do
       write("\t\ta")

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: ruco
 version: !ruby/object:Gem::Version 
-  hash: 81
-  prerelease: 
+  prerelease: false
   segments: 
   - 0
   - 0
-  - 39
-  version: 0.0.39
+  - 40
+  version: 0.0.40
 platform: ruby
 authors: 
 - Michael Grosser
@@ -15,25 +14,24 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-02 00:00:00 +01:00
+date: 2011-02-04 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: 
@@ -96,7 +94,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: -441011373
       segments: 
       - 0
       version: "0"
@@ -105,14 +103,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