rfd 0.5.2 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f88e92471a817afd233405868bab1793df50f33c
-  data.tar.gz: de66b26038bcba42bc51b926702d2626934f5e61
+  metadata.gz: 7c84b042ee4196d959b2aa91af8c59ca9fa3b28b
+  data.tar.gz: 46504bdc73c1b0f8a1779955f455e09fe73bc06a
 SHA512:
-  metadata.gz: 2aa57038d747467073c2bd99d9edc359bf66263a7c243b1ede45bf29f7ae81e40a7653e37d5700721195117888b6f47a71b42bff17f8ef296868494ea4a934af
-  data.tar.gz: e2da5fc82b60839e72713f08ce0f0096c7d7ce852017e54aa5b90dca9bd4803c762f1c0e88fa67cdcaff2f292a1c18bc5f3c29e2b15e5225d230d935e67176b5
+  metadata.gz: 538534dad4ea1aadd91e06c02ad6ed31b794e25de2460f4329120e7a1988bded79d7086eb8983d479302db4a9e0d751d68129f3e73ad2238fdf80c25a141bca1
+  data.tar.gz: b15391a9ca20f6a2d171542fd0fa3aa92f077471cc43d963ab6182fe75146e9607315a6d7f08710381e04fd21ab059040504a193c1c1840e2c1b09105812d330

data/lib/rfd.rb

@@ -34,6 +34,7 @@ module Rfd
   def self.start(dir = '.')
     init_curses
     Rfd::Window.draw_borders
+    Curses.refresh
     rfd = Rfd::Controller.new
     rfd.cd dir
     rfd
@@ -50,6 +51,7 @@ module Rfd
       @header_l = HeaderLeftWindow.new
       @header_r = HeaderRightWindow.new
       @command_line = CommandLineWindow.new
+      @debug = DebugWindow.new if ENV['DEBUG']
       @direction, @dir_history, @last_command, @times, @yanked_items = nil, [], nil, nil, nil
     end
 
@@ -58,12 +60,12 @@ module Rfd
       loop do
         begin
           number_pressed = false
-          case (c = Curses.getch).ord
+          case (c = Curses.getch)
           when 10, 13  # enter, return
             enter
-          when 27
+          when 27  # ESC
             q
-          when 32  # space
+          when ' '  # space
             space
           when 127  # DEL
             del
@@ -78,12 +80,12 @@ 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
+          when ?0..?9
+            public_send c
             number_pressed = true
-          when 0..255
-            if respond_to? c.chr
-              public_send c.chr
+          when ?!..?~
+            if respond_to? c
+              public_send c
             else
               debug "key: #{c}" if ENV['DEBUG']
             end
@@ -113,7 +115,7 @@ module Rfd
 
     # Change the number of columns in the main window.
     def spawn_panes(num)
-      main.spawn_panes num
+      main.number_of_panes = num
       @current_row = @current_page = 0
     end
 
@@ -145,15 +147,12 @@ module Rfd
     # The row number can be out of range of the current page.
     def move_cursor(row = nil)
       if row
-        page, item_index_in_page = row.divmod max_items
-        if page != current_page
-          switch_page page
-        else
-          if (prev_item = items[current_row])
-            main.draw_item prev_item
-          end
+        if (prev_item = items[current_row])
+          main.draw_item prev_item
         end
-        main.activate_pane item_index_in_page / maxy
+        page = row / max_items
+        switch_page page if page != current_page
+        main.activate_pane row / maxy
         @current_row = row
       else
         @current_row = 0
@@ -161,9 +160,10 @@ module Rfd
 
       item = items[current_row]
       main.draw_item item, current: true
+      main.display current_page
 
       header_l.draw_current_file_info item
-      header_l.wrefresh
+      header_l.refresh
       @current_row
     end
 
@@ -255,16 +255,16 @@ module Rfd
       unless in_zip?
         @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
+          Item.new dir: current_dir, name: fn, stat: stat, window_width: main.width
         }.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)]
+        @items = [Item.new(dir: current_dir, name: '.', stat: File.stat(current_dir), window_width: main.width),
+          Item.new(dir: current_dir, name: '..', stat: File.stat(File.dirname(current_dir)), window_width: main.width)]
         zf = Zip::File.new current_dir
         zf.each {|entry|
           next if entry.name_is_directory?
           stat = zf.file.stat entry.name
-          @items << Item.new(dir: current_dir, name: entry.name, stat: stat, window_width: maxx)
+          @items << Item.new(dir: current_dir, name: entry.name, stat: stat, window_width: main.width)
         }
       end
     end
@@ -298,7 +298,9 @@ module Rfd
 
     # Update the main window with the loaded files and directories. Also update the header.
     def draw_items
-      main.draw_items_to_each_pane (@displayed_items = items[current_page * max_items, max_items])
+      main.newpad items
+      @displayed_items = items[current_page * max_items, max_items]
+      main.display current_page
       header_l.draw_path_and_page_number path: current_dir.path, current: current_page + 1, total: total_pages
     end
 
@@ -597,8 +599,9 @@ module Rfd
     # ==== Parameters
     # * +page+ - Target page number
     def switch_page(page)
-      @current_page = page
-      draw_items
+      main.display (@current_page = page)
+      @displayed_items = items[current_page * max_items, max_items]
+      header_l.draw_path_and_page_number path: current_dir.path, current: current_page + 1, total: total_pages
     end
 
     # Update the header information concerning currently marked files or directories.
@@ -633,12 +636,12 @@ module Rfd
       cmd, *args = command_line.get_command(prompt: prompt).split(' ')
       if cmd && !cmd.empty? && respond_to?(cmd)
         self.public_send cmd, *args
-        command_line.wclear
-        command_line.wrefresh
+        command_line.clear
+        command_line.refresh
       end
     rescue Interrupt
-      command_line.wclear
-      command_line.wrefresh
+      command_line.clear
+      command_line.refresh
     end
 
     # Accept user input, and directly execute it in an external shell.
@@ -650,8 +653,8 @@ module Rfd
       end
     rescue Interrupt
     ensure
-      command_line.wclear
-      command_line.wrefresh
+      command_line.clear
+      command_line.refresh
     end
 
     # Let the user answer y or n.
@@ -660,12 +663,12 @@ module Rfd
     # * +prompt+ - Prompt message
     def ask(prompt = '(y/n)')
       command_line.set_prompt prompt
-      command_line.wrefresh
+      command_line.refresh
       while (c = Curses.getch)
         next unless [?N, ?Y, ?n, ?y, 3, 27] .include? c  # N, Y, n, y, ^c, esc
-        command_line.wclear
-        command_line.wrefresh
-        break %[Y y].include? c  # Y, y
+        command_line.clear
+        command_line.refresh
+        break (c == 'y') || (c == 'Y')
       end
     end
 
@@ -734,8 +737,8 @@ module Rfd
       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
+      ls
     end
 
     def expand_path(path)
@@ -756,7 +759,7 @@ module Rfd
     end
 
     def debug(str)
-      header_r.debug str
+      @debug.debug str
     end
   end
 end

data/lib/rfd/commands.rb

@@ -192,7 +192,7 @@ module Rfd
       draw_items
       move_cursor current_row
       draw_marked_items
-      header_r.wrefresh
+      header_r.refresh
     end
 
     # "b"ack to the previous page.
@@ -279,7 +279,7 @@ module Rfd
       toggle_mark
       j
       draw_marked_items
-      header_r.wrefresh
+      header_r.refresh
     end
 
     # cd to the upper hierarchy.

data/lib/rfd/windows.rb

@@ -1,95 +1,35 @@
-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
+require 'delegate'
 
+module Rfd
+  class Window < DelegateClass(Curses::Window)
     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
+      [[5, Curses.stdscr.maxx, 0, 0], [5, Curses.cols - 30, 0, 0], [Curses.stdscr.maxy - 5, Curses.stdscr.maxx, 4, 0]].each do |height, width, top, left|
+        w = Curses.stdscr.subwin height, width, top, left
+        w.bkgdset Curses.color_pair(Curses::COLOR_CYAN)
+        w.box 0, 0
+        w.close
       end
     end
 
-    def wmove(y, x = 0)
-      window.setpos y, x
-    end
-
-    def waddstr(str, clear_to_eol_before_add: false)
-      window.clrtoeol if clear_to_eol_before_add
-      window.addstr str
-    end
-
-    def wclear
-      window.clear
-    end
-
-    def wrefresh
-      window.refresh
+    def initialize(maxy: nil, maxx: nil, begy: nil, begx: nil, window: nil)
+      super window || Curses.stdscr.subwin(maxy, maxx, begy, begx)
     end
 
-    def maxx
-      window.maxx
-    end
-
-    def maxy
-      window.maxy
-    end
-
-    def begx
-      window.begx
-    end
-
-    def begy
-      window.begy
+    def writeln(row, str)
+      setpos row, 0
+      clrtoeol
+      self << str
     end
   end
 
   class HeaderLeftWindow < Window
     def initialize
