rfd 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d75fe5bcaf9a3f7a14ba0f23fb6fc475c4aaea68
-  data.tar.gz: 19fad896ea6eec39e417bdfee2bb0bac28d37e96
+  metadata.gz: 34e313d8625f35c512be57647e3038e018d854b0
+  data.tar.gz: 0aeb62e0b57a4d965647e4f31e6a930e248d3385
 SHA512:
-  metadata.gz: 778f65ab177d37b688ea9f7dbe678ab3fa5b656cba93096387689cf7521c305f29b6de971a2e1de8f1cdd90918fba0776763df7573c41542adba52f8c4806ff7
-  data.tar.gz: e3d23535bdc25262fa98c802c8a526a76dd25d585722dac423b601ce5c60f7dbab738d20307e76becb7e9133637bdae00004ee524885c305391182c80577161f
+  metadata.gz: 1b6e5d86f1c94a5164d10f2b660807abf654fc8e2f65a01c05ace52365319e3c0d62ecaa42ab101070bbb59ddbf3ef2f0851894682b6b315c7a8acf35fdc8765
+  data.tar.gz: ff9ee591f2a29eb16bf23c2e1196a9472dd2da45d3789c38c713bcea524421a318b8f4b84ee49101974772288113d67d10c95c0ff76a25c387e3d91306ff2bb2

data/README.md

@@ -10,7 +10,6 @@ rfd is a terminal-based filesystem explorer, inpsired by the legendary freesoft
 
 * Ruby 2.0, Ruby 2.1
 * NCurses
-* (FFI)
 
 ## Tested environments
 
