rfd 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 69382b24587d8b96f6e478174154cec5789aee94
-  data.tar.gz: 0358469e32e915327f17bcd8f5ea379449ffc3c9
+  metadata.gz: 85ce1000330ce786e4ea5b2dba2854adb3188a89
+  data.tar.gz: 47299a571cdf2f7e18fea161971b463c1a5ea733
 SHA512:
-  metadata.gz: 977b478de382705aaced23f74ae8714f796d3d8d1e92a073c0dcb6e5fda07b9b3ff33f375598143d5fb433e6f2a151bcfbc86cee97cd5f56f24295de0e207d24
-  data.tar.gz: f70b35ab1d5a592c13d3540f2b4dd92cc3cac1c56415b6a64d8fcedf6903212b4dc7c41d657fc64921534120b058548e040af2069022cc89752a31ac752ca0b3
+  metadata.gz: 4fbdea0a3e8ba2c97369f5e9d057fe18d3bc3214c01f868c6212196e7d5fdaeecd17a194225d751880b45052aed7055f7ac448e80c961fece3c8538355502346
+  data.tar.gz: e640102c242bd0741ebaafae583c6b5ac166b2038785021b800da907fcc061b01756687ba5c617020cba9bc5acfa62a0f557afb1482695ba3ad00ff047737f9f

data/lib/rfd.rb

@@ -34,9 +34,10 @@ module Rfd
   def self.start(dir = '.')
     init_curses
     Rfd::Window.draw_borders
-    Curses.refresh
+    Curses.stdscr.noutrefresh
     rfd = Rfd::Controller.new
     rfd.cd dir
+    Curses.doupdate
     rfd
   end
 
@@ -60,7 +61,7 @@ module Rfd
       loop do
         begin
           number_pressed = false
-          case (c = Curses.getch)
+          ret = case (c = Curses.getch)
           when 10, 13  # enter, return
             enter
           when 27  # ESC
@@ -101,6 +102,7 @@ module Rfd
           else
             debug "key: #{c}" if ENV['DEBUG']
           end
+          Curses.doupdate if ret
           @times = nil unless number_pressed
         rescue StopIteration
           raise
@@ -163,7 +165,6 @@ module Rfd
       main.display current_page
 
       header_l.draw_current_file_info item
-      header_l.refresh
       @current_row
     end
 
@@ -180,6 +181,7 @@ module Rfd
       @current_dir, @current_page, @current_row = dir, 0, nil
       main.activate_pane 0
       ls
+      @current_dir
     end
 
     # cd to the previous directory.
@@ -199,6 +201,7 @@ module Rfd
 
       draw_marked_items
       draw_total_items
+      true
     end
 
     # Sort the whole files and directories in the current directory, then refresh the screen.
@@ -586,7 +589,7 @@ module Rfd
 
     # Number of pages in the current directory.
     def total_pages
-      items.size / max_items + 1
+      (items.size - 1) / max_items + 1
     end
 
     # Move to the given page number.
@@ -630,13 +633,14 @@ module Rfd
       command_line.set_prompt prompt
       cmd, *args = command_line.get_command(prompt: prompt).split(' ')
       if cmd && !cmd.empty? && respond_to?(cmd)
-        self.public_send cmd, *args
+        ret = self.public_send cmd, *args
         command_line.clear
-        command_line.refresh
+        command_line.noutrefresh
+        ret
       end
     rescue Interrupt
       command_line.clear
-      command_line.refresh
+      command_line.noutrefresh
     end
 
     # Accept user input, and directly execute it in an external shell.
@@ -649,7 +653,7 @@ module Rfd
     rescue Interrupt
     ensure
       command_line.clear
-      command_line.refresh
+      command_line.noutrefresh
     end
 
     # Let the user answer y or n.
@@ -662,7 +666,7 @@ module Rfd
       while (c = Curses.getch)
         next unless [?N, ?Y, ?n, ?y, 3, 27] .include? c  # N, Y, n, y, ^c, esc
         command_line.clear
-        command_line.refresh
+        command_line.noutrefresh
         break (c == 'y') || (c == 'Y')
       end
     end

data/lib/rfd/commands.rb

@@ -192,7 +192,6 @@ module Rfd
       draw_items
       move_cursor current_row
       draw_marked_items
-      header_r.refresh
     end
 
     # "b"ack to the previous page.
@@ -246,17 +245,17 @@ module Rfd
     end
 
     # Change current directory (cd).
-    define_method('@') do
+    define_method(:'@') do
       process_command_line preset_command: 'cd'
     end
 
     # Execute a shell command in an external shell.
-    define_method('!') do
+    define_method(:!) do
       process_shell_command
     end
 
     # Execute a command in the controller context.
-    define_method(':') do
+    define_method(:':') do
       process_command_line
     end
 
@@ -277,9 +276,8 @@ module Rfd
     # Toggle mark, and move down.
     def space
       toggle_mark
-      j
       draw_marked_items
-      header_r.refresh
+      j
     end
 
     # cd to the upper hierarchy.

data/lib/rfd/windows.rb

@@ -29,14 +29,16 @@ module Rfd
 
     def draw_path_and_page_number(path: nil, current: 1, total: nil)
       writeln 0, %Q[Page: #{"#{current}/ #{total}".ljust(11)}  Path: #{path}]
-      refresh
+      noutrefresh
     end
 
     def draw_current_file_info(current_file)
       draw_current_filename current_file.full_display_name
       draw_stat current_file
+      noutrefresh
     end
 
+    private
     def draw_current_filename(current_file_name)
       writeln 1, "File: #{current_file_name}"
     end
@@ -53,11 +55,12 @@ module Rfd
 
     def draw_marked_items(count: 0, size: 0)
       writeln 0, %Q[#{"#{count}Marked".rjust(11)} #{size.to_s.reverse.gsub( /(\d{3})(?=\d)/, '\1,').reverse.rjust(16)}]
+      noutrefresh
     end
 
     def draw_total_items(count: 0, size: 0)
       writeln 1, %Q[#{"#{count}Files".rjust(10)} #{size.to_s.reverse.gsub( /(\d{3})(?=\d)/, '\1,').reverse.rjust(17)}]
-      refresh
+      noutrefresh
     end
   end
 
@@ -68,7 +71,7 @@ module Rfd
 
     def debug(s)
       writeln 0, s.to_s
-      refresh
+      noutrefresh
     end
   end
 
@@ -91,7 +94,7 @@ module Rfd
     end
 
     def display(page)
-      refresh 0, (Curses.cols - 2) * page, begy, 1, begy + maxy - 1, Curses.cols - 2
+      noutrefresh 0, (Curses.cols - 2) * page, begy, 1, begy + maxy - 1, Curses.cols - 2
     end
 
     def activate_pane(num)
@@ -156,7 +159,7 @@ module Rfd
       attron(Curses.color_pair(Curses::COLOR_RED) | Curses::A_BOLD) do
         writeln 0, str
       end
-      refresh
+      noutrefresh
     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.6.1'
+  spec.version       = '0.6.2'
   spec.authors       = ["Akira Matsuda"]
   spec.email         = ["ronnie@dio.jp"]
   spec.description   = 'Ruby on Files & Directories'

metadata

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