tors 0.3.0 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ee398e99916449521153f862a0c18bb7534e7cc
-  data.tar.gz: 34f775df3c49296be598fe4d541c5b20ce27fef1
+  metadata.gz: 3b01df74d9ebdef51e46ede758d4b144e8a81beb
+  data.tar.gz: 333697b0e6ce94ce7d71ff36ee34d3531cb0f2f7
 SHA512:
-  metadata.gz: 9ffa6277f1db5d387ce401abb32a4f66466f0a32cac5e62d3269558d878385fa3933dfba00f15a08fd2d301c9dc5ef14912c9a2a9a82b37ab661333298f8f4d5
-  data.tar.gz: 52caa081807d7a89ec6ea03a16b775db271fcb57cddc3d93cb1f44611ab3545ac6e5a8b1adbf5486c00b0a3a66c2f6a154e29fa6bd0327ceb5cdcbf21e22a7f7
+  metadata.gz: a310371c00409519df7190cb6cd4df7087d073d9f72dee140a95b1288b8e94d4a22e69e6b0120563b6a6cdba9cdf73a4da488f82bbb93c62d19f48604f651b38
+  data.tar.gz: 21632d35679252bc8c90c21b97f5d8af1c2f6cc5c689cc2f02d92e45b293336977c280bc2c3b5fc82df3fa0be4151a4c7b54bc2d85ba84121a7194f3c4731d84

data/README.md

@@ -78,6 +78,7 @@ And you can list all active providers and usage instructions with `-h` or `--hel
         -p, --provider=p                 Provider name [PROVIDER]
         -l, --list-providers             List providers
         -a, --auto-download              Auto download best choice
+        -o, --open                       Open torrent after downloading
 
 
 
@@ -91,7 +92,13 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at [https://github.com/muratbsts/TorS](https://github.com/muratbsts/tors). This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
+Bug reports and pull requests are welcome on GitHub at [https://github.com/muratbsts/tors](https://github.com/muratbsts/tors). This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
+
+## Contributors
+
+- [Murat Bastas](https://github.com/muratbsts)
+- [Eren Türkay](https://github.com/eren)
+- [Muhammet Dilmaç](https://github.com/muhammetdilmac)
 
 ## License
 

data/lib/tors.rb

@@ -6,20 +6,20 @@ require 'optparse'
 module TorS
   options = {}
   OptionParser.new do |opts|
-    opts.on('-h', '--help', 'Show usage instructions') do |h|
+    opts.on('-h', '--help', 'Show usage instructions') do |_h|
       puts opts
       abort
     end
     opts.on('-s=s', '--search=s', 'Search term [SEARCH]') do |s|
       options[:search] = s
     end
-    opts.on('-d=d', '--directory=d', 'Destination path for download torrent [DIRECTORY]') do |d|
+    opts.on('-d=d', '--directory=d', 'Destination path for downloaded torrent [DIRECTORY]') do |d|
       options[:directory] = d
     end
     opts.on('-p=p', '--provider=p', 'Provider name [PROVIDER]') do |p|
       options[:provider] = p
     end
-    opts.on('-l', '--list-providers', 'List providers') do |l|
+    opts.on('-l', '--list-providers', 'List providers') do |_l|
       Dir[File.expand_path('providers/*.yml')].each do |f|
         puts '- ' + File.basename(f).split('.').first
       end
@@ -28,7 +28,20 @@ module TorS
     opts.on('-a', '--auto-download', 'Auto download best choice') do
       options[:auto] = true
     end
+
+    if RUBY_PLATFORM =~ /darwin/
+      opts.on('-o', '--open', 'Open torrent after downloading') do
+        options[:open] = true
+      end
+    end
   end.parse!
 
-  TorS::Search.new(options[:search], options[:provider] || 'katcr', options[:auto] || false, options[:directory] || Dir.pwd)
-end
+  tors = TorS::Search.new(options[:provider] || 'katcr') do |ts|
+    ts.query        = options[:search]
+    ts.auto         = options[:auto] || false
+    ts.directory    = options[:directory] || Dir.pwd
+    ts.open_torrent = options[:open] || false
+  end
+
+  tors.run
+end

data/lib/tors/search.rb

@@ -7,19 +7,26 @@ require 'tty-prompt'
 
 module TorS
   class Search
-    def initialize(query = '', from = 'katcr', auto = false, directory = Dir.pwd)
+    attr_accessor :query, :from, :auto, :directory, :open_torrent
+
+    def initialize(from = 'katcr')
+      @from = from
+
       yaml = File.expand_path("../../../providers/#{from}.yml", __FILE__)
-      if File.exists? yaml
+      if File.exist? yaml
         @provider = YAML.load_file(yaml)
       else
-        not_exists_provider
+        list_providers_and_exit
       end
 
-      @query = query
-      @from = from
-      @auto = auto
-      @directory = directory
+      if block_given?
+        yield self
+      else
+        raise "#{self.class} requires block to initialize"
+      end
+    end
 
+    def run
       check_download_directory
       scrape
     end
@@ -30,7 +37,7 @@ module TorS
 
       if @page.css(@provider['scrape']['selector']).empty?
         if threat_defence @page
-          puts '😰  Sorry, I think you banned from ' + @from + '. There is a threat defense redirection.'
+          puts "😰  Sorry, I think you are banned from #{from}. There is a threat defense redirection."
         end
 
         puts 'Please check this url is works : ' + @url
@@ -40,7 +47,7 @@ module TorS
       @rows = []
       @downloads = []
 
-      puts 'Scrabing...'
+      puts 'Scraping...'
 
       key = 0
       @page.css(@provider['scrape']['selector']).each do |row|
@@ -95,7 +102,7 @@ module TorS
 
     def prompt
       prompt = TTY::Prompt.new(interrupt: :exit)
-      choice = prompt.ask("Which torrent you want to download? (1..#{@downloads.size} or ctrl+c/cmd+c for interrupt)",
+      choice = prompt.ask("Which torrent do you want to download? (1..#{@downloads.size} or ctrl+c/cmd+c to interrupt)",
                           convert: :int,
                           default: 1) do |c|
         c.in "1-#{@downloads.size}"
@@ -107,20 +114,28 @@ module TorS
 
     def download(choice)
       if choice[:url] =~ /^magnet:\?/
-        puts '😏  Sorry, I can\'t start automatically magnet links. Please use this in your torrent client.'
+        puts '😏  Sorry, I cannot download magnet links. Please copy/paste the following link into your torrent client'
         puts choice[:url]
       else
         begin
+          target_file_name = choice[:name].tr("\n", ' ').squeeze(' ').strip + '.torrent'
+          puts 'Downloading ' + target_file_name
+
           source            = Net::HTTP.get(URI.parse(choice[:url]))
-          target_file_name  = choice[:name].tr("\n", ' ').squeeze(' ').strip + '.torrent'
           target_file       = File.join(@directory, target_file_name)
-          puts 'Downloading ' + target_file_name
+
           File.write(target_file, source)
         rescue IOError => e
+          # FIXME: what about HTTP errors? Net::HTTP throws a number of
+          # exceptions. It would be wise to use another HTTP library for this
+          # purpose
           puts '😵  There is an error! ' + e.message
-        ensure
+        else
           puts '🥂  Downloaded!'
-          system 'open', target_file if RUBY_PLATFORM =~ /darwin/
+
+          # Open torrent option is only present in Darwin platform so there is
+          # no need to check the platform here
+          system("open '#{target_file}'") if @open_torrent
         end
       end
     end
@@ -132,20 +147,20 @@ module TorS
 
     private
 
-    def not_exists_provider
-      puts "☠️  There is not found #{@from} provider."
+    def list_providers_and_exit
+      puts "☠️  Provider '#{@from}' does not exist."
+      puts "Please choose a valid provider from the following list:\n\n"
 
-      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'
+      abort
     end
 
     def check_download_directory
       ioerr = false
-      ioerr = "😱  Directory #{@directory} not found." unless File.exist? @directory or File.directory? @directory
+      ioerr = "😱  Directory #{@directory} not found." unless File.exist?(@directory) || File.directory?(@directory)
       ioerr = "😱  Directory #{@directory} not writable." unless File.writable? @directory
       if ioerr
         puts ioerr

data/lib/tors/version.rb

@@ -1,3 +1,3 @@
 module TorS
-  VERSION = '0.3.0'.freeze
+  VERSION = '0.3.2'.freeze
 end

metadata

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