subshift 0.0.1.pre → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eca0f3e420aa7da6bc77caf3fe0d82b0d054e489
-  data.tar.gz: abbbf371c94959ee413b1b31492db2f52946572c
+  metadata.gz: 12a63eff2c966223e00b6dad281bcf19c969a9ff
+  data.tar.gz: 66ed320752ad51fa811664fdfd6dcbda7c3b2093
 SHA512:
-  metadata.gz: f69963697a4df6b11a50408605a2f9894be0cc6c2ade11e220095c0e1e0e6d4df7a0321dd96a62535d66645c7b9aedd48af997dea8e4bc63e5db14787d9c5ef2
-  data.tar.gz: 4edd16730ac6c4d4b95f32d2901d5a572bac2b44977cdf786bacb0d76154b12d815aff25a7aa667857fcf68a9d02ead3acad6b42722f641312f3dbf331abe031
+  metadata.gz: 536e92b7bf5beebfb618caafdd65a067bf78b0be5585f5cd24aaf8c7268e5cce96e1abde150cf954159bb3794d9c17385db76500aa5f35c7ece0cab556d9f1dc
+  data.tar.gz: 47c8dba8776adf289d120125123f319569088003b3357ddbc43abd80cd1b5c1a3496fef73ffa5d679663f3742d714eeaf821c7c4f7484ba1667bffb79b542c25

data/README.md

@@ -37,7 +37,7 @@ Here are some extracts from it:
 
 require 'subshift'
 
-Subshift::Runner.run!(ARGV)
+Subshift::Runner.run(ARGV)
 ```
 
 ```ruby
@@ -45,30 +45,65 @@ module Subshift
   class Runner
     # ...
 
-    def run!
+    def run
       File.copylines(source, destination) do |line|
-        line.timeline? ? line.shift_times(delay) : line
+        shift_times(line) if timeline?(line)
       end
     end
+
+  private
+
+    def shift_times(line)
+      line.gsub(Time::FORMAT) do |time|
+        Time.parse(time) + delay
+      end
+    end
+
+    def timeline?(line)
+      /-->/ === line
+    end
   end
 end
 ```
 
 ```ruby
-require 'time'
+require 'singleton'
+
+module Subshift
+  class Time
+    include Singleton
+
+    FORMAT = /\d{2,}:\d{2}:\d{2},\d{3}/
+
+    attr_accessor :total_ms
+
+    def self.parse(string)
+      h, m, s, ms = string.split(/:|,/).map(&:to_i)
 
-class String
-  TIME = /\d{2}:\d{2}:\d{2},\d{3}/
+      instance.total_ms = \
+        h * 60 * 60 * 1000 +
+        m * 60 * 1000 +
+        s * 1000 +
+        ms
 
-  def shift_times(delay)
-    gsub(TIME) do |time|
-      new_time = Time.parse(time) + delay
-      new_time.strftime '%H:%M:%S,%3N'
+      instance
     end
-  end
 
-  def timeline?
-    /-->/ === self
+    def +(seconds)
+      tap do |t|
+        t.total_ms += seconds * 1000
+      end
+    end
+
+  private
+
+    def to_s
+      h, ms = total_ms.divmod(60 * 60 * 1000)
+      m, ms = ms.divmod(60 * 1000)
+      s, ms = ms.divmod(1000)
+
+      format '%02d:%02d:%02d,%03d', h, m, s, ms
+    end
   end
 end
 ```
@@ -76,24 +111,31 @@ end
 ```ruby
 require 'tempfile'
 
-class File
-  def self.copylines(src, dst)
-    tempfile = Tempfile.new(dst)
-
-    begin
-      readlines(src).each do |line|
-        line = yield(line) if block_given?
-
-        tempfile.write line
+module Extensions
+  module File
+    def copylines(src, dst)
+      tempfile = Tempfile.new(dst)
+
+      begin
+        open(src).each_line do |line|
+          if block_given?
+            new_line = yield(line)
+            line = new_line unless new_line.nil?
+          end
+
+          tempfile.write line
+        end
+
+        FileUtils.chmod(stat(src).mode, tempfile.path)
+        FileUtils.move(tempfile.path, dst)
+      ensure
+        tempfile.close!
       end
-
-      FileUtils.chmod(stat(src).mode, tempfile.path)
-      FileUtils.move(tempfile.path, dst)
-    ensure
-      tempfile.close!
     end
   end
 end
+
+File.singleton_class.prepend Extensions::File
 ```
 
 ## Contributing

data/bin/subshift

@@ -2,4 +2,4 @@
 
 require 'subshift'
 
-Subshift::Runner.run!(ARGV)
+Subshift::Runner.run(ARGV)

data/lib/extensions/file.rb

@@ -0,0 +1,27 @@
+require 'tempfile'
+
+module Extensions
+  module File
+    def copylines(src, dst)
+      tempfile = Tempfile.new(dst)
+
+      begin
+        open(src).each_line do |line|
+          if block_given?
+            new_line = yield(line)
+            line = new_line unless new_line.nil?
+          end
+
+          tempfile.write line
+        end
+
+        FileUtils.chmod(stat(src).mode, tempfile.path)
+        FileUtils.move(tempfile.path, dst)
+      ensure
+        tempfile.close!
+      end
+    end
+  end
+end
+
+File.singleton_class.prepend Extensions::File

data/lib/extensions/module.rb

@@ -0,0 +1,15 @@
+require 'forwardable'
+
+module Extensions
+  module Module
+    def self.prepended(base)
+      base.include Forwardable
+    end
+
+    def delegate(*methods, to:)
+      super methods => to
+    end
+  end
+end
+
+Module.prepend Extensions::Module

data/lib/subshift.rb

@@ -1,8 +1,11 @@
-require 'patches/module'
-require 'patches/encoding'
-require 'patches/file'
-require 'patches/string'
+require 'extensions/module'
+require 'extensions/file'
 
-require 'subshift/version'
 require 'subshift/runner'
+require 'subshift/time'
+require 'subshift/version'
 require 'subshift/options'
+
+module Subshift
+  Encoding.default_external = 'ISO-8859-1'
+end

data/lib/subshift/runner.rb

@@ -4,18 +4,30 @@ module Subshift
 
     delegate :source, :destination, :delay, to: :options
 
-    def self.run!(argv)
-      new(argv).run!
+    def self.run(argv)
+      new(argv).run
     end
 
     def initialize(argv)
-      @options = Subshift::Options.new(argv)
+      @options = Options.new(argv)
     end
 
-    def run!
+    def run
       File.copylines(source, destination) do |line|
-        line.timeline? ? line.shift_times(delay) : line
+        shift_times(line) if timeline?(line)
       end
     end
+
+  private
+
+    def shift_times(line)
+      line.gsub(Time::FORMAT) do |time|
+        Time.parse(time) + delay
+      end
+    end
+
+    def timeline?(line)
+      /-->/ === line
+    end
   end
 end

data/lib/subshift/time.rb

@@ -0,0 +1,39 @@
+require 'singleton'
+
+module Subshift
+  class Time
+    include Singleton
+
+    FORMAT = /\d{2,}:\d{2}:\d{2},\d{3}/
+
+    attr_accessor :total_ms
+
+    def self.parse(string)
+      h, m, s, ms = string.split(/:|,/).map(&:to_i)
+
+      instance.total_ms = \
+        h * 60 * 60 * 1000 +
+        m * 60 * 1000 +
+        s * 1000 +
+        ms
+
+      instance
+    end
+
+    def +(seconds)
+      tap do |t|
+        t.total_ms += seconds * 1000
+      end
+    end
+
+  private
+
+    def to_s
+      h, ms = total_ms.divmod(60 * 60 * 1000)
+      m, ms = ms.divmod(60 * 1000)
+      s, ms = ms.divmod(1000)
+
+      format '%02d:%02d:%02d,%03d', h, m, s, ms
+    end
+  end
+end

data/lib/subshift/version.rb

@@ -1,3 +1,3 @@
 module Subshift
-  VERSION = "0.0.1.pre"
+  VERSION = "0.0.2"
 end

data/test/test_file.rb

@@ -19,7 +19,7 @@ class TestFile < Minitest::Test
 
   def test_copylines
     File.copylines 'file', 'copy' do |line|
-      /1/ === line ? "First line\n": line
+      "First line\n" if /1/ === line
     end
 
     assert_equal "First line\n2\n3\n", File.read('copy')
@@ -27,7 +27,7 @@ class TestFile < Minitest::Test
 
   def test_copylines_on_the_same_file
     File.copylines 'file', 'file' do |line|
-      /1/ === line ? "First line\n": line
+      "First line\n" if /1/ === line
     end
 
     assert_equal "First line\n2\n3\n", File.read('file')

data/test/test_runner.rb

@@ -1,6 +1,10 @@
 require 'test_helper'
 
 class RunnerTest < Minitest::Test
+  def setup
+    @runner = Subshift::Runner.new(['sample.srt', '0'])
+  end
+
   def teardown
     if File.exist?('sample_delayed.srt')
       FileUtils.rm('sample_delayed.srt')
@@ -17,15 +21,43 @@ class RunnerTest < Minitest::Test
   end
 
   def test_run
-    regexp = String::TIME
+    regexp = Subshift::Time::FORMAT
+
     assert_equal '00:00:42,407', regexp.match(File.read('sample.srt'))[0]
-    Subshift::Runner.run!(['sample.srt', '3'])
+    Subshift::Runner.run(['sample.srt', '3'])
     assert_equal '00:00:45,407', regexp.match(File.read('sample.srt'))[0]
 
     # Reset
-    runner = Subshift::Runner.run!(['sample.srt', '-3'])
+    Subshift::Runner.run(['sample.srt', '-3'])
 
-    runner = Subshift::Runner.run!(['sample.srt', '3', '-d', 'sample_delayed.srt'])
+    assert_equal '00:00:42,407', regexp.match(File.read('sample.srt'))[0]
+    Subshift::Runner.run(['sample.srt', '3', '-d', 'sample_delayed.srt'])
     assert_equal '00:00:45,407', regexp.match(File.read('sample_delayed.srt'))[0]
   end
+
+  def test_timeline
+    refute @runner.send(:timeline?, '1')
+    assert @runner.send(:timeline?, '00:00:42,407 --> 00:00:44,932')
+    refute @runner.send(:timeline?, '<i>"Winner, winner, chicken dinner."</i>')
+  end
+
+  def test_shift_times
+    set_delay(2)
+    assert_equal '00:00:44,407 --> 00:00:46,932', @runner.send(:shift_times, '00:00:42,407 --> 00:00:44,932')
+
+    set_delay(-2)
+    assert_equal '00:00:40,407 --> 00:00:42,932', @runner.send(:shift_times, '00:00:42,407 --> 00:00:44,932')
+
+    set_delay(2.5)
+    assert_equal '00:00:44,907 --> 00:00:47,432', @runner.send(:shift_times, '00:00:42,407 --> 00:00:44,932')
+
+    set_delay(-2.5)
+    assert_equal '00:00:39,907 --> 00:00:42,432', @runner.send(:shift_times, '00:00:42,407 --> 00:00:44,932')
+  end
+
+private
+
+  def set_delay(seconds)
+    @runner.options.instance_variable_set :@delay, seconds
+  end
 end

data/test/test_time.rb

@@ -0,0 +1,18 @@
+require 'test_helper'
+
+class TestTime < Minitest::Test
+  def test_parse
+    time = Subshift::Time.parse('00:00:00,000')
+    assert_equal 0, time.total_ms
+  end
+
+  def test_plus
+    time = Subshift::Time.parse('00:00:00,000') + 1
+    assert_equal 1000, time.total_ms
+  end
+
+  def test_to
+    time = Subshift::Time.parse('12:34:56,789')
+    assert_equal '12:34:56,789', time.send(:to_s)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: subshift
 version: !ruby/object:Gem::Version
-  version: 0.0.1.pre
+  version: 0.0.2
 platform: ruby
 authors:
 - delba
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-20 00:00:00.000000000 Z
+date: 2015-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -67,13 +67,12 @@ files:
 - README.md
 - Rakefile
 - bin/subshift
-- lib/patches/encoding.rb
-- lib/patches/file.rb
-- lib/patches/module.rb
-- lib/patches/string.rb
+- lib/extensions/file.rb
+- lib/extensions/module.rb
 - lib/subshift.rb
 - lib/subshift/options.rb
 - lib/subshift/runner.rb
+- lib/subshift/time.rb
 - lib/subshift/version.rb
 - sample.srt
 - subshift.gemspec
@@ -83,7 +82,7 @@ files:
 - test/test_module.rb
 - test/test_options.rb
 - test/test_runner.rb
-- test/test_string.rb
+- test/test_time.rb
 homepage: https://github.com/delba/subshift
 licenses:
 - MIT
@@ -99,9 +98,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.5
@@ -115,5 +114,5 @@ test_files:
 - test/test_module.rb
 - test/test_options.rb
 - test/test_runner.rb
-- test/test_string.rb
+- test/test_time.rb
 has_rdoc: 

data/lib/patches/encoding.rb

@@ -1 +0,0 @@
-Encoding.default_external = Encoding.find('ISO-8859-1')

data/lib/patches/file.rb

@@ -1,20 +0,0 @@
-require 'tempfile'
-
-class File
-  def self.copylines(src, dst)
-    tempfile = Tempfile.new(dst)
-
-    begin
-      readlines(src).each do |line|
-        line = yield(line) if block_given?
-
-        tempfile.write line
-      end
-
-      FileUtils.chmod(stat(src).mode, tempfile.path)
-      FileUtils.move(tempfile.path, dst)
-    ensure
-      tempfile.close!
-    end
-  end
-end

data/lib/patches/module.rb

@@ -1,9 +0,0 @@
-require 'forwardable'
-
-class Module
-  include Forwardable
-
-  def delegate(*methods, to:)
-    public_send :def_delegators, to, *methods
-  end
-end

data/lib/patches/string.rb

@@ -1,16 +0,0 @@
-require 'time'
-
-class String
-  TIME = /\d{2}:\d{2}:\d{2},\d{3}/
-
-  def shift_times(delay)
-    gsub(TIME) do |time|
-      new_time = Time.parse(time) + delay
-      new_time.strftime '%H:%M:%S,%3N'
-    end
-  end
-
-  def timeline?
-    /-->/ === self
-  end
-end

data/test/test_string.rb

@@ -1,16 +0,0 @@
-require 'test_helper'
-
-class TestString < Minitest::Test
-  def test_timeline
-    refute '1'.timeline?
-    assert '00:00:42,407 --> 00:00:44,932'.timeline?
-    refute '<i>"Winner, winner, chicken dinner."</i>'.timeline?
-  end
-
-  def test_shift_times
-    assert_equal '00:00:44,407 --> 00:00:46,932', '00:00:42,407 --> 00:00:44,932'.shift_times(2)
-    assert_equal '00:00:40,407 --> 00:00:42,932', '00:00:42,407 --> 00:00:44,932'.shift_times(-2)
-    assert_equal '00:00:44,907 --> 00:00:47,432', '00:00:42,407 --> 00:00:44,932'.shift_times(2.5)
-    assert_equal '00:00:39,907 --> 00:00:42,432', '00:00:42,407 --> 00:00:44,932'.shift_times(-2.5)
-  end
-end