tors 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dbc41cecac6500bfa91947abab8ebfd9f0ab8658
-  data.tar.gz: f49142eb95de177576f23ee3fbf9b14d5294cab3
+  metadata.gz: 3051833668a39d67c65e1aad241994436241c455
+  data.tar.gz: 8db8f95fe1308068e16d2a811b6daf2d25ba5283
 SHA512:
-  metadata.gz: 1e03556f83b022ad8ee04bfd5efd0261ba4c3e0a6281fdec84e79e4e2ce4279fa5886392efca35a76983e3d9f0feeab232287d395d31bfd319fd2cf604ce72fd
-  data.tar.gz: 62ceb765aff677e8d114ba5f5ffbf89c0d0821d43a15b6eb1e669cad81563707e2701ad05d94b37f10ec998cbe2995291d7484113eea1882945353b3d0d3c0fc
+  metadata.gz: ecb00262740d37ea438b14ae6dffac0a41ecbb4c4ba6d4fee4326e3674d77685205e104c0f223c2b0a3cbc8dfca02fb5d7a1c8fbdc137ab193e9dae212a1d9ac
+  data.tar.gz: bdf8b6e022adbdaf29069d860d943b6664b4169c7d8c0c5b2033ac74a65c04e5e71de84302c64d3c7af7bf06d2a0fa25febe48f7550c6d2ef1441fd1ef08f0e7

data/.gitignore

@@ -12,4 +12,6 @@
 .rspec_status
 
 /.idea
-/*.gem
+/*.gem
+
+*.swp

data/README.md

@@ -43,17 +43,17 @@ Because katcr fastest provider for scrabing currently.
 
 Yep, there is a few provider option.
 
-| Provider          | Status | Problems |
-|:------------------|:------:|:---------|
-| katcr             | ✅     | - |
+| Provider          | Status | Problems                          |
+|:------------------|:------:|:----------------------------------|
+| katcr             | ✅     | -                                 |
 | rarbg             | ✅     | Slow Connection, Threat defensing |
-| thepiratebay      | ✅     | Only Magnet |
-| extratorrent      | ✅     | Slow Connection |
-| 1337x             | ✅     | Connection N+1 |
-| zooqle            | ✅     | Skipping some torrents |
-| zamunda           | ✅     | Require authentication |
-| torrentfunk       | ☑️       | 🙈 |
-| limetorrents      | ☑️       | 🙈 |
+| thepiratebay      | ✅     | Only Magnet                       |
+| extratorrent      | ✅     | Slow Connection                   |
+| 1337x             | ✅     | Connection N+1                    |
+| zooqle            | ✅     | Skipping some torrents            |
+| zamunda           | ✅     | Require authentication            |
+| torrentfunk       | ☑️      | 🙈                                |
+| limetorrents      | ☑️      | 🙈                                |
 
 Use `-p PROVIDER` flag for scrape another providers.
 
@@ -67,7 +67,7 @@ You can use `-a` or `--auto-download` flag for automatically download the best t
 
 You can use `-d TARGET` flag for set destination storage path. Example:
 
-    $ tors -s 'Assassins' -d $HOME/Downloads -a
+    $ tors -s 'ubuntu' -d $HOME/Downloads -a
 
 And you can list all active providers and usage instructions with `-h` or `--help` flag.
 

data/lib/tors.rb

@@ -1,59 +1,69 @@
 require 'tors/version'
 require 'tors/search'
-require 'colorize'
-require 'optparse'
+require 'slop'
 
+# Main module for passing options and initializing TorS::Search class
 module TorS
-  options = {}
-  OptionParser.new do |opts|
-    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 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('-u=u', '--username=u', 'Username for authentication') do |u|
-      options[:username] = u
-    end
-    opts.on('-w=p', '--password=p', 'Password for authentication') do |p|
-      options[:password] = p
-    end
-    opts.on('-l', '--list-providers', 'List providers') do |_l|
+  REQUIRE_AUTH = %w[zamunda].freeze
+
+  opts = Slop.parse do |o|
+    o.banner = 'usage: tors [options] SEARCH_STRING'
+    o.string '-d', '--directory', 'Destination path for downloaded torrent', default: Dir.pwd
+    o.string '-p', '--provider', 'Provider name', default: 'katcr'
+    o.string '-u', '--username', 'Username for authentication'
+    o.string '-w', '--password', 'Password for authentication'
+    o.on     '-l', '--list-providers', 'List available providers' do
       puts '- 1337x'
       puts '- extratorrent'
       puts '- katcr'
       puts '- rarbg'
       puts '- thepiratebay'
-      puts '- zamunda'
+      puts '- zamunda (requires authentication)'
       puts '- zooqle'
-      abort
-    end
-    opts.on('-a', '--auto-download', 'Auto download best choice') do
-      options[:auto] = true
+      exit
     end
 
+    o.bool '-a', '--auto-download', 'Auto download best choice', default: false
+
     if RUBY_PLATFORM =~ /darwin/
-      opts.on('-o', '--open', 'Open torrent after downloading') do
-        options[:open] = true
-      end
+      o.bool '-o', '--open', 'Open torrent after downloading', default: false
+    end
+
+    o.on '-h', '--help', 'Print help' do
+      puts o
+      exit
     end
-  end.parse!
-
-  tors = TorS::Search.new(options[:provider] || 'katcr') do |ts|
-    ts.username     = options[:username]
-    ts.password     = options[:password]
-    ts.query        = options[:search]
-    ts.auto         = options[:auto] || false
-    ts.directory    = options[:directory] || Dir.pwd
-    ts.open_torrent = options[:open] || false
+
+    o.on '-v', '--version', 'Print version' do
+      puts VERSION
+      exit
+    end
+  end
+
+  if opts.arguments.empty?
+    puts opts
+    exit
+  end
+
+  if REQUIRE_AUTH.include?(opts['provider'])
+    if opts['username'].nil? || opts['password'].nil?
+      puts "ERROR! Provider #{opts['provider']} requires username and password for authentication".red
+      abort
+    end
+  end
+
+  tors = TorS::Search.new(opts.arguments[0]) do |ts|
+    ts.username      = opts['username']
+    ts.password      = opts['password']
+    ts.from          = opts['provider']
+    ts.auto_download = opts.auto_download?
+    ts.directory     = opts['directory']
+
+    # We only have this option in Darwin platform and slop throws an exception
+    # for non-defined parameters. That's the reason to check the platform here
+    ts.open_torrent = RUBY_PLATFORM =~ /darwin/ ? opts.open? : false
   end
 
   tors.run
+
 end

data/lib/tors/search.rb

@@ -5,13 +5,21 @@ require 'mechanize'
 require 'open-uri'
 require 'tty-table'
 require 'tty-prompt'
+require 'colorize'
 
 module TorS
   class Search
-    attr_accessor :query, :from, :username, :password, :directory, :auto, :open_torrent
+    attr_accessor :from, :username, :password, :directory, :auto_download, :open_torrent
 
-    def initialize(from = 'katcr')
-      @from = from
+    # Initialize class. Only query string is required and the rest of the attributes
+    # are assigned default values.
+    def initialize(query)
+      raise "#{self.class} requires block to initialize" unless block_given?
+      yield self
+
+      @query = query
+      @from ||= 'katcr'
+      @directory ||= Dir.pwd
 
       yaml = File.expand_path("../../../providers/#{from}.yml", __FILE__)
       if File.exist? yaml
@@ -19,12 +27,6 @@ module TorS
       else
         list_providers_and_exit
       end
-
-      if block_given?
-        yield self
-      else
-        raise "#{self.class} requires block to initialize"
-      end
     end
 
     def run
@@ -36,16 +38,14 @@ module TorS
       @url = URI.encode(@provider['url'].gsub(/%{(\w+)}/, @query ? @query : ''))
       @page = Nokogiri::HTML(open(@url))
 
-      if @provider['authenticate']
-        authenticate
-      end
+      authenticate if @provider['authenticate']
 
       if @page.css(@provider['scrape']['selector']).empty?
         if threat_defence @page
-          puts "😰  Sorry, I think you are banned from #{from}. There is a threat defense redirection.".red
+          puts "Sorry, I think you are banned from #{@from}. There is a threat defense redirection.".red
         end
 
-        puts 'Please check this url is works : ' + @url
+        puts "Cannot parse the page (#{@url})".red
         return
       end
 
@@ -98,7 +98,7 @@ module TorS
       table = TTY::Table.new %i[# Category Title Size Seed Leech], @rows
       puts table.render(:unicode, padding: [0, 1, 0, 1])
 
-      if @auto
+      if @auto_download
         download @downloads.find { |v| v[:key] == 1 }
       else
         prompt
@@ -119,7 +119,7 @@ module TorS
 
     def download(choice)
       if choice[:url] =~ /^magnet:\?/
-        puts '😏  Sorry, I cannot download magnet links. Please copy/paste the following link into your torrent client'
+        puts 'Sorry! I cannot download magnet links. Please copy/paste the following link into your torrent client'.red
         puts choice[:url]
       else
         begin
@@ -139,9 +139,9 @@ module TorS
           # 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
+          puts 'There is an error! ' + e.message
         else
-          puts '🥂  Downloaded!'
+          puts '✔ Downloaded!'.green
 
           # Open torrent option is only present in Darwin platform so there is
           # no need to check the platform here
@@ -169,8 +169,8 @@ module TorS
         puts 'Login failed with your credentials!'.red
         abort
       end
-      
-      puts '✔ Authentication successfull'.green
+
+      puts '✔ Authentication successful'.green
     end
 
     def threat_defence(page)
@@ -181,7 +181,7 @@ module TorS
     private
 
     def list_providers_and_exit
-      puts "☠️  Provider '#{@from}' does not exist."
+      puts "Provider '#{@from}' does not exist.".red
       puts "Please choose a valid provider from the following list:\n\n"
 
       Dir[File.expand_path('providers/*.yml')].each do |f|
@@ -193,10 +193,11 @@ module TorS
 
     def check_download_directory
       ioerr = false
-      ioerr = "😱  Directory #{@directory} not found." unless File.exist?(@directory) || File.directory?(@directory)
-      ioerr = "😱  Directory #{@directory} not writable." unless File.writable? @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
+        puts ioerr.red
         abort 'Exiting'
       end
     end

data/lib/tors/version.rb

@@ -1,3 +1,3 @@
 module TorS
-  VERSION = '0.4.0'.freeze
+  VERSION = '0.5.0'.freeze
 end

data/tors.gemspec

@@ -28,6 +28,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'colorize', '~> 0.8.1'
   spec.add_dependency 'tty-table', '~> 0.8.0'
   spec.add_dependency 'tty-prompt', '~> 0.13.1'
+  spec.add_dependency 'slop', '~> 4.5.0'
 
   spec.add_development_dependency 'bundler', '~> 1.15'
   spec.add_development_dependency 'rake', '~> 10.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tors
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Murat Bastas
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-03 00:00:00.000000000 Z
+date: 2017-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -86,6 +86,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.13.1
+- !ruby/object:Gem::Dependency
+  name: slop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.5.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.5.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -179,7 +193,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Yet another torrent searching application for your command line.