ruco 0.0.44 → 0.0.45

data/Readme.md

@@ -12,6 +12,7 @@ Features:
  - cut, copy and paste -> Ctrl+x/c/v
  - undo / redo
  - stays at last position when reopening a file
+ - (optional) remove trailing whitespace on save
 
 Install
 =======
@@ -29,6 +30,7 @@ Customize
       # set options
       options.window_line_scroll_offset = 5 # default 1
       options.history_entries = 10          # default 100
+      options.editor_remove_trailing_whitespace_on_save = true # default false
       ...
 
       # bind a key
@@ -63,7 +65,7 @@ Customize
 TIPS
 ====
  - [Tabs] Ruco does not like tabs. Existing tabs are displayed as ' ' and pressing tab inserts 2*' '
- - [RVM] `alias r="rvm ree exec ruco"` and you only have to install ruco once 
+ - [RVM] `alias r="rvm ree exec ruco"` and you only have to install ruco once
  - [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
@@ -71,7 +73,6 @@ TIPS
 TODO
 =====
  - align soft-tabs
- - 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

data/VERSION

@@ -1 +1 @@
-0.0.44
+0.0.45

data/lib/ruco/editor.rb

@@ -12,6 +12,7 @@ module Ruco
 
     def initialize(file, options)
       @file = file
+      @options = options
 
       # check for size (10000 lines * 100 chars should be enough for everybody !?)
       if File.exist?(@file) and File.size(@file) > (1024 * 1024)
@@ -19,16 +20,16 @@ module Ruco
       end
 
       content = (File.exist?(@file) ? File.read(@file) : '')
-      content.tabs_to_spaces! if options[:convert_tabs]
+      content.tabs_to_spaces! if @options[:convert_tabs]
       
-      if options[:convert_return]
+      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)
+      @text_area = EditorArea.new(content, @options)
       restore_session
     end
 
@@ -46,9 +47,13 @@ module Ruco
     end
 
     def save
-      content = text_area.content
+      lines = text_area.send(:lines)
+      lines.each(&:rstrip!) if @options[:remove_trailing_whitespace_on_save]
+      content = lines * "\n"
+
       File.open(@file,'w'){|f| f.write(content) }
       @saved_content = content
+
       true
     rescue Object => e
       e.message

data/lib/ruco/text_area.rb

@@ -243,6 +243,7 @@ module Ruco
     end
 
     def adjust_window
+      sanitize_position
       @window.set_position(position, :max_lines => @lines.size)
     end
   end

data/ruco.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ruco}
-  s.version = "0.0.44"
+  s.version = "0.0.45"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]
-  s.date = %q{2011-02-09}
+  s.date = %q{2011-02-10}
   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.3.7}
+  s.rubygems_version = %q{1.4.2}
   s.summary = %q{Commandline editor written in ruby}
   s.test_files = [
     "spec/ruco/application_spec.rb",
@@ -85,7 +85,6 @@ 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

@@ -691,6 +691,33 @@ describe Ruco::Editor do
         `chmod +w #{@file}`
       end
     end
+
+    describe 'remove trailing whitespace' do
+      it "can remove trailing whitespace" do
+        write("a  \n  \nb\n\n")
+        editor.move(:to, 0,2)
+        editor.instance_eval{@options[:remove_trailing_whitespace_on_save] = true}
+        editor.save
+        editor.view.should == "a\n\nb\n"
+        editor.cursor.should == [0,1]
+      end
+
+      it "does not affect trailing newlines" do
+        write("\n\n\n")
+        editor.move(:to, 2,0)
+        editor.instance_eval{@options[:remove_trailing_whitespace_on_save] = true}
+        editor.save
+        editor.view.should == "\n\n\n"
+        editor.cursor.should == [2,0]
+      end
+
+      it "does not remove trailing whitespace by default" do
+        write("a  \n  \nb\n\n")
+        editor.save
+        editor.view.should == "a  \n  \nb\n"
+        editor.cursor.should == [0,0]
+      end
+    end
   end
 
   describe :delete do

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruco
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 69
+  prerelease: 
   segments: 
   - 0
   - 0
-  - 44
-  version: 0.0.44
+  - 45
+  version: 0.0.45
 platform: ruby
 authors: 
 - Michael Grosser
@@ -14,24 +15,25 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-09 00:00:00 +01:00
+date: 2011-02-10 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: 
@@ -101,7 +103,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -55157123
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -110,13 +112,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: Commandline editor written in ruby