nrename 0.2.5 → 0.2.6

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 99a1a68b5cb84496cd6604eb163663bb1db2c30b
+  data.tar.gz: ccea83a7063621be76a9850dc4f72cd1fae17f1b
+SHA512:
+  metadata.gz: 7b8d2ce878965f61ec9ee7af6d857d06adcdd640bb1baf5a7fb9967c8a80445bb369ce8902d2dc968c213cc3f527ff36c8948f6c75ce1c383e739db8a9495601
+  data.tar.gz: 22519ea4b7f2104cbc63042150efd8e7645ed819ec9d468aa484ec5f186961ca9e2f77f10b9a95b37338340a23e67311cc883faa7fe9f76d78bfd22128536bfd

data/features/renaming_files.feature

@@ -97,10 +97,9 @@ Feature: Renaming files
     | bb1.txt    |
     | bb10.txt   |
     | cc0023.txt |
-    When I cd to "dir"
-    When I run `nrename -XN .`
+    When I run `nrename -XN dir`
     Then the exit status should be 0
-    And the following files should exist:
+    And the following files should exist inside directory "dir":
     | 01.txt |
     | 10.txt |
     | 23.txt |

data/features/support/env.rb

@@ -1,7 +1,7 @@
 require 'aruba/cucumber'
 require 'fileutils'
 
-ENV['PATH'] = "#{File.expand_path __FILE__, '../../../bin'}#{File::PATH_SEPARATOR}#{ENV['PATH']}"
+ENV['PATH'] = "#{File.expand_path('../../../bin', __FILE__)}#{File::PATH_SEPARATOR}#{ENV['PATH']}"
 
 application_root = File.expand_path('../../..', __FILE__)
 

data/lib/nrename.rb

@@ -1,6 +1,7 @@
 libdir = File.expand_path(File.dirname __FILE__)
 $:.push libdir unless $:.include? libdir
 
+require 'nrename/counter'
 require 'nrename/directory'
 require 'nrename/numbered_file'
 require 'nrename/options'
@@ -14,10 +15,11 @@ module Nrename
   end
 
   def self.options
-    Options.instance
+    @options ||= Options.new
   end
 
   def self.parse_options(args)
+    @options = Options.new
     options.parse args
   end
 end

data/lib/nrename/counter.rb

@@ -0,0 +1,11 @@
+module Nrename
+  class Counter
+    def initialize
+      @counter = 0
+    end
+
+    def next
+      @counter = @counter.next
+    end
+  end
+end

data/lib/nrename/directory.rb

@@ -9,8 +9,11 @@ module Nrename
     def_delegator :numbered_files, :empty?
     def_delegator Nrename, :options
 
+    attr_reader :counter
+
     def initialize(dir)
       @dir = Pathname.new dir
+      @counter = Counter.new
     end
 
     def directories
@@ -28,8 +31,8 @@ module Nrename
     def numbered_files
       @numbered_files ||= files.
         select { |file| file.basename.to_s =~ options.pattern }.
-        map { |file| NumberedFile.new file }.
-        sort_by(&:number)
+        map { |file| NumberedFile.new file, self }.
+        sort_by(&:number_from_path)
     end
 
     def num_field_length
@@ -40,29 +43,14 @@ module Nrename
       if options.renumber
         numbered_files.size
       else
-        numbered_files.map(&:number).max
-      end
-    end
-
-    def renumber
-      numbered_files.each_with_index do |file, idx|
-
-        # Force 1-based indexing (could use Enumerator#with_index with
-        # argument, but that would be incompatible with ruby-1.8).
-        idx += 1
-
-        file.normalize num_field_length, idx
+        numbered_files.map(&:number_from_path).max
       end
     end
 
-    def fix_numbers
+    def normalize
       numbered_files.each do |file|
-        file.normalize num_field_length
+        file.normalize
       end
     end
