download_tv 2.2.1 → 2.2.2

data/lib/download_tv/myepisodes.rb

@@ -1,87 +1,79 @@
 module DownloadTV
-
-	class MyEpisodes
-
-		def initialize(user=nil, save_cookie)
-			@agent = Mechanize.new
-			@user = user
-			@save_cookie = save_cookie
-			@cookie_path = File.join(ENV["HOME"], ".config", "download_tv", "cookie")
-		end
-
-		def login
-			if !@user || @user==""
-				print "Enter your MyEpisodes username: "
-				@user = STDIN.gets.chomp
-			end
-
-			print "Enter your MyEpisodes password: "
-			pass = STDIN.noecho(&:gets).chomp
-			puts
-
-			page = @agent.get "https://www.myepisodes.com/login.php"
-
-			login_form = page.forms[1]
-			login_form.username = @user
-			login_form.password = pass
-
-			page = @agent.submit(login_form, login_form.buttons.first)
-
-			raise InvalidLoginError if page.filename == "login.php"
-
-			save_cookie() if @save_cookie
-
-			@agent
-			
-		end
-
-		def load_cookie
-			if File.exist? @cookie_path
-				@agent.cookie_jar.load @cookie_path
-				page = @agent.get "https://www.myepisodes.com/login.php"
-				if page.links[1].text == "Register"
-					puts "The cookie is invalid/has expired."
-					login
-				end
-				@agent
-			else
-				puts "Cookie file not found"
-				login
-			end
-			
-		end
-
-		def save_cookie
-			@agent.cookie_jar.save(@cookie_path, session: true)
-			@agent
-			
-		end
-		
-		def get_shows(last)
-			page = @agent.get "https://www.myepisodes.com/ajax/service.php?mode=view_privatelist"
-			shows = page.parser.css('tr.past')
-
-			s = shows.select do |i|
-				airdate = i.css('td.date')[0].text
-				Date.parse(airdate) >= last
-			end
-
-			s.map do |i|
-				name = i.css('td.showname').text
-				ep = i.css('td.longnumber').text
-
-				ep.insert(0, "S")
-				ep.sub!("x", "E")
-
-				"#{name} #{ep}"
-			end
-			
-		end
-		
-	end
-
-	class InvalidLoginError < StandardError
-
-	end
-
-end
+  ##
+  # API wrapper for MyEpisodes
+  class MyEpisodes
+    def initialize(user, save_cookie)
+      @agent = Mechanize.new
+      @user = user
+      @save_cookie = save_cookie
+      @cookie_path = File.join(ENV['HOME'], '.config', 'download_tv', 'cookie')
+    end
+
+    def login
+      if !@user || @user == ''
+        print 'Enter your MyEpisodes username: '
+        @user = STDIN.gets.chomp
+      end
+
+      print 'Enter your MyEpisodes password: '
+      pass = STDIN.noecho(&:gets).chomp
+      puts
+
+      page = @agent.get 'https://www.myepisodes.com/login.php'
+
+      login_form = page.forms[1]
+      login_form.username = @user
+      login_form.password = pass
+
+      page = @agent.submit(login_form, login_form.buttons.first)
+
+      raise InvalidLoginError if page.filename == 'login.php'
+
+      save_cookie if @save_cookie
+
+      @agent
+    end
+
+    def load_cookie
+      if File.exist? @cookie_path
+        @agent.cookie_jar.load @cookie_path
+        page = @agent.get 'https://www.myepisodes.com/login.php'
+        if page.links[1].text == 'Register'
+          puts 'The cookie is invalid/has expired.'
+          login
+        end
+        @agent
+      else
+        puts 'Cookie file not found'
+        login
+      end
+    end
+
+    def save_cookie
+      @agent.cookie_jar.save(@cookie_path, session: true)
+      @agent
+    end
+
+    def get_shows(last)
+      page = @agent.get 'https://www.myepisodes.com/ajax/service.php?mode=view_privatelist'
+      shows = page.parser.css('tr.past')
+
+      s = shows.select do |i|
+        airdate = i.css('td.date')[0].text
+        Date.parse(airdate) >= last
+      end
+
+      s.map do |i|
+        name = i.css('td.showname').text
+        ep = i.css('td.longnumber').text
+
+        ep.insert(0, 'S')
+        ep.sub!('x', 'E')
+
+        "#{name} #{ep}"
+      end
+    end
+  end
+
+  class InvalidLoginError < StandardError; end
+end

