rfd 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c84b042ee4196d959b2aa91af8c59ca9fa3b28b
-  data.tar.gz: 46504bdc73c1b0f8a1779955f455e09fe73bc06a
+  metadata.gz: 69382b24587d8b96f6e478174154cec5789aee94
+  data.tar.gz: 0358469e32e915327f17bcd8f5ea379449ffc3c9
 SHA512:
-  metadata.gz: 538534dad4ea1aadd91e06c02ad6ed31b794e25de2460f4329120e7a1988bded79d7086eb8983d479302db4a9e0d751d68129f3e73ad2238fdf80c25a141bca1
-  data.tar.gz: b15391a9ca20f6a2d171542fd0fa3aa92f077471cc43d963ab6182fe75146e9607315a6d7f08710381e04fd21ab059040504a193c1c1840e2c1b09105812d330
+  metadata.gz: 977b478de382705aaced23f74ae8714f796d3d8d1e92a073c0dcb6e5fda07b9b3ff33f375598143d5fb433e6f2a151bcfbc86cee97cd5f56f24295de0e207d24
+  data.tar.gz: f70b35ab1d5a592c13d3540f2b4dd92cc3cac1c56415b6a64d8fcedf6903212b4dc7c41d657fc64921534120b058548e040af2069022cc89752a31ac752ca0b3

data/lib/rfd/item.rb

@@ -4,8 +4,9 @@ module Rfd
     attr_reader :name, :dir, :stat
     attr_accessor :index
 
-    def initialize(dir: nil, name: nil, stat: nil, window_width: nil)
-      @dir, @name, @stat, @window_width, @marked = dir, name, stat, window_width, false
+    def initialize(path: nil, dir: nil, name: nil, stat: nil, window_width: nil)
+      @path, @dir, @name, @stat, @window_width, @marked = path, dir || File.dirname(path), name || File.basename(path), stat, window_width, false
+      @stat = File.lstat self.path unless stat
     end
 
     def path
@@ -127,10 +128,8 @@ module Rfd
       @zip_ ||= begin
         if directory?
           false
-        elsif symlink?
-          File.binread(target, 4).unpack('V').first == 0x04034b50
         else
-          File.binread(path, 4).unpack('V').first == 0x04034b50
+          File.binread(realpath, 4).unpack('V').first == 0x04034b50
         end
       rescue
         false
@@ -141,10 +140,8 @@ module Rfd
       @gz_ ||= begin
         if directory?
           false
-        elsif symlink?
-          File.binread(target, 2).unpack('n').first == 0x1f8b
         else
-          File.binread(path, 2).unpack('n').first == 0x1f8b
+          File.binread(realpath, 2).unpack('n').first == 0x1f8b
         end
       rescue
         false
@@ -155,6 +152,10 @@ module Rfd
       File.readlink path if symlink?
     end
 
+    def realpath
+      @realpath ||= File.realpath path
+    end
+
     def toggle_mark
       unless %w(. ..).include? name
         @marked = !@marked

data/lib/rfd/windows.rb

@@ -76,7 +76,7 @@ module Rfd
     attr_reader :current_index, :begy
     attr_writer :number_of_panes
 
-    def initialize(dir = '.')
+    def initialize
       @begy, @current_index, @number_of_panes = 5, 0, 2
       super window: Curses::Pad.new(Curses.lines - 7, Curses.cols - 2)
     end
@@ -127,10 +127,7 @@ module Rfd
     end
 
     def toggle_mark(item)
-      if item.toggle_mark
-        setpos item.index % maxy, 0
-        self << item.current_mark
-      end
+      item.toggle_mark
     end
   end
 

data/lib/rfd.rb

@@ -169,7 +169,7 @@ module Rfd
 
     # Change the current directory.
     def cd(dir = '~', pushd: true)
-      dir = load_item expand_path(dir) unless dir.is_a? Item
+      dir = load_item path: expand_path(dir) unless dir.is_a? Item
       unless dir.zip?
         Dir.chdir dir
         @current_zip = nil
@@ -254,17 +254,16 @@ module Rfd
     def fetch_items_from_filesystem_or_zip
       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: main.width
+          load_item dir: current_dir, name: fn
         }.to_a.partition {|i| %w(. ..).include? i.name}.flatten
       else
-        @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)]
+        @items = [load_item(dir: current_dir, name: '.', stat: File.stat(current_dir)),
+          load_item(dir: current_dir, name: '..', stat: File.stat(File.dirname(current_dir)))]
         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: main.width)
+          @items << load_item(dir: current_dir, name: entry.name, stat: stat)
         }
       end
     end
@@ -281,11 +280,6 @@ module Rfd
       move_cursor items.size - index - 1 if index
     end
 
-    # Width of the currently active pane.
-    def maxx
-      main.maxx
-    end
-
     # Height of the currently active pane.
     def maxy
       main.maxy
@@ -348,6 +342,7 @@ module Rfd
       fetch_items_from_filesystem_or_zip
       @items = items.shift(2) + items.select {|i| i.name =~ regexp}
       sort_items_according_to_current_direction
+      draw_items
       switch_page 0
       move_cursor 0
 
@@ -489,7 +484,7 @@ module Rfd
             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
+                new_item = load_item dir: current_dir, name: "#{item.basename}_#{i}#{item.extname}", stat: item.stat
                 break unless File.exist? new_item.path
               end
               FileUtils.cp_r item, new_item
@@ -745,9 +740,8 @@ module Rfd
       File.expand_path path.start_with?('/') || path.start_with?('~') ? path : current_dir ? current_dir.join(path) : path
     end
 
-    def load_item(path)
-      stat = File.lstat path
-      Item.new dir: File.dirname(path), name: File.basename(path), stat: stat, window_width: maxx
+    def load_item(path: nil, dir: nil, name: nil, stat: nil)
+      Item.new dir: dir || File.dirname(path), name: name || File.basename(path), stat: stat, window_width: main.width
     end
 
     def 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.6.0'
+  spec.version       = '0.6.1'
   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.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Akira Matsuda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-22 00:00:00.000000000 Z
+date: 2013-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip