srtshifter 1.1.0 → 1.1.1

data/bin/srtshifter

@@ -2,4 +2,8 @@
 
 lib = File.expand_path(File.dirname(__FILE__) + '/../lib')
 $LOAD_PATH.unshift(lib) if File.directory?(lib) && !$LOAD_PATH.include?(lib)
-require 'srtshifter'
+
+require 'srtshifter'
+
+shifter = SrtShifter::Shifter.new(ARGV)
+shifter.execute

data/lib/srtshifter/options.rb

@@ -31,7 +31,7 @@ module SrtShifter
 
         opts.on_tail('-h', '--help', 'Show this help message.') do
           puts(opts)
-          exit(0)
+          # exit(0)
         end
         
         opts.parse!
@@ -41,7 +41,6 @@ module SrtShifter
     def validate_args
       begin
 
-
           raise "Operation option is missing" if @options[:operation].nil?
           raise "Unknown operation: #{@options[:operation]}" unless @operations.include? @options[:operation].upcase
 
@@ -53,12 +52,9 @@ module SrtShifter
           raise "Output file is missing" if @arguments[1].nil?
           @options[:output] = @arguments[1]
 
-          # subtitle = SrtShifter::Subtitle.new(@options)
-          # subtitle.shift
-
         rescue Exception => ex
           puts "#{ex.message}. Please use -h or --help for usage."
-          exit(1)
+          # exit(1)
         end
     end
   end

data/lib/srtshifter/shifter.rb

@@ -4,7 +4,7 @@ module SrtShifter
 		def initialize(args)
 			@arguments = args
 			@opts = SrtShifter::Options.new(@arguments)
-			@subtitle = subtitle = SrtShifter::Subtitle.new(@opts.options)
+			@subtitle = SrtShifter::Subtitle.new(@opts.options)
 		end
 
 		def execute

data/lib/srtshifter/subtitle.rb

@@ -32,7 +32,7 @@ module SrtShifter
 
 			end_time = Time.now
 
-			puts "File created with success!"
+			puts "\nFile created with success!"
 			puts "Elapsed time: #{end_time-start_time} seconds."
 		end
 
@@ -44,7 +44,7 @@ module SrtShifter
 
 			current_time = Time.parse(time)
 			new_time = Time.at(current_time.to_f + @opts[:time])
-			"#{new_time.strftime('%H:%M:%S')},#{new_time.usec/1000}"
+			"#{new_time.strftime('%H:%M:%S')},#{sprintf("%.3d",new_time.usec/1000)}"
 		end
 	end
 end

data/lib/srtshifter/version.rb

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

data/lib/srtshifter.rb

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

data/srtshifter.gemspec

@@ -16,4 +16,5 @@ Gem::Specification.new do |gem|
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
+  gem.add_development_dependency 'rake'
 end

data/test/lib/srtshifter/options_test.rb

@@ -2,7 +2,54 @@ require "test_helper"
 
 describe SrtShifter do
 
-	describe "OPTIONS" do
+	describe "Options" do
+		
+		describe "validate_args" do
+
+			before(:each) do
+				@args = {:operation => "add", :time => 10.0, :input => "test/samples/test_srt.srt", :output => "test_output.srt"}
+			end
+
+			after(:each) do
+				@args = nil
+			end
+			
+			it "raise error when get none operation option" do
+				
+				args = ""
+				opts = SrtShifter::Options.new args
+
+				lambda { opts.validate_args }.must_output("Operation option is missing. Please use -h or --help for usage.\n", nil)
+
+			end
+
+			it "raise error when operation is unknown" do
+				
+				opts = SrtShifter::Options.new ""
+				opts.options[:operation] = "bla"
+
+				lambda { opts.validate_args }.must_output("Unknown operation: bla. Please use -h or --help for usage.\n", nil)				
+			end
+
+			it "must accept lowercase existing operations" do
+
+				opts = SrtShifter::Options.new "test/samples/test_srt.srt test_output.srt"
+				@args[:operation] = "add"
+				opts.options = @args
+
+				lambda { opts.validate_args }.must_be_silent				
+			end
+
+			it "raise error when get none time option"
+
+			it "raise error when get none time value"
+
+			it "raise error when get none input file path" 
+
+			it "raise error when get none output file path"
+
+		end
 
 	end
+
 end

data/test/lib/srtshifter/subtitle_test.rb

@@ -1,5 +1,54 @@
 require "test_helper"
 
 describe SrtShifter do
-	
+
+	describe "SUBTITLE" do
+		
+		before(:each) do
+			@options = {:operation => "ADD", :time => 10.0, :input => "test/samples/test_srt.srt", :output => "test_output.srt"}
+		end
+
+		after(:each) do
+			@options = nil
+		end
+
+		describe "convert_time" do
+			
+			it "must add 2.5 seconds to a given time" do
+				
+				given_time = "00:00:10,000"
+
+				@options[:operation] = "ADD"
+				@options[:time] = 2.5
+				sub = SrtShifter::Subtitle.new(@options)
+				
+				sub.convert_time(given_time).must_equal "00:00:12,500"
+
+			end
+
+			it "must subtract 5.3 seconds to a given time" do
+
+				given_time = "00:00:10,000"
+
+				@options[:operation] = "SUB"
+				@options[:time] = 5.3
+				sub = SrtShifter::Subtitle.new(@options)
+
+				sub.convert_time(given_time).must_equal "00:00:04,700"
+
+			end
+
+		end
+
+		describe "shift" do
+			
+			it "must generate a new srt file" do
+				sub = SrtShifter::Subtitle.new(@options)
+				sub.shift
+				File.exist?(@options[:output]).must_equal true
+			end
+
+		end
+
+	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: srtshifter
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,23 @@ autorequire:
 bindir: bin
 cert_chain: []
 date: 2012-12-26 00:00:00.000000000 Z
-dependencies: []
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Shifts STR Subtitles
 email:
 - kimobr@gmail.com
@@ -32,7 +48,6 @@ files:
 - 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
@@ -63,7 +78,6 @@ 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

data/test/lib/srtshifter/shifter_test.rb

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