@@ -42,6 +41,7 @@ All available commands in rfd are defined as Ruby methods here. https://github.c
 * `<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).
+* `@`: cd to a directory given via the command-line window.
 
 ### Moving the cursor
 

data/lib/rfd.rb

@@ -1,5 +1,4 @@
-require 'ffi-ncurses'
-Curses = FFI::NCurses
+require 'curses'
 require 'fileutils'
 require 'tmpdir'
 require 'rubygems/package'
@@ -14,19 +13,18 @@ module Rfd
 
   # :nodoc:
   def self.init_curses
-    Curses.initscr
+    Curses.init_screen
     Curses.raw
     Curses.noecho
     Curses.curs_set 0
-    Curses.keypad Curses.stdscr, true
+    Curses.stdscr.keypad = true
     Curses.start_color
 
     [Curses::COLOR_WHITE, Curses::COLOR_CYAN, Curses::COLOR_MAGENTA, Curses::COLOR_GREEN, Curses::COLOR_RED].each do |c|
       Curses.init_pair c, c, Curses::COLOR_BLACK
     end
 
-    Curses.mousemask Curses::ALL_MOUSE_EVENTS | Curses::REPORT_MOUSE_POSITION, nil
-    Curses.extend FFI::NCurses::Mouse
+    Curses.mousemask Curses::BUTTON1_CLICKED | Curses::BUTTON1_DOUBLE_CLICKED
   end
 
   # Start the app here!
@@ -35,9 +33,9 @@ module Rfd
   # * +dir+ - The initial directory.
   def self.start(dir = '.')
     init_curses
+    Rfd::Window.draw_borders
     rfd = Rfd::Controller.new
     rfd.cd dir
-    rfd.ls
     rfd
   end
 
@@ -57,14 +55,13 @@ module Rfd
 
     # The main loop.
     def run
-      mouse_event = Curses::MEVENT.new
       loop do
         begin
           number_pressed = false
-          case (c = Curses.getch)
-          when Curses::KEY_RETURN
+          case (c = Curses.getch).ord
+          when 10, 13  # enter, return
             enter
-          when Curses::KEY_ESCAPE
+          when 27
             q
           when 32  # space
             space
@@ -91,14 +88,16 @@ module Rfd
               debug "key: #{c}" if ENV['DEBUG']
             end
           when Curses::KEY_MOUSE
-            if Curses.getmouse(mouse_event) == Curses::OK
-              if Curses.BUTTON_CLICK(mouse_event[:bstate], 1) > 0
-                click y: mouse_event[:y], x: mouse_event[:x]
-              elsif Curses.BUTTON_DOUBLE_CLICK(mouse_event[:bstate], 1) > 0
-                double_click y: mouse_event[:y], x: mouse_event[:x]
+            if (mouse_event = Curses.getmouse)
+              case mouse_event.bstate
+              when Curses::BUTTON1_CLICKED
+                click y: mouse_event.y, x: mouse_event.x
+              when Curses::BUTTON1_DOUBLE_CLICKED
+                double_click y: mouse_event.y, x: mouse_event.x
               end
             end
           else
+            raise c
             debug "key: #{c}" if ENV['DEBUG']
           end
           @times = nil unless number_pressed
@@ -110,7 +109,7 @@ module Rfd
         end
       end
     ensure
-      Curses.endwin
+      Curses.close_screen
     end
 
     # Change the number of columns in the main window.
@@ -166,10 +165,11 @@ module Rfd
 
       header_l.draw_current_file_info item
       header_l.wrefresh
+      @current_row
     end
 
     # Change the current directory.
-    def cd(dir, pushd: true)
+    def cd(dir = '~', pushd: true)
       dir = load_item expand_path(dir) unless dir.is_a? Item
       unless dir.zip?
         Dir.chdir dir
@@ -180,14 +180,12 @@ module Rfd
       @dir_history << current_dir if current_dir && pushd
       @current_dir, @current_page, @current_row = dir, 0, nil
       main.activate_pane 0
+      ls
     end
 
     # cd to the previous directory.
     def popd
-      if @dir_history.any?
-        cd @dir_history.pop, pushd: false
-        ls
-      end
+      cd @dir_history.pop, pushd: false if @dir_history.any?
     end
 
     # Fetch files from current directory.
@@ -259,7 +257,7 @@ module Rfd
         @items = Dir.foreach(current_dir).map {|fn|
           stat = File.lstat current_dir.join(fn)
           Item.new dir: current_dir, name: fn, stat: stat, window_width: maxx
-        }.to_a
+        }.to_a.partition {|i| %w(. ..).include? i.name}.flatten
       else
         @items = [Item.new(dir: current_dir, name: '.', stat: File.stat(current_dir), window_width: maxx),
           Item.new(dir: current_dir, name: '..', stat: File.stat(File.dirname(current_dir)), window_width: maxx)]
@@ -307,33 +305,31 @@ module Rfd
 
     # Sort the loaded files and directories in already given sort order.
     def sort_items_according_to_current_direction
-      @items, unsorted = items.partition {|i| %w(. ..).include? i.name}
-      @items.sort!
-      @items += case @direction
+      case @direction
       when nil
-        unsorted.partition(&:directory?).flat_map(&:sort)
+        @items = items.shift(2) + items.partition(&:directory?).flat_map(&:sort)
       when 'r'
-        unsorted.partition(&:directory?).flat_map {|arr| arr.sort.reverse}
+        @items = items.shift(2) + items.partition(&:directory?).flat_map {|arr| arr.sort.reverse}
       when 'S', 's'
-        unsorted.partition(&:directory?).flat_map {|arr| arr.sort_by {|i| -i.size}}
+        @items = items.shift(2) + items.partition(&:directory?).flat_map {|arr| arr.sort_by {|i| -i.size}}
       when 'Sr', 'sr'
-        unsorted.partition(&:directory?).flat_map {|arr| arr.sort_by(&:size)}
+        @items = items.shift(2) + items.partition(&:directory?).flat_map {|arr| arr.sort_by(&:size)}
       when 't'
-        unsorted.partition(&:directory?).flat_map {|arr| arr.sort {|x, y| y.mtime <=> x.mtime}}
+        @items = items.shift(2) + items.partition(&:directory?).flat_map {|arr| arr.sort {|x, y| y.mtime <=> x.mtime}}
       when 'tr'
-        unsorted.partition(&:directory?).flat_map {|arr| arr.sort_by(&:mtime)}
+        @items = items.shift(2) + items.partition(&:directory?).flat_map {|arr| arr.sort_by(&:mtime)}
       when 'c'
-        unsorted.partition(&:directory?).flat_map {|arr| arr.sort {|x, y| y.ctime <=> x.ctime}}
+        @items = items.shift(2) + items.partition(&:directory?).flat_map {|arr| arr.sort {|x, y| y.ctime <=> x.ctime}}
       when 'cr'
-        unsorted.partition(&:directory?).flat_map {|arr| arr.sort_by(&:ctime)}
+        @items = items.shift(2) + items.partition(&:directory?).flat_map {|arr| arr.sort_by(&:ctime)}
       when 'u'
-        unsorted.partition(&:directory?).flat_map {|arr| arr.sort {|x, y| y.atime <=> x.atime}}
+        @items = items.shift(2) + items.partition(&:directory?).flat_map {|arr| arr.sort {|x, y| y.atime <=> x.atime}}
       when 'ur'
-        unsorted.partition(&:directory?).flat_map {|arr| arr.sort_by(&:atime)}
+        @items = items.shift(2) + items.partition(&:directory?).flat_map {|arr| arr.sort_by(&:atime)}
       when 'e'
-        unsorted.partition(&:directory?).flat_map {|arr| arr.sort {|x, y| y.extname <=> x.extname}}
+        @items = items.shift(2) + items.partition(&:directory?).flat_map {|arr| arr.sort {|x, y| y.extname <=> x.extname}}
       when 'er'
-        unsorted.partition(&:directory?).flat_map {|arr| arr.sort_by(&:extname)}
+        @items = items.shift(2) + items.partition(&:directory?).flat_map {|arr| arr.sort_by(&:extname)}
       end
       items.each.with_index {|item, index| item.index = index}
     end
@@ -667,10 +663,10 @@ module Rfd
       command_line.set_prompt prompt
       command_line.wrefresh
       while (c = Curses.getch)
-        next unless [78, 89, 110, 121, 3, 27] .include? c  # N, Y, n, y, ^c, esc
+        next unless [?N, ?Y, ?n, ?y, 3, 27] .include? c  # N, Y, n, y, ^c, esc
         command_line.wclear
         command_line.wrefresh
-        break [89, 121].include? c  # Y, y
+        break %[Y y].include? c  # Y, y
       end
     end
 
@@ -732,11 +728,14 @@ module Rfd
     private
     def execute_external_command(pause: false)
       Curses.def_prog_mode
-      Curses.endwin
+      Curses.close_screen
       yield
     ensure
       Curses.reset_prog_mode
       Curses.getch if pause
+      #NOTE needs to draw borders and ls again here since the stdlib Curses.refresh fails to retrieve the previous screen
+      Rfd::Window.draw_borders
+      ls
       Curses.refresh
     end
 

data/lib/rfd/commands.rb

@@ -245,6 +245,11 @@ module Rfd
       process_command_line preset_command: 'grep'
     end
 
+    # Change current directory (cd).
+    define_method('@') do
+      process_command_line preset_command: 'cd'
+    end
+
     # Execute a shell command in an external shell.
     define_method('!') do
       process_shell_command
@@ -260,12 +265,10 @@ module Rfd
       if current_item.name == '.'  # do nothing
       elsif current_item.name == '..'
         cd '..'
-        ls
       elsif in_zip?
         v
       elsif current_item.directory? || current_item.zip?
         cd current_item
-        ls
       else
         v
       end
@@ -283,7 +286,6 @@ module Rfd
     def del
       if current_dir.path != '/'
         cd File.expand_path(current_dir.join(['..'] * times))
-        ls
       end
     end
 

data/lib/rfd/item.rb

@@ -101,7 +101,11 @@ module Rfd
 
     def directory?
       @directory ||= if symlink?
-        File.stat(path).directory?
+        begin
+          File.stat(path).directory?
+        rescue Errno::ENOENT
+          false
+        end
       else
         stat.directory?
       end

data/lib/rfd/windows.rb

@@ -1,63 +1,88 @@
 module Rfd
   class Window
+    ACS_URCORNER = 4194411
+    ACS_LRCORNER = 4194410
+    ACS_ULCORNER = 4194412
+    ACS_LLCORNER = 4194413
+    ACS_HLINE = 4194417
+    ACS_LTEE = 4194420
+    ACS_RTEE = 4194421
+    ACS_BTEE = 4194422
+    ACS_TTEE = 4194423
+    ACS_VLINE = 4194424
+
     attr_reader :window
 
-    def wmove(y, x = 0)
-      Curses.wmove window, y, x
+    def self.draw_borders
+      Curses.attron Curses.color_pair(Curses::COLOR_CYAN) do
+        Curses.addch ACS_ULCORNER
+        (Curses.cols - 32).times { Curses.addch ACS_HLINE }
+        Curses.addch ACS_TTEE
+        29.times { Curses.addch ACS_HLINE }
+        Curses.addch ACS_URCORNER
+
+        [*1..3, *5..(Curses.lines - 3)].each do |i|
+          Curses.setpos i, 0
+          Curses.addch ACS_VLINE
+          Curses.setpos i, Curses.cols - 1
+          Curses.addch ACS_VLINE
+        end
+        [1, 2, 3].each do |i|
+          Curses.setpos i, Curses.cols - 31
+          Curses.addch ACS_VLINE
+        end
+
+        Curses.setpos 4, 0
+        Curses.addch ACS_LTEE
+        (Curses.cols - 32).times { Curses.addch ACS_HLINE }
+        Curses.addch ACS_BTEE
+        29.times { Curses.addch ACS_HLINE }
+        Curses.addch ACS_RTEE
+
+        Curses.setpos Curses.lines - 2, 0
+        Curses.addch ACS_LLCORNER
+        (Curses.cols - 2).times { Curses.addch ACS_HLINE }
+        Curses.addch ACS_LRCORNER
+      end
     end
 
-    def waddstr(str, clear_to_eol_before_add: false)
-      wclrtoeol if clear_to_eol_before_add
-      Curses.waddstr window, str
+    def wmove(y, x = 0)
+      window.setpos y, x
     end
 
-    def mvwaddstr(y, x, str)
-      Curses.mvwaddstr window, y, x, str
+    def waddstr(str, clear_to_eol_before_add: false)
+      window.clrtoeol if clear_to_eol_before_add
+      window.addstr str
     end
 
     def wclear
-      Curses.wclear window
+      window.clear
     end
 
     def wrefresh
-      Curses.wrefresh window
+      window.refresh
     end
 
     def maxx
-      Curses.getmaxx window
+      window.maxx
     end
 
     def maxy
-      Curses.getmaxy window
+      window.maxy
     end
 
     def begx
-      Curses.getbegx window
+      window.begx
     end
 
     def begy
-      Curses.getbegy window
-    end
-
-    def subwin(height, width, top, left)
-      Curses.derwin Curses.stdscr, height, width, top, left
-    end
-
-    def wclrtoeol
-      Curses.wclrtoeol window
-    end
-
-    def draw_border(*border_param)
-      border_window = subwin maxy + 2, maxx + 2, begy - 1, begx - 1
-      Curses.wbkgd border_window, Curses.COLOR_PAIR(Curses::COLOR_CYAN)
-      Curses.wborder border_window, *border_param
+      window.begy
     end
   end
 
   class HeaderLeftWindow < Window
     def initialize
-      @window = subwin 3, Curses.COLS - 32, 1, 1
-      draw_border 0, 0, 0, 0, 0, 0, Curses::ACS_LTEE, 0
+      @window = Curses.stdscr.subwin 3, Curses.cols - 32, 1, 1
     end
 
     def draw_path_and_page_number(path: nil, current: 1, total: nil)
@@ -87,8 +112,7 @@ module Rfd
 
   class HeaderRightWindow < Window
     def initialize
-      @window = subwin 3, 29, 1, Curses.COLS - 30
-      draw_border 0, 0, 0, 0, Curses::ACS_TTEE, 0, Curses::ACS_BTEE, Curses::ACS_RTEE
+      @window = Curses.stdscr.subwin 3, 29, 1, Curses.cols - 30
     end
 
     def draw_marked_items(count: 0, size: 0)
@@ -104,7 +128,7 @@ module Rfd
 
     def debug(s)
       wmove 0, 0
-      wclrtoeol
+      window.clrtoeol
       waddstr s.to_s
       wrefresh
     end
@@ -139,28 +163,24 @@ module Rfd
 
       def close_all
         @panes.each do |p|
-          Curses.wclear p
-          Curses.delwin p
+          p.clear
+          p.close
         end
       end
 
       def include_point?(pane: pane, y: nil, x: nil)
-        (y >= Curses.getbegy(pane)) && (Curses.getbegy(pane) + Curses.getmaxy(pane) > y) && (x >= Curses.getbegx(pane)) && (Curses.getbegx(pane) + Curses.getmaxx(pane) > x)
+        (y >= pane.begy) && (pane.begy + pane.maxy > y) && (x >= pane.begx) && (pane.begx + pane.maxx > x)
       end
     end
 
     def initialize(dir = '.')
-      border_window = subwin Curses.LINES - 5, Curses.COLS, 4, 0
-      Curses.wbkgd border_window, Curses::COLOR_PAIR(Curses::COLOR_CYAN)
-      Curses.box border_window, 0, 0
-
       spawn_panes 2
     end
 
     def spawn_panes(num)
       @panes.close_all if defined? @panes
-      width = (Curses.COLS - 2) / num
-      windows = 0.upto(num - 1).inject([]) {|arr, i| arr << subwin(Curses.LINES - 7, width - 1, 5, width * i + 1)}
+      width = (Curses.cols - 2) / num
+      windows = 0.upto(num - 1).inject([]) {|arr, i| arr << Curses.stdscr.subwin(Curses.lines - 7, width - 1, 5, width * i + 1)}
       @panes = Panes.new windows
       activate_pane 0
     end
@@ -182,9 +202,10 @@ module Rfd
     end
 
     def draw_item(item, current: false)
-      Curses.wattr_set window, current ? Curses::A_UNDERLINE : Curses::A_NORMAL, item.color, nil
-      mvwaddstr item.index % maxy, 0, "#{item.to_s}\n"
-      Curses.wstandend window
+      window.setpos item.index % maxy, 0
+      window.attron(Curses.color_pair(item.color) | (current ? Curses::A_UNDERLINE : Curses::A_NORMAL)) do
+        window.addstr "#{item.to_s}\n"
+      end
       wrefresh
     end
 
@@ -196,50 +217,51 @@ module Rfd
         wclear
         wmove 0
         items[maxy * index, maxy * (index + 1)].each do |item|
-          Curses.wattr_set window, Curses::A_NORMAL, item.color, nil
-          waddstr "#{item.to_s}\n"
+          window.attron(Curses.color_pair(item.color) | Curses::A_NORMAL) { waddstr "#{item.to_s}\n" }
         end if items[maxy * index, maxy * (index + 1)]
-        Curses.wstandend window
         wrefresh
       end
       activate_pane original_active_pane_index
     end
 
     def toggle_mark(item)
-      mvwaddstr item.index % maxy, 0, item.current_mark if item.toggle_mark
+      if item.toggle_mark
+        window.setpos item.index % maxy, 0
+        window.addstr item.current_mark
+      end
     end
   end
 
   class CommandLineWindow < Window
     def initialize
-      @window = subwin 1, Curses.COLS, Curses.LINES - 1, 0
+      @window = Curses.stdscr.subwin 1, Curses.cols, Curses.lines - 1, 0
     end
 
     def set_prompt(str)
-      Curses.wattr_set window, Curses::A_BOLD, Curses::COLOR_WHITE, nil
-      wmove 0
-      wclrtoeol
-      waddstr str
-      Curses.wstandend window
+      window.attron(Curses.color_pair(Curses::COLOR_WHITE) | Curses::A_BOLD) do
+        wmove 0
+        window.clrtoeol
+        waddstr str
+      end
     end
 
     def get_command(prompt: nil)
       Curses.echo
       startx = prompt ? prompt.size : 1
-      s = ' ' * 100
-      Curses.mvwgetstr window, 0, startx, s
+      window.setpos 0, startx
+      s = window.getstr
       "#{prompt[1..-1] if prompt}#{s.strip}"
     ensure
       Curses.noecho
     end
 
     def show_error(str)
-      Curses.wattr_set window, Curses::A_BOLD, Curses::COLOR_RED, nil
-      wmove 0
-      wclrtoeol
-      waddstr str
+      window.attron(Curses.color_pair(Curses::COLOR_RED) | Curses::A_BOLD) do
+        wmove 0
+        window.clrtoeol
+        waddstr str
+      end
       wrefresh
-      Curses.wstandend window
     end
   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.4.0'
+  spec.version       = '0.5.0'
   spec.authors       = ["Akira Matsuda"]
   spec.email         = ["ronnie@dio.jp"]
   spec.description   = 'Ruby on Files & Directories'
@@ -17,7 +17,6 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'ffi-ncurses'
   spec.add_dependency 'rubyzip', '>= 1.0.0'
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"

data/spec/controller_spec.rb

@@ -20,7 +20,7 @@ describe Rfd::Controller do
   end
 
   after :all do
-    Curses.endwin
+    Curses.close_screen
   end
 
   let(:tmpdir) { File.join __dir__, 'tmpdir' }

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: rfd
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Akira Matsuda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-14 00:00:00.000000000 Z
+date: 2013-10-17 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: ffi-ncurses
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
@@ -152,4 +138,3 @@ test_files:
 - spec/testdir/link1
 - spec/testdir/link2
 - spec/testdir/zip1.zip
-has_rdoc: