rfd 0.6.9 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 323d87aef7ac725e1dda66c4fc9008401f784d177fda1d93d3893caa3f0aefea
-  data.tar.gz: b87f6831f7b92f41ca33b3117a7ea8d79d85dd75607bb9e9973030e1d22207b2
+  metadata.gz: 84197fc407fef60acd2692a461619061d05c114d57bed5d6454d0f726df88475
+  data.tar.gz: 5b3f4027252840d90e600f9f4b67c7d287f3c56b7f9611f51c58d9b9d5601b02
 SHA512:
-  metadata.gz: bdafa08d499d35cef4df3a14ae871241c4cfe7b7a6579b7e541377b1ae1952fe44db243678bcacb2c660dad71267271ad99fec95bcdd4b310cf93ddd874ffc97
-  data.tar.gz: d9066a242964e13a5356ce4fa349a58978faa64355e3899850fa1d3ce8f8d3d4309b3930e097e880c099c2970953f666d8d8eaf11ece7cc443e5155875149b26
+  metadata.gz: 74abcf3216b07f522d18d7061a6347a8255198e4377c54b210a54401c578372a4111931c46f4abaff98a7f35965b747fa3033e8c4dc5c565edd482a4dc928f81
+  data.tar.gz: 1d34bae5303921385f0bdc181f8b140817034027f10962c8840d2e9b317210999d454b7e27520e034ccab18f5eb02ef56c3afb7141c4e9b6b8dd0a1ec64f5e24

data/bin/rfd

@@ -1,6 +1,9 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 require File.expand_path('../../lib/rfd', __FILE__)
+require 'optparse'
 
-rfd = Rfd.start ARGV[0] || '.'
+options = ARGV.getopts 'l:'
+
+rfd = Rfd.start ARGV[0] || '.', log: options['l']
 rfd.run

data/lib/rfd.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 require 'curses'
 require 'fileutils'
+require 'time'
 require 'tmpdir'
 require 'rubygems/package'
 require 'zip'
@@ -8,9 +9,10 @@ require 'zip/filesystem'
 require_relative 'rfd/commands'
 require_relative 'rfd/item'
 require_relative 'rfd/windows'
+require_relative 'rfd/logging'
 
 module Rfd
-  VERSION = Gem.loaded_specs['rfd'].version.to_s
+  VERSION = Gem.loaded_specs['rfd'] ? Gem.loaded_specs['rfd'].version.to_s : '0'
 
   # :nodoc:
   def self.init_curses
@@ -32,7 +34,9 @@ module Rfd
   #
   # ==== Parameters
   # * +dir+ - The initial directory.
-  def self.start(dir = '.')
+  def self.start(dir = '.', log: nil)
+    Rfd.log_to log if log
+
     init_curses
     Rfd::Window.draw_borders
     Curses.stdscr.noutrefresh
@@ -108,6 +112,7 @@ module Rfd
         rescue StopIteration
           raise
         rescue => e
+          Rfd.logger.error e if Rfd.logger
           command_line.show_error e.to_s
           raise if ENV['DEBUG']
         end
@@ -467,7 +472,9 @@ module Rfd
           zip.instance_variable_get(:@entry_set) << Zip::Entry.new(current_zip, filename)
         end
       end
+
       ls
+      move_cursor items.index {|i| i.name == filename}
     end
 
     # Create a symlink to the current file or directory.
@@ -476,6 +483,15 @@ module Rfd
       ls
     end
 
+    # Change the timestamp of the selected files and directories.
+    #
+    # ==== Parameters
+    # * +timestamp+ - A string that can be parsed with `Time.parse`. Note that this parameter is not compatible with UNIX `touch -t`.
+    def touch_t(timestamp)
+      FileUtils.touch selected_items, mtime: Time.parse(timestamp)
+      ls
+    end
+
     # Yank selected file / directory names.
     def yank
       @yanked_items = selected_items
@@ -554,7 +570,7 @@ module Rfd
                 end
                 dest ||= File.join dest_dir, entry.full_name
                 if entry.directory?
-                  FileUtils.mkdir_p dest, :mode => entry.header.mode
+                  FileUtils.mkdir_p dest, mode: entry.header.mode
                 elsif entry.file?
                   FileUtils.mkdir_p dest_dir
                   File.open(dest, 'wb') {|f| f.print entry.read}
@@ -638,10 +654,11 @@ module Rfd
     #
     # ==== Parameters
     # * +preset_command+ - A command that would be displayed at the command line before user input.
-    def process_command_line(preset_command: nil)
+    # * +default_argument+ - A default argument for the command.
+    def process_command_line(preset_command: nil, default_argument: nil)
       prompt = preset_command ? ":#{preset_command} " : ':'
       command_line.set_prompt prompt
-      cmd, *args = command_line.get_command(prompt: prompt).split(' ')
+      cmd, *args = command_line.get_command(prompt: prompt, default: default_argument).split(' ')
       if cmd && !cmd.empty? && respond_to?(cmd)
         ret = self.public_send cmd, *args
         clear_command_line
