subtool 0.1.0 → 0.1.1

data/.gitignore

@@ -18,3 +18,4 @@ tmp
 .yardoc
 _yardoc
 doc/
+Gemfile.lock

data/.travis.yml

@@ -7,3 +7,6 @@ rvm:
   - ruby-head
   - 1.8.7
   - ree
+  - jruby-head
+  - jruby-18mode
+  - jruby-19mode

data/README.md

@@ -1,4 +1,6 @@
-[![Build Status](https://travis-ci.org/0livier/subtool.png)](https://travis-ci.org/0livier/subtool) [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/0livier/subtool) [![Gem Version](https://badge.fury.io/rb/subtool.png)](http://badge.fury.io/rb/subtool)
+# Subtool
+
+[![Build Status](https://travis-ci.org/0livier/subtool.png)](https://travis-ci.org/0livier/subtool) [![Code Climate](https://codeclimate.com/github/0livier/subtool.png)](https://codeclimate.com/github/0livier/subtool) [![Gem Version](https://badge.fury.io/rb/subtool.png)](http://badge.fury.io/rb/subtool)
 
 subtool is a commandline tool that help fix the timing of subtitles files.
 
@@ -10,10 +12,13 @@ Install it using the gem command:
 
 ## Usage
 
+    subtool -i subtitle.srt add > output.srt
+    subtool < subtitle.srt remove 3.5 -o output.srt
+    subtool --help
 
 ## Want another tool ?
 
-There are several other tool to manipulate SRT files. Among them,
+There are several other tools to manipulate SRT files. Among them,
 
 * https://github.com/remram44/srt-shift
 * http://www.aegisub.org/

data/Rakefile

@@ -10,7 +10,7 @@ spec = eval(File.read('subtool.gemspec'))
 Gem::PackageTask.new(spec) do |pkg|
 end
 
-Dir.mkdir 'tmp' unless File.exists?("tmp")
+Dir.mkdir 'tmp' unless File.exists?('tmp')
 
 CUKE_RESULTS = 'tmp/results.html'
 

data/bin/subtool

@@ -24,7 +24,7 @@ option_parser = OptionParser.new do |opts|
   end
 
   opts.on('-o', '--output FILENAME',
-          'Ouput SRT filename. STDOUT by default or if - is given.') do |filename|
+          'Output SRT filename. STDOUT by default or if - is given.') do |filename|
     options.output = filename unless filename == '-'
   end
 
@@ -54,10 +54,15 @@ if ARGV.count == 0
   exit
 end
 
-commands = ARGV.dup
+# as jruby does not support ARGV/ARGF well (see code history)
+# we have to import
+if options.input
+  subtitles = Subtool::Import::Srt.file(options.input)
+else
+  subtitles = Subtool::Import::Srt.filehandler($stdin)
+end
 
-ARGV.replace([options.input]) if options.input
-subtitles = Subtool::Import::Srt.filehandler(ARGF)
+commands = ARGV.dup
 
 # @Todo more filters otherwise the loop won't make any sense
 while commands.count > 0

data/features/files/simple2.srt

@@ -0,0 +1,12 @@
+1
+00:00:01,000 --> 00:00:04,074
+My wonderful SRT
+
+2
+00:00:52,341 --> 00:00:58,341
+SHOULD BE NICE
+And clean
+
+3
+00:01:03,091 --> 00:01:05,881
+Nah?

data/features/filter.feature

@@ -53,3 +53,14 @@ Feature: Modifying Parser Import / Export should get and write content properly
       | 1  | 22100   | 26500   | Altocumulus clouds occur between six thousand |
       | 2  | 26700   | 29900   | and twenty thousand feet above ground level.  |
       | 3  | 3663200 | 7324300 | QUACK\n\\_o<                                  |
+
+  Scenario: Srt Loading #2
+    When I parse a Srt file named "features/files/simple2.srt"
+    And I add a delay of 2 seconds
+    And I export the subtitles to a file named "tmp/output_simple2.srt"
+    And I parse a Srt file named "tmp/output_simple2.srt"
+    Then I should have the following subtitles:
+      | id | start | end   | body                      |
+      | 1  | 3000  | 6074  | My wonderful SRT          |
+      | 2  | 54341 | 60341 | SHOULD BE NICE\nAnd clean |
+      | 3  | 65091 | 67881 | Nah?                      |

data/features/import_export.feature

@@ -4,7 +4,7 @@ Feature: Parser Import / Export should get and write content properly
   As a developer of subtool
   I want it to load and write them correctly
 
-  Scenario: Srt Loading
+  Scenario: Srt Loading #1
     When I parse a Srt file named "features/files/simple.srt"
     Then I should have the following subtitles:
       | id | start   | end     | body                                          |
@@ -12,6 +12,15 @@ Feature: Parser Import / Export should get and write content properly
       | 2  | 24600   | 27800   | and twenty thousand feet above ground level.  |
       | 3  | 3661100 | 7322200 | QUACK\n\\_o<                                  |
 
+  Scenario: Srt Loading #2
+    When I parse a Srt file named "features/files/simple2.srt"
+    And I export the subtitles to a file named "tmp/output_simple2.srt"
+    And I parse a Srt file named "tmp/output_simple2.srt"
+    Then I should have the following subtitles:
+      | id | start | end   | body                      |
+      | 1  | 1000  | 4074  | My wonderful SRT          |
+      | 2  | 52341 | 58341 | SHOULD BE NICE\nAnd clean |
+      | 3  | 63091 | 65881 | Nah?                      |
 
   Scenario: Writing file
     When I parse a Srt file named "features/files/simple.srt"
@@ -23,7 +32,7 @@ Feature: Parser Import / Export should get and write content properly
       | 2  | 24600   | 27800   | and twenty thousand feet above ground level.  |
       | 3  | 3661100 | 7322200 | QUACK\n\\_o<                                  |
 
-  # need to call the binary since it does not capture the output of current process
+  # need to call the binary since we do not capture the output of current process
   Scenario: Writing file on STDOUT
     When I call "subtool" with the argument "-i ../../features/files/simple.srt add 0"
     Then the output should contain "1\n00:00:20,000 --> 00:00:24,400\nAltocumulus clouds occur between six thousand"

data/features/support/env.rb

@@ -14,6 +14,15 @@ Before do
   @puts = true
   @original_rubylib = ENV['RUBYLIB']
   ENV['RUBYLIB'] = LIB_DIR + File::PATH_SEPARATOR + ENV['RUBYLIB'].to_s
+
+  # Spawning processes in tests with jruby is slow, so we wait longer and we try to make it start faster
+  @aruba_timeout_seconds = RUBY_PLATFORM == 'java' ? 60 : 3
+  Aruba.configure do |config|
+    config.before_cmd do |cmd|
+      set_env('JRUBY_OPTS', "-X-C #{ENV['JRUBY_OPTS']}") # disable JIT since these processes are so short lived
+      set_env('JAVA_OPTS', "#{ENV['JAVA_OPTS']}")
+    end
+  end if RUBY_PLATFORM == 'java'
 end
 
 After do

data/lib/subtool/import/srt.rb

@@ -2,16 +2,22 @@ module Subtool
   module Import
     class Srt
 
+      HOUR = 60 * 60 * 1000
+      MIN = 60 * 1000
+      SEC = 1000
+
       def self.filehandler(fh)
         subtitles = []
-
         until fh.eof? do
 
           number = Integer(fh.readline.strip)
           position = self.parse_position(fh.readline.strip)
-          body = fh.readline("\n\n").strip
+          body = ""
+          while (! fh.eof?) && ("" != (content = fh.readline.strip))
+            body = body + content + "\n"
+          end
 
-          subtitles.push(Subtool::Subtitle.new(number, position[:start], position[:end], body))
+          subtitles.push(Subtool::Subtitle.new(number, position[:start], position[:end], body.strip))
         end
 
         subtitles
@@ -28,13 +34,20 @@ module Subtool
       def self.parse_position(position)
         matches = position.match(/^(\d\d):(\d\d):(\d\d),(\d\d\d) --> (\d\d):(\d\d):(\d\d),(\d\d\d)$/)
         throw Exception.new("Can't parse #{position} as a valid time range") unless matches
-        matches = matches[1..8].map { |s| Integer(s) }
+
+        matches = matches[1..8].map { |s| s.to_i }
         {
-            :start => matches[0]*60*60*1000 + matches[1]*60*1000 + matches[2]*1000 + matches[3],
-            :end => matches[4]*60*60*1000 + matches[5]*60*1000 + matches[6]*1000 + matches[7]
+            :start => self.to_millisecs(matches[0], matches[1], matches[2], matches[3]),
+            :end => self.to_millisecs(matches[4], matches[5], matches[6], matches[7]),
         }
       end
 
+      private
+
+      def self.to_millisecs(hour, min, sec, millisec)
+        return hour * HOUR + min * MIN + sec * SEC + millisec
+      end
+
     end
   end
 end

data/lib/subtool/version.rb

@@ -1,3 +1,3 @@
 module Subtool
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: subtool
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-19 00:00:00.000000000 Z
+date: 2013-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &17361740 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17361740
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &17361220 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17361220
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &17360700 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +53,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17360700
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: subtool is a library and CLI program to add (or remove) delay in subtitles
   files
 email: olivier@lol.cat
@@ -55,13 +70,13 @@ files:
 - .gitignore
 - .travis.yml
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
 - bin/subtool
 - features/files/malformed.srt
 - features/files/simple.srt
+- features/files/simple2.srt
 - features/filter.feature
 - features/help.feature
 - features/import_export.feature
@@ -87,15 +102,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 4316214694996564458
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 4316214694996564458
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: CLI tool for manipulating subtitles files

data/Gemfile.lock

@@ -1,42 +0,0 @@
-PATH
-  remote: .
-  specs:
-    subtool (0.0.1)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    aruba (0.5.1)
-      childprocess (~> 0.3.6)
-      cucumber (>= 1.1.1)
-      rspec-expectations (>= 2.7.0)
-    builder (3.1.4)
-    childprocess (0.3.6)
-      ffi (~> 1.0, >= 1.0.6)
-    cucumber (1.2.1)
-      builder (>= 2.1.2)
-      diff-lcs (>= 1.1.3)
-      gherkin (~> 2.11.0)
-      json (>= 1.4.6)
-    diff-lcs (1.1.3)
-    ffi (1.2.0)
-    gherkin (2.11.5)
-      json (>= 1.4.6)
-    json (1.7.5)
-    multi_json (1.1.0)
-    rake (10.0.2)
-    rspec-expectations (2.12.0)
-      diff-lcs (~> 1.1.3)
-    simplecov (0.6.1)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.5.3)
-    simplecov-html (0.5.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  aruba
-  rake
-  simplecov
-  subtool!