get_tapas 0.9.2 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bfb515bfc887f0f74afc3a4991b6191c84d4e8c7
-  data.tar.gz: 4bbb9b48eb3cd5e01fcd8729b2c1e3109ccb1dd6
+  metadata.gz: 13e579fd245dac6c5c005e32e58fed5a40daf655
+  data.tar.gz: 403989d84bf35a73f6ebdc752ed50138dbfd2557
 SHA512:
-  metadata.gz: d39c83321d878357d859de21ebe8aad3877d863adfa57267fd607542a1fdc5c6a161648a0c037fae0a16f4d84c0309a34a31c3079c934087d2c2bab35953d3da
-  data.tar.gz: 2258899bf9f96724f5ac6382664ed06e1609b1d332cacbb3a556cd137f0a8b52636ad768503902bae62234d25a08e5123bbe6b78b545f81a57f53e3ed1153577
+  metadata.gz: 8400e1777e08589b7b3666b936b310e0e016122f38d4171be507d3d8fbce877a01a97d9322944c1f026d44750fd0d9743f3cbde6ac88b3b551c39d3bf65a8c07
+  data.tar.gz: d68aeadc9e3ad5da7b29516ee0b0815a821feb39abf4c80d64ed2e843cc9af401ce33bf137ae2043923f9597f48e38c02f2b5903ff3e1575ad7d05609bf4eb95

data/.gitignore

@@ -8,3 +8,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+*.gem

data/README.md

@@ -57,3 +57,11 @@ Usage: get-tapas [options]
     -h, --help                       Show this message
 ```
 
+For your convenience, the output directory defaults to `$HOME/ruby-tapas`.
+
+## Validation of the Dowloaded Files
+
+The script makes only a crude test to see that the file has been successfully downloaded
+(see `Downloader#validate_downloaded_file`).
+You may want to verify that yourself. If you find an error condition not already tested,
+please let me know (directly or by posting an issue) and I may be able to add a test for it.

data/exe/get-tapas

@@ -30,6 +30,8 @@ end
 
 def process_options
 
+  no_args_were_provided = ARGV.empty?
+
   option_parser = nil
   output_help_and_terminate = -> { puts option_parser; puts; exit(-1) }
 
@@ -78,7 +80,7 @@ def process_options
 
   end.parse!
 
-  if ARGV.empty?
+  if no_args_were_provided
     output_help_and_terminate.()
   end
 
@@ -90,8 +92,10 @@ def get_html(options)
   input = options.input_spec
   if input == '-'
     STDIN.read
-  else
+  elsif input.is_a?(String) && File.file?(input)
     File.read(input)
+  else
+    raise "Invalid download list HTML input source: #{input.inspect}"
   end
 end
 

data/lib/get_tapas/downloader.rb

@@ -18,7 +18,7 @@ class Downloader
 
 
   def ensure_output_dir_exists(dir)
-    return if Dir.exists?(dir)
+    return if Dir.exist?(dir)
     begin
       FileUtils.mkdir_p(dir)
       puts "Created output data directory #{dir}."
@@ -62,11 +62,23 @@ class Downloader
   end
 
 
+  def validate_downloaded_file(filespec)
+    if File.size(filespec) < 20000
+      text = File.read(filespec)
+      if %r{<Error>}.match(text) && %r{</Error>}.match(text)
+        puts "\nDownload error, text was:\n#{text}\n\n\n"
+        raise "Download error"
+      end
+    end
+  end
+
+
   def download_file(link, data_dir)
     puts "Downloading #{link.filespec}..."
     tempfilespec = File.join(data_dir, 'tempfile')
     `curl -o #{tempfilespec} #{Shellwords.shellescape(link.url)}`
     if $?.exitstatus == 0
+      validate_downloaded_file(tempfilespec)
       FileUtils.mv(tempfilespec, link.filespec)
       puts "Finished downloading #{link.filename}\n\n"
     else

data/lib/get_tapas/page_parser.rb

@@ -7,20 +7,26 @@ module PageParser
 
   # Example Input: "https://rubytapas-media.s3.amazonaws.com/298-file-find.mp4?response-content-disposition=...
   # Example Return: '298-file-find.mp4'
-  RUBY_TAPAS_URL_TO_FILENAME = ->(url) { url.split('?').first.split('/').last }
+  def self.ruby_tapas_url_to_filename(url)
+    url.split('?').first.split('/').last
+  end
 
 
   # @param html_string an HTML string from https://www.rubytapas.com/download-list/
   # @return an array of DownloadLink instances.
-  def self.parse(html_string, fn_url_to_filename = RUBY_TAPAS_URL_TO_FILENAME)
+  def self.parse(html_string)
     html_doc = Nokogiri::HTML(html_string)
     html_links = html_doc.xpath("//*[contains(@class, 'video-download-link')]")
 
-    html_links.map do |link|
-      url         = link.children.first.attributes['href'].value
-      description = link.children.first.text.strip
-      filename    = fn_url_to_filename.(url)
-      DownloadLink.new(url, filename, description)
+    if html_links.empty?
+      raise "No screencast links found. Are you sure about the input HTML source?"
+    else
+      html_links.map do |link|
+        url         = link.children.first.attributes['href'].value
+        description = link.children.first.text.strip
+        filename    = ruby_tapas_url_to_filename(url)
+        DownloadLink.new(url, filename, description)
+      end
     end
   end
 end

data/lib/get_tapas/version.rb

@@ -1,3 +1,3 @@
 module GetTapas
-  VERSION = "0.9.2"
+  VERSION = "0.9.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: get_tapas
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.4
 platform: ruby
 authors:
 - Keith Bennett