download_tv 2.6.0 → 2.6.5

data/lib/download_tv/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DownloadTV
-  VERSION = '2.6.0'
+  VERSION = '2.6.5'
 end

data/test/config_test.rb

@@ -18,28 +18,28 @@ describe DownloadTV::Configuration do
       create_dummy_config(config_path)
 
       c = DownloadTV::Configuration.new(path: config_path)
-      c.content.must_equal(path: config_path, version: DownloadTV::VERSION)
+      _(c.content).must_equal(path: config_path, version: DownloadTV::VERSION)
     end
 
     it 'will load the existing configuration (existing)' do
       create_dummy_config(config_path, auto: false, myepisodes_user: 'dummy')
 
       c = DownloadTV::Configuration.new(path: config_path)
-      c.content.must_equal(path: config_path, auto: false, myepisodes_user: 'dummy', version: DownloadTV::VERSION)
+      _(c.content).must_equal(path: config_path, auto: false, myepisodes_user: 'dummy', version: DownloadTV::VERSION)
     end
 
     it 'will get overwritten by the parameters given' do
       create_dummy_config(config_path, myepisodes_user: 'dummy')
 
       c = DownloadTV::Configuration.new(path: config_path, myepisodes_user: 'fake')
-      c.content.must_equal(path: config_path, myepisodes_user: 'fake', version: DownloadTV::VERSION)
+      _(c.content).must_equal(path: config_path, myepisodes_user: 'fake', version: DownloadTV::VERSION)
     end
 
     it 'will downcase ignored shows' do
       create_dummy_config(config_path, ignored: %w[duMMy String])
 
       c = DownloadTV::Configuration.new(path: config_path)
-      c.content[:ignored].must_equal %w[dummy string]
+      _(c.content[:ignored]).must_equal %w[dummy string]
     end
   end
 
@@ -48,7 +48,7 @@ describe DownloadTV::Configuration do
       create_dummy_config(config_path)
 
       c = DownloadTV::Configuration.new(path: config_path)
-      c.breaking_changes?(DownloadTV::VERSION).must_be_nil
+      _(c.breaking_changes?(DownloadTV::VERSION)).must_be_nil
     end
 
     it "returns true when there's been a major update" do
@@ -58,7 +58,7 @@ describe DownloadTV::Configuration do
       split[0] = (split[0].to_i - 1).to_s
       new_version = split.join('.')
       c = DownloadTV::Configuration.new(path: config_path)
-      c.breaking_changes?(new_version).must_equal true
+      _(c.breaking_changes?(new_version)).must_equal true
     end
 
     it "returns true when there's been a minor update" do
@@ -68,7 +68,7 @@ describe DownloadTV::Configuration do
       split[1] = (split[1].to_i - 1).to_s
       new_version = split.join('.')
       c = DownloadTV::Configuration.new(path: config_path)
-      c.breaking_changes?(new_version).must_equal true
+      _(c.breaking_changes?(new_version)).must_equal true
     end
 
     it "returns false when it's a small patch" do
@@ -78,7 +78,7 @@ describe DownloadTV::Configuration do
       split[2] = (split[2].to_i - 1).to_s
       new_version = split.join('.')
       c = DownloadTV::Configuration.new(path: config_path)
-      c.breaking_changes?(new_version).must_equal false
+      _(c.breaking_changes?(new_version)).must_equal false
     end
   end
 
@@ -90,7 +90,7 @@ describe DownloadTV::Configuration do
         end
       end
 
-      File.exist?(config_path).must_equal true
+      _(File.exist?(config_path)).must_equal true
     end
 
     it 'will have the right values' do
@@ -101,15 +101,14 @@ describe DownloadTV::Configuration do
         end
       end
 
-      c.content[:myepisodes_user].must_equal 'anything'
-      c.content[:cookie].must_equal true
-      c.content[:ignored].must_equal ['anything']
-      c.content[:auto].must_equal true
-      c.content[:subs].must_equal true
-      c.content[:pending].must_equal []
-      c.content[:grabber].must_equal 'TorrentAPI'
-      c.content[:date].must_equal(Date.today - 1)
-      c.content[:version].must_equal DownloadTV::VERSION
+      _(c.content[:myepisodes_user]).must_equal 'anything'
+      _(c.content[:cookie]).must_equal true
+      _(c.content[:ignored]).must_equal ['anything']
+      _(c.content[:auto]).must_equal true
+      _(c.content[:pending]).must_equal []
+      _(c.content[:grabber]).must_equal 'TorrentAPI'
+      _(c.content[:date]).must_equal(Date.today - 1)
+      _(c.content[:version]).must_equal DownloadTV::VERSION
     end
 
     it 'will set the cookie value to false when explicitly told so' do
@@ -120,7 +119,7 @@ describe DownloadTV::Configuration do
         end
       end
 
-      c.content[:cookie].must_equal false
+      _(c.content[:cookie]).must_equal false
     end
 
     it 'will separate the ignored values by commas' do
@@ -130,7 +129,7 @@ describe DownloadTV::Configuration do
           c = DownloadTV::Configuration.new(path: config_path)
         end
       end
-      c.content[:ignored].must_equal ['ignored1', 'itsgone', 'ignored 2']
+      _(c.content[:ignored]).must_equal ['ignored1', 'itsgone', 'ignored 2']
     end
   end
 
@@ -147,22 +146,21 @@ describe DownloadTV::Configuration do
       content = JSON.parse(source, symbolize_names: true)
       content[:date] = Date.parse(content[:date])
 
-      content[:cookie].must_equal true
-      content[:myepisodes_user].must_equal 'anything'
-      content[:ignored].must_equal ['anything']
-      content[:auto].must_equal true
-      content[:subs].must_equal true
-      content[:pending].must_equal []
-      content[:grabber].must_equal 'TorrentAPI'
-      content[:date].must_equal Date.today - 1
-      content[:version].must_equal DownloadTV::VERSION
+      _(content[:cookie]).must_equal true
+      _(content[:myepisodes_user]).must_equal 'anything'
+      _(content[:ignored]).must_equal ['anything']
+      _(content[:auto]).must_equal true
+      _(content[:pending]).must_equal []
+      _(content[:grabber]).must_equal 'TorrentAPI'
+      _(content[:date]).must_equal Date.today - 1
+      _(content[:version]).must_equal DownloadTV::VERSION
     end
   end
 
   describe 'the constructor' do
     it 'will trigger a configuration change when asked to' do
       create_dummy_config(config_path, auto: false)
-      File.exist?(config_path).must_equal true
+      _(File.exist?(config_path)).must_equal true
       c = nil
 
       run_silently do
@@ -171,7 +169,7 @@ describe DownloadTV::Configuration do
         end
       end
 
-      c.content[:auto].must_equal false
+      _(c.content[:auto]).must_equal false
     end
   end
 end

data/test/downloader_test.rb

@@ -17,8 +17,8 @@ describe DownloadTV::Downloader do
   describe 'when creating the object' do
     it 'can receive an optional configuration hash' do
       dl = DownloadTV::Downloader.new(auto: true, grabber: 'KAT', path: config_path)
-      dl.config.content[:auto].must_equal true
-      dl.config.content[:grabber].must_equal 'KAT'
+      _(dl.config.content[:auto]).must_equal true
+      _(dl.config.content[:grabber]).must_equal 'KAT'
     end
   end
 
@@ -30,7 +30,7 @@ describe DownloadTV::Downloader do
                 'Baz The Story S05E22']
 
       dl = DownloadTV::Downloader.new(ignored: [], path: config_path)
-      dl.fix_names(shows).must_equal result
+      _(dl.fix_names(shows)).must_equal result
     end
   end
 
@@ -40,24 +40,24 @@ describe DownloadTV::Downloader do
       result = ['Bar S00E22']
 
       dl = DownloadTV::Downloader.new(ignored: ['ignored'], path: config_path)
-      dl.reject_ignored(shows).must_equal result
+      _(dl.reject_ignored(shows)).must_equal result
     end
   end
 
-  describe 'the check_date method' do
-    it 'exits the script when up to date' do
+  describe 'the date_to_check_from method' do
+    it 'returns the config date when offset is not given' do
       dl = DownloadTV::Downloader.new(date: Date.today, path: config_path)
-      dl.check_date(0).must_be_nil
+      _(dl.date_to_check_from(0)).must_equal Date.today
     end
 
     it 'uses the offset to adjust the date' do
       # Would exit with offset 0
       dl = DownloadTV::Downloader.new(date: Date.today, path: config_path)
 
-      date = dl.check_date(1)
+      date = dl.date_to_check_from(1)
 
