comer_de_tapas 0.1.3 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c97e323c1838461bc221ef30b5549c6fb1bc52c8
-  data.tar.gz: 02b0a3e9814c081c618d8d2ac2a70a5a5a6a1eeb
+  metadata.gz: f6a70e6965493b65379f10034f6643dddce8ba66
+  data.tar.gz: b0379d2250f250c9947422445b50dc400d556b96
 SHA512:
-  metadata.gz: 7812e1ee92b1ef2cbaf6c4897dc2f4ae91c775d474f456750660d63e6ddb817ef2cfaf0708bf0ec2a9f46f7b7ac14d816a5ae537342eeba863dde87b21d8a630
-  data.tar.gz: 370a445ca90681db21e53430f416346f7075a77cd2f46610f4ed9007e7e389ed3f9bfef520c8fe7a2dd9d65629839977b368eab3a1e24679bddfb1c3c0134c4f
+  metadata.gz: e1cd96252871165b33c73b88338d7c444f755da59a8bedce3d9d0f96eb9d122284a46d51ca0fd3f80feb8ddfde2d579e77fe8fc1ef6c6dfb976c53d298ccfc81
+  data.tar.gz: d21d9b28b70a8379102324d2b3b1d8b3c37f251d8049bbf348e95a5362552e7472c824c53a072808bec50d87f74e107ae26b469803c040886680ab7437794e51

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014 Juanito Fatas
+Copyright (c) 2014-2015 Juanito Fatas
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -5,8 +5,8 @@ Comer de Tapas
 [![Build Status](https://travis-ci.org/JuanitoFatas/comer_de_tapas.svg)][travis]
 [![Dependency Status](https://gemnasium.com/JuanitoFatas/comer_de_tapas.svg)][gemnasium]
 [![Inline docs ](http://inch-ci.org/github/juanitofatas/comer_de_tapas.svg)][docs]
-[![Code Climate](https://codeclimate.com/github/JuanitoFatas/comer_de_tapas.png)][codeclimate]
-[![Coverage](https://codeclimate.com/github/JuanitoFatas/comer_de_tapas/coverage.png)][coverage]
+[![Code Climate](https://codeclimate.com/github/JuanitoFatas/comer_de_tapas.svg)][codeclimate]
+[![Coverage](https://codeclimate.com/github/JuanitoFatas/comer_de_tapas/coverage.svg)][coverage]
 
 [gem]: https://rubygems.org/gems/comer_de_tapas
 [travis]: https://travis-ci.org/JuanitoFatas/comer_de_tapas

data/bin/comer_de_tapas

@@ -1,5 +1,7 @@
 #!/usr/bin/env ruby
 
-Signal.trap('INT') { abort }
-require 'comer_de_tapas'
+Signal.trap("INT") { abort }
+
+require "comer_de_tapas"
+
 ComerDeTapas::CLI.start(ARGV)

data/comer_de_tapas.gemspec

@@ -5,25 +5,25 @@ require "comer_de_tapas/version"
 
 Gem::Specification.new do |spec|
   spec.name          = "comer_de_tapas"
-  spec.version       = ComerDeTapas::VERSION
   spec.authors       = ["Juanito Fatas"]
   spec.email         = ["katehuang0320@gmail.com"]
+
+  spec.homepage      = "https://github.com/juanitofatas/comer_de_tapas"
   spec.summary       = %q{Ruby Tapas Episode Downloader.}
   spec.description   = spec.summary
-  spec.homepage      = "https://github.com/juanitofatas/comer_de_tapas"
   spec.license       = "MIT"
 
-  spec.files = %w[CONTRIBUTING.md DEVELOPMENT.md LICENSE README.md Rakefile comer_de_tapas.gemspec]
-  spec.files += Dir.glob("lib/**/*.rb")
-  spec.files += Dir.glob("bin/**/*")
-  spec.files += Dir.glob("test/**/*")
-
+  spec.files = %w[CONTRIBUTING.md DEVELOPMENT.md LICENSE README.md Rakefile comer_de_tapas.gemspec] + Dir["bin/*"]  + Dir["lib/**/*.rb"]
   spec.executables   = ["comer_de_tapas"]
-  spec.test_files    = Dir.glob("test/**/*")
-  spec.require_paths = ["lib"]
+  spec.require_paths = %w(lib)
+
+  spec.version       = ComerDeTapas::VERSION
+
+  spec.required_ruby_version     = ">= 2.0.0"
+  spec.required_rubygems_version = ">= 2.2.2"
 
   spec.add_dependency "thor"
-  spec.add_dependency "http", ">= 0.6"
+  spec.add_dependency "http", ">= 0.7.3"
   spec.add_dependency "nokogiri"
-  spec.add_dependency "celluloid-io"
+  spec.add_dependency "celluloid-io", "~> 0.17.0"
 end

data/lib/comer_de_tapas/cli.rb

@@ -1,4 +1,4 @@
-require 'thor'
+require "thor"
 
 module ComerDeTapas
   class CLI < Thor
@@ -7,28 +7,24 @@ module ComerDeTapas
       super
     end
 
-    desc 'version', 'Show version'
+    desc "version", "Show version"
     def version
       say VERSION
     end
     map %w[-v --version] => :version
 
-    desc 'init', 'Create config folder and files'
+    desc "init", "Create config folder and files"
     def init
       @client.init!
-      say 'Please fill in your subscription info in ~/.rubytapas/.credentials.'
-      say 'When you finished, type `comer_de_tapas download` to download.'
+      say "Please fill in your subscription info in ~/.rubytapas/.credentials."
+      say "When you finished, type `comer_de_tapas download` to download."
     end
 
     # -f, --force, options[:force] => true, otherwise nil.
-    desc 'download', 'Download RubyTapas episodes'
-    method_option 'force', :aliases => '-f', type: :boolean, desc: 'Force download.'
+    desc "download", "Download RubyTapas episodes"
+    method_option "force", :aliases => "-f", type: :boolean, desc: "Force download."
     def download
-      @client.fetch_episodes!(options[:force])
-      @client.prepare_save_folder!
-      @client.authenticate
-      @client.load_episodes
-      @client.download_all_tapas!
+      @client.download(force: options[:force])
     end
   end
 end

data/lib/comer_de_tapas/client.rb

@@ -1,7 +1,7 @@
-require 'http'
-require 'json'
-require 'pathname'
-require 'fileutils'
+require "http"
+require "json"
+require "pathname"
+require "fileutils"
 
 module ComerDeTapas
   class Client
@@ -11,78 +11,87 @@ module ComerDeTapas
     # $ touch ~/.rubytapas/.credentials
     def init!
       if RUBYTAPAS_DIR.exist? && CREDENTIAL_FILE.exist?
-        abort 'Credentials found. type `comer_de_tapas download` to download.'
+        abort "Credentials found. type `comer_de_tapas download` to download."
       end
       create_rubytapas_files!
-      puts '~/.rubytapas/.credentials folder and file has been created.'
+      puts "~/.rubytapas/.credentials folder and file has been created."
     end
 
-    # Fetch latest feed on rubytapas.dpdcart.com
-    # Parse it to episode, save episodes data as json to ~/.rubytapas.json
-    def fetch_episodes! force=nil
-      return puts 'Use cached episode data.' if fresh? && force.nil?
-      puts 'Force fetching. Getting latest Ruby Tapas...' if force
-      puts 'Fetching episodes...'
-      if get_feed_with_basic_auth
-        save_feed_data parse_xml_feed
-        puts 'Episodes successfully fetched and saved.'
-      end
+    def download(force: false)
+      fetch_episodes!(force)
+      prepare_save_folder!
+      authenticate
+      load_episodes
+      download_all_tapas!
     end
 
-    # Create user specified folder: credentials[:save_path]
-    def prepare_save_folder!
-      return puts "#{save_folder} found." if save_folder.exist?
+    private
 
-      save_folder.mkpath
-      puts "#{save_folder} created."
-    end
+      # Fetch latest feed on rubytapas.dpdcart.com
+      # Parse it to episode, save episodes data as json to ~/.rubytapas.json
+      def fetch_episodes! force=false
+        return puts "Use cached episode data." if fresh? && !force
 
-    # Authenticate and return Cookie
-    def authenticate
-      @cookie ||= HTTP.post(LOGIN_URL, form_params).headers['Set-Cookie']
-    end
+        puts "Force fetching. Getting latest Ruby Tapas..." if force
+        puts "Fetching episodes..."
+        if get_feed_with_basic_auth
+          save_feed_data parse_xml_feed
+          puts "Episodes successfully fetched and saved."
+        end
+      end
 
-    # Load episodes json from EPISODES_JSON_FILE
-    def load_episodes
-      @episodes ||= JSON.parse(EPISODES_JSON_FILE.read)
-    end
+      # Create user specified folder: credentials[:save_path]
+      def prepare_save_folder!
+        return puts "#{save_folder} found." if save_folder.exist?
 
-    # User spefified folder to save episodes.
-    # @return [Pathname]
-    def save_folder
-      Pathname(credentials[:save_path]).expand_path
-    end
+        save_folder.mkpath
+        puts "#{save_folder} created."
+      end
+
+      # User spefified folder to save episodes.
+      # @return [Pathname]
+      def save_folder
+        Pathname(credentials[:save_path]).expand_path
+      end
 
-    # Download episode in parallel using Actors
-    # Powered by Celluloid::IO
-    def download_all_tapas!
-      episodes.each do |episode|
-        FileUtils.cd(save_folder) do
-          episode_title = episode['title']
-          puts "Downloading Epsiode #{episode_title}..."
+      # Authenticate and return Cookie
+      def authenticate
+        @cookie ||= HTTP.post(LOGIN_URL, form_params).headers["Set-Cookie"]
+      end
 
-          episode_folder = save_folder.join(sanitized episode_title)
+      # Load episodes json from EPISODES_JSON_FILE
+      def load_episodes
+        @episodes ||= JSON.parse(EPISODES_JSON_FILE.read)
+      end
 
-          FileUtils.mkdir_p episode_folder unless episode_folder.exist?
+      # Download episode in parallel using Actors
+      # Powered by Celluloid::IO
+      def download_all_tapas!
+        episodes.each do |episode|
+          FileUtils.cd(save_folder) do
+            episode_title = episode["title"]
+            puts "Downloading Epsiode #{episode_title}..."
 
-          FileUtils.cd episode_folder do
-            fetcher = Fetcher.new
-            file_and_links = episode['links']
-            downloadables = find_downloadables file_and_links, fetcher
+            episode_folder = save_folder.join(sanitized episode_title)
 
-            if downloadables.all? &:nil?
-              puts 'Already downloaded, skip.'
-              next
-            end
+            FileUtils.mkdir_p episode_folder unless episode_folder.exist?
+
+            FileUtils.cd episode_folder do
+              fetcher = Fetcher.new
+              file_and_links = episode["links"]
+              downloadables = find_downloadables file_and_links, fetcher
 
-            download_parallelly! downloadables
-            puts "Episode #{episode_title} content all saved."
+              if downloadables.all? &:nil?
+                puts "Already downloaded, skip."
+                next
+              end
+
+              download_parallelly! downloadables
+              puts "Episode #{episode_title} content all saved."
+            end
           end
         end
       end
-    end
-
-    private
 
       attr_reader :feed_xml, :cookie, :episodes
 
@@ -102,14 +111,14 @@ module ComerDeTapas
       # @param [Array] file_and_links
       def find_downloadables file_and_links, fetcher
         file_and_links.map do |file_and_link|
-          file_name = file_and_link['filename']
+          file_name = file_and_link["filename"]
 
           # mp4 less than 3MB considered as unfinished. Redownload it.
           FileUtils.rm file_name if small_mp4? file_name
 
           next if File.exist? file_name
 
-          q, v = file_and_link['link'].split('?').last.split('=')
+          q, v = file_and_link["link"].split("?").last.split("=")
           [file_name, fetcher.future.fetch(DOWNLOAD_URL, cookie, { q => v })]
         end
       end
@@ -117,7 +126,7 @@ module ComerDeTapas
       # Return true if file is a mp4 and its size less than 3MB.
       def small_mp4?(file)
         return false unless File.exist? file
-        File.size(file) < 3*1024*1024 && File.extname(file) == '.mp4'
+        File.size(file) < 3*1024*1024 && File.extname(file) == ".mp4"
       end
 
       # mkdir -p ~/.rubytapas
@@ -130,21 +139,21 @@ module ComerDeTapas
 
       # Use to create empty credential file
       def credential_template
-        require 'yaml'
+        require "yaml"
         {"credentials"=>[{"email"=>nil}, {"password"=>nil}, {"save_path"=>nil}]}.to_yaml
       end
 
       # Get raw feed data (XML), RSS
       def get_feed_with_basic_auth
-        puts 'Authorizing...'
-        response = HTTP.auth(:basic, authenticate_params).get(FEED_URL).body.to_s
+        puts "Authorizing..."
+        response = HTTP.auth(:basic, authenticate_params).get(FEED_URL).to_s
 
         if response.empty?
           abort "Authroized failed. Please check your email & password in #{CREDENTIAL_FILE}"
         end
 
         if @feed_xml = response
-          puts 'Authroized.'
+          puts "Authroized."
           return true
         end
       end
@@ -185,7 +194,7 @@ module ComerDeTapas
       end
 
       # Given links, parse to
-      # { filename: "123.rb", "/subscriber/download?file_id=34567" }
+      # { filename: '123.rb', '/subscriber/download?file_id=34567' }
       # @return [Array<Hash>]
       def attachments links
         links.each_with_object([]) do |link, episode|

data/lib/comer_de_tapas/constants.rb

@@ -1,12 +1,12 @@
-require 'pathname'
+require "pathname"
 
 module ComerDeTapas
-  BASE_URL     = 'https://rubytapas.dpdcart.com'
-  DOWNLOAD_URL = BASE_URL + '/subscriber/download'
-  LOGIN_URL    = BASE_URL + '/subscriber/login'
-  FEED_URL     = BASE_URL + '/feed'
+  BASE_URL     = "https://rubytapas.dpdcart.com"
+  DOWNLOAD_URL = BASE_URL + "/subscriber/download"
+  LOGIN_URL    = BASE_URL + "/subscriber/login"
+  FEED_URL     = BASE_URL + "/feed"
 
-  RUBYTAPAS_DIR      = Pathname.new(ENV['HOME']).join('.rubytapas')
-  EPISODES_JSON_FILE = RUBYTAPAS_DIR.join('episodes.json')
-  CREDENTIAL_FILE    = RUBYTAPAS_DIR.join('.credentials')
+  RUBYTAPAS_DIR      = Pathname.new(ENV["HOME"]).join(".rubytapas")
+  EPISODES_JSON_FILE = RUBYTAPAS_DIR.join("episodes.json")
+  CREDENTIAL_FILE    = RUBYTAPAS_DIR.join(".credentials")
 end

data/lib/comer_de_tapas/fetcher.rb

@@ -1,4 +1,4 @@
-require 'celluloid/io'
+require "celluloid/io"
 
 module ComerDeTapas
   class Fetcher
@@ -9,8 +9,8 @@ module ComerDeTapas
     # @param cookie
     # @option query [Hash]
     def fetch url, cookie, query={}
-      require 'http'
-      HTTP.with('Cookie' => cookie).get(url, ssl_socket_class: Celluloid::IO::SSLSocket, params: query)
+      require "http"
+      HTTP.with("Cookie" => cookie).get(url, ssl_socket_class: Celluloid::IO::SSLSocket, params: query)
     end
   end
 end

data/lib/comer_de_tapas/subscription.rb

@@ -3,12 +3,12 @@ module ComerDeTapas
     KEYS = %w(email password save_path)
 
     def initialize
-      abort 'Please run `comer_de_tapas init` first' unless CREDENTIAL_FILE.exist?
+      abort "Please run `comer_de_tapas init` first" unless CREDENTIAL_FILE.exist?
 
       set_subscription_data if subscription_data_valid?
     end
 
-    # @return [Hash] User's Ruby Tapas credential information
+    # @return [Hash] User"s Ruby Tapas credential information
     def to_h
       { email: email, password: password, save_path: save_path }
     end
@@ -19,17 +19,17 @@ module ComerDeTapas
 
       # Load ~/.rubytapas/.credentials yaml
       def load_credential_data
-        require 'yaml'
-        @credential_yaml ||= YAML.load_file CREDENTIAL_FILE
+        require "yaml"
+        @credential_yaml ||= YAML.load CREDENTIAL_FILE.read
       end
 
       # Return true if ~/.rubytapas/.credentials files are filled and correct.
       # @return [Boolen]
       def subscription_data_valid?
-        # empty credential file's size is about 50-55.
+        # empty credential file"s size is about 50-55.
         # 65 is when you have a very short email, password, and save_path.
         # So when you filled in data, probably will > 65.
-        if File.size(CREDENTIAL_FILE) < 65
+        if CREDENTIAL_FILE.size < 65
           abort "Did you fill in your subscription data in #{CREDENTIAL_FILE}?"
           return false
         end
@@ -44,7 +44,7 @@ module ComerDeTapas
           hash.each do |k,v|
             abort <<-MSG unless KEYS.include? k
 Probably have a typo in #{CREDENTIAL_FILE}: #{k}
-Valid yaml keys: #{KEYS.join(', ')}.
+Valid yaml keys: #{KEYS.join(", ")}.
             MSG
             abort "Please fill in #{k} in #{CREDENTIAL_FILE}" unless v
           end
@@ -60,9 +60,9 @@ Valid yaml keys: #{KEYS.join(', ')}.
 
       # Set subscription data from ~/.rubytapas/.credentials yaml
       def set_subscription_data
-        @email     ||= load_credential_data['credentials'][0]['email']
-        @password  ||= load_credential_data['credentials'][1]['password']
-        @save_path ||= load_credential_data['credentials'][2]['save_path']
+        @email     ||= load_credential_data["credentials"][0]["email"]
+        @password  ||= load_credential_data["credentials"][1]["password"]
+        @save_path ||= load_credential_data["credentials"][2]["save_path"]
       end
   end
 end

data/lib/comer_de_tapas/version.rb

@@ -1,3 +1,3 @@
 module ComerDeTapas
-  VERSION = "0.1.3"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comer_de_tapas
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.1
 platform: ruby
 authors:
 - Juanito Fatas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-16 00:00:00.000000000 Z
+date: 2015-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: 0.7.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: 0.7.3
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -56,16 +56,16 @@ dependencies:
   name: celluloid-io
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.17.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.17.0
 description: Ruby Tapas Episode Downloader.
 email:
 - katehuang0320@gmail.com
@@ -88,11 +88,6 @@ files:
 - lib/comer_de_tapas/fetcher.rb
 - lib/comer_de_tapas/subscription.rb
 - lib/comer_de_tapas/version.rb
-- test/cli_test.rb
-- test/client_test.rb
-- test/fetcher_test.rb
-- test/subscription_test.rb
-- test/test_helper.rb
 homepage: https://github.com/juanitofatas/comer_de_tapas
 licenses:
 - MIT
@@ -105,22 +100,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.2.2
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.3.0
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Ruby Tapas Episode Downloader.
-test_files:
-- test/cli_test.rb
-- test/client_test.rb
-- test/fetcher_test.rb
-- test/subscription_test.rb
-- test/test_helper.rb
+test_files: []
 has_rdoc: 

data/test/cli_test.rb

@@ -1,12 +0,0 @@
-require 'test_helper'
-
-class CliTest < ComerDeTapas::Test
-  def setup
-    @cli = ComerDeTapas::CLI.new
-  end
-
-  def test_cli_version
-    out, _ = capture_io { @cli.version }
-    assert_match %r(\d.\d.\d), out
-  end
-end

data/test/client_test.rb

@@ -1,7 +0,0 @@
-require 'test_helper'
-
-class ClientTest < ComerDeTapas::Test
-  def setup
-    @client = ComerDeTapas::Client.new
-  end
-end

data/test/fetcher_test.rb

@@ -1,7 +0,0 @@
-require 'test_helper'
-
-class RubyTapasFetcherTest < ComerDeTapas::Test
-  def setup
-    @fetch = ComerDeTapas::Fetcher.new
-  end
-end

data/test/subscription_test.rb

@@ -1,6 +0,0 @@
-require 'test_helper'
-
-class SubscriptionTest < ComerDeTapas::Test
-  def setup
-  end
-end

data/test/test_helper.rb

@@ -1,14 +0,0 @@
-require_relative '../lib/comer_de_tapas'
-
-require 'codeclimate-test-reporter'
-CodeClimate::TestReporter.start
-
-# ensures  using the gem, and not the built-in.
-gem 'minitest'
-require 'minitest/autorun'
-
-module ComerDeTapas
-  class Test < Minitest::Test
-  end
-end
-