nrename 0.2.3 → 0.2.5

data/lib/nrename/options.rb

@@ -119,16 +119,7 @@ module Nrename
 
       if options.recursive
         dirs.dup.each do |dir|
-          # Workaround: every other engine except jruby does not
-          # work with unescaped path, also mri-1.8 does not have
-          # constant RUBY_ENGINE defined.
-          unless defined? RUBY_ENGINE and RUBY_ENGINE == 'jruby'
-            dir = dir.shellescape
-          end
-
-          Dir.glob(File.join dir, '**/') do |subdir|
-            dirs << subdir.chomp('/')
-          end
+          dirs.merge Utils.all_subdirs_of dir
         end
       end
 

data/lib/nrename/utils.rb

@@ -0,0 +1,20 @@
+require 'pathname'
+require 'set'
+
+module Nrename
+  module Utils
+    def all_subdirs_of(dir)
+      dir = Pathname.new dir
+
+      children = Set.new
+
+      dir.children.select(&:directory?).map(&:to_s).each do |child|
+        children.add child
+        children.merge all_subdirs_of child
+      end
+
+      Array children
+    end
+    module_function :all_subdirs_of
+  end
+end

data/lib/nrename/version.rb

@@ -1,3 +1,3 @@
 module Nrename
-  VERSION = '0.2.3'
+  VERSION = '0.2.5'
 end

data/lib/nrename.rb

@@ -5,6 +5,7 @@ require 'nrename/directory'
 require 'nrename/numbered_file'
 require 'nrename/options'
 require 'nrename/runner'
+require 'nrename/utils'
 require 'nrename/version'
 
 module Nrename

data/spec/nrename/utils_spec.rb

@@ -0,0 +1,59 @@
+require 'spec_helper'
+
+describe Nrename::Utils do
+  include Nrename::Utils
+
+  describe '.all_subdirs_of' do
+    let(:test_dir) { File.expand_path '[dir] )with( funny {name}' }
+
+    let(:subdirs) {
+      %w[foo bar baz quux].map { |dir|
+        File.expand_path dir, test_dir
+      }
+    }
+
+    before :each do
+      mkdir_p subdirs
+    end
+
+    after :each do
+      rm_rf test_dir
+    end
+
+    it 'returns subdirectories of provided directory' do
+      expect(all_subdirs_of test_dir).to match_array subdirs
+    end
+
+    it 'ignores plain files' do
+      inside test_dir do
+        touch %w[some plain files]
+      end
+
+      expect(all_subdirs_of test_dir).to match_array subdirs
+    end
+
+    it 'captures deeply nested directories' do
+      inside test_dir do
+        inside 'deeper' do
+          inside 'even_deeper' do
+            mkdir 'deepest'
+          end
+        end
+      end
+
+      all_subdirs = [
+        File.join(test_dir, 'deeper'),
+        File.join(test_dir, 'deeper', 'even_deeper'),
+        File.join(test_dir, 'deeper', 'even_deeper', 'deepest')
+      ] + subdirs
+
+      expect(all_subdirs_of test_dir).to match_array all_subdirs
+    end
+
+    it 'raises error when given argument is not a directory' do
+      expect {
+        all_subdirs_of '/non/existant/directory'
+      }.to raise_error StandardError
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nrename
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.5
   prerelease: 
 platform: ruby
 authors:
@@ -111,10 +111,12 @@ files:
 - lib/nrename/numbered_file.rb
 - lib/nrename/options.rb
 - lib/nrename/runner.rb
+- lib/nrename/utils.rb
 - lib/nrename/version.rb
 - spec/nrename/directory_spec.rb
 - spec/nrename/numbered_file_spec.rb
 - spec/nrename/options_spec.rb
+- spec/nrename/utils_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/vderyagin/nrename
 licenses:
@@ -131,7 +133,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -821845461691458616
+      hash: -2006144639180283266
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: