ruco 0.0.33 → 0.0.34

data/Readme.md

@@ -58,12 +58,13 @@ TIPS
 
 TODO
 =====
- - a = replace all
- - limit possible file size to e.g. 1MB (would hang/be too slow with insanely big files)
+ - make modified smarter <-> no manual addition of every action
+ - make history more efficient (e.g. no need to check when only moving / store only diffs)
+ - limit possible file size to e.g. 1MB (would hang/be too slow with big files)
  - find next (Alt+n)
  - add selection colors to forms in command_bar
  - session storage (stay at same line/column when reopening)
- - smart staying at end of line/column when changing line
+ - smart staying at column when changing line
  - warnings / messages
  - syntax highlighting
  - raise when binding to a unsupported key

data/VERSION

@@ -1 +1 @@
-0.0.33
+0.0.34

data/lib/ruco/application.rb

@@ -177,12 +177,19 @@ module Ruco
         ask("Find: ", :cache => true) do |term|
           if editor.find(term)
             ask("Replace with: ", :cache => true) do |replace|
-              loop_ask("Replace=Enter Skip=s Cancel=Esc") do |ok|
-                if ok == '' # enter
+              loop_ask("Replace=Enter Skip=s All=a Cancel=Esc") do |ok|
+                case ok
+                when '' # enter
                   editor.insert(replace)
-                elsif ok != 's'
+                when 'a'
+                  stop = true
+                  editor.insert(replace)
+                  editor.insert(replace) while editor.find(term)
+                when 's' # do nothing
+                else
                   stop = true
                 end
+
                 :finished if stop or not editor.find(term)
               end
             end

data/lib/ruco/editor.rb

@@ -5,7 +5,7 @@ module Ruco
     private :text_area
     delegate :view, :color_mask, :cursor,
       :selecting, :selection, :text_in_selection, :reset,
-      :move, :resize, :undo, :redo,
+      :move, :resize,
       :to => :text_area
 
     def initialize(file, options)
@@ -31,29 +31,13 @@ module Ruco
       true
     end
 
-    def insert(text)
-      text_area.insert(text)
-      @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
-    end
-
-    def delete_line(*args)
-      text_area.delete_line(*args)
-      @modified = true
+    %w[insert indent unindent delete delete_line redo undo].each do |modifying|
+      eval <<-RUBY
+        def #{modifying}(*args)
+          text_area.#{modifying}(*args)
+          @modified = true
+        end
+      RUBY
     end
 
     def modified?

data/ruco.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ruco}
-  s.version = "0.0.33"
+  s.version = "0.0.34"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]
@@ -54,7 +54,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",
@@ -72,7 +72,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/application_spec.rb

@@ -138,6 +138,19 @@ describe Ruco::Application do
       editor_part(app.view).should == "xabac\n\n"
     end
 
+    it "can replace all" do
+      write '_a_a_a_a'
+      type :"Ctrl+r", 'a', :enter
+      app.view.should include("Replace with:")
+      type 'd', :enter
+      app.view.should include("Replace")
+      type 's', :enter # skip first
+      app.view.should include("Replace")
+      type 'a', :enter # all
+      app.view.should_not include("Replace")
+      editor_part(app.view).should == "_a_d_d_d\n\n"
+    end
+
     it "breaks if neither s nor enter is entered" do
       write 'xabac'
       type :"Ctrl+r", 'a', :enter

data/spec/ruco/editor_spec.rb

@@ -593,11 +593,30 @@ describe Ruco::Editor do
     it "removes selection on undo" do
       editor.insert('a')
       editor.selecting{move(:to, 1,1)}
-      editor.selection.should != nil
+      editor.selection.should_not == nil
       editor.view # trigger save point
       editor.undo
       editor.selection.should == nil
     end
+
+    it "sets modified on undo" do
+      editor.insert('a')
+      editor.view # trigger save point
+      editor.save
+      editor.modified?.should == false
+      editor.undo
+      editor.modified?.should == true
+    end
+
+    it "sets modified on undo" do
+      editor.insert('a')
+      editor.view # trigger save point
+      editor.undo
+      editor.save
+      editor.modified?.should == false
+      editor.redo
+      editor.modified?.should == true
+    end
   end
 
   describe :save do

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruco
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 91
+  prerelease: 
   segments: 
   - 0
   - 0
-  - 33
-  version: 0.0.33
+  - 34
+  version: 0.0.34
 platform: ruby
 authors: 
 - Michael Grosser
@@ -18,20 +19,21 @@ date: 2011-01-28 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: 
@@ -92,7 +94,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -1049918031
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -101,13 +103,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