-      date.must_equal(Date.today - 1)
-      dl.config.content[:date].must_equal Date.today
+      _(date).must_equal(Date.today - 1)
+      _(dl.config.content[:date]).must_equal Date.today
     end
   end
 
@@ -67,7 +67,7 @@ describe DownloadTV::Downloader do
       dl = DownloadTV::Downloader.new(path: config_path, filters: f)
       links = [['Link 1', ''], ['Link 2 2160p', ''], ['Link 3', '']]
       res = [['Link 1', ''], ['Link 3', '']]
-      dl.filter_shows(links).must_equal res
+      _(dl.filter_shows(links)).must_equal res
     end
 
     it 'removes names without include words in them' do
@@ -76,7 +76,7 @@ describe DownloadTV::Downloader do
       links = [['Link 1', ''], ['Link 2 2160p', ''], ['Link 3', ''],
                ['Link REPACK 5', '']]
       res = [['Link REPACK 5', '']]
-      dl.filter_shows(links).must_equal res
+      _(dl.filter_shows(links)).must_equal res
     end
 
     it "doesn't apply a filter if it would reject every option" do
@@ -84,24 +84,24 @@ describe DownloadTV::Downloader do
       dl = DownloadTV::Downloader.new(path: config_path, filters: f)
       links = [['Link 1 720p', ''], ['Link 2 2160p', ''], ['Link 720p 3', '']]
       res = [['Link 1 720p', ''], ['Link 720p 3', '']]
-      dl.filter_shows(links).must_equal res
+      _(dl.filter_shows(links)).must_equal res
     end
   end
 
   describe 'the get_link method' do
-    it "returns an empty string when it can't find links" do
+    it "returns nil when it can't find links" do
       t = Minitest::Mock.new
       show = 'Example Show S01E01'
 
       t.expect(:get_links, [], [show])
       dl = DownloadTV::Downloader.new(auto: true, path: config_path, pending: ['show 11'])
-      dl.get_link(t, show, true).must_equal ''
-      dl.config.content[:pending].must_equal ['show 11', show]
+      _(dl.get_link(t, show, save_pending: true)).must_be_nil
+      _(dl.config.content[:pending]).must_equal ['show 11', show]
 
       t.expect(:get_links, [], [show])
       dl = DownloadTV::Downloader.new(auto: false, path: config_path, pending: [])
-      dl.get_link(t, show, true).must_equal ''
-      dl.config.content[:pending].must_include show
+      _(dl.get_link(t, show, save_pending: true)).must_be_nil
+      _(dl.config.content[:pending]).must_include show
 
       t.verify
     end
@@ -112,7 +112,7 @@ describe DownloadTV::Downloader do
 
       t.expect(:get_links, [['Name 1', 'Link 1'], ['Name 2', 'Link 2']], [show])
       dl = DownloadTV::Downloader.new(auto: true, path: config_path)
-      dl.get_link(t, show).must_equal 'Link 1'
+      _(dl.get_link(t, show)).must_equal 'Link 1'
       t.verify
     end
   end
@@ -123,7 +123,7 @@ describe DownloadTV::Downloader do
       RbConfig::CONFIG['host_os'] = 'linux-gnu'
 
       dl = DownloadTV::Downloader.new(path: config_path)
-      dl.detect_os.must_equal 'xdg-open'
+      _(dl.detect_os).must_equal 'xdg-open'
 
       RbConfig::CONFIG['host_os'] = prev
     end
@@ -133,7 +133,7 @@ describe DownloadTV::Downloader do
       RbConfig::CONFIG['host_os'] = 'darwin15.6.0'
 
       dl = DownloadTV::Downloader.new(path: config_path)
-      dl.detect_os.must_equal 'open'
+      _(dl.detect_os).must_equal 'open'
 
       RbConfig::CONFIG['host_os'] = prev
     end
@@ -144,8 +144,8 @@ describe DownloadTV::Downloader do
 
       dl = DownloadTV::Downloader.new(path: config_path)
 
-      to_run = -> { run_silently { dl.detect_os.must_equal 'xdg-open' } }
-      to_run.must_raise SystemExit
+      to_run = -> { run_silently { _(dl.detect_os).must_equal 'xdg-open' } }
+      _(to_run).must_raise SystemExit
 
       RbConfig::CONFIG['host_os'] = prev
     end

data/test/grabbers_test.rb

