diakonos 0.8.4 → 0.8.5

data/lib/diakonos/clipboard.rb

@@ -1,33 +1,33 @@
 module Diakonos
-
-class Clipboard
+  
+  class Clipboard
     def initialize( max_clips )
-        @clips = Array.new
-        @max_clips = max_clips
+      @clips = Array.new
+      @max_clips = max_clips
     end
-
+    
     def [] ( arg )
-        return @clips[ arg ]
+      return @clips[ arg ]
     end
-
+    
     def clip
-        return @clips[ 0 ]
+      return @clips[ 0 ]
     end
-
+    
     # text is an array of Strings
     # Returns true iff a clip was added,
     # and only non-nil text can be added.
     def addClip( text )
-        return false if text == nil
-        @clips.unshift text
-        @clips.pop if @clips.length > @max_clips
-        return true
+      return false if text == nil
+      @clips.unshift text
+      @clips.pop if @clips.length > @max_clips
+      true
     end
     
     def each
-        @clips.each do |clip|
-            yield clip
-        end
+      @clips.each do |clip|
+        yield clip
+      end
     end
     
     # text is an array of Strings (lines)
@@ -35,13 +35,13 @@ class Clipboard
     # If no current clip, then a new clip is created.
     # Returns true iff the text was successfully appended.
     def appendToClip( text )
-        return false if text.nil?
-        return addClip( text ) if @clips.length == 0
-        last_clip = @clips[ 0 ]
-        last_clip.pop if last_clip[ -1 ] == ""
-        @clips[ 0 ] = last_clip + text
-        return true
+      return false if text.nil?
+      return addClip( text ) if @clips.length == 0
+      last_clip = @clips[ 0 ]
+      last_clip.pop if last_clip[ -1 ] == ""
+      @clips[ 0 ] = last_clip + text
+      return true
     end
-end
-
+  end
+  
 end

data/lib/diakonos/finding.rb

@@ -25,7 +25,7 @@ class Finding
             i += 1
         end
         
-        return retval
+        retval
     end
 end
 

data/test/buffer-test.rb

@@ -4,34 +4,50 @@ require 'test/unit'
 require 'diakonos'
 
 class TC_Buffer < Test::Unit::TestCase
-    SAMPLE_FILE = File.dirname( File.expand_path( __FILE__ ) ) + '/sample-file.rb'
-    
-    def setup
-        @d = Diakonos::Diakonos.new [ '-e', 'quit' ]
-        @d.start
-    end
-    
-    def teardown
-        system "reset"
-    end
-    
-    def test_selected_text
-        @d.openFile( SAMPLE_FILE )
-        b = Diakonos::Buffer.new( @d, SAMPLE_FILE )
-        @d.anchorSelection
-        @d.cursorDown
-        @d.cursorDown
-        @d.cursorDown
-        @d.copySelection
-        assert_equal(
-            [
-                "#!/usr/bin/env ruby",
-                "",
-                "# This is only a sample file used in the tests.",
-                ""
-            ],
-            @d.clipboard.clip
-        )
-    end
-    
+  SAMPLE_FILE = File.dirname( File.expand_path( __FILE__ ) ) + '/sample-file.rb'
+  
+  def setup
+    @d = Diakonos::Diakonos.new [ '-e', 'quit' ]
+    @d.start
+  end
+  
+  def teardown
+    system "reset"
+  end
+  
+  def test_selected_text
+    @d.openFile( SAMPLE_FILE )
+    b = Diakonos::Buffer.new( @d, SAMPLE_FILE, SAMPLE_FILE )
+    @d.anchorSelection
+    @d.cursorDown
+    @d.cursorDown
+    @d.cursorDown
+    @d.copySelection
+    assert_equal(
+      [
+        "#!/usr/bin/env ruby",
+        "",
+        "# This is only a sample file used in the tests.",
+        ""
+      ],
+      @d.clipboard.clip
+    )
+  end
+  
+  def test_replace
+    @d.openFile SAMPLE_FILE
+    b = Diakonos::Buffer.new( @d, SAMPLE_FILE, SAMPLE_FILE )
+    b.find( [ /only/ ], :down, "\\2", Diakonos::CHOICE_YES_AND_STOP )
+    assert_equal "# This is  a sample file used in the tests.", b[ 2 ]
+    b.find( [ /\bx\b/ ], :down, "\\0_", Diakonos::CHOICE_YES_AND_STOP )
+    assert_equal "        @x_ = 1", b[ 6 ]
+    b.find( [ /\b(y)\b/ ], :down, "\\1_", Diakonos::CHOICE_YES_AND_STOP )
+    assert_equal "        @y_ = 2", b[ 7 ]
+    b.find( [ /puts (\w+)/ ], :down, "print \\1", Diakonos::CHOICE_YES_AND_STOP )
+    assert_equal "        print x", b[ 11 ]
+    b.find( [ /puts (\w+)/ ], :down, "puts \\1, \\1, \\1", Diakonos::CHOICE_YES_AND_STOP )
+    assert_equal "        puts y, y, y", b[ 12 ]
+    b.find( [ /Sample\.(\w+)/ ], :down, "\\1\\\\\\1", Diakonos::CHOICE_YES_AND_STOP )
+    assert_equal "s = new\\new", b[ 16 ]
+  end
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: diakonos
 version: !ruby/object:Gem::Version 
-  version: 0.8.4
-platform: ""
+  version: 0.8.5
+platform: ruby
 authors: 
 - Pistos
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2008-05-26 00:00:00 -04:00
+date: 2008-10-03 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -22,20 +22,21 @@ extensions: []
 extra_rdoc_files: 
 - README
 - CHANGELOG
+- LICENCE
 files: 
 - CHANGELOG
 - README
+- LICENCE
 - home-on-save.rb
 - diakonos.conf
+- diakonos-256-colour.conf
 - bin/diakonos
 - lib/diakonos.rb
 - lib/diakonos/bignum.rb
 - lib/diakonos/bookmark.rb
 - lib/diakonos/buffer-hash.rb
-- lib/diakonos/clipboard.rb
 - lib/diakonos/ctag.rb
 - lib/diakonos/enumerable.rb
-- lib/diakonos/finding.rb
 - lib/diakonos/fixnum.rb
 - lib/diakonos/hash.rb
 - lib/diakonos/keycode.rb
@@ -46,8 +47,10 @@ files:
 - lib/diakonos/window.rb
 - lib/diakonos/array.rb
 - lib/diakonos/readline.rb
-- lib/diakonos/buffer.rb
 - lib/diakonos/string.rb
+- lib/diakonos/clipboard.rb
+- lib/diakonos/finding.rb
+- lib/diakonos/buffer.rb
 has_rdoc: false
 homepage: http://purepistos.net/diakonos
 post_install_message: 
@@ -70,15 +73,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: 
 - curses library for Ruby (not in default Ruby install on Debian or FreeBSD; not sufficiently implemented on Windows)
 rubyforge_project: diakonos
-rubygems_version: 0.9.5
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
-summary: A usable console-based text editor.
+summary: A Linux editor for the masses.
 test_files: 
-- test/buffer-test.rb
 - test/clipboard-test.rb
 - test/diakonos-test.rb
 - test/hash-test.rb
 - test/regexp-test.rb
 - test/sizedarray-test.rb
 - test/string-test.rb
+- test/buffer-test.rb