rfd 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bfede93c56a43d3df90257d60df31b8934b6891f
-  data.tar.gz: d5187481f8cb6076394a4337ae85a1799120f2a6
+  metadata.gz: d75fe5bcaf9a3f7a14ba0f23fb6fc475c4aaea68
+  data.tar.gz: 19fad896ea6eec39e417bdfee2bb0bac28d37e96
 SHA512:
-  metadata.gz: 427efc2d0a2a5e6fba9e4ad7de07dc791b335e6b59ca0f21c62dd3760999816d338f58cd233eddcc80c8849232302808911d447878b3cd1824765e872cba5044
-  data.tar.gz: 4f41128bcd148e16149a4ce40ea1485be8e11b989bcb280a69e31074088e50865488097434ecfaa0daf623218df09723454ee5789f9132c56a4740d69f632105
+  metadata.gz: 778f65ab177d37b688ea9f7dbe678ab3fa5b656cba93096387689cf7521c305f29b6de971a2e1de8f1cdd90918fba0776763df7573c41542adba52f8c4806ff7
+  data.tar.gz: e3d23535bdc25262fa98c802c8a526a76dd25d585722dac423b601ce5c60f7dbab738d20307e76becb7e9133637bdae00004ee524885c305391182c80577161f

data/README.md

@@ -1,6 +1,6 @@
 # rfd (Ruby on Files & Directories)
 
-rfd is a terminal based File explorer, inpsired by the legendary freesoft MS-DOS filer, "FD".
+rfd is a terminal-based filesystem explorer, inpsired by the legendary freesoft MS-DOS filer, "FD".
 
 ## Installation
 
@@ -12,42 +12,43 @@ rfd is a terminal based File explorer, inpsired by the legendary freesoft MS-DOS
 * NCurses
 * (FFI)
 
-## Tested environment
+## Tested environments
 
-Mac OS X Mountain Lion, Mac OS X Lion
+Mac OS X Mountain Lion, Mac OS X Lion, Ubuntu 13.04
 
 ## Screenshot
 