@@ -11,30 +11,30 @@ describe DownloadTV::LinkGrabber do
       next unless grabber.online?
 
       it 'will have a url attribute on creation' do
-        grabber.url.wont_be_nil
+        _(grabber.url).wont_be_nil
       end
 
       it "will raise NoTorrentsError when torrent can't be found" do
         notfound = -> { grabber.get_links('Totally Fake Show askjdgsaudas') }
-        notfound.must_raise DownloadTV::NoTorrentsError
+        _(notfound).must_raise DownloadTV::NoTorrentsError
       end
 
       it 'will return an array with names and links of results when a torrent can be found' do
-        result = grabber.get_links('Game Of Thrones S04E01')
-        result.must_be_instance_of Array
-        result.wont_be :empty?
+        result = grabber.get_links('The Boys S02E01')
+        _(result).must_be_instance_of Array
+        _(result).wont_be :empty?
         result.each do |r|
-          r.size.must_equal 2
-          r[0].must_be_instance_of String
-          r[0].upcase.must_include 'THRONES'
-          r[1].must_be_instance_of String
-          r[1].must_include 'magnet:'
+          _(r.size).must_equal 2
+          _(r[0]).must_be_instance_of String
+          _(r[0].upcase).must_include 'BOYS'
+          _(r[1]).must_be_instance_of String
+          _(r[1]).must_include 'magnet:'
         end
       end
     end
   end
 
   it "raises an error if the instance doesn't implement get_links" do
-    -> { DownloadTV::LinkGrabber.new('').get_links('test') }.must_raise NotImplementedError
+    _(-> { DownloadTV::LinkGrabber.new('').get_links('test') }).must_raise NotImplementedError
   end
 end

data/test/torrent_test.rb

@@ -10,16 +10,16 @@ describe DownloadTV::Torrent do
     end
 
     it 'will populate the instances' do
-      @t.g_instances.size.must_equal grabber_names.size
+      _(@t.g_instances.size).must_equal grabber_names.size
     end
 
     it 'will start with all tries available' do
-      @t.tries.must_equal grabber_names.size - 1
+      _(@t.tries).must_equal grabber_names.size - 1
     end
 
     it 'will call get_links on its grabber' do
       @t.g_instances.first.stub :get_links, %w[test result] do
-        @t.get_links('test show').must_equal %w[test result]
+        _(@t.get_links('test show')).must_equal %w[test result]
       end
     end
   end
@@ -28,13 +28,13 @@ describe DownloadTV::Torrent do
     it 'has a default order' do
       t = DownloadTV::Torrent.new(nil)
       expected = grabber_names.map { |i| "DownloadTV::#{i}" }
-      t.g_instances.map { |i| i.class.name }.must_equal expected
+      _(t.g_instances.map { |i| i.class.name }).must_equal expected
     end
 
     grabber_names.each do |g|
       it 'correctly uses the given grabber first' do
         t = DownloadTV::Torrent.new(g)
-        t.g_instances.first.class.name.must_equal "DownloadTV::#{g}"
+        _(t.g_instances.first.class.name).must_equal "DownloadTV::#{g}"
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: download_tv
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.6.5
 platform: ruby
 authors:
 - guille
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-07-29 00:00:00.000000000 Z
+date: 2021-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -40,18 +40,46 @@ dependencies:
         version: '5.0'
 - !ruby/object:Gem::Dependency
   name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 12.3.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 12.3.3
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.13'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.13'
+- !ruby/object:Gem::Dependency
+  name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '11.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '11.1'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -80,7 +108,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email:
 - guillerg96@gmail.com
 executables:
@@ -88,8 +116,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.md
 - README.md
@@ -104,6 +134,7 @@ files:
 - lib/download_tv/grabbers/eztv.rb
 - lib/download_tv/grabbers/kat.rb
 - lib/download_tv/grabbers/torrentapi.rb
+- lib/download_tv/grabbers/torrentz2.rb
 - lib/download_tv/grabbers/tpb.rb
 - lib/download_tv/linkgrabber.rb
 - lib/download_tv/myepisodes.rb
@@ -119,7 +150,7 @@ homepage: https://github.com/guille/download_tv
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -134,8 +165,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
-signing_key: 
+rubygems_version: 3.2.17
+signing_key:
 specification_version: 4
 summary: DownloadTV is a tool that allows the user to find magnet links for tv show
   episodes. It accepts shows as arguments, from a file or it can integrate with your