-      @window = Curses.stdscr.subwin 3, Curses.cols - 32, 1, 1
+      super maxy: 3, maxx: Curses.cols - 32, begy: 1, begx: 1
     end
 
     def draw_path_and_page_number(path: nil, current: 1, total: nil)
-      @path_and_page_number = %Q[Page: #{"#{current}/ #{total}".ljust(11)}  Path: #{path}]
-      wmove 0
-      waddstr @path_and_page_number, clear_to_eol_before_add: true
-      wrefresh
+      writeln 0, %Q[Page: #{"#{current}/ #{total}".ljust(11)}  Path: #{path}]
+      refresh
     end
 
     def draw_current_file_info(current_file)
@@ -98,170 +38,128 @@ module Rfd
     end
 
     def draw_current_filename(current_file_name)
-      @current_file_name = "File: #{current_file_name}"
-      wmove 1
-      waddstr @current_file_name, clear_to_eol_before_add: true
+      writeln 1, "File: #{current_file_name}"
     end
 
     def draw_stat(item)
-      @stat = "      #{item.size_or_dir.ljust(13)}#{item.mtime} #{item.mode}"
-      wmove 2
-      waddstr @stat, clear_to_eol_before_add: true
+      writeln 2, "      #{item.size_or_dir.ljust(13)}#{item.mtime} #{item.mode}"
     end
   end
 
   class HeaderRightWindow < Window
     def initialize
-      @window = Curses.stdscr.subwin 3, 29, 1, Curses.cols - 30
+      super maxy: 2, maxx: 29, begy: 2, begx: Curses.cols - 30
     end
 
     def draw_marked_items(count: 0, size: 0)
-      wmove 1
-      waddstr %Q[#{"#{count}Marked".rjust(11)} #{size.to_s.reverse.gsub( /(\d{3})(?=\d)/, '\1,').reverse.rjust(16)}], clear_to_eol_before_add: true
+      writeln 0, %Q[#{"#{count}Marked".rjust(11)} #{size.to_s.reverse.gsub( /(\d{3})(?=\d)/, '\1,').reverse.rjust(16)}]
     end
 
     def draw_total_items(count: 0, size: 0)
-      wmove 2
-      waddstr %Q[#{"#{count}Files".rjust(10)} #{size.to_s.reverse.gsub( /(\d{3})(?=\d)/, '\1,').reverse.rjust(17)}], clear_to_eol_before_add: true
-      wrefresh
+      writeln 1, %Q[#{"#{count}Files".rjust(10)} #{size.to_s.reverse.gsub( /(\d{3})(?=\d)/, '\1,').reverse.rjust(17)}]
+      refresh
+    end
+  end
+
+  class DebugWindow < Window
+    def initialize
+      super maxy: 1, maxx: 29, begy: 1, begx: Curses.cols - 30
     end
 
     def debug(s)
-      wmove 0, 0
-      window.clrtoeol
-      waddstr s.to_s
-      wrefresh
+      writeln 0, s.to_s
+      refresh
     end
   end
 
   class MainWindow < Window
-    class Panes
-      attr_reader :current_index
-
-      def initialize(panes)
-        @panes, @current_index = panes, 0
-      end
-
-      def active
-        @panes[@current_index]
-      end
+    attr_reader :current_index, :begy
+    attr_writer :number_of_panes
 
-      def activate(index)
-        @current_index = index if index < @panes.size
-      end
-
-      def get_index_by_point(y: nil, x: nil)
-        @panes.each.with_index do |p, i|
-          return i if include_point? pane: p, y: y, x: x
-        end if y && x
-        nil
-      end
-
-      def size
-        @panes.size
-      end
-
-      def close_all
-        @panes.each do |p|
-          p.clear
-          p.close
-        end
-      end
-
-      def include_point?(pane: pane, y: nil, x: nil)
-        (y >= pane.begy) && (pane.begy + pane.maxy > y) && (x >= pane.begx) && (pane.begx + pane.maxx > x)
-      end
+    def initialize(dir = '.')
+      @begy, @current_index, @number_of_panes = 5, 0, 2
+      super window: Curses::Pad.new(Curses.lines - 7, Curses.cols - 2)
     end
 
-    def initialize(dir = '.')
-      spawn_panes 2
+    def newpad(items)
+      clear
+      columns = items.size / maxy + 1
+      newx = width * (((columns - 1) / @number_of_panes + 1) * @number_of_panes)
+      resize maxy, newx if newx != maxx
+
+      draw_items_to_each_pane items
     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 << Curses.stdscr.subwin(Curses.lines - 7, width - 1, 5, width * i + 1)}
-      @panes = Panes.new windows
-      activate_pane 0
+    def display(page)
+      refresh 0, (Curses.cols - 2) * page, begy, 1, begy + maxy - 1, Curses.cols - 2
     end
 
     def activate_pane(num)
-      @panes.activate num
+      @current_index = num
     end
 
     def pane_index_at(y: nil, x: nil)
-      @panes.get_index_by_point y: y, x: x
+      (y >= begy) && (begy + maxy > y) && (x / width)
     end
 
-    def window
-      @panes.active
+    def width
+      (Curses.cols - 2) / @number_of_panes
     end
 
     def max_items
-      maxy * @panes.size
+      maxy * @number_of_panes
     end
 
     def draw_item(item, current: false)
-      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"
+      setpos item.index % maxy, width * @current_index
+      attron(Curses.color_pair(item.color) | (current ? Curses::A_UNDERLINE : Curses::A_NORMAL)) do
+        self << item.to_s
       end
-      wrefresh
     end
 
     def draw_items_to_each_pane(items)
-      original_active_pane_index = @panes.current_index
-
-      0.upto(@panes.size - 1) do |index|
-        activate_pane index
-        wclear
-        wmove 0
-        items[maxy * index, maxy * (index + 1)].each do |item|
-          window.attron(Curses.color_pair(item.color) | Curses::A_NORMAL) { waddstr "#{item.to_s}\n" }
-        end if items[maxy * index, maxy * (index + 1)]
-        wrefresh
+      items.each_slice(maxy).each.with_index do |arr, col_index|
+        arr.each.with_index do |item, i|
+          setpos i, width * col_index
+          attron(Curses.color_pair(item.color) | Curses::A_NORMAL) { self << item.to_s }
+        end
       end
-      activate_pane original_active_pane_index
     end
 
     def toggle_mark(item)
       if item.toggle_mark
-        window.setpos item.index % maxy, 0
-        window.addstr item.current_mark
+        setpos item.index % maxy, 0
+        self << item.current_mark
       end
     end
   end
 
   class CommandLineWindow < Window
     def initialize
-      @window = Curses.stdscr.subwin 1, Curses.cols, Curses.lines - 1, 0
+      super maxy: 1, maxx: Curses.cols, begy: Curses.lines - 1, begx: 0
     end
 
     def set_prompt(str)
-      window.attron(Curses.color_pair(Curses::COLOR_WHITE) | Curses::A_BOLD) do
-        wmove 0
-        window.clrtoeol
-        waddstr str
+      attron(Curses.color_pair(Curses::COLOR_WHITE) | Curses::A_BOLD) do
+        writeln 0, str
       end
     end
 
     def get_command(prompt: nil)
       Curses.echo
       startx = prompt ? prompt.size : 1
-      window.setpos 0, startx
-      s = window.getstr
+      setpos 0, startx
+      s = getstr
       "#{prompt[1..-1] if prompt}#{s.strip}"
     ensure
       Curses.noecho
     end
 
     def show_error(str)
-      window.attron(Curses.color_pair(Curses::COLOR_RED) | Curses::A_BOLD) do
-        wmove 0
-        window.clrtoeol
-        waddstr str
+      attron(Curses.color_pair(Curses::COLOR_RED) | Curses::A_BOLD) do
+        writeln 0, str
       end
-      wrefresh
+      refresh
     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.5.2'
+  spec.version       = '0.6.0'
   spec.authors       = ["Akira Matsuda"]
   spec.email         = ["ronnie@dio.jp"]
   spec.description   = 'Ruby on Files & Directories'

data/spec/controller_spec.rb

@@ -31,8 +31,8 @@ describe Rfd::Controller do
   describe '#spawn_panes' do
     before { controller.spawn_panes 3 }
 
-    subject { controller.main.instance_variable_get :@panes }
-    it { should have(3).panes }
+    subject { controller.main.instance_variable_get :@number_of_panes }
+    it { should  == 3 }
   end
 
   describe '#current_item' do
@@ -89,8 +89,8 @@ describe Rfd::Controller do
         before do
           controller.move_cursor 5
         end
-        subject { controller.main.instance_variable_get :@panes }
-        its(:current_index) { should == 1 }
+        subject { controller.main.instance_variable_get :@current_index }
+        it { should == 1 }
       end
 
       context 'When moving to the second page' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rfd
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.6.0
 platform: ruby
 authors:
 - Akira Matsuda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-18 00:00:00.000000000 Z
+date: 2013-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip