rfd 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d1dd36a7cd7b7b8a56e25d704089e6c390935e07
-  data.tar.gz: eb3055ac47eb7a6105fb9a1a0b093323bab1d23a
+  metadata.gz: 433838cecd4fd367a1820347e5e6914cf4baf3a9
+  data.tar.gz: d92980f79fc3a0bd3a553f10360d061d054dfc0f
 SHA512:
-  metadata.gz: 14187a51b3c5d3ea90b7f4fcbd363170c9cd391e0d4ea7f54f75045de1a34e6dd762c56f61964af537b4a4e83d28325198e794c99c4dd942f8a94645d41a0a92
-  data.tar.gz: d1beb6cd74c3c03c06c02140d2d2680727ab27ac8cb2dfcb93da8659e1f0c23f3c879437701e6f81b8eb90884a298ac23786a166eb4f949c59faa403524fd5e7
+  metadata.gz: ac5d0d885e4d5c26c431711072be5bd878a876c2be73999a3e0cc9638f3cfb7d109c5cd091d8032c5fb803f7f3b064c2ed15642e3df813fc0e32fc8055714738
+  data.tar.gz: cd1051af5fa5fdc53978193962f2ca25d95163cbc870b6fea55c0cadb3905c47407af90f075e5ac9370891ef648a6c18ff95a31bfcc6fc423a54faa00d93e763

data/README.md

@@ -14,7 +14,7 @@ rfd is a terminal based File explorer, inpsired by the legendary freesoft MS-DOS
 
 ## Tested environment
 
-Mac OSX Snow Leopard
+Mac OS X Mountain Lion, Mac OS X Lion
 
 ## Usage
 

data/lib/rfd.rb

@@ -53,7 +53,7 @@ module Rfd
       @header_l = HeaderLeftWindow.new
       @header_r = HeaderRightWindow.new
       @command_line = CommandLineWindow.new
-      @direction, @dir_history = nil, []
+      @direction, @dir_history, @last_command, @times = nil, [], nil, nil
     end
 
     # The main loop.
@@ -61,6 +61,7 @@ module Rfd
       mouse_event = Curses::MEVENT.new
       loop do
         begin
+          number_pressed = false
           case (c = Curses.getch)
           when Curses::KEY_RETURN
             enter
@@ -81,6 +82,9 @@ module Rfd
           when Curses::KEY_CTRL_A..Curses::KEY_CTRL_Z
             chr = ((c - 1 + 65) ^ 0b0100000).chr
             public_send "ctrl_#{chr}" if respond_to?("ctrl_#{chr}")
+          when 48..57  # ?0..?9
+            public_send c.chr
+            number_pressed = true
           when 0..255
             if respond_to? c.chr
               public_send c.chr
@@ -98,6 +102,7 @@ module Rfd
           else
             debug "key: #{c}" if ENV['DEBUG']
           end
+          @times = nil unless number_pressed
         rescue StopIteration
           raise
         rescue => e
@@ -115,6 +120,11 @@ module Rfd
       @current_row = @current_page = 0
     end
 
+    # Number of times to repeat the next command.
+    def times
+      (@times || 1).to_i
+    end
+
     # The file or directory on which the cursor is on.
     def current_item
       items[current_row]
@@ -273,13 +283,13 @@ module Rfd
 
     # Focus at the first file or directory of which name starts with the given String.
     def find(str)
-      index = items.index {|i| i.name.start_with? str}
+      index = items.index {|i| i.index > current_row && i.name.start_with?(str)} || items.index {|i| i.name.start_with? str}
       move_cursor index if index
     end
 
     # Focus at the last file or directory of which name starts with the given String.
     def find_reverse(str)
-      index = items.reverse.index {|i| i.name.start_with? str}
+      index = items.reverse.index {|i| i.index < current_row && i.name.start_with?(str)} || items.reverse.index {|i| i.name.start_with? str}
       move_cursor items.size - index - 1 if index
     end
 
@@ -586,10 +596,17 @@ module Rfd
       header_r.draw_total_items count: items.size, size: items.inject(0) {|sum, i| sum += i.size}
     end
 
+    # Swktch on / off marking on the current file or directory.
     def toggle_mark
       main.toggle_mark current_item
     end
 
