subdb-cli 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7559d42447598fcce6945f6a1cd5bb4f7f448ca5
-  data.tar.gz: de5e8bd3e157d42820dd7e97a222d39b37eb4988
+  metadata.gz: d5ad8ef2b99c52f9e3742897b0b266be010d52c7
+  data.tar.gz: b75e627f2306e3cfbd03e916d7940469af4592ab
 SHA512:
-  metadata.gz: 3f4c7ac96f0cd0ca796d9fd1add056ca42c2ada8402996a0525950465300751a5b2a2c0721ad510c6cc40efb983319f3100f1758767af757b849fef8de3f0f0b
-  data.tar.gz: 019013892ee90b4b2b3a88de9c14410a223939586322cad0f0f4ba734f283540affddb7ba5f896b76ddd8c4656093375513b3245beaa8e3adce7ea13923de176
+  metadata.gz: 24f697bbc1ce268933af2554c17375966c254d5ae7fabe32758f5adb91b9ee2c1f81e05993d3bab013297e4d0c87de29ae7aefd737e7987258618474e507c60f
+  data.tar.gz: 82187aa1d0fc4a8a0cfe220f1bcd9562814b5fc1af3a5f644fa302c0b13f8d289a11487a81b694c96bf2e3d6f675ccda17a3fea4bcb000fbe900da88f5f4d569

data/exe/subdb

@@ -4,13 +4,15 @@ require "bundler/setup"
 require "subdb/cli"
 
 def display_help
-  puts <<-USAGE
+  puts <<-HELP
+  subdb-cli v#{Subdb::Cli::VERSION}
+
   Usage:
     subdb download [video_file_path] [languages]
     subdb upload [video_file_path] [subtitles_file_path]
 
     [languages] is a comma separated list of desired languages in priority order to download (default: en)
-  USAGE
+  HELP
 end
 
 action = ARGV[0]
@@ -38,6 +40,8 @@ begin
   end
 rescue Subdb::Cli::FileNotFound
   puts "File not found"
+rescue Subdb::Cli::ErrorCalculatingHash
+  puts "Error calculating hash for video file"
 rescue Subdb::Cli::SubtitlesNotFound
   puts "Subtitles file not found at Subdb database for the given language."
 rescue SubtitleUploadError

data/lib/subdb/cli.rb

@@ -8,32 +8,36 @@ module Subdb
     BASE_URL = 'http://api.thesubdb.com/'
     READSIZE = 64 * 1024
 
-    FileNotFound        = Class.new(StandardError)
-    SubtitlesNotFound   = Class.new(StandardError)
-    SubtitleUploadError = Class.new(StandardError)
+    FileNotFound         = Class.new(StandardError)
+    ErrorCalculatingHash = Class.new(StandardError)
+    SubtitlesNotFound    = Class.new(StandardError)
+    SubtitleUploadError  = Class.new(StandardError)
+
+    def download(video_file_path, language)
+      raise FileNotFound unless File.exists?(video_file_path)
 
-    def download(file_path, language)
       response = client.get('/', {
         action: 'download',
         language: language,
-        hash: hash_for(file_path)
+        hash: hash_for(video_file_path)
       })
 
       raise SubtitleNotFound unless response.status == 200
 
-      File.open(srt_file_for(file_path), "w") do |file|
-        file.write(response.body)
+      File.open(srt_file_for(video_file_path), "w") do |srt_file|
+        srt_file.write(response.body)
       end
     end
 
 
     def upload(video_file_path, subtitles_file_path)
-      response = client.post('/', {
-        action: 'upload',
-        hash: hash_for(video_file_path)
-      }) do |request|
-        request.body = File.read(subtitles_file_path)
-      end
+      raise FileNotFound unless File.exists?(video_file_path)
+      raise FileNotFound unless File.exists?(subtitles_file_path)
+
+      response = client.post('/?action=upload', {
+        hash: hash_for(video_file_path),
+        file: Faraday::UploadIO.new(subtitles_file_path, 'application/octet-stream')
+      })
 
       raise SubtitleUploadError unless response.status == 200
     end
@@ -47,14 +51,14 @@ module Subdb
     end
 
     def hash_for(file_path)
-      file    = File.open(file_path)
+      file    = File.open(file_path, "r")
       buffer  = file.read(READSIZE)
       file.seek(-READSIZE, IO::SEEK_END)
       buffer += file.read(READSIZE)
       file.close
       md5_for(buffer)
-    rescue Errno::ENOENT
-      raise FileNotFound
+    rescue
+      raise ErrorCalculatingHash
     end
 
     def md5_for(buffer)

data/lib/subdb/cli/version.rb

@@ -1,5 +1,5 @@
 module Subdb
   class Cli
-    VERSION = "0.2.0"
+    VERSION = "0.2.1"
   end
 end

data/subdb-cli.gemspec

@@ -24,4 +24,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.14"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "webmock", "~> 3.0.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: subdb-cli
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Carlos Paramio
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-22 00:00:00.000000000 Z
+date: 2017-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.1
 description: SubDB client in Ruby
 email:
 - hola@carlosparamio.com