data/lib/download_tv/subtitles.rb

@@ -1,20 +1,15 @@
 module DownloadTV
-
-	class Subtitles
-
-		def initialize
-			@a = Addic7ed.new
-			
-		end
-
-		def get_subs(show)
-			@a.get_subs(show)
-
-		rescue NoSubtitlesError
-			puts "No subtitles found for #{show}"
-
-		end
-		
-	end
-
-end
+  ##
+  # Manages the subtitles (WIP)
+  class Subtitles
+    def initialize
+      @a = Addic7ed.new
+    end
+
+    def get_subs(show)
+      @a.get_subs(show)
+    rescue NoSubtitlesError
+      puts "No subtitles found for #{show}"
+    end
+  end
+end

data/lib/download_tv/torrent.rb

@@ -1,84 +1,70 @@
 module DownloadTV
-
-	class Torrent
-
-		attr_reader :g_names, :g_instances, :n_grabbers
-
-		def grabbers
-			["Eztv", "KAT", "ThePirateBay", "TorrentAPI"]
-		end
-
-		def initialize(default_grabber=nil)
-			@g_names = grabbers
-			@g_instances = Array.new
-			@n_grabbers = @g_names.size # Initial size
-			@tries = @n_grabbers - 1
-
-			# Silently ignores bad names
-			@g_names.rotate! @g_names.find_index(default_grabber).to_i+1
-
-			change_grabbers
-			
-		end
-
-		
-		def change_grabbers
-			if !@g_names.empty?
-				# Instantiates the last element from g_names, popping it
-				newt = (DownloadTV.const_get @g_names.pop).new
-				newt.test_connection
-
-				@g_instances.unshift newt
-
-			else
-				# Rotates the instantiated grabbers
-				@g_instances.rotate!
-
-			end
-
-		rescue Mechanize::ResponseCodeError, Net::HTTP::Persistent::Error
-
-			warn "Problem accessing #{newt.class.name}"
-			# We won't be using this grabber
-			@n_grabbers = @n_grabbers-1
-			@tries = @n_grabbers - 1
-
-			change_grabbers
-
-		rescue SocketError, Errno::ECONNRESET, Net::OpenTimeout
-			warn "Connection error."
-			exit 1
-			
-		end
-
-
-		def get_links(show)
-			links = @g_instances.first.get_links(show)
-
-			# Reset the counter
-			@tries = @n_grabbers - 1
-			
-			links
-
-		rescue NoTorrentsError
-			puts "No torrents found for #{show} using #{@g_instances.first.class.name}"
-
-			# Use next grabber
-			if @tries > 0
-				@tries-=1
-				change_grabbers
-				retry
-
-			else # Reset the counter
-				@tries = @n_grabbers - 1
-				# Handle show not found here!!
-				return []
-			
-			end
-			
-		end
-
-		
-	end
-
-end
+  ##
+  # Class in charge of managing the link grabbers
+  class Torrent
+    attr_reader :g_names, :g_instances, :n_grabbers
+
+    def grabbers
+      %w[Eztv KAT ThePirateBay TorrentAPI]
+    end
+
+    def initialize(default_grabber = nil)
+      @g_names = grabbers
+      @g_instances = []
+      @n_grabbers = @g_names.size # Initial size
+      @tries = @n_grabbers - 1
+
+      # Silently ignores bad names
+      @g_names.rotate! @g_names.find_index(default_grabber).to_i + 1
+
+      change_grabbers
+    end
+
+    def change_grabbers
+      if !@g_names.empty?
+        # Instantiates the last element from g_names, popping it
+        newt = (DownloadTV.const_get @g_names.pop).new
+        newt.test_connection
+
+        @g_instances.unshift newt
+
+      else
+        # Rotates the instantiated grabbers
+        @g_instances.rotate!
+      end
+    rescue Mechanize::ResponseCodeError, Net::HTTP::Persistent::Error
+      warn "Problem accessing #{newt.class.name}"
+      # We won't be using this grabber
+      @n_grabbers -= 1
+      @tries = @n_grabbers - 1
+
+      change_grabbers
+    rescue SocketError, Errno::ECONNRESET, Net::OpenTimeout
+      warn 'Connection error.'
+      exit 1
+    end
+
+    def get_links(show)
+      links = @g_instances.first.get_links(show)
+
+      # Reset the counter
+      @tries = @n_grabbers - 1
+
+      links
+    rescue NoTorrentsError
+      puts "No torrents found for #{show} using #{@g_instances.first.class.name}"
+
+      # Use next grabber
+      if @tries > 0
+        @tries -= 1
+        change_grabbers
+        retry
+
+      else # Reset the counter
+        @tries = @n_grabbers - 1
+        # Handle show not found here!!
+        return []
+      end
+    end
+  end
+end

data/lib/download_tv/version.rb

@@ -1,3 +1,3 @@
 module DownloadTV
-  VERSION = "2.2.1"
+  VERSION = '2.2.2'.freeze
 end

data/test/config_test.rb

@@ -1,172 +1,170 @@
-require "test_helper"
+require 'test_helper'
 
 describe DownloadTV::Configuration do
-	config_path = File.realdirpath("#{__dir__}/test_config")
-
-	before do
-		Dir.chdir(__dir__)
-	end
-
-	after do
-		File.delete(config_path) if File.exist?(config_path)
-	end
-
-	describe "when the file already exists" do
-		it "will load the existing configuration (blank)" do
-			create_dummy_config(config_path)
-
-			c = DownloadTV::Configuration.new(path: config_path)
-			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})
-		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})
-		end
-
-		it "will downcase ignored shows" do
-			create_dummy_config(config_path, ignored: ["duMMy", "String"])
-
-			c = DownloadTV::Configuration.new(path: config_path)
-			c.content[:ignored].must_equal ["dummy", "string"]
-		end
-	end
-
-	describe "the breaking_changes method" do
-		it "returns nil when both versions are equal" do
-			create_dummy_config(config_path)
-
-			c = DownloadTV::Configuration.new(path: config_path)
-			c.breaking_changes?(DownloadTV::VERSION).must_be_nil
-		end
-
-		it "returns true when there's been a major update" do
-			create_dummy_config(config_path)
-
-			split = DownloadTV::VERSION.split(".")
-			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
-		end
-
-		it "returns true when there's been a minor update" do
-			create_dummy_config(config_path)
-
-			split = DownloadTV::VERSION.split(".")
-			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
-		end
-
-		it "returns false when it's a small patch" do
-			create_dummy_config(config_path)
-
-			split = DownloadTV::VERSION.split(".")
-			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
-		end
-	end
-
-	describe "when the file doesn't exist" do
-		it "will create a new one" do
-			run_silently do
-				STDIN.stub :gets, "myepisodes\ncookie\nignored" do
-					DownloadTV::Configuration.new(path: config_path)
-				end
-			end
-
-			File.exist?(config_path).must_equal true
-		end
-
-		it "will have the right values" do
-			c = nil
-			run_silently do
-				STDIN.stub :gets, "anything" do
-					c = DownloadTV::Configuration.new(path: config_path)
-				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[: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
-			c = nil
-			run_silently do
-				STDIN.stub :gets, "n" do
-					c = DownloadTV::Configuration.new(path: config_path)
-				end
-			end
-
-			c.content[:cookie].must_equal false
-		end
-
-		it "will separate the ignored values by commas" do
-			c = nil
-			run_silently do
-				STDIN.stub :gets, "ignored1, itsgone, ignored 2" do
-					c = DownloadTV::Configuration.new(path: config_path)
-				end
-			end
-			c.content[:ignored].must_equal ["ignored1", "itsgone", "ignored 2"]
-		end
-	end
-
-	describe "the serialize method" do
-		it "stores the configuration in a Marshal'd file" do
-			# Calls serialize
-			run_silently do
-				STDIN.stub :gets, "anything" do
-					DownloadTV::Configuration.new(path: config_path)
-				end
-			end
-			content = File.open(config_path, "rb") { |f| Marshal.load(f) }
-
-			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[: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
-			c = nil
-
-			run_silently do
-				STDIN.stub :gets, "anything" do
-					c = DownloadTV::Configuration.new(path: config_path)
-				end
-			end
-
-			c.content[:auto].must_equal false
-		end
-	end
-
-end
+  config_path = File.realdirpath("#{__dir__}/test_config")
+
+  before do
+    Dir.chdir(__dir__)
+  end
+
+  after do
+    File.delete(config_path) if File.exist?(config_path)
+  end
+
+  describe 'when the file already exists' do
+    it 'will load the existing configuration (blank)' do
+      create_dummy_config(config_path)
+
+      c = DownloadTV::Configuration.new(path: config_path)
+      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)
+    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)
+    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]
+    end
+  end
+
+  describe 'the breaking_changes method' do
+    it 'returns nil when both versions are equal' do
+      create_dummy_config(config_path)
+
+      c = DownloadTV::Configuration.new(path: config_path)
+      c.breaking_changes?(DownloadTV::VERSION).must_be_nil
+    end
+
+    it "returns true when there's been a major update" do
+      create_dummy_config(config_path)
+
+      split = DownloadTV::VERSION.split('.')
+      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
+    end
+
+    it "returns true when there's been a minor update" do
+      create_dummy_config(config_path)
+
+      split = DownloadTV::VERSION.split('.')
+      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
+    end
+
+    it "returns false when it's a small patch" do
+      create_dummy_config(config_path)
+
+      split = DownloadTV::VERSION.split('.')
+      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
+    end
+  end
+
+  describe "when the file doesn't exist" do
+    it 'will create a new one' do
+      run_silently do
+        STDIN.stub :gets, 'myepisodes\ncookie\nignored' do
+          DownloadTV::Configuration.new(path: config_path)
+        end
+      end
+
+      File.exist?(config_path).must_equal true
+    end
+
+    it 'will have the right values' do
+      c = nil
+      run_silently do
+        STDIN.stub :gets, 'anything' do
+          c = DownloadTV::Configuration.new(path: config_path)
+        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[: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
+      c = nil
+      run_silently do
+        STDIN.stub :gets, 'n' do
+          c = DownloadTV::Configuration.new(path: config_path)
+        end
+      end
+
+      c.content[:cookie].must_equal false
+    end
+
+    it 'will separate the ignored values by commas' do
+      c = nil
+      run_silently do
+        STDIN.stub :gets, 'ignored1, itsgone, ignored 2' do
+          c = DownloadTV::Configuration.new(path: config_path)
+        end
+      end
+      c.content[:ignored].must_equal ['ignored1', 'itsgone', 'ignored 2']
+    end
+  end
+
+  describe 'the serialize method' do
+    it 'stores the configuration in a Marshalled file' do
+      # Calls serialize
+      run_silently do
+        STDIN.stub :gets, 'anything' do
+          DownloadTV::Configuration.new(path: config_path)
+        end
+      end
+      content = File.open(config_path, 'rb') { |f| Marshal.load(f) }
+
+      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[: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
+      c = nil
+
+      run_silently do
+        STDIN.stub :gets, 'anything' do
+          c = DownloadTV::Configuration.new(path: config_path)
+        end
+      end
+
+      c.content[:auto].must_equal false
+    end
+  end
+end