subtitle2utf8 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7299bced9d2870fa841eece07f08e4ac23b89fee
-  data.tar.gz: 5f7af2b826832afc3502c84fdde7376e72ddf904
+  metadata.gz: ee5d73a80af4b8727c459ac8c0a603990cc3d6a9
+  data.tar.gz: f9b189cd8bedf98d8b251e86bec9d3f1a6c993d5
 SHA512:
-  metadata.gz: 541bd920730e4ec4e07860f01f253bf190093840e08f68d1c691ce3af1e87c2d78e785417d1dec687858f5a202240b19e95a71319b528f3dc18642b063ff1364
-  data.tar.gz: eb036b48465fb37f41610e02316ca5c60515763fdb399b48be1bf6dd4059013b533219b51340db021a2941190c35b5cbd69af5076de5796efc2ac8f8a02bf0f7
+  metadata.gz: 227426f10cee1d90807a267d77371528690948ea25147927975cec76e0a9d7a8aa59f5a8848545e17627b42f285235d21772dc4009357938408d102283589ed0
+  data.tar.gz: 0dce74dbcc2ca5ef2f1cd467c0cb2f32e7a59a9699a2d809b06fd49372f5fa60c8bb1d4115e4a155931e2eb3d5cc0b3346088ca2b48f70bee078c1f1c78fa6b6

data/bin/s2u

@@ -21,13 +21,11 @@ OptionParser.new do |opts|
 end.parse!
 
 if ARGV.size != 1
-  puts "Wrong arguments, one is enough."
-  exit
+  abort "Wrong arguments, one is enough."
 end
 
 if options[:file] && options[:dir]
-  puts "Wrong switches..."
-  exit
+  abort "Wrong switches..."
 end
 
 include Subtitle2utf8

data/lib/subtitle2utf8/version.rb

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

data/lib/subtitle2utf8.rb

@@ -2,48 +2,49 @@ require 'subtitle2utf8/version'
 require 'rchardet'
 
 module Subtitle2utf8
-  def self.convert(val, type, recursion = false)
-    val = File.expand_path val
+  def self.convert(subtitle, type, recursion = false)
+    path = File.expand_path(subtitle)
 
     case type
     when :file
-      if !File.exist? val
-        puts "#{val} does not exist!"
-        exit
+      if !File.exist?(path)
+        abort "#{path} does not exist!"
       end
 
-      convert_file val
+      convert_file(path)
     when :dir
-      if !Dir.exist? val
-        puts "#{val} does not exist!"
-        exit
+      if !Dir.exist?(path)
+        abort "#{path} does not exist!"
       end
 
       if recursion
-        convert_dirs val
+        convert_dirs(path)
       else
-        convert_dir val
+        convert_dir(path)
       end
     end
   end
 
+  private
+
   def convert_file(origin)
     valid = '.srt'
 
     if (ext = File.extname(origin)) != valid
-      puts "#{origin} is not valid file!"
-      exit
+      abort "#{origin} is not valid file!"
     end
 
     name = File.basename(origin, ext)
     # Ignore converted file.
     return if name =~ /^*.utf-8/
 
-    dir = File.dirname origin
+    dir = File.dirname(origin)
     new_file = "#{dir}/#{name}.utf-8#{ext}"
     encoding = CharDet.detect(File.new(origin).read(64))['encoding']
     # GB18030 is a superset of Chinese encoding GB2312.
-    encoding = encoding == 'GB2312' ? 'GB18030' : encoding
+    encoding = begin
+      encoding == 'GB2312' ? 'GB18030' : encoding
+    end
 
     begin
       file_content =
@@ -55,11 +56,10 @@ module Subtitle2utf8
           File.read(origin, encoding: encoding).dup.force_encoding(encoding).encode('utf-8')
         end
     rescue Exception => e
-      puts "#{origin} cannot be converted to utf-8..."
-      return
+      abort "#{e}: #{origin} cannot be converted to utf-8..."
     end
 
-    File.open(new_file, 'w') {|f| f.write file_content}
+    File.open(new_file, 'w') { |f| f.write(file_content) }
   end
 
   def convert_dir(present)

data/subtitle2utf8.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency 'bundler', '~> 1.7'
-  spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_dependency 'rchardet', '~> 1.5.0'
+  spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'rake'
+  spec.add_dependency 'rchardet', '~> 1.6.0'
 end

metadata

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: subtitle2utf8
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Rick Yu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-01 00:00:00.000000000 Z
+date: 2015-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rchardet
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.6.0
 description: This simple gem is used to convert movie subtitle's encoding to utf-8.
 email:
 - cosmtrek@gmail.com
@@ -89,7 +89,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Convert movie subtitle's encoding to utf-8.