nrename 0.0.1 → 0.0.2

data/features/renaming_files.feature

@@ -84,3 +84,36 @@ Feature: Renaming files
     And the following files should exist inside directory "bar":
     | 0033.txt |
     | 1234.txt |
+
+  Scenario: Renaming files with bare numbers
+    Given a directory named "dir"
+    And the following empty files inside directory "dir":
+    | bb1.txt    |
+    | bb10.txt   |
+    | cc0023.txt |
+    When I cd to "dir"
+    When I run `nrename -XN`
+    Then the exit status should be 0
+    And the following files should exist:
+    | 01.txt |
+    | 10.txt |
+    | 23.txt |
+    And the following files should not exist:
+    | bb1.txt    |
+    | bb1o.txt   |
+    | cc0023.txt |
+
+
+  Scenario: Using custom regular expression
+    Given a directory named "dir"
+    And the following empty files inside directory "dir":
+    | 003_1.txt    |
+    | 003_10.txt   |
+    | 003_0023.txt |
+    When I cd to "dir"
+    When I run `nrename -X --regexp '^003_(\d+)\.txt'`
+    Then the exit status should be 0
+    And the following files should exist:
+    | 003_01.txt |
+    | 003_10.txt |
+    | 003_23.txt |

data/features/support/env.rb

@@ -1,4 +1,5 @@
 require 'aruba/cucumber'
+require 'fileutils'
 
 ENV['PATH'] = "#{File.expand_path __FILE__, '../../../bin'}#{File::PATH_SEPARATOR}#{ENV['PATH']}"
 
@@ -17,3 +18,7 @@ Then(/^the following files should exist inside directory "([^"]*)":$/) do |direc
     check_file_presence ["#{directory}/#{file_row[0]}"], true
   end
 end
+
+After do
+  FileUtils.rm_rf File.expand_path('../../../tmp', __FILE__)
+end

data/lib/nrename/directory.rb

@@ -6,15 +6,12 @@ module Nrename
     def initialize(dir)
       @dir = Pathname.new dir
 
-      unless @dir.absolute?
-        fail ArgumentError, 'directory path should be absolute.'
-      end
-
       opts = Nrename.options
 
       @verbose = opts.verbose
       @execute = opts.execute
       @pattern = opts.pattern
+      @numbers_only = opts.numbers_only
     end
 
     def numbered_files
@@ -45,7 +42,13 @@ module Nrename
     def normalized_name_for(path)
       dirname, filename = path.split
       new_filename = filename.to_s
-      new_filename[@pattern, 1] = adjusted_number_string_for(path)
+      if @numbers_only
+        name = adjusted_number_string_for path
+        extname = filename.extname
+        new_filename = "#{name}#{extname}"
+      else
+        new_filename[@pattern, 1] = adjusted_number_string_for(path)
+      end
       dirname + new_filename
     end
 

data/lib/nrename/options.rb

@@ -5,11 +5,12 @@ module Nrename
   module Options
     def self.parse(args)
       default_options = {
-        :dirs      => [],
-        :execute   => false,
-        :pattern   => /(\d+)/,
-        :recursive => false,
-        :verbose   => true
+        :numbers_only => false,
+        :dirs         => [],
+        :execute      => false,
+        :pattern      => /(\d+)/,
+        :recursive    => false,
+        :verbose      => true
       }
 
       options = OpenStruct.new default_options
@@ -37,6 +38,16 @@ module Nrename
           options.recursive = rec
         end
 
+        opts.on '-N', '--numbers-only',
+             'Leave only numbers in file name' do |n|
+          options.numbers_only = n
+        end
+
+        opts.on '--regexp REGEXP', Regexp,
+             'Use REGEXP to match filenames' do |regexp|
+          options.pattern = regexp
+        end
+
         opts.on '-v', '--[no-]verbose', 'Run verbosely' do |v|
           options.verbose = v
         end

data/lib/nrename/version.rb

@@ -1,3 +1,3 @@
 module Nrename
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/nrename/directory_spec.rb

@@ -85,7 +85,7 @@ describe Nrename::Directory do
 
   describe '#normalize' do
     before do
-      Nrename.options.stub execute: true
+      Nrename.options.stub execute: true, verbose: false
     end
 
     it 'renames files so than they can be sorted properly' do
@@ -93,9 +93,6 @@ describe Nrename::Directory do
         touch %w[1 2 3 10 11 004 005 006]
       end
 
-      # turn off verbose output:
-      Nrename.options.stub verbose: false
-
       dir = Nrename::Directory.new test_dir
       dir.normalize
 
@@ -108,7 +105,16 @@ describe Nrename::Directory do
   describe '#normalized_name_for' do
     it 'returns normalized name for file' do
       dir = Nrename::Directory.new test_dir
-      file = Pathname.new(test_dir) + '1.txt'
+      file = Pathname.new(test_dir) + 'b1.txt'
+      dir.stub num_field_length: 4
+      new_name = dir.normalized_name_for(file).basename.to_s
+      new_name.should be == 'b0001.txt'
+    end
+
+    it 'returns bare number if numbers_only options is provided' do
+      Nrename.options.stub numbers_only: true
+      dir = Nrename::Directory.new test_dir
+      file = Pathname.new(test_dir) + 'b1.txt'
       dir.stub num_field_length: 4
       new_name = dir.normalized_name_for(file).basename.to_s
       new_name.should be == '0001.txt'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nrename
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &81769620 !ruby/object:Gem::Requirement
+  requirement: &74275200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *81769620
+  version_requirements: *74275200
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &81769410 !ruby/object:Gem::Requirement
+  requirement: &74274990 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *81769410
+  version_requirements: *74274990
 description: ''
 email:
 - vderyagin@gmail.com