datahen 0.14.1 → 0.14.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f53bb8631bee37890dddae7045b89342fcb01611f693fe454a2d001ea9cdfe30
-  data.tar.gz: fe2ab54f12f5865ea60bb7d2f447e09e7eb9cf5dff8a74bfbdced103f8bd03e1
+  metadata.gz: 10e4e646ff403fbdb91e0be43e0a78a879c48f3686be251f26185cae961e4b4f
+  data.tar.gz: bc8a4f11cb3929e2cf1655d7463f02c6dd9166a1994a7cbdb69cddf327099f95
 SHA512:
-  metadata.gz: 59a642fe8ea6274bfb378e60ae4e8e730bb76cc58a188f0c267636d063afa45eb202c635b05b3a906a67f278e03e9f2e5637750f79ef5b8edf8e5ad3a42668d7
-  data.tar.gz: b86f95465887321c090724a65db613a57350050ccdd5c1fb4c407701ac560d6bf6a2ef2964b7c44722578205672483d713b8358e5e3e68c29f59076602391f84
+  metadata.gz: 7d57fc498d3f3b6bcf08a31a663a48f5ace6fff5f9fdeeb1b8f396710e6d7e96f31b1a0dc460aeab312d468d19098b759cc19d6c60ecee9286a409934cfd5872
+  data.tar.gz: ff1585a9b3be081898c597d5e696f0927b90f54d420de3bab39451b16dbd55d622a1aa7c9b631dac22cc9f84d1c5e60b86bf5284bde1cb0abb0a24ed69a5834e

data/lib/datahen/cli/scraper_job.rb

@@ -7,10 +7,16 @@ module Datahen
       end
 
       desc "show <scraper_name>", "Show a scraper's current job (Defaults to showing data from cached job)"
+      option :job, :aliases => :j, type: :numeric, desc: 'Set a specific job ID'
       option :live, type: :boolean, desc: 'Get data from the live job, not cached job.'
       def show(scraper_name)
-        client = Client::ScraperJob.new(options)
-        puts "#{client.find(scraper_name, options)}"
+        if options[:job]
+          client = Client::Job.new(options)
+          puts "#{client.find(options[:job], options)}"
+        else
+          client = Client::ScraperJob.new(options)
+          puts "#{client.find(scraper_name, options)}"
+        end
       end
 
 

data/lib/datahen/cli/scraper_page.rb

@@ -230,7 +230,7 @@ module Datahen
         end
       end
 
-      desc "failedcontent <gid>", "Show a page's failed content in scraper's current job"
+      desc "failedcontent <scraper_name> <gid>", "Show a page's failed content in scraper's current job"
       option :job, :aliases => :j, type: :numeric, desc: 'Set a specific job ID'
       def failedcontent(scraper_name, gid)
         result = nil

data/lib/datahen/scraper/executor.rb

@@ -60,7 +60,12 @@ module Datahen
 
       def init_global_page()
         client = Client::GlobalPage.new()
-        client.find(gid)
+        global_page = client.find(gid)
+        unless global_page.code == 200
+          raise "GID #{gid} not found. Aborting execution!"
+        else
+          global_page
+        end
       end
 
       def get_content(job_id, gid)
@@ -287,11 +292,12 @@ module Datahen
           end
 
           # behave differently if it is a real save
+          save_status = status
           if save
             log_msg = "Saving #{log_msgs.join(' and ')}."
             puts "#{log_msg}"
           else
-            status = "#{status}_try"
+            save_status = "#{status}_try"
           end
 
           # saving to server
@@ -300,7 +306,7 @@ module Datahen
             gid: gid,
             pages: pages_slice,
             outputs: outputs_slice,
-            status: status)
+            status: save_status)
 
           if response.code == 200
             if save

data/lib/datahen/version.rb

@@ -1,3 +1,3 @@
 module Datahen
-  VERSION = "0.14.1"
+  VERSION = "0.14.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datahen
 version: !ruby/object:Gem::Version
-  version: 0.14.1
+  version: 0.14.2
 platform: ruby
 authors:
 - Parama Danoesubroto
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-26 00:00:00.000000000 Z
+date: 2020-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -264,7 +264,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: DataHen toolbelt for developers