-![screenshot](https://www.evernote.com/shard/s20/sh/0bec8345-46c6-45f9-989b-c979b060f5a6/1cffd4c54b30204426251d8561c084a2/res/659f4073-10cc-48f5-a3d2-eb5fe54fba45/skitch.png?resizeSmall&width=768)
+![screenshot](https://www.evernote.com/shard/s20/sh/a0a275ee-39b5-4ba4-9374-8534f4ee2a24/377c504f45f17a75eb2ea12bd015b6ee/deep/0/rfd_screenshot.png)
 
 ## Start Me Up
 
-Open up your terminal and type in:
+Open up your terminal and type:
 
     % rfd
 
-You can also pass in a starting directory name, which is defaulted to `.`.
+You can also pass in a starting directory name, which defaults to `.`.
 
     % rfd ~/src/rails
 
 ## Commands
 
-You can command rfd by pressing some chars on your keyboard, just like Vim. If you're totally unfamiliar with this sort of command system, I recommend you to play with `vimtutor` before you go any further.
+You can send commands to rfd by pressing some chars on your keyboard, just like Vim.
+If you're unfamiliar with this sort of command system, I recommend you to play with `vimtutor` before you go any further.
 
 All available commands in rfd are defined as Ruby methods here. https://github.com/amatsuda/rfd/tree/master/lib/rfd/commands.rb
 
 ### Changing the current directory
 
-* **\<Enter\>**: cd into the directory where the cursor is on.
-* **\<Delete\>** (or \<Backspace\> on you keyboard, probably?): Go up to the upper directory (cd ..).
-* **-**: Get back to where you once belonged (popd).
+* `<Enter>`: cd into the directory where the cursor is on.
+* `<Delete>` (or \<Backspace\> on your keyboard, probably?): Go up to the upper directory (cd ..).
+* `-`: Get back to where you once belonged (popd).
 
 ### Moving the cursor
 
-* **j**: Move downward.
-* **k**: Move upward.
-* **h**: Move to the left column. At the left end column, move to the right end column at the previous page.
-* **l**: Move to the right column. At the right end column, move to the left end column at the next page.
+* `j`: Move down.
+* `k`: Move up.
+* `h`: Move left. At the leftmost column, move to the right end column at the previous page.
+* `l`: Move right. At the rightmost column, move to the left end column at the next page.
 
 ### The {count} parameter
 
@@ -56,31 +57,31 @@ For example, `3j` moves the cursor to 3 lines below, and `999k` will take your c
 
 ### Jumping the cursor
 
-* **H**: Move to the top of the current page.
-* **M**: Move to the middle of the current page.
-* **L**: Move to the bottom of the current page.
+* `H`: Move to the top of the current page.
+* `M`: Move to the middle of the current page.
+* `L`: Move to the bottom of the current page.
 
 ### Switching the page
 
-* **ctrl-n, ctrl-f**: Move to the top of the next page.
-* **ctrl-p, ctrl-b**: Move to the top of the previous page.
-* **g**: Move to the top of the first page.
-* **G**: Move to the bottom of the last page.
+* `ctrl-n, ctrl-f`: Move to the top of the next page.
+* `ctrl-p, ctrl-b`: Move to the top of the previous page.
+* `g`: Move to the top of the first page.
+* `G`: Move to the bottom of the last page.
 
 ### Finding a file / directory
 
 You can find a file by typing the first letter of it immediately after the find commands.
 
-* **f{char}**: Move to the next file / directory of which name starts with the given char.
-* **F{char}**: Move to the previous file / directory of which name starts with the given char.
-* **n**: Repeat the last `f` or `F`.
+* `f{char}`: Move to the next file / directory of which name starts with the given char.
+* `F{char}`: Move to the previous file / directory of which name starts with the given char.
+* `n`: Repeat the last `f` or `F`.
 
 ### Searching, sorting
 
 For commands like these that require a parameter string, type the parameter in the command line at the bottom of the screen, and press \<Enter\>.
 
-* **/**: Grep the current directory with the given parameter. The parameter will be interpreted as Ruby Regexp (e.g. `.*\.rb$`).
-* **s**: Sort files / directories in the current directory in the given order.
+* `/`: Grep the current directory with the given parameter. The parameter will be interpreted as Ruby Regexp (e.g. `.*\.rb$`).
+* `s`: Sort files / directories in the current directory in the given order.
     * (none): by name
     * r     : reverse order by name
     * s, S  : order by file size
@@ -99,41 +100,48 @@ For commands like these that require a parameter string, type the parameter in t
 You can send a command to the file / directory on which the cursor is on. Or, you can send a command to multiple files / directories at once by marking them first.
 The mark is drawn as a `*` char on the left of each file / directory name.
 
-* **\<Space\>**: Mark / unmark current file / directory.
-* **ctrl-a**: Mark / unmark all file / directories in the current directory.
+* `<Space>`: Mark / unmark current file / directory.
+* `ctrl-a`: Mark / unmark all file / directories in the current directory.
 
 ### Manipulating files / directories
 
 As stated above, you can send a command to one or more files / directories. In this document, the term "selected items" means "(the marked files / directories) || (the file / directory on which the cursor is on)".
 
-* **c**: Copy selected items (cp).
-* **m**: Move selected items (mv).
-* **d**: Move selected items into the Trash.
-* **D**: Delete selected items.
-* **r**: Rename selected items.
+* `c`: Copy selected items (cp).
+* `m`: Move selected items (mv).
+* `d`: Move selected items into the Trash.
+* `D`: Delete selected items.
+* `r`: Rename selected items. This command takes a sed-like argument separated by a `/`. For example, changing all .html files' extention to .html.erb could be done by `\.html$/.html.erb`.
+
+### Yank and Paste
+
+`y` & `p` works just like Windows-c & Windows-v on explorer.exe.
+
+* `y`: Yank selected items.
+* `p`: Paste yanked items into the directory on which the cursor is, or into the current directory.
 
 ### Creating files / directories
 
-* **t**: Create a new file (touch).
-* **K**: Creat a new directory (mkdir).
-* **S**: Create new symlink to the current file / directory (ln -s).
+* `t`: Create a new file (touch).
+* `K`: Creat a new directory (mkdir).
+* `S`: Create new symlink to the current file / directory (ln -s).
 
 ### Attributes
 
-* **a**: Change permission of selected items (chmod).
-* **w**: Change the owner of of selected items (chown).
+* `a`: Change permission of selected items (chmod). Takes chmod-like argument such as `g+w`, `755`.
+* `w`: Change the owner of of selected items (chown). Takes chown-like argument such as `alice`, `nobody:nobody`.
 
 ### Viewing, Editing, Opening
 
-* **\<Enter\>**: View current file with the system $VIEWER such as `less`.
-* **v**: View current file with the system $VIEWER such as `less`.
-* **e**: Edit current file with the system $EDITOR such as `vim`.
-* **o**: Send the `open` command.
+* `<Enter>`: View current file with the system $VIEWER such as `less`.
+* `v`: View current file with the system $VIEWER such as `less`.
+* `e`: Edit current file with the system $EDITOR such as `vim`.
+* `o`: Send the `open` command.
 
 ### Manipulating archives
 
-* **u**: Unarchive .zip, .gz, or .tar.gz file into the current directory.
-* **z**: Archive selected items into a .zip file with the given name.
+* `u`: Unarchive .zip, .gz, or .tar.gz file into the current directory.
+* `z`: Archive selected items into a .zip file with the given name.
 
 ### Handling .zip files
 
@@ -141,15 +149,24 @@ You can `cd` into a .zip file as if it's just a directory, then unarchive select
 
 ### Splitting columns
 
-* **ctrl-w**: Change the window split size to the {count} value (e.g. `4<C-w>` to split the window into 4 columns). The default number of columns is 2.
+* `ctrl-w`: Change the window split size to the {count} value (e.g. `4<C-w>` to split the window into 4 columns). The default number of columns is 2.
+
+### Using mouse
+
+Mouse is available if your terminal supports it. You can move the cursor by clicking on a file / directory. Double clicking on a file / directory is equivalent to pressing \<Enter\> on it.
 
 ### Misc
 
-* **ctrl-l**: Refresh the whole screen.
-* **C**: Copy selected items' paths to the clipboard.
-* **O**: Open a new terminal window at the current directory.
-* **!**: Execute a shell command.
-* **q**: Quit the app.
+* `ctrl-l`: Refresh the whole screen.
+* `C`: Copy selected items' paths to the clipboard.
+* `O`: Open a new terminal window at the current directory.
+* `!`: Execute a shell command.
+* `q`: Quit the app.
+
+## How to manually execute a command, or how the commands are executed
+
+By pressing `:`, you can enter the command-line mode. Any string given in the command line after `:` will be executed as Ruby method call in the `Controller` instance.
+For instance, `:j` brings your cursor down, `:mkdir foo` makes a directory named "foo". And `:q!` of course works as you might expect, since `q!` method is implemented so.
 
 ## Contributing
 

data/lib/rfd.rb

@@ -1,5 +1,4 @@
 require 'ffi-ncurses'
-require 'ffi-ncurses/mouse'
 Curses = FFI::NCurses
 require 'fileutils'
 require 'tmpdir'
@@ -53,7 +52,7 @@ module Rfd
       @header_l = HeaderLeftWindow.new
       @header_r = HeaderRightWindow.new
       @command_line = CommandLineWindow.new
-      @direction, @dir_history, @last_command, @times = nil, [], nil, nil
+      @direction, @dir_history, @last_command, @times, @yanked_items = nil, [], nil, nil, nil
     end
 
     # The main loop.
@@ -308,31 +307,33 @@ module Rfd
 
     # Sort the loaded files and directories in already given sort order.
     def sort_items_according_to_current_direction
-      case @direction
+      @items, unsorted = items.partition {|i| %w(. ..).include? i.name}
+      @items.sort!
+      @items += case @direction
       when nil
-        @items = items.shift(2) + items.partition(&:directory?).flat_map(&:sort)
+        unsorted.partition(&:directory?).flat_map(&:sort)
       when 'r'
-        @items = items.shift(2) + items.partition(&:directory?).flat_map {|arr| arr.sort.reverse}
+        unsorted.partition(&:directory?).flat_map {|arr| arr.sort.reverse}
       when 'S', 's'
-        @items = items.shift(2) + items.partition(&:directory?).flat_map {|arr| arr.sort_by {|i| -i.size}}
+        unsorted.partition(&:directory?).flat_map {|arr| arr.sort_by {|i| -i.size}}
       when 'Sr', 'sr'
-        @items = items.shift(2) + items.partition(&:directory?).flat_map {|arr| arr.sort_by(&:size)}
+        unsorted.partition(&:directory?).flat_map {|arr| arr.sort_by(&:size)}
       when 't'
-        @items = items.shift(2) + items.partition(&:directory?).flat_map {|arr| arr.sort {|x, y| y.mtime <=> x.mtime}}
+        unsorted.partition(&:directory?).flat_map {|arr| arr.sort {|x, y| y.mtime <=> x.mtime}}
       when 'tr'
-        @items = items.shift(2) + items.partition(&:directory?).flat_map {|arr| arr.sort_by(&:mtime)}
+        unsorted.partition(&:directory?).flat_map {|arr| arr.sort_by(&:mtime)}
       when 'c'
-        @items = items.shift(2) + items.partition(&:directory?).flat_map {|arr| arr.sort {|x, y| y.ctime <=> x.ctime}}
+        unsorted.partition(&:directory?).flat_map {|arr| arr.sort {|x, y| y.ctime <=> x.ctime}}
       when 'cr'
-        @items = items.shift(2) + items.partition(&:directory?).flat_map {|arr| arr.sort_by(&:ctime)}
+        unsorted.partition(&:directory?).flat_map {|arr| arr.sort_by(&:ctime)}
       when 'u'
-        @items = items.shift(2) + items.partition(&:directory?).flat_map {|arr| arr.sort {|x, y| y.atime <=> x.atime}}
+        unsorted.partition(&:directory?).flat_map {|arr| arr.sort {|x, y| y.atime <=> x.atime}}
       when 'ur'
-        @items = items.shift(2) + items.partition(&:directory?).flat_map {|arr| arr.sort_by(&:atime)}
+        unsorted.partition(&:directory?).flat_map {|arr| arr.sort_by(&:atime)}
       when 'e'
-        @items = items.shift(2) + items.partition(&:directory?).flat_map {|arr| arr.sort {|x, y| y.extname <=> x.extname}}
+        unsorted.partition(&:directory?).flat_map {|arr| arr.sort {|x, y| y.extname <=> x.extname}}
       when 'er'
-        @items = items.shift(2) + items.partition(&:directory?).flat_map {|arr| arr.sort_by(&:extname)}
+        unsorted.partition(&:directory?).flat_map {|arr| arr.sort_by(&:extname)}
       end
       items.each.with_index {|item, index| item.index = index}
     end
@@ -476,6 +477,34 @@ module Rfd
       ls
     end
 
+    # Yank selected file / directory names.
+    def yank
+      @yanked_items = selected_items
+    end
+
+    # Paste yanked files / directories here.
+    def paste
+      if @yanked_items
+        if current_item.directory?
+          FileUtils.cp_r @yanked_items.map(&:path), current_item
+        else
+          @yanked_items.each do |item|
+            if items.include? item
+              i = 1
+              while i += 1
+                new_item = Item.new dir: current_dir, name: "#{item.basename}_#{i}#{item.extname}", stat: item.stat, window_width: maxx
+                break unless File.exist? new_item.path
+              end
+              FileUtils.cp_r item, new_item
+            else
+              FileUtils.cp_r item, current_dir
+            end
+          end
+        end
+        ls
+      end
+    end
+
     # Copy selected files and directories' path into clipboard on OSX.
     def clipboard
       IO.popen('pbcopy', 'w') {|f| f << selected_items.map(&:path).join(' ')} if osx?

data/lib/rfd/commands.rb

@@ -73,11 +73,21 @@ module Rfd
       end
     end
 
+    # Paste yanked files / directories into the directory on which the cursor is, or into the current directory.
+    def p
+      paste
+    end
+
     # "q"uit the app.
     def q
       raise StopIteration if ask 'Are you sure want to exit? (y/n)'
     end
 
+    # "q"uit the app!
+    def q!
+      raise StopIteration
+    end
+
     # "r"ename selected files and directories.
     def r
       process_command_line preset_command: 'rename'
@@ -108,6 +118,11 @@ module Rfd
       process_command_line preset_command: 'chown'
     end
 
+    # "y"ank selected file / directory names.
+    def y
+      yank
+    end
+
     # Archive selected files and directories into a "z"ip file.
     def z
       process_command_line preset_command: 'zip'
@@ -159,7 +174,7 @@ module Rfd
 
     # "O"pen terminal here.
     def O
-      dir = current_item.directory? ? current_item.path : current_dir
+      dir = current_item.directory? ? current_item.path : current_dir.path
       system %Q[osascript -e 'tell app "Terminal"
         do script "cd #{dir}"
       end tell'] if osx?

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.3.0'
+  spec.version       = '0.4.0'
   spec.authors       = ["Akira Matsuda"]
   spec.email         = ["ronnie@dio.jp"]
   spec.description   = 'Ruby on Files & Directories'

data/spec/controller_spec.rb

@@ -305,6 +305,47 @@ describe Rfd::Controller do
     it { should be_symlink File.join(tmpdir, 'aaa') }
   end
 
+  describe '#yank' do
+    before do
+      controller.find '.file1'
+      controller.toggle_mark
+      controller.find 'dir3'
+      controller.toggle_mark
+      controller.yank
+    end
+    it 'should be yanked' do
+      controller.instance_variable_get(:@yanked_items).map(&:name).should =~ %w(.file1 dir3)
+    end
+  end
+
+  describe '#paste' do
+    before do
+      controller.find '.file1'
+      controller.toggle_mark
+      controller.find 'dir3'
+      controller.toggle_mark
+      controller.yank
+    end
+    context 'when the cursor is on a directory' do
+      before do
+        controller.find 'dir1'
+        controller.paste
+      end
+      subject { File }
+      it { should be_exist File.join(tmpdir, 'dir1', '.file1') }
+      it { should be_exist File.join(tmpdir, 'dir1', 'dir3') }
+    end
+    context 'when the cursor is on a file' do
+      before do
+        controller.find 'file2'
+        controller.paste
+      end
+      subject { File }
+      it { should be_exist File.join(tmpdir, '.file1_2') }
+      it { should be_exist File.join(tmpdir, 'dir3_2') }
+    end
+  end
+
   describe '#pbcopy' do
     before do
       controller.find '.file1'

metadata

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