rfd 0.6.6 → 0.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e3cf16078b9de1442a1222b894e175e5342e6329
-  data.tar.gz: b370f528cb226975b077330b758d1e7218714d73
+  metadata.gz: 73cf32d334a52233e41042d8dad8b7bc1a00d6c0
+  data.tar.gz: 7d6eb47271a96ab17bacccfdbe34ffdd81d8f31d
 SHA512:
-  metadata.gz: 825059c0b082e92b03fc54d1c7d9cc096b6e8bf3c6df8b8b5201128019db9929c6e449eeaa30299e867f62093fa948a944ae4c21f147ccf3668cc8e21f05fb45
-  data.tar.gz: 73df368499184e4c48a0652e0f53d23754c52631752d2f18fd77f2dc9bc853e6ba83d540cb434b8b49261c9d034227f0dc590d06b5beaa90b07d068d6c15a0cd
+  metadata.gz: c3fe7fbaad753cbb3b466c8736d5a07f23cdedde45251198526883427c3bef2390774cd834009f4a56e9af879ac2bbcdc1fa2ce038b4a4cb645dbdf887344d35
+  data.tar.gz: 5a948b9f5d22eaf9e1c75b3d9986ced53237b8f249f837d6c68db4f8ce89c5bcbe18a5598ea60da19cfeaa8bedf6f79b59004e5367b7a53c8a7c1495d2a4f4f5

data/Gemfile

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in rfd.gemspec

data/Rakefile

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'bundler'
 Bundler::GemHelper.install_tasks
 require "bundler/gem_tasks"

data/bin/rfd

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 require File.expand_path('../../lib/rfd', __FILE__)
 
 rfd = Rfd.start ARGV[0] || '.'

data/lib/rfd.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'curses'
 require 'fileutils'
 require 'tmpdir'
@@ -382,10 +383,14 @@ module Rfd
     # Rename selected files and directories.
     #
     # ==== Parameters
-    # * +pattern+ - / separated Regexp like string
+    # * +pattern+ - new filename, or a shash separated Regexp like string
     def rename(pattern)
-      from, to = pattern.split '/'
-      from = Regexp.new from
+      from, to = pattern.sub(/^\//, '').sub(/\/$/, '').split '/'
+      if to.nil?
+        from, to = current_item.name, from
+      else
+        from = Regexp.new from
+      end
       unless in_zip?
         selected_items.each do |item|
           name = item.name.gsub from, to
@@ -507,7 +512,7 @@ module Rfd
     # Archive selected files and directories into a .zip file.
     def zip(zipfile_name)
       return unless zipfile_name
-      zipfile_name << '.zip' unless zipfile_name.end_with? '.zip'
+      zipfile_name += '.zip' unless zipfile_name.end_with? '.zip'
 
       Zip::File.open(zipfile_name, Zip::File::CREATE) do |zipfile|
         selected_items.each do |item|
@@ -623,6 +628,12 @@ module Rfd
       c if (0..255) === c.ord
     end
 
+    def clear_command_line
+      command_line.writeln 0, ""
+      command_line.clear
+      command_line.noutrefresh
+    end
+
     # Accept user input, and directly execute it as a Ruby method call to the controller.
     #
     # ==== Parameters
@@ -633,13 +644,11 @@ module Rfd
       cmd, *args = command_line.get_command(prompt: prompt).split(' ')
       if cmd && !cmd.empty? && respond_to?(cmd)
         ret = self.public_send cmd, *args
-        command_line.clear
-        command_line.noutrefresh
+        clear_command_line
         ret
       end
     rescue Interrupt
-      command_line.clear
-      command_line.noutrefresh
+      clear_command_line
     end
 
     # Accept user input, and directly execute it in an external shell.
@@ -740,7 +749,7 @@ module Rfd
     end
 
     def expand_path(path)
-      File.expand_path path.start_with?('/') || path.start_with?('~') ? path : current_dir ? current_dir.join(path) : path
+      File.expand_path path.start_with?('/', '~') ? path : current_dir ? current_dir.join(path) : path
     end
 
     def load_item(path: nil, dir: nil, name: nil, stat: nil)

data/lib/rfd/commands.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Rfd
   module Commands
     # Change permission ("A"ttributes) of selected files and directories.
@@ -230,7 +231,8 @@ module Rfd
     # Number of times to repeat the next command.
     (?0..?9).each do |n|
       define_method(n) do
-        (@times ||= '') << n
+        @times ||= ''
+        @times += n
       end
     end
 

data/lib/rfd/item.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Rfd
   class Item
     include Comparable
@@ -83,9 +84,9 @@ module Rfd
     def mode
       @mode ||= begin
         m = stat.mode
-        ret = directory? ? 'd' : symlink? ? 'l' : '-'
-        [(m & 0700) / 64, (m & 070) / 8, m & 07].inject(ret) do |str, s|
-          str << "#{s & 4 == 4 ? 'r' : '-'}#{s & 2 == 2 ? 'w' : '-'}#{s & 1 == 1 ? 'x' : '-'}"
+        ft = directory? ? 'd' : symlink? ? 'l' : '-'
+        ret = [(m & 0700) / 64, (m & 070) / 8, m & 07].inject(ft) do |str, s|
+          str += "#{s & 4 == 4 ? 'r' : '-'}#{s & 2 == 2 ? 'w' : '-'}#{s & 1 == 1 ? 'x' : '-'}"
         end
         if m & 04000 != 0
           ret[3] = directory? ? 's' : 'S'

data/lib/rfd/windows.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'delegate'
 
 module Rfd
@@ -19,6 +20,7 @@ module Rfd
       setpos row, 0
       clrtoeol
       self << str
+      refresh
     end
   end
 
@@ -145,14 +147,28 @@ module Rfd
       end
     end
 
+    def getstr_with_echo
+      str = ""
+      loop do
+        case (c = Curses.getch)
+        when 27
+          raise Interrupt
+        when 10, 13
+          break
+        else
+          self << c
+          refresh
+          str << c
+        end
+      end
+      str
+    end
+
     def get_command(prompt: nil)
-      Curses.echo
       startx = prompt ? prompt.size : 1
       setpos 0, startx
-      s = getstr
+      s = getstr_with_echo
       "#{prompt[1..-1] if prompt}#{s.strip}"
-    ensure
-      Curses.noecho
     end
 
     def show_error(str)

data/rfd.gemspec

@@ -1,10 +1,11 @@
 # coding: utf-8
+# frozen_string_literal: true
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "rfd"
-  spec.version       = '0.6.6'
+  spec.version       = '0.6.7'
   spec.authors       = ["Akira Matsuda"]
   spec.email         = ["ronnie@dio.jp"]
   spec.description   = 'Ruby on Files & Directories'
@@ -20,6 +21,6 @@ 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 "rake"
-  spec.add_development_dependency 'rspec'
+  spec.add_development_dependency "rake", "< 11.0"
+  spec.add_development_dependency 'rspec', "< 2.99"
 end

data/spec/controller_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 require 'rfd'
 
@@ -346,16 +347,18 @@ describe Rfd::Controller do
     end
   end
 
-  describe '#pbcopy' do
-    before do
-      controller.find '.file1'
-      controller.toggle_mark
-      controller.find 'dir3'
-      controller.toggle_mark
-      controller.clipboard
-    end
-    it 'copies the selected paths into clipboard' do
-      `pbpaste`.should == "#{File.join(tmpdir, 'dir3')} #{File.join(tmpdir, '.file1')}"
+  if RbConfig::CONFIG['host_os'] =~ /darwin/
+    describe '#pbcopy' do
+      before do
+        controller.find '.file1'
+        controller.toggle_mark
+        controller.find 'dir3'
+        controller.toggle_mark
+        controller.clipboard
+      end
+      it 'copies the selected paths into clipboard' do
+        `pbpaste`.should == "#{File.join(tmpdir, 'dir3')} #{File.join(tmpdir, '.file1')}"
+      end
     end
   end
 

data/spec/spec_helper.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 $LOAD_PATH.unshift(File.join(__dir__, '..', 'lib'))
 $LOAD_PATH.unshift(__dir__)
 

data/spec/support/capture_helper.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'tempfile'
 
 # copied from ActiveSupport 4

data/spec/testdir/.link1

@@ -0,0 +1 @@
+spec/testdir/.file1

data/spec/testdir/dirlink1

@@ -0,0 +1 @@
+spec/testdir/dir1

data/spec/testdir/link1

@@ -0,0 +1 @@
+spec/testdir/file1

data/spec/testdir/link2

@@ -0,0 +1 @@
+spec/testdir/file2

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rfd
 version: !ruby/object:Gem::Version
-  version: 0.6.6
+  version: 0.6.7
 platform: ruby
 authors:
 - Akira Matsuda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-03 00:00:00.000000000 Z
+date: 2017-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses
@@ -56,30 +56,30 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '11.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '11.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.99'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.99'
 description: Ruby on Files & Directories
 email:
 - ronnie@dio.jp
@@ -109,6 +109,7 @@ files:
 - spec/testdir/dir1/.keep
 - spec/testdir/dir2/.keep
 - spec/testdir/dir3/.keep
+- spec/testdir/dirlink1
 - spec/testdir/file1
 - spec/testdir/file2
 - spec/testdir/file3
@@ -136,7 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Ruby on Files & Directories
@@ -151,6 +152,7 @@ test_files:
 - spec/testdir/dir1/.keep
 - spec/testdir/dir2/.keep
 - spec/testdir/dir3/.keep
+- spec/testdir/dirlink1
 - spec/testdir/file1
 - spec/testdir/file2
 - spec/testdir/file3

data/spec/testdir/link1

@@ -1 +0,0 @@
-file1