renmov 0.0.3 → 0.1.0

data/bin/renmov

@@ -8,5 +8,5 @@ rescue LoadError
 end
 
 cli = Renmov::CLI.new
-cli.parse_options
-cli.run
+exit_status = cli.run
+exit exit_status

data/features/options.feature

@@ -67,3 +67,39 @@ Feature: Options
 
     Usage: renmov [options] filename...
     """
+
+  Scenario: no arguments/options
+    Given a blank slate
+    When I run `renmov`
+    Then the exit status should be 1
+    And the stderr should contain:
+    """
+    renmov: no filename(s) provided
+    Rename video files to a consistent format.
+
+    Usage: renmov [options] filename...
+    """
+
+  Scenario: invalid option (short)
+    Given a blank slate
+    When I run `renmov -i`
+    Then the exit status should be 1
+    And the stderr should contain:
+    """
+    renmov: invalid option: -i
+    Rename video files to a consistent format.
+
+    Usage: renmov [options] filename...
+    """
+
+  Scenario: invalid option (long)
+    Given a blank slate
+    When I run `renmov --invalid`
+    Then the exit status should be 1
+    And the stderr should contain:
+    """
+    renmov: invalid option: --invalid
+    Rename video files to a consistent format.
+
+    Usage: renmov [options] filename...
+    """

data/features/rename_files.feature

@@ -14,3 +14,8 @@ Feature: Rename Files
       | TV.Show.S01E02.HDTV.x264-LOL.[VTV].mp4  | tv.show.s01e02.mp4 |
       | The.TV.Show.S01E02.[VTV].avi            | tv.show.s01e02.avi |
       | TV.Show.2012.S01E02.x264-LOL.mp4        | tv.show.s01e02.mp4 |
+
+  Scenario: same file name
+    Given an empty file named "tv.show.s01e01.mp4"
+    When I successfully run `renmov tv.show.s01e01.mp4`
+    Then a file named "tv.show.s01e01.mp4" should exist

data/lib/renmov.rb

@@ -1,5 +1,6 @@
 require 'renmov/basic_renamer'
 require 'renmov/cli'
+require 'renmov/errors'
 require 'renmov/version'
 
 module Renmov

data/lib/renmov/basic_renamer.rb

@@ -1,6 +1,7 @@
 module Renmov
   class BasicRenamer
     attr_reader :filename
+
     def initialize(filename)
       @filename = filename.downcase
     end
@@ -38,7 +39,7 @@ module Renmov
 
     def get_format
       format = filename.dup
-      format.gsub!(/.*\.(...)\z/, '\1')
+      format.gsub!(/.*\.(.*)\z/, '\1')
 
       format
     end

data/lib/renmov/cli.rb

@@ -1,65 +1,92 @@
 require 'optparse'
 require 'fileutils'
 require 'renmov/basic_renamer'
+require 'renmov/errors'
 
 module Renmov
   class CLI
-    attr_reader :args
-    attr_accessor :options
-    attr_accessor :filenames
-    attr_accessor :renamer
+    attr_reader   :executable_name, :args, :options, :optparse
+    attr_accessor :filenames, :renamer
 
     def initialize(args = ARGV, renamer = BasicRenamer)
+      @executable_name = File.basename($PROGRAM_NAME, '.rb')
       @args      = args
-      @filenames = []
       @options   = { verbose: false, noop: false }
+      @optparse  = OptionParser.new
+      @filenames = []
       @renamer   = renamer
     end
 
-    def parse_options
-      optparse = OptionParser.new do |opts|
-        executable_name = File.basename($PROGRAM_NAME, '.rb')
-        opts.banner = <<EOL
-Rename video files to a consistent format.
+    def run
+      exit_status = 0
 
-Usage: #{executable_name} [options] filename...
-EOL
+      begin
+        parse_options
+        raise NoFilenameError if filenames.empty?
 
-        opts.on('-v', '--verbose', 'Output more information') do
-          options[:verbose] = true
-        end
+        filenames.each do |filename|
+          dirname   = "#{File.dirname(filename)}/"
+          dirname.gsub!(/\A\.\/\z/, '')
+          
+          basename  = File.basename(filename)
+          renamer_i = renamer.new(basename)
+          newname   = "#{dirname}#{renamer_i.rename}"
 
-        opts.on('-n', '--noop', 'Output actions without invoking them') do
-          options[:noop]    = true
-          options[:verbose] = true
+          rename_file(filename, newname)
         end
+      rescue OptionParser::InvalidOption => e
+        output_error_message(e)
+        exit_status = 1
+      rescue NoFilenameError => e
+        output_error_message(e)
+        exit_status = 1
+      end
 
-        opts.on_tail('-h', '--help', 'Show this message') do
-          puts opts
-          exit
-        end
+      exit_status
+    end
 
-        opts.on_tail('--version', 'Show version') do
-          puts Renmov::VERSION
-          exit
-        end
+    def parse_options
+      optparse.banner =
+        ['Rename video files to a consistent format.', '',
+         "Usage: #{executable_name} [options] filename..."].join("\n")
+
+      optparse.on('-v', '--verbose',
+                  'Output more information') do
+        options[:verbose] = true
+      end
+
+      optparse.on('-n', '--noop',
+                  'Output actions without invoking them') do
+        options[:noop]    = true
+        options[:verbose] = true
+      end
+
+      optparse.on_tail('-h', '--help',
+                       'Show this message') do
+        puts optparse
+        exit
+      end
+
+      optparse.on_tail('--version',
+                       'Show version') do
+        puts Renmov::VERSION
+        exit
       end
 
       self.filenames = optparse.parse! args
     end
 
-    def run
-      filenames.each do |filename|
-        dirname   = "#{File.dirname(filename)}/"
-        dirname.gsub!(/\A\.\/\z/, '')
-        
-        basename  = File.basename(filename)
-        renamer_i = renamer.new(basename)
-        newname   = "#{dirname}#{renamer_i.rename}"
-        FileUtils.mv(filename,
-                     newname,
+    def output_error_message(msg)
+      $stderr.puts "#{executable_name}: #{msg}"
+      $stderr.puts optparse
+    end
+
+    def rename_file(old, new)
+      unless old == new
+        FileUtils.mv(old,
+                     new,
                      verbose: options[:verbose],
-                     noop: options[:noop])
+                     noop:    options[:noop])
       end
     end
   end

data/lib/renmov/errors.rb

@@ -0,0 +1,7 @@
+module Renmov
+  class NoFilenameError < StandardError
+    def to_s
+      'no filename(s) provided'
+    end
+  end
+end

data/lib/renmov/version.rb

@@ -1,3 +1,3 @@
 module Renmov
-  VERSION = '0.0.3'
+  VERSION = '0.1.0'
 end

data/spec/renmov/cli_spec.rb

@@ -3,22 +3,107 @@ require 'fileutils'
 
 module Renmov
   describe CLI do
-    describe '#parse_options' do
-      let(:default_options) { { verbose: false, noop: false } }
+    describe '#run' do
+      let(:tmpdir) { File.expand_path('../../../tmp', __FILE__) }
 
+      before(:each) do
+        filenames.each { |f| FileUtils.rm(f) if File.exists?(f) }
+        newnames.each  { |f| FileUtils.rm(f) if File.exists?(f) }
+
+        FileUtils.touch(filenames) unless filenames.empty? 
+        cli = CLI.new(filenames)
+        @exit_status = cli.run
+      end
+
+      context 'no filename provided' do
+        let(:filenames) { [] }
+        let(:newnames)  { [] }
+
+        it 'exits with a status of 1' do
+          @exit_status.should == 1
+        end
+      end
+
+      context 'one filename provided' do
+        context 'filename different than newname' do
+          let(:filenames) { ["#{tmpdir}/TV.Show.S01E02.HDTV.test.mp4"] }
+          let(:newnames)  { ["#{tmpdir}/tv.show.s01e02.mp4"] }
+
+          it 'properly renames file' do
+            File.should_not exist(filenames[0])
+            File.should exist(newnames[0])
+          end
+
+          it 'exits with a status of 0' do
+            @exit_status.should == 0
+          end
+        end
+
+        context 'filename same as newname' do
+          let(:filenames) { ["#{tmpdir}/tv.show.s01e02.mp4"] }
+          let(:newnames)  { ["#{tmpdir}/tv.show.s01e02.mp4"] }
+
+          it 'does not rename file' do
+            File.should exist(newnames[0])
+          end
+
+          it 'exits with a status of 0' do
+            @exit_status.should == 0
+          end
+        end
+      end
+
+      context 'multiple filenames provided' do
+        context 'filenames different than newnames' do
+          let(:filenames) { ["#{tmpdir}/TV.Show.S01E02.HDTV.test.mp4",
+                             "#{tmpdir}/The.TV.Show.S02E03.LOL.avi"] }
+          let(:newnames)  { ["#{tmpdir}/tv.show.s01e02.mp4",
+                             "#{tmpdir}/tv.show.s02e03.avi"] }
+
+          it 'properly renames all files' do
+            filenames.each { |f| File.should_not exist(f) }
+            newnames.each  { |n| File.should exist(n) }
+          end
+
+          it 'exits with a status of 0' do
+            @exit_status.should == 0
+          end
+        end
+
+        context 'one filename same as and one filename different than newnames' do
+          let(:filenames) { ["#{tmpdir}/TV.Show.S01E02.HDTV.test.mp4",
+                             "#{tmpdir}/tv.show.s02e03.avi"] }
+          let(:newnames)  { ["#{tmpdir}/tv.show.s01e02.mp4",
+                             "#{tmpdir}/tv.show.s02e03.avi"] }
+
+          it 'properly renames first file and not second file' do
+            File.should_not exist(filenames[0])
+            File.should exist(filenames[1])
+            newnames.each  { |n| File.should exist(n) }
+          end
+
+          it 'exits with a status of 0' do
+            @exit_status.should == 0
+          end
+        end
+      end
+    end
+
+    describe '#parse_options' do
       before(:each) do
         @cli = CLI.new(options + filenames)
+        @default_options = @cli.options
         @cli.parse_options
       end
 
-      context 'with no options provided' do
+      context 'no options provided' do
         let(:options) { [] }
 
-        context 'with no filenames provided' do
+        context 'no filenames provided' do
           let(:filenames) { [] }
 
           it 'keeps default options' do
-            @cli.options.should == default_options
+            @cli.options.should == @default_options
           end
 
           it 'sets filenames to []' do
@@ -26,11 +111,11 @@ module Renmov
           end
         end
 
-        context 'with one filename provided' do
+        context 'one filename provided' do
           let(:filenames) { ['TV.Show.S01E02.HDTV.test.mp4'] }
 
           it 'keeps default options' do
-            @cli.options.should == default_options
+            @cli.options.should == @default_options
           end
 
           it 'sets filenames to filename provided' do
@@ -39,14 +124,14 @@ module Renmov
         end
       end
 
-      context 'with verbose option provided' do
+      context 'verbose option provided' do
         let(:options) { ['-v'] }
 
-        context 'with no filenames provided' do
+        context 'no filenames provided' do
           let(:filenames) { [] }
 
           it 'merges verbose with default options' do
-            @cli.options.should == default_options.merge(verbose: true)
+            @cli.options.should == @default_options.merge(verbose: true)
           end
 
           it 'sets filenames to []' do
@@ -54,11 +139,11 @@ module Renmov
           end
         end
 
-        context 'with one filename provided' do
+        context 'one filename provided' do
           let(:filenames) { ['TV.Show.S01E02.HDTV.test.mp4'] }
 
           it 'merges verbose with default options' do
-            @cli.options.should == default_options.merge(verbose: true)
+            @cli.options.should == @default_options.merge(verbose: true)
           end
 
           it 'sets filenames to filename provided' do
@@ -67,14 +152,14 @@ module Renmov
         end
       end
 
-      context 'with noop option provided' do
+      context 'noop option provided' do
         let(:options) { ['-n'] }
 
-        context 'with no filenames provided' do
+        context 'no filenames provided' do
           let(:filenames) { [] }
 
           it 'merges verbose and noop with default options' do
-            @cli.options.should == default_options.merge(verbose: true,
+            @cli.options.should == @default_options.merge(verbose: true,
                                                          noop: true)
           end
 
@@ -83,11 +168,11 @@ module Renmov
           end
         end
 
-        context 'with one filename provided' do
+        context 'one filename provided' do
           let(:filenames) { ['TV.Show.S01E02.HDTV.test.mp4'] }
 
           it 'merges verbose and noop with default options' do
-            @cli.options.should == default_options.merge(verbose: true,
+            @cli.options.should == @default_options.merge(verbose: true,
                                                          noop: true)
           end
 
@@ -97,45 +182,5 @@ module Renmov
         end
       end
     end
-
-    describe '#run' do
-      let(:tmpdir) { File.expand_path('../../../tmp', __FILE__) }
-
-      before(:each) do
-        filenames.each do |filename|
-          FileUtils.rm(filename) if File.exists?(filename)
-        end
-        newnames.each do |newname|
-          FileUtils.rm(newname) if File.exists?(newname)
-        end
-
-        FileUtils.touch(filenames)
-        cli = CLI.new(filenames)
-        cli.parse_options
-        cli.run
-      end
-
-      context 'with one filename provided' do
-        let(:filenames) { ["#{tmpdir}/TV.Show.S01E02.HDTV.test.mp4"] }
-        let(:newnames)  { ["#{tmpdir}/tv.show.s01e02.mp4"] }
-
-        it 'properly renames file' do
-          File.exists?(filenames[0]).should_not be_true
-          File.exists?(newnames[0]).should be_true
-        end
-      end
-
-      context 'with multiple filenames provided' do
-        let(:filenames) { ["#{tmpdir}/TV.Show.S01E02.HDTV.test.mp4",
-                           "#{tmpdir}/The.TV.Show.S02E03.LOL.avi"] }
-        let(:newnames)  { ["#{tmpdir}/tv.show.s01e02.mp4",
-                           "#{tmpdir}/tv.show.s02e03.avi"] }
-
-        it 'properly renames all files' do
-          filenames.each { |f| File.exists?(f).should_not be_true }
-          newnames.each  { |n| File.exists?(n).should be_true }
-        end
-      end
-    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: renmov
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -75,6 +75,7 @@ files:
 - lib/renmov.rb
 - lib/renmov/basic_renamer.rb
 - lib/renmov/cli.rb
+- lib/renmov/errors.rb
 - lib/renmov/version.rb
 - renmov.gemspec
 - spec/renmov/basic_renamer_spec.rb
@@ -104,7 +105,7 @@ rubyforge_project:
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: renmov-0.0.3
+summary: renmov-0.1.0
 test_files:
 - features/options.feature
 - features/rename_files.feature