ruco 0.0.45 → 0.0.46

data/Readme.md

@@ -3,7 +3,7 @@ Simple, extendable, test-driven commandline editor written in ruby.
 Features:
 
  - **Intuitive interface**
- - selecting via Shift+left/right/up/down and Ctrl+a(all)
+ - selecting via Shift+left/right/up/down (only on Linux) and Ctrl+a(all)
  - Tab -> indent / Shift+Tab -> unindent
  - keeps indentation (+ paste-detection e.g. via Cmd+v)
  - change (*) + writable (!) indicators
@@ -12,6 +12,7 @@ Features:
  - cut, copy and paste -> Ctrl+x/c/v
  - undo / redo
  - stays at last position when reopening a file
+ - keeps whatever newline format you use (\r \n \r\n)
  - (optional) remove trailing whitespace on save
 
 Install

data/VERSION

@@ -1 +1 @@
-0.0.45
+0.0.46

data/bin/ruco

@@ -20,7 +20,6 @@ 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"){
@@ -117,7 +116,6 @@ 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/editor.rb

@@ -21,12 +21,11 @@ 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
+
+      # cleanup newline formats
+      @newline = content.match("\r\n|\r|\n")
+      @newline = (@newline ? @newline[0] : "\n")
+      content.gsub!(/\r\n?/,"\n")
 
       @saved_content = content
       @text_area = EditorArea.new(content, @options)
@@ -49,10 +48,10 @@ module Ruco
     def save
       lines = text_area.send(:lines)
       lines.each(&:rstrip!) if @options[:remove_trailing_whitespace_on_save]
-      content = lines * "\n"
+      content = lines * @newline
 
       File.open(@file,'w'){|f| f.write(content) }
-      @saved_content = content
+      @saved_content = content.gsub(/\r?\n/, "\n")
 
       true
     rescue Object => e

data/ruco.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ruco}
-  s.version = "0.0.45"
+  s.version = "0.0.46"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]
-  s.date = %q{2011-02-10}
+  s.date = %q{2011-02-13}
   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/editor_spec.rb

@@ -5,6 +5,10 @@ describe Ruco::Editor do
     File.open(@file,'w'){|f| f.write(content) }
   end
 
+  def read
+    File.read(@file)
+  end
+
   let(:editor){
     editor = Ruco::Editor.new(@file, :lines => 3, :columns => 5)
     # only scroll when we reach end of lines/columns <-> able to test with smaller area
@@ -24,26 +28,46 @@ 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
+  describe "strange newline formats" do
+    it 'views \r normally' do
+      write("a\rb\rc\r")
+      editor.view.should == "a\nb\nc\n"
     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)
+
+    it 'views \r\n normally' do
+      write("a\r\nb\r\nc\r\n")
       editor.view.should == "a\nb\nc\n"
     end
-    
-    it "is happy with \n" do
-      write("\n")
-      editor
+
+    it 'saves \r as \r' do
+      write("a\rb\rc\r")
+      editor.save
+      read.should == "a\rb\rc\r"
+    end
+
+    it 'saves \r\n as \r\n' do
+      write("a\r\nb\r\nc\r\n")
+      editor.save
+      read.should == "a\r\nb\r\nc\r\n"
+    end
+
+    it "converts mixed formats to first" do
+      write("a\rb\r\nc\n")
+      editor.save
+      read.should == "a\rb\rc\r"
+    end
+
+    it "converts newline-free to \n" do
+      write("a")
+      editor.insert("\n")
+      editor.save
+      read.should == "\na"
+    end
+
+    it "is not modified after saving strange newline format" do
+      write("a\r\nb\r\nc\r\n")
+      editor.save
+      editor.modified?.should == false
     end
   end
   

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: ruco
 version: !ruby/object:Gem::Version 
-  hash: 69
-  prerelease: 
+  prerelease: false
   segments: 
   - 0
   - 0
-  - 45
-  version: 0.0.45
+  - 46
+  version: 0.0.46
 platform: ruby
 authors: 
 - Michael Grosser
@@ -15,25 +14,24 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-10 00:00:00 +01:00
+date: 2011-02-13 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: -1048497741
       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