-
-    def normalize
-      options.renumber ? renumber : fix_numbers
-    end
   end
 end

data/lib/nrename/numbered_file.rb

@@ -4,24 +4,27 @@ require 'forwardable'
 
 module Nrename
   class NumberedFile
-    attr_reader :path, :number_length, :override_number
+    attr_reader :path, :dir
 
     extend Forwardable
 
     def_delegator Nrename, :options
+    def_delegators :dir, :counter, :num_field_length
 
-    def initialize(path)
+    def initialize(path, dir)
       @path = path
+      @dir = dir
     end
 
     def number
-      override_number || path.basename.to_s[options.pattern, 1].to_i
+      @number ||= options.renumber ? counter.next : number_from_path
     end
 
-    def normalize(length, override_number = nil)
-      @number_length = length
-      @override_number = override_number
+    def number_from_path
+      path.basename.to_s[options.pattern, 1].to_i
+    end
 
+    def normalize
       rename_to normalized_path
     end
 
@@ -50,7 +53,7 @@ module Nrename
     end
 
     def adjusted_number
-      number.to_s.rjust number_length, '0'
+      number.to_s.rjust num_field_length, '0'
     end
   end
 end

data/lib/nrename/options.rb

@@ -3,28 +3,28 @@ require 'optparse'
 require 'ostruct'
 require 'set'
 require 'shellwords'
-require 'singleton'
 
 module Nrename
   class Options
-    include Singleton
+    extend Forwardable
+
+    def initialize
+      self.class.def_delegators :options, *default_options.keys
+    end
 
     def default_options
       {
-        :numbers_only => false,
-        :dirs         => Set.new,
-        :execute      => false,
-        :pattern      => /(\d+)/,
-        :recursive    => false,
-        :rename_dirs  => false,
-        :renumber     => false,
-        :verbose      => true
+      :numbers_only => false,
+      :dirs         => Set.new,
+      :execute      => false,
+      :pattern      => /(\d+)/,
+      :recursive    => false,
+      :rename_dirs  => false,
+      :renumber     => false,
+      :verbose      => true
       }
     end
 
-    extend Forwardable
-    def_delegators :options, *instance.default_options.keys
-
     def options
       @options ||= OpenStruct.new default_options
     end

data/lib/nrename/utils.rb

@@ -1,20 +1,28 @@
 require 'pathname'
-require 'set'
 
 module Nrename
   module Utils
     def all_subdirs_of(dir)
-      dir = Pathname.new dir
-
-      children = Set.new
+      children = []
 
-      dir.children.select(&:directory?).map(&:to_s).each do |child|
-        children.add child
-        children.merge all_subdirs_of child
+      each_subdir(dir) do |subdir|
+        children << subdir
+        children.concat all_subdirs_of subdir
       end
 
-      Array children
+      children
     end
     module_function :all_subdirs_of
+
+    def each_subdir(dir, &block)
+      dir = Pathname.new dir
+
+      subdirs = dir.children.select &:directory?
+
+      subdirs.each do |subdir|
+        block.call subdir.to_s
+      end
+    end
+    module_function :each_subdir
   end
 end

data/lib/nrename/version.rb

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

data/spec/nrename/numbered_file_spec.rb

@@ -2,7 +2,9 @@ require 'spec_helper'
 
 describe Nrename::NumberedFile do
   def numbered_file(path)
-    Nrename::NumberedFile.new Pathname.new path
+    file = Pathname.new path
+    dir = Nrename::Directory.new file.dirname
+    Nrename::NumberedFile.new file, dir
   end
 
   describe '#number' do
@@ -38,7 +40,7 @@ describe Nrename::NumberedFile do
       it 'normalizes file name' do
         file = numbered_file 'abc_34.rb'
 
-        file.stub :number_length => 3
+        file.stub :num_field_length => 3
         expect(file.normalized_path.to_s).to be == '034.rb'
       end
     end
@@ -51,17 +53,17 @@ describe Nrename::NumberedFile do
       it 'normalizes file name' do
         file = numbered_file 'abc_34.rb'
 
-        file.stub :number_length => 5
+        file.stub :num_field_length => 5
         expect(file.normalized_path.to_s).to be == 'abc_00034.rb'
       end
     end
   end
 
   describe '#adjusted_number' do
-    it 'returns number, adjusted accordingly to #number_length' do
+    it 'returns number, adjusted accordingly to #num_field_length' do
       file = numbered_file 'foo123bar'
 
-      file.stub :number_length => 4
+      file.stub :num_field_length => 4
       expect(file.adjusted_number).to be == '0123'
     end
   end

data/spec/nrename/options_spec.rb

@@ -6,12 +6,12 @@ describe Nrename::Options do
 
   def_delegator Nrename, :parse_options
 
+  let(:defaults) { parse_options([]) }
+
   after :each do
     Nrename.options.reset                 # do not leak state
   end
 
-  let(:defaults) { parse_options([]) }
-
   describe 'verbosity' do
     it 'is on by default' do
       expect(defaults.verbose).to be_true
@@ -108,16 +108,16 @@ describe Nrename::Options do
   end
 
   describe 'directory arguments' do
-    let(:test_dir) { File.expand_path 'test ][ directory' }
-    let(:subdirs) {  ['aa', 'bb', 'cc', 'foo bar [baz] (quux)'] }
+    let(:test_dir) { File.expand_path 'test [directory]' }
+    let(:subdirs) {  ['aa', 'bb', 'cc', 'foo bar [baz]'] }
 
-    before :all do
+    before :each do
       inside test_dir do
         mkdir subdirs
       end
     end
 
-    after :all do
+    after :each do
       rm_rf test_dir
     end
 

data/spec/nrename/utils_spec.rb

@@ -34,11 +34,7 @@ describe Nrename::Utils do
 
     it 'captures deeply nested directories' do
       inside test_dir do
-        inside 'deeper' do
-          inside 'even_deeper' do
-            mkdir 'deepest'
-          end
-        end
+        mkdir_p 'deeper/even_deeper/deepest'
       end
 
       all_subdirs = [

data/spec/spec_helper.rb

@@ -1,7 +1,5 @@
-require 'rspec'
 require 'fileutils'
-
-require File.expand_path '../../lib/nrename', __FILE__
+require 'nrename'
 
 module Support
   def inside(dir, &block)
@@ -14,6 +12,8 @@ RSpec.configure do |config|
   config.include FileUtils
   config.include Support
 
+  config.order = 'random'
+
   config.expect_with :rspec do |c|
     c.syntax = :expect
   end

metadata

@@ -1,96 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: nrename
 version: !ruby/object:Gem::Version
-  version: 0.2.5
-  prerelease: 
+  version: 0.2.6
 platform: ruby
 authors:
 - Victor Deryagin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-07 00:00:00.000000000 Z
+date: 2013-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.11
+        version: 0.5.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.11
+        version: 0.5.1
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 2.5.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 2.5.4
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: 10.0.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: 10.0.3
 - !ruby/object:Gem::Dependency
   name: rb-inotify
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.8
+        version: 0.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.8
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.11.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.11.0
+        version: 0.9.0
 description: Nrename lets you rename set of numbered files so that they can be sorted
   correctly in any shell or file manager.
 email:
@@ -107,6 +82,7 @@ files:
 - features/renaming_files.feature
 - features/support/env.rb
 - lib/nrename.rb
+- lib/nrename/counter.rb
 - lib/nrename/directory.rb
 - lib/nrename/numbered_file.rb
 - lib/nrename/options.rb
@@ -121,29 +97,26 @@ files:
 homepage: https://github.com/vderyagin/nrename
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2006144639180283266
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: nrename
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Command-line utility for renaming numbered files.
 test_files: []
+has_rdoc: