kat 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2169e0aa1bb57e770b1f18c28c7e303a1d873f91
-  data.tar.gz: ef1a8c23da1ffbf1a178b82a1296bdbd98f42124
+  metadata.gz: a787a58459b2ef07e56e8ea0dcbd2303b88d1a2e
+  data.tar.gz: 8044118ce50282384b57378d82c117b633a1f372
 SHA512:
-  metadata.gz: 63795bf527fc336114b525c5d0de19bab3cb5079c761fd8261383801a1cf204a2e6079cd54f3e9819ea2e464bb4c434785da21ace8b063cd34d29913f91270bc
-  data.tar.gz: e6be7512cb382544a0614ec6dfce16bb713326412f72b25f877eaf71519b1eb9f47454d68a4691c19e5246594d33f52d69c4cc8a5164f60c819d117514fd08da
+  metadata.gz: 47b3095fe9256337fe71d7248d0f36d3cee42f78794d66da09bedea20bb8120efe9bed80bfa24f45469b7bf25361ee236155f4d36bab343b8b4691640aec14ce
+  data.tar.gz: 5bfe7bd174afabe76d089625bc35054da1be957781061932db125c1e6fa74fc84be2fc22b7e3323cc8570d6f1d9f3fd99496b6e8855d99f203834bea89820e47

data/README.md

@@ -22,11 +22,11 @@ Or install it yourself as:
 
 ### Quick search
 
-    Kat.search('game of thrones')
+    Kat.quick_search('game of thrones')
 
 ### Search for torrents
 
-    kat = Kat.new('game of thrones', { :category => 'tv' })
+    kat = Kat.search('game of thrones', { :category => 'tv' })
     kat.search
 
 ### Specifying pages

data/kat.gemspec

@@ -16,11 +16,12 @@ Gem::Specification.new do |s|
   s.description   = 'A Ruby interface to Kickass Torrents'
 
   s.files         = `git ls-files`.split $/
-  s.executables   = s.files.grep(%r{^bin/}) {|f| File.basename f }
+  s.executables   = s.files.grep(%r{^bin/}) { |f| File.basename f }
   s.test_files    = s.files.grep(%r{^(test|spec|features)/})
-  s.require_paths = [ 'lib' ]
+  s.require_paths = ['lib']
 
   s.add_runtime_dependency 'nokogiri', '~> 1.6'
   s.add_runtime_dependency 'highline', '~> 1.6'
   s.add_runtime_dependency 'trollop', '~> 2.0'
+  s.add_runtime_dependency 'andand', '~> 1.3'
 end

data/lib/kat/app.rb

@@ -18,6 +18,7 @@ module Kat
 
   class App
     MIN_WIDTH = 80
+    CONFIG = File.join ENV['HOME'], '.katrc'
 
     # The current page number (0-based)
     attr_accessor :page
@@ -46,20 +47,22 @@ module Kat
     # Initialise the app's options
     #
     def init_options(args = nil)
-      @options = {}
       @args = case args
       when nil    then []
       when String then args.split
       else             args
       end
 
-      load_config
+      @options = load_config || {}
 
       Kat.options(@args).tap { |o|
         @options.merge!(o) { |k, ov, nv| o["#{ k }_given".intern] ? nv : ov }
       }
 
       Kat::Colour.colour = @options[:colour]
+    rescue NoMethodError => e
+      @options = {}
+      warn "Wrong config file format: #{ e }"
     end
 
     #
@@ -144,28 +147,26 @@ module Kat
         }
       ].map { |w| Thread.new { w.call } }.each(&:join)
 
-      unless @kat.results[@page] && !@kat.error
-        puts "\rNo results    ".red
-        puts @kat.error[:error] if @kat.error
-        return false
-      end
+      puts (res = format_results)
 
-      puts format_results
+      if res.size > 1
+        case (answer = prompt)
+        when 'i' then @show_info = !@show_info
+        when 'n' then @page += 1 if next?
+        when 'p' then @page -= 1 if prev?
+        when 'q' then return false
+        else
+          if (1..@kat.results[@page].size).include? (answer = answer.to_i)
+            print "\nDownloading".yellow <<
+                  ": #{ @kat.results[@page][answer - 1][:title] }... "
+            puts download @kat.results[@page][answer - 1]
+          end
+        end
 
-      case (answer = prompt)
-      when 'i' then @show_info = !@show_info
-      when 'n' then @page += 1 if next?
-      when 'p' then @page -= 1 if prev?
-      when 'q' then return false
+        true
       else
-        if (1..@kat.results[@page].size).include? (answer = answer.to_i)
-          print "\nDownloading".yellow <<
-                ": #{ @kat.results[@page][answer - 1][:title] }... "
-          puts download @kat.results[@page][answer - 1]
-        end
+        false
       end
-
-      true
     end
 
     #
@@ -195,6 +196,12 @@ module Kat
     def format_results
       main_width = @window_width - (!hide_info? || @show_info ? 42 : 4)
 
+      if @kat.error
+        return ["\rConnection failed".red]
+      elsif !@kat.results[@page]
+        return ["\rNo results    ".red]
+      end
+
       buf = ["\r%-#{ main_width + 5 }s#{ '      Size     Age      Seeds Leeches' if !hide_info? || @show_info }" %
         "Page #{ page + 1 } of #{ @kat.pages }", nil].yellow!
 
@@ -242,7 +249,9 @@ module Kat
     # Download the torrent to either the output directory or the working directory
     #
     def download(torrent)
-      uri = URI(URI::encode torrent[:download])
+      return [:failed, 'no download link available'].red unless torrent[:download]
+
+      uri = URI(URI.encode torrent[:download])
       uri.query = nil
       file = "#{ @options[:output] || '.' }/" <<
              "#{ torrent[:title].tr(' ', ?.).gsub(/[^a-z0-9()_.-]/i, '') }.torrent"
@@ -259,16 +268,14 @@ module Kat
     end
 
     #
-    # Load options from ~/.katrc if it exists
+    # Load options from CONFIG if it exists
     #
     def load_config
-      config = File.join(ENV['HOME'], '.katrc')
-
-      @options = (symbolise = -> h {
+      (symbolise = -> h {
         Hash === h ? Hash[h.map { |k, v| [k.intern, symbolise[v]] }] : h
-      })[YAML.load_file config] if File.readable? config
+      })[YAML.load_file CONFIG] if File.readable? CONFIG
     rescue => e
-      warn "Failed to load #{config}: #{e}"
+      warn "Failed to load #{ CONFIG }: #{ e }"
     end
 
   end

data/lib/kat/field_map.rb

@@ -1,122 +1,33 @@
-require 'yaml'
-
 module Kat
 
-  FIELD_MAP = (symbolise = -> h {
-    case h
-    when Hash   then Hash[h.map { |k, v| [k.to_sym, k == 'desc' ? v : symbolise[v]] }]
-    when String then h.to_sym
-    else h
-    end
-  })[YAML.load(<<-FIELD_MAP
----
-exact:
-  type:   string
-  desc:   Exact phrase
-
-or:
-  type:   string
-  desc:   Optional words
-  multi:  true
-
-without:
-  type:   string
-  desc:   Without this word
-  multi:  true
-
-sort:
-  type:   string
-  desc:   Sort field (size, files, added, seeds, leeches)
-
-asc:
-  desc:   Ascending sort order (descending is default)
-
-category:
-  select: categories
-  type:   string
-  desc:   Category
-  short:  c
-
-added:
-  select: times
-  sort:   time_add
-  type:   string
-  desc:   Age of the torrent
-  id:     age
-  short:  a
-
-size:
-  sort:   size
-
-user:
-  input:  true
-  type:   string
-  desc:   Uploader
-
-files:
-  input:  true
-  sort:   files_count
-  type:   int
-  desc:   Number of files
-
-imdb:
-  input:  true
-  type:   int
-  desc:   IMDB ID
-
-seeds:
-  input:  true
-  sort:   seeders
-  type:   int
-  desc:   Min no of seeders
-  short:  s
-
-leeches:
-  sort:   leechers
-
-season:
-  input:  true
-  type:   int
-  desc:   Television season
-
-episode:
-  input:  true
-  type:   int
-  desc:   Television episode
-  short:  e
+  FIELD_MAP = {
+    exact:    { type: :string, desc: 'Exact phrase' },
+    or:       { type: :string, desc: 'Optional words',    multi: true },
+    without:  { type: :string, desc: 'Without this word', multi: true },
 
-language:
-  select: languages
-  type:   int
-  desc:   Language
-  id:     lang_id
+    sort:     { type: :string, desc: 'Sort field (size, files, added, seeds, leeches)' },
+    asc:      {                desc: 'Ascending sort order (descending is default)' },
 
-platform:
-  select: platforms
-  type:   int
-  desc:   Game platform
-  id:     platform_id
+    category: { type: :string, desc: 'Category',           select: :categories, short: :c },
+    added:    { type: :string, desc: 'Age of the torrent', select: :times,      short: :a, sort: :time_add, id: :age },
+    size:     { sort: :size },
 
-safe:
-  check:  true
-  desc:   Family safe filter
-  short:  none
+    user:     { type: :string, desc: 'Uploader',           input: true },
+    files:    { type: :int,    desc: 'Number of files',    input: true, sort: :files_count },
+    imdb:     { type: :int,    desc: 'IMDB ID',            input: true },
+    seeds:    { type: :int,    desc: 'Min no of seeders',  input: true, sort: :seeders, short: :s },
+    leeches:  { sort: :leechers },
+    season:   { type: :int,    desc: 'Television season',  input: true },
+    episode:  { type: :int,    desc: 'Television episode', input: true, short: :e },
 
-verified:
-  check:  true
-  desc:   Verified torrent
-  short:  none
+    language: { type: :int,    desc: 'Language',      select: :languages, id: :lang_id },
+    platform: { type: :int,    desc: 'Game platform', select: :platforms, id: :platform_id },
 
-output:
-  type:   string
-  desc:   Directory to save torrents in
-  short:  o
+    safe:     {                desc: 'Family safe filter', check: true, short: :none},
+    verified: {                desc: 'Verified torrent',   check: true, short: :none },
 
-colour:
-  type:   boolean
-  desc:   Output with colour
-  short:  none
-FIELD_MAP
-  )].freeze
+    output:   { type: :string, desc: 'Directory to save torrents in', short: :o },
+    colour:   {                desc: 'Output with colour',            short: :none }
+  }.freeze
 
 end

data/lib/kat/search.rb

@@ -1,6 +1,7 @@
 require File.dirname(__FILE__) + '/field_map'
 require 'nokogiri'
 require 'net/http'
+require 'andand'
 
 module Kat
 
@@ -197,10 +198,10 @@ module Kat
           doc = Nokogiri::HTML(res.body)
 
           @results[page] = doc.css('td.torrentnameCell').map { |node|
-            { path:     node.css('a.normalgrey').first.attributes['href'].value,
+            { path:     node.css('a.normalgrey').first.andand.attr('href'),
               title:    node.css('a.normalgrey').text,
-              magnet:   node.css('a.imagnet').first.attributes['href'].value,
-              download: node.css('a.idownload').last.attributes['href'].value,
+              magnet:   node.css('a.imagnet').first.andand.attr('href'),
+              download: node.css('a.idownload').last.andand.attr('href'),
               size:     (node = node.next_element).text,
               files:    (node = node.next_element).text.to_i,
               age:      (node = node.next_element).text,

data/lib/kat/version.rb

@@ -1,6 +1,6 @@
 module Kat
   NAME = 'Kickass Torrents Search'
-  VERSION = '2.0.0'
+  VERSION = '2.0.1'
   MALEVOLENT_DICTATOR_FOR_LIFE = 'Fission Xuiptz'
   AUTHOR = MALEVOLENT_DICTATOR_FOR_LIFE
   VERSION_STR = "#{NAME} #{VERSION} (c) 2013 #{MALEVOLENT_DICTATOR_FOR_LIFE}"

data/test/kat/test_app.rb

@@ -1,7 +1,7 @@
 require 'minitest/autorun'
 require File.dirname(__FILE__) + '/../../lib/kat/app'
 
-app = Kat::App.new %w(predator -c movies -o .)
+app = Kat::App.new %w(aliens -c movies -o .)
 app.kat.go(1).go(app.kat.pages - 1)
 
 describe Kat::App do
@@ -14,7 +14,7 @@ describe Kat::App do
     end
 
     it 're-initialises options' do
-      k = Kat::App.new %w(predator)
+      k = Kat::App.new %w(aliens)
       k.init_options %w(bible -c books)
       k.options.must_be_instance_of Hash
       k.options[:category].must_equal 'books'
@@ -42,11 +42,13 @@ describe Kat::App do
 
         prev?.must_equal true
         next?.wont_equal true
+        # Skip the test if there's no results. We really only want to test in ideal
+        # network conditions and no results here are an indication that's not the case
         validation_regex.must_equal(
           /^([pq]|[1-#{ [9, n].min }]#{
-            "|1[0-#{ [9, n - 10].min }]" if n > 9
-            }#{ "|2[0-#{ n - 20 }]" if n > 19 })$/
-        )
+          "|1[0-#{ [9, n - 10].min }]" if n > 9
+          }#{ "|2[0-#{ n - 20 }]" if n > 19 })$/
+        ) if n > 0
 
         @page = 0
       }
@@ -83,6 +85,7 @@ describe Kat::App do
 
     it 'formats a list of torrents' do
       Kat::Colour.colour = false
+
       app.instance_exec {
         set_window_width
         list = format_results
@@ -90,8 +93,10 @@ describe Kat::App do
         list.must_be_instance_of Array
         list.wont_be_empty
 
-        list.size.must_equal kat.results[0].size + 3
-        2.upto(list.size - 2) { |i|
+        list[1].must_be_nil
+        list.last.must_be_nil
+
+        (2..list.size - 2).each { |i|
           list[i].must_match /^(\s[1-9]|[12][0-9])\. .*/
         }
       }
@@ -99,6 +104,7 @@ describe Kat::App do
 
     it 'downloads data from a URL' do
       Kat::Colour.colour = false
+
       app.instance_exec {
         s = 'foobar'
         result = download({ download: 'http://google.com', title: s })
@@ -110,6 +116,7 @@ describe Kat::App do
 
     it 'returns an error message when a download fails' do
       Kat::Colour.colour = false
+
       app.instance_exec {
         result = download({ download: 'http://foo.bar', title: 'foobar' })
         result.must_be_instance_of Array

data/test/kat/test_colour.rb

@@ -23,6 +23,8 @@ describe Kat::Colour do
     end
 
     it 'colours strings' do
+      Kat::Colour.colour = true
+
       colours.each_with_index { |c, i|
         str = 'foobar'
         result = "\e[0;#{ 30 + i }mfoobar\e[0m"
@@ -55,6 +57,8 @@ describe Kat::Colour do
     end
 
     it 'colours symbols' do
+      Kat::Colour.colour = true
+
       colours.each_with_index { |c, i|
         sym = :foobar
         result = "\e[0;#{ 30 + i }mfoobar\e[0m"
@@ -85,6 +89,8 @@ describe Kat::Colour do
     end
 
     it 'colours arrays of strings and symbols' do
+      Kat::Colour.colour = true
+
       colours.each_with_index { |c, i|
         s = ['foobar', :foobar, nil, ['foobar', :foobar, nil]]
         t = ['foobar', :foobar, nil, ['foobar', :foobar, nil]]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kat
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Fission Xuiptz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-18 00:00:00.000000000 Z
+date: 2014-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -52,6 +52,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: andand
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
 description: A Ruby interface to Kickass Torrents
 email: fissionxuiptz@softwaremojo.com
 executables:
@@ -76,7 +90,6 @@ files:
 - lib/kat/version.rb
 - test/kat/test_app.rb
 - test/kat/test_colour.rb
-- test/kat/test_field_map.rb
 - test/kat/test_options.rb
 - test/kat/test_search.rb
 homepage: http://github.com/fissionxuiptz/kat
@@ -99,13 +112,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Kickass Torrents Interface
 test_files:
 - test/kat/test_app.rb
 - test/kat/test_colour.rb
-- test/kat/test_field_map.rb
 - test/kat/test_options.rb
 - test/kat/test_search.rb

data/test/kat/test_field_map.rb

@@ -1,46 +0,0 @@
-require 'minitest/autorun'
-require File.dirname(__FILE__) + '/../../lib/kat/field_map'
-
-describe Kat do
-  describe 'field map' do
-    let(:f) { Kat::FIELD_MAP }
-
-    it 'is a hash' do
-      f.must_be_instance_of Hash
-    end
-
-    it 'has symbolised keys' do
-      f.keys.wont_be_empty
-      f.keys.each { |key|
-        key.must_be_instance_of Symbol
-      }
-    end
-
-    it 'has a hash for values' do
-      f.values.wont_be_empty
-      f.values.each { |value|
-        value.must_be_instance_of Hash
-      }
-    end
-
-    it 'has symbolised keys in each value' do
-      f.values.each { |value|
-        value.keys.wont_be_empty
-        value.keys.each { |key|
-          key.must_be_instance_of Symbol
-          case key
-          when :desc
-            value[key].must_be_instance_of String
-          when :multi, :check, :input
-            value[key].must_equal true
-          when :short
-            value[key].must_be_instance_of Symbol
-            value[key].must_match /\A([a-z]|none)\Z/
-          else
-            value[key].must_be_instance_of Symbol
-          end
-        }
-      }
-    end
-  end
-end