+    # Get a char as a String from user input.
+    def get_char
+      c = Curses.getch
+      c.chr if (0..255) === c
+    end
+
     # Accept user input, and directly execute it as a Ruby method call to the controller.
     #
     # ==== Parameters

data/lib/rfd/commands.rb

@@ -26,7 +26,12 @@ module Rfd
 
     # "f"ind the first file or directory of which name starts with the given String.
     def f
-      process_command_line preset_command: 'find'
+      c = get_char and (@last_command = -> { find c }).call
+    end
+
+    # Move the cursor to the top of the list.
+    def g
+      move_cursor 0
     end
 
     # Move the cursor to the left pane.
@@ -36,20 +41,12 @@ module Rfd
 
     # Move the cursor down.
     def j
-      if current_row + 1 >= items.size
-        move_cursor 0
-      else
-        move_cursor current_row + 1
-      end
+      move_cursor (current_row + times) % items.size
     end
 
     # Move the cursor up.
     def k
-      if current_row == 0
-        move_cursor items.size - 1
-      else
-        move_cursor current_row - 1
-      end
+      move_cursor (current_row - times) % items.size
     end
 
     # Move the cursor to the right pane.
@@ -62,6 +59,11 @@ module Rfd
       process_command_line preset_command: 'mv'
     end
 
+    # Redo the latest f or F.
+    def n
+      @last_command.call if @last_command
+    end
+
     # "o"pen selected files and directories with the OS "open" command.
     def o
       if selected_items.any?
@@ -127,7 +129,7 @@ module Rfd
 
     # "f"ind the last file or directory of which name starts with the given String.
     def F
-      process_command_line preset_command: 'find_reverse'
+      c = get_char and (@last_command = -> { find_reverse c }).call
     end
 
     # Move the cursor to the top.
@@ -135,6 +137,11 @@ module Rfd
       move_cursor current_page * max_items
     end
 
+    # Move the cursor to the bottom of the list.
+    def G
+      move_cursor items.size - 1
+    end
+
     # Ma"K"e a directory.
     def K
       process_command_line preset_command: 'mkdir'
@@ -190,31 +197,26 @@ module Rfd
 
     # Forward to the "n"ext page.
     def ctrl_n
-      if total_pages > 1
-        if last_page?
-          move_cursor 0
-        else
-          move_cursor (current_page + 1) * max_items
-        end
-      end
+      move_cursor (current_page + 1) % total_pages * max_items if total_pages > 1
     end
 
     # Back to the "p"revious page.
     def ctrl_p
-      if total_pages > 1
-        if first_page?
-          move_cursor (total_pages - 1) * max_items
-        else
-          move_cursor (current_page - 1) * max_items
-        end
+      move_cursor (current_page - 1) % total_pages * max_items if total_pages > 1
+    end
+
+    # Split the main "w"indow into given number of columns.
+    def ctrl_w
+      if @times
+        spawn_panes @times.to_i
+        ls
       end
     end
 
-    # Change the number of columns in the main window.
-    (?1..?9).each do |n|
+    # Number of times to repeat the next command.
+    (?0..?9).each do |n|
       define_method(n) do
-        spawn_panes n.to_i
-        ls
+        (@times ||= '') << n
       end
     end
 
@@ -265,7 +267,7 @@ module Rfd
     # cd to the upper hierarchy.
     def del
       if current_dir != '/'
-        cd '..'
+        cd File.expand_path(File.join(current_dir, ['..'] * times))
         ls
       end
     end

data/rfd.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "rfd"
-  spec.version       = '0.1.0'
+  spec.version       = '0.2.0'
   spec.authors       = ["Akira Matsuda"]
   spec.email         = ["ronnie@dio.jp"]
   spec.description   = 'Ruby on Files & Directories'

data/spec/controller_spec.rb

@@ -375,4 +375,21 @@ describe Rfd::Controller do
     subject { items[10] }
     it { should be_marked }
   end
+
+  describe 'times' do
+    subject { controller.times }
+    context 'before accepting 0-9' do
+      it { should == 1 }
+    end
+    context 'When 0-9 were typed' do
+      before do
+        controller.public_send '3'
+        controller.public_send '7'
+      end
+      after do
+        controller.instance_variable_set :@times, nil
+      end
+      it { should == 37 }
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rfd
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Akira Matsuda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-11 00:00:00.000000000 Z
+date: 2013-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi-ncurses