datahen 0.13.7 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c05f6ab973fe74a21e7f68411a66b97444575cc75c5812e99c5e0da4ffe05d56
-  data.tar.gz: dac1d2be8f6281d3da328abd5f844036765991764bb1e3ffad4b72ee4c18eac6
+  metadata.gz: 3ff2ed2cd4772450c01e3e88248ae89441de709198fdd177d3e572bbc5f0e474
+  data.tar.gz: 5701717fcba8a05b6f3e027d9bce33a3830fa20dabe3413255779899478cb4ab
 SHA512:
-  metadata.gz: 48c15f9830308488d434dce7b7cf4888795724d88d4ca9de63cc2deca8397798b815145430af2143eb646366bfc4e97f37e563315214258b434276919e724ac7
-  data.tar.gz: faee0369f81ab45dbb6c62258a6214d530d51d5dcb0f6b6ebd7028bda2c48ccbe630b41006ffcc96dba773a28e84e724b6b1f2266ef7866605e5423f1ced61d2
+  metadata.gz: 949ad06a090a4ac8c2ef5b4e053ed4b7668c051be15b6959a2948614e771c25e18774d9ee97fe1f5c03c130986b671a8b26ac253f592a993fa4ad393bcad7673
+  data.tar.gz: b73cfc6c070314f97cbc7917d571de67031247aac42f3474b2e71d04e8b3d650fc380a0ce3ca65c1d8339bf8743d94b666ecccca4431f7b89df4e7485a03a382

data/lib/datahen/cli/job.rb

@@ -18,12 +18,24 @@ module Datahen
         puts "#{client.all()}"
       end
 
-      desc "show <job_id>", "Show a job"
+      desc "show <job_id>", "Show a job (Defaults to showing data from cached job)"
+      option :live, type: :boolean, desc: 'Get data from the live job, not cached job.'
       def show(job_id)
         client = Client::Job.new(options)
-        puts "#{client.find(job_id)}"
+        puts "#{client.find(job_id, options)}"
       end
 
+      desc "stats <job_id>", "Get the stat for a job (Defaults to showing data from cached stats)"
+      long_desc <<-LONGDESC
+        Get stats for a scraper's current job\n
+      LONGDESC
+      option :live, type: :boolean, desc: 'Get data from the live stats, not cached stats.'
+      def stats(job_id)
+        client = Client::JobStat.new(options)
+        puts "#{client.job_current_stats(job_id, options)}"
+      end
+
+
     end
   end
 

data/lib/datahen/cli/scraper.rb

@@ -60,7 +60,7 @@ module Datahen
       desc "show <scraper_name>", "Show a scraper"
       def show(scraper_name)
         client = Client::Scraper.new(options)
-        puts "#{client.find(scraper_name)}"
+        puts "#{client.find(scraper_name, options)}"
       end
 
       desc "delete <scraper_name>", "Delete a scraper and related records"
@@ -140,17 +140,18 @@ module Datahen
         end
       end
 
-      desc "stats <scraper_name>", "Get the current stat for a job"
+      desc "stats <scraper_name>", "Get the stat for a current job (Defaults to showing data from cached stats)"
       long_desc <<-LONGDESC
         Get stats for a scraper's current job\n
       LONGDESC
       option :job, :aliases => :j, type: :numeric, desc: 'Set a specific job ID'
+      option :live, type: :boolean, desc: 'Get data from the live stats, not cached stats.'
       def stats(scraper_name)
         client = Client::JobStat.new(options)
         if options[:job]
-          puts "#{client.job_current_stats(options[:job])}"
+          puts "#{client.job_current_stats(options[:job], options)}"
         else
-          puts "#{client.scraper_job_current_stats(scraper_name)}"
+          puts "#{client.scraper_job_current_stats(scraper_name, options)}"
         end
       end
 

data/lib/datahen/cli/scraper_job.rb

@@ -6,10 +6,11 @@ module Datahen
         "#{basename} #{@package_name} #{command.usage}"
       end
 
-      desc "show <scraper_name>", "Show a scraper's current job"
+      desc "show <scraper_name>", "Show a scraper's current job (Defaults to showing data from cached job)"
+      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)}"
+        puts "#{client.find(scraper_name, options)}"
       end
 
 

data/lib/datahen/client/job.rb

@@ -6,8 +6,12 @@ module Datahen
         self.class.get("/jobs", params)
       end
 
-      def find(job_id)
-        self.class.get("/jobs/#{job_id}", @options)
+      def find(job_id, opts={})
+        if opts[:live]
+          self.class.get("/jobs/#{job_id}", @options)
+        else
+          self.class.get("/cached/jobs/#{job_id}", @options)
+        end
       end
 
       def update(job_id, opts={})

data/lib/datahen/client/job_stat.rb

@@ -2,12 +2,20 @@ module Datahen
   module Client
     class JobStat < Datahen::Client::Base
 
-      def job_current_stats(job_id)
-        self.class.get("/jobs/#{job_id}/stats/current", @options)
+      def job_current_stats(job_id, opts={})
+        if opts[:live]
+          self.class.get("/jobs/#{job_id}/stats/current", @options)
+        else
+          self.class.get("/cached/jobs/#{job_id}/stats/current", @options)
+        end
       end
 
-      def scraper_job_current_stats(scraper_name)
-        self.class.get("/scrapers/#{scraper_name}/current_job/stats/current", @options)
+      def scraper_job_current_stats(scraper_name, opts={})
+        if opts[:live]
+          self.class.get("/scrapers/#{scraper_name}/current_job/stats/current", @options)
+        else
+          self.class.get("/cached/scrapers/#{scraper_name}/current_job/stats/current", @options)
+        end
       end
 
       def job_stats_history(job_id)

data/lib/datahen/client/scraper_job.rb

@@ -15,8 +15,12 @@ module Datahen
         self.class.post("/scrapers/#{scraper_name}/jobs", params)
       end
 
-      def find(scraper_name)
-        self.class.get("/scrapers/#{scraper_name}/current_job", @options)
+      def find(scraper_name, opts={})
+        if opts[:live]
+          self.class.get("/scrapers/#{scraper_name}/current_job", @options)
+        else
+          self.class.get("/cached/scrapers/#{scraper_name}/current_job", @options)
+        end
       end
 
       def update(scraper_name, opts={})

data/lib/datahen/version.rb

@@ -1,3 +1,3 @@
 module Datahen
-  VERSION = "0.13.7"
+  VERSION = "0.14.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datahen
 version: !ruby/object:Gem::Version
-  version: 0.13.7
+  version: 0.14.0
 platform: ruby
 authors:
 - Parama Danoesubroto
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-06 00:00:00.000000000 Z
+date: 2020-07-26 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.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: DataHen toolbelt for developers