@@ -673,8 +690,7 @@ module Rfd
       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.clear
-        command_line.noutrefresh
+        clear_command_line
         break (c == 'y') || (c == 'Y')
       end
     end

data/lib/rfd/commands.rb

@@ -186,6 +186,11 @@ module Rfd
       process_command_line preset_command: 'symlink'
     end
 
+    # "T"ouch the current file. This updates current item's timestamp (equivalent to `touch -t`).
+    def T
+      process_command_line preset_command: 'touch_t', default_argument: current_item.mtime.tr(': -', '')
+    end
+
     # Mark or unmark "a"ll files and directories.
     def ctrl_a
       mark = marked_items.size != (items.size - 2)  # exclude . and ..

data/lib/rfd/item.rb

@@ -37,12 +37,10 @@ module Rfd
         n = full_display_name
         if mb_size(n) <= @window_width - 15
           n
+        elsif symlink?
+          mb_left n, @window_width - 16
         else
-          if symlink?
-            mb_left n, @window_width - 16
-          else
-            "#{mb_left(basename, @window_width - 16 - extname.size)}…#{extname}"
-          end
+          "#{mb_left(basename, @window_width - 16 - extname.size)}…#{extname}"
         end
       end
     end

data/lib/rfd/logging.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+require 'logger'
+
+module Rfd
+  @logger = nil
+
+  class << self
+    def log_to(file)
+      @logger = Logger.new file
+      @logger.debug 'hello'
+
+      Rfd::Controller.include Logging
+    end
+
+    def log(str)
+      Rfd.logger.debug str if Rfd.logger
+    end
+
+    attr_reader :logger
+  end
+
+  module Logging
+    def self.included(m)
+      mod = Module.new do
+        (m.instance_methods - Object.instance_methods).each do |meth|
+          Rfd.logger.info meth
+          define_method(meth) {|*args, &block| Rfd.logger.debug "calling #{meth}(#{args.inspect})"; super(*args, &block) }
+        end
+      end
+      m.prepend mod
+    end
+  end
+end

data/lib/rfd/windows.rb

@@ -56,12 +56,12 @@ module Rfd
     end
 
     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)}]
+      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)}]
+      writeln 1, %Q[#{"#{count}Files".rjust(10)} #{size.to_s.reverse.gsub(/(\d{3})(?=\d)/, '\1,').reverse.rjust(17)}]
       noutrefresh
     end
   end
@@ -147,15 +147,29 @@ module Rfd
       end
     end
 
-    def getstr_with_echo
-      str = "".dup
+    def getstr_with_echo(default = nil)
+      str = default || ''.dup
+
+      unless str.empty?
+        self << str
+        refresh
+      end
+
       loop do
         case (c = Curses.getch)
-        when 27
+        when 27, 3  # ESC, C-c
           raise Interrupt
         when 10, 13
           break
+        when 127, 263  # delete
+          raise Interrupt if curx == 1
+
+          setpos cury, curx - 1
+          delch
+          refresh
+          str.chop!
         else
+          Rfd.log "#{__method__}: #{c}"
           self << c
           refresh
           str << c
@@ -164,10 +178,10 @@ module Rfd
       str
     end
 
-    def get_command(prompt: nil)
+    def get_command(prompt: nil, default: nil)
       startx = prompt ? prompt.size : 1
       setpos 0, startx
-      s = getstr_with_echo
+      s = getstr_with_echo default
       "#{prompt[1..-1] if prompt}#{s.strip}"
     end
 

data/rfd.gemspec

@@ -5,10 +5,10 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "rfd"
-  spec.version       = '0.6.9'
+  spec.version       = '0.7.0'
   spec.authors       = ["Akira Matsuda"]
   spec.email         = ["ronnie@dio.jp"]
-  spec.description   = 'Ruby on Files & Directories'
+  spec.description   = 'A Ruby filer that runs on terminal'
   spec.summary       = 'Ruby on Files & Directories'
   spec.homepage      = 'https://github.com/amatsuda/rfd'
   spec.license       = "MIT"
@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'curses', '>= 1.0.0'
   spec.add_dependency 'rubyzip', '>= 1.0.0'
-  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency 'bundler'
   spec.add_development_dependency "rake", "< 11.0"
   spec.add_development_dependency 'rspec', "< 2.99"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rfd
 version: !ruby/object:Gem::Version
-  version: 0.6.9
+  version: 0.7.0
 platform: ruby
 authors:
 - Akira Matsuda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-30 00:00:00.000000000 Z
+date: 2019-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses
@@ -42,16 +42,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -80,7 +80,7 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.99'
-description: Ruby on Files & Directories
+description: A Ruby filer that runs on terminal
 email:
 - ronnie@dio.jp
 executables:
@@ -97,6 +97,7 @@ files:
 - lib/rfd.rb
 - lib/rfd/commands.rb
 - lib/rfd/item.rb
+- lib/rfd/logging.rb
 - lib/rfd/windows.rb
 - rfd.gemspec
 - spec/controller_spec.rb
@@ -136,7 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Ruby on Files & Directories