srtshifter 1.0.2 → 1.1.0

data/lib/srtshifter/options.rb

@@ -3,75 +3,63 @@ require 'optparse'
 module SrtShifter
   class Options
 
-    operations = ["ADD", "SUB"]
+    attr_accessor :options
 
-    options = {}
-    
-    ARGV.options do |opts|
+    def initialize(args)
+      @arguments = args
 
-      opts.banner = "Usage:  #{File.basename($PROGRAM_NAME)} [OPTIONS] input_file output_file"
-      
-      opts.separator ""
-      opts.separator "Common Options:"
+      @operations = ["ADD", "SUB"]
 
-      opts.on("-o","--operation (ADD|SUB)", String, "Type ADD to increase time or SUB to decrease time.") do |o|
-        options[:operation] = o.upcase if operations.include? o.upcase
-      end
+      @options = {}
+    end
 
-      opts.on("-t","--time (VALUE)", Float, "Time in milliseconds.") do |n|
-        options[:time] = n
-      end
+    def parse_options
+      @arguments.options do |opts|
+
+        opts.banner = "Usage:  #{File.basename($PROGRAM_NAME)} [OPTIONS] input_file output_file"
+        
+        opts.separator ""
+        opts.separator "Common Options:"
+
+        opts.on("-o","--operation (ADD|SUB)", String, "Type ADD to increase time or SUB to decrease time.") do |o|
+          @options[:operation] = o
+        end
+
+        opts.on("-t","--time (VALUE)", Float, "Time in milliseconds.") do |n|
+          @options[:time] = n
+        end
 
-      opts.on_tail('-h', '--help', 'Show this help message.') do
-        puts(opts)
-        exit(0)
+        opts.on_tail('-h', '--help', 'Show this help message.') do
+          puts(opts)
+          exit(0)
+        end
+        
+        opts.parse!
       end
-      
-      opts.parse!
+    end
 
+    def validate_args
       begin
-        raise "Operation option is missing" if options[:operation].nil?
-        raise "Time option is missing" if options[:time].nil?
-        
-        raise "Input file is missing" if ARGV[0].nil?
-        options[:input] = ARGV[0]
-        
-        raise "Output file is missing" if ARGV[1].nil?
-        options[:output] = ARGV[1]
 
-        subtitle = SrtShifter::Subtitle.new(options)
-        subtitle.shift
 
-      rescue Exception => ex
-        puts "#{ex.message}. Please use -h or --help for usage."
-        exit(1)
-      end
+          raise "Operation option is missing" if @options[:operation].nil?
+          raise "Unknown operation: #{@options[:operation]}" unless @operations.include? @options[:operation].upcase
+
+          raise "Time option is missing" if @options[:time].nil?
+                    
+          raise "Input file is missing" if @arguments[0].nil?
+          @options[:input] = @arguments[0]
+          
+          raise "Output file is missing" if @arguments[1].nil?
+          @options[:output] = @arguments[1]
+
+          # subtitle = SrtShifter::Subtitle.new(@options)
+          # subtitle.shift
 
-      # begin
-      #   raise "Unknown option(s) #{options.join(', ')}" if options.empty?
-      # rescue Exception => e
-      #   puts "#{ex.message()}. Please use -h or --help for usage."
-      #   exit(1)
-      # end
-      
-      # begin
-
-      #   opts.parse! ARGV
-
-      #   # raise OptionParser::MissingArgument if options[:operation].nil? || options[:time].nil?
-
-      #   # options[:input] = ARGV[0] unless ARGV[0] == nil
-      #   # options[:output] = ARGV[1] unless ARGV[1] == nil
-
-      #   # subtitle = SrtShifter::Subtitle.new(options)
-      #   # subtitle.shift
-      # rescue 
-      #   # $stderr.print $!
-      #   # puts options
-      #   # puts "\n" 
-      #   # puts opts
-      #   # #exit
-      # end
+        rescue Exception => ex
+          puts "#{ex.message}. Please use -h or --help for usage."
+          exit(1)
+        end
     end
   end
 end

data/lib/srtshifter/shifter.rb

@@ -0,0 +1,24 @@
+module SrtShifter
+	class Shifter
+		
+		def initialize(args)
+			@arguments = args
+			@opts = SrtShifter::Options.new(@arguments)
+			@subtitle = subtitle = SrtShifter::Subtitle.new(@opts.options)
+		end
+
+		def execute
+			@subtitle.shift if parsed_options? and valid_args?
+		end
+
+		protected
+		def parsed_options?
+			@opts.parse_options
+		end
+
+		def valid_args?
+			@opts.validate_args
+		end
+
+	end
+end

data/lib/srtshifter/version.rb

@@ -1,3 +1,3 @@
 module SrtShifter
-  VERSION = "1.0.2"
+  VERSION = "1.1.0"
 end

data/lib/srtshifter.rb

@@ -1,3 +1,7 @@
 require "srtshifter/subtitle"
 require "srtshifter/options"
-require "srtshifter/version"
+require "srtshifter/version"
+require "srtshifter/shifter"
+
+shifter = SrtShifter::Shifter.new(ARGV)
+shifter.execute

data/test/lib/srtshifter/shifter_test.rb

@@ -0,0 +1,2 @@
+require "test_helper"
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: srtshifter
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-25 00:00:00.000000000 Z
+date: 2012-12-26 00:00:00.000000000 Z
 dependencies: []
 description: Shifts STR Subtitles
 email:
@@ -27,10 +27,12 @@ files:
 - bin/srtshifter
 - lib/srtshifter.rb
 - lib/srtshifter/options.rb
+- lib/srtshifter/shifter.rb
 - lib/srtshifter/subtitle.rb
 - lib/srtshifter/version.rb
 - srtshifter.gemspec
 - test/lib/srtshifter/options_test.rb
+- test/lib/srtshifter/shifter_test.rb
 - test/lib/srtshifter/subtitle_test.rb
 - test/lib/srtshifter/version_test.rb
 - test/samples/test_srt.srt
@@ -61,6 +63,7 @@ specification_version: 3
 summary: It fixes the timing of a given SubRip file
 test_files:
 - test/lib/srtshifter/options_test.rb
+- test/lib/srtshifter/shifter_test.rb
 - test/lib/srtshifter/subtitle_test.rb
 - test/lib/srtshifter/version_test.rb
 - test/samples/test_srt.srt