tors 0.2.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95eea10bc57ad0710b1f7fcd62eb7c4e81376256
-  data.tar.gz: b92ad9855bac1ba0072a8d1f5738f6252cc06d83
+  metadata.gz: 4123d0ae088d788aae134a9e2ab5bfb5138a61ec
+  data.tar.gz: 182d86c5d7633c0a1e2a8cd2aeea3193fb89160e
 SHA512:
-  metadata.gz: 703eeacae5a37dc895a43e97193eae58dea34bda9f4c1ccc2325ecc122d566d28b195d518318e2befa7dec131b486661b2daf194ca328520495d61f00f51d539
-  data.tar.gz: 144829b12bb8a24f7f955d55d94699e828c490844b3cbb2fdb951d4c530b672ea3206b094eda83a88b48ce6367894cc84ee0baa6da48366c2b16b17177b7001c
+  metadata.gz: bb9a2272db7c209518fc1cfc3fc102a10a9800596455dbd2b11697dc4cc09be990550f06ec1b4b06218fb37eb5f6872c6d398d28ac6f5c6971a52f2051f392ad
+  data.tar.gz: 55b54cfcc54c3e98730c782cf7cf9f77d5dcce590950ed5709bc0a3dcc08b6676e45759b9c10ea4dbb5f7b80707c47ae9b95e8510496fd2bcfcd4ba6f93b9cc3

data/README.md

@@ -60,22 +60,24 @@ Use `-p PROVIDER` flag for scrape another providers.
 
 And then It will ask for **which torrent you want to download?** You can answer with a torrent number seen on list.
 
-You can use `-a 1` flag for automatically download the best torrent. Example:
+You can use `-a` or `--auto-download` flag for automatically download the best torrent. Example:
 
-    $ tors -s 'game of thrones' -p 1337x -a 1
+    $ tors -s 'game of thrones' -p 1337x -a
 
 You can use `-d TARGET` flag for set destination storage path. Example:
 
-    $ tors -s 'Assassins' -d $HOME/Downloads -a 1
+    $ tors -s 'Assassins' -d $HOME/Downloads -a
 
 And you can list all active providers and usage instructions with `-h` or `--help` flag.
 
     $ tors -h
     Usage: tors [options]
+        -h, --help                       Show usage instructions
         -s, --search=s                   Search term [SEARCH]
-        -p, --provider=p                 From provider name [PROVIDER]
-        -a, --auto-download=a            Auto download best choice
-        -d, --directory=d                Destination torrent download directory
+        -d, --directory=d                Destination path for download torrent [DIRECTORY]
+        -p, --provider=p                 Provider name [PROVIDER]
+        -a, --auto-download              Auto download best choice
+
 
 [![See it in action](https://asciinema.org/a/No1Zdfk3gYoCYdGb2XUdFaUyS.png)](https://asciinema.org/a/No1Zdfk3gYoCYdGb2XUdFaUyS)
 

data/lib/tors.rb

@@ -6,17 +6,21 @@ require 'optparse'
 module TorS
   options = {}
   OptionParser.new do |opts|
+    opts.on('-h', '--help', 'Show usage instructions') do |s|
+      puts opts
+      abort
+    end
     opts.on('-s=s', '--search=s', 'Search term [SEARCH]') do |s|
       options[:search] = s
     end
-    opts.on('-p=p', '--provider=p', 'From provider name [PROVIDER]') do |p|
-      options[:provider] = p
+    opts.on('-d=d', '--directory=d', 'Destination path for download torrent [DIRECTORY]') do |d|
+      options[:directory] = d
     end
-    opts.on('-a=a', '--auto-download=a', 'Auto download best choice') do |a|
-      options[:auto] = a || true
+    opts.on('-p=p', '--provider=p', 'Provider name [PROVIDER]') do |p|
+      options[:provider] = p
     end
-    opts.on('-d=d', '--directory=d', 'Auto download directory') do |d|
-      options[:directory] = d
+    opts.on('-a', '--auto-download', 'Auto download best choice') do
+      options[:auto] = true
     end
   end.parse!
 

data/lib/tors/search.rb

@@ -8,7 +8,13 @@ require 'tty-prompt'
 module TorS
   class Search
     def initialize(query = '', from = 'katcr', auto = false, directory = Dir.pwd)
-      @provider = YAML.load_file(File.expand_path("../../../providers/#{from}.yml", __FILE__))
+      yaml = File.expand_path("../../../providers/#{from}.yml", __FILE__)
+      if File.exists? yaml
+        @provider = YAML.load_file(yaml)
+      else
+        not_exists_provider
+      end
+
       @query = query
       @from = from
       @auto = auto
@@ -70,9 +76,7 @@ module TorS
       puts 'From : ' + @from
 
       table = TTY::Table.new %i[# Category Title Size Seed Leech], @rows
-      puts table.render(:unicode, padding: [0, 1, 0, 1]) do |renderer|
-        renderer.border.style = :green
-      end
+      puts table.render(:unicode, padding: [0, 1, 0, 1])
 
       if @auto
         download @downloads.find { |v| v[:key] == 1 }
@@ -105,7 +109,7 @@ module TorS
           puts 'Downloading ' + target_file_name
           File.write(target_file, source)
         rescue IOError => e
-          puts '😵  There is an error! ' + e.message + ' Here: L108'
+          puts '😵  There is an error! ' + e.message
         ensure
           puts '🥂  Downloaded!'
         end
@@ -119,13 +123,24 @@ module TorS
 
     private
 
+    def not_exists_provider
+      puts "☠️  There is not found #{@from} provider."
+
+      puts 'You must choose from this list.'
+      Dir[File.expand_path('providers/*.yml')].each do |f|
+        puts '- ' + File.basename(f).split('.').first
+      end
+
+      abort 'Exiting'
+    end
+
     def check_download_directory
       ioerr = false
-      ioerr = "😱  Your download directory #{@directory} not found." unless File.exist? @directory or File.directory? @directory
-      ioerr = "😱  Your download directory #{@directory} not writable." unless File.writable? @directory
+      ioerr = "😱  Directory #{@directory} not found." unless File.exist? @directory or File.directory? @directory
+      ioerr = "😱  Directory #{@directory} not writable." unless File.writable? @directory
       if ioerr
         puts ioerr
-        Process.kill 9, Process.pid
+        abort 'Exiting'
       end
     end
   end

data/lib/tors/version.rb

@@ -1,3 +1,3 @@
 module TorS
-  VERSION = '0.2.0'.freeze
+  VERSION = '0.2.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tors
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.2
 platform: ruby
 authors:
 - Murat Bastas
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-30 00:00:00.000000000 Z
+date: 2017-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri