datahen 0.14.11 → 0.14.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 678f01c798cd52a29da298f48e65b1139f13c80a1214d2c1328f4a4c49abbc63
-  data.tar.gz: 0f787dc429274bb1cd0521237883615e7f8c83316d36fcb319e542cd0fe22d7c
+  metadata.gz: 79ae69bd67fcd5158e782a4944cad2fef5f50a9ca896b67e62312778e4d3026c
+  data.tar.gz: b41c7c981d40dc1fb84bd6c3b32ee83d7a2f571f99a93d2c0253570bf4723e2e
 SHA512:
-  metadata.gz: dcaf8fbd6dcfb04f74b8b65ffdcbc127c3e8f179bf0b6da3f2e55acbd2f8d0e425f09a79287bc3ff1791b3fd20e1503c31af3a3128af6eaaedf43e149f1bc995
-  data.tar.gz: 577dda3f28fe7303c08aa290f2fa82150e6f1e679184fac739f839f9de6200be11df7111eddd79f7db7fcfa3aa03f925933db85bed382a1c5c0211534b384e67
+  metadata.gz: 176c36236e870b58eeb11ad008aeb7115ecf3a7ddcced3bddaef88238f638a1159ff0fd8f037143e670c8ed1713332bd6117ff4c90f363c4fa46f54277dc48fa
+  data.tar.gz: dd2b96e8dcd3a7cb136affb56050b4e61c5339d5e3dae527223b20067fe506089d12535e8b06252fea7bd20086bf056a9afcd3cbb8edfb4fb3fd3bbf9bbc65d2

data/lib/datahen/cli/global_page.rb

@@ -15,7 +15,10 @@ module Datahen
 
         if result['available'] == true
           puts "Preview content url: \"#{result['preview_url']}\""
-          `open "#{result['preview_url']}"`
+          begin
+            `open "#{result['preview_url']}"`
+          rescue
+          end
         else
           puts "Content does not exist"
         end

data/lib/datahen/cli/job.rb

@@ -6,7 +6,6 @@ module Datahen
         "#{basename} #{@package_name} #{command.usage}"
       end
 
-
       desc "list", "gets a list of jobs"
       option :page, :aliases => :p, type: :numeric, desc: 'Get the next set of records by page.'
       option :per_page, :aliases => :P, type: :numeric, desc: 'Number of records per page. Max 500 per page.'
@@ -35,8 +34,7 @@ module Datahen
         client = Client::JobStat.new(options)
         puts "#{client.job_current_stats(job_id, options)}"
       end
-
-
+      
     end
   end
 

data/lib/datahen/cli/scraper.rb

@@ -30,6 +30,8 @@ module Datahen
       option :schedule, type: :string, desc: 'Set the schedule of the scraper to run. Must be in CRON format.'
       option :timezone, type: :string, desc: "Set the scheduler's timezone. Must be in IANA Timezone format. Defaults to \"America/Toronto\""
       option :profile, type: :string, desc: 'Set the profiles (comma separated) to apply to the job. Default: default'
+      option :multiple_jobs, type: :boolean, desc: 'Set true to enable multiple jobs. Default: false'
+      option :max_job_count, type: :numeric, desc: 'Set a value to set max number of jobs available. Set -1 for unlimited. Default: 3'
       def create(scraper_name, git_repository)
         # puts "options #{options}"
         client = Client::Scraper.new(options)
@@ -53,6 +55,8 @@ module Datahen
       option :schedule, type: :string, desc: 'Set the schedule of the scraper to run. Must be in CRON format.'
       option :timezone, type: :string, desc: "Set the scheduler's timezone. Must be in IANA Timezone format. Defaults to \"America/Toronto\""
       option :profile, type: :string, desc: 'Set the profiles (comma separated) to apply to the job. Default: default'
+      option :multiple_jobs, type: :boolean, desc: 'Set true to enable multiple jobs. Default: false'
+      option :max_job_count, type: :numeric, desc: 'Set a value to set max number of jobs available. Set -1 for unlimited. Default: 3'
       def update(scraper_name)
         client = Client::Scraper.new(options)
         puts "#{client.update(scraper_name, options)}"

data/lib/datahen/cli/scraper_export.rb

@@ -36,7 +36,10 @@ module Datahen
 
         if result['signed_url']
           puts "Download url: \"#{result['signed_url']}\""
-          `open "#{result['signed_url']}"`
+          begin
+            `open "#{result['signed_url']}"`
+          rescue
+          end
         else
           puts "Exported file does not exist"
         end

data/lib/datahen/cli/scraper_job.rb

@@ -48,6 +48,21 @@ module Datahen
         end
       end
 
+      desc "delete <scraper_name>", "delete a scraper's current job"
+      long_desc <<-LONGDESC
+        Delete a scraper's current job
+      LONGDESC
+      option :job, :aliases => :j, type: :numeric, desc: 'Set a specific job ID'
+      def delete(scraper_name)
+        if options[:job]
+          client = Client::Job.new(options)
+          puts "#{client.delete(options[:job])}"
+        else
+          client = Client::ScraperJob.new(options)
+          puts "#{client.delete(scraper_name)}"
+        end
+      end
+
       desc "resume <scraper_name>", "resumes a scraper's current job"
       long_desc <<-LONGDESC
         Resumes a scraper's current job

data/lib/datahen/cli/scraper_page.rb

@@ -111,6 +111,7 @@ module Datahen
           puts "Must specify either a --gid, --fetch-fail, --parse-fail or --status"
           return
         end
+
         if options[:job]
           client = Client::JobPage.new(options)
           puts "#{client.refetch(options[:job])}"
@@ -129,26 +130,39 @@ module Datahen
       option :status, type: :string, desc: 'Reparse only pages with a specific status.'
       option :job, :aliases => :j, type: :numeric, desc: 'Set a specific job ID'
       def reparse(scraper_name)
-        begin
-          options[:vars] = JSON.parse(options[:vars]) if options[:vars]
+        if !options.key?(:gid) && !options.key?(:parse_fail) && !options.key?(:status)
+          puts "Must specify either a --gid, --parse-fail or --status"
+          return
+        end
 
-          if !options.key?(:gid) && !options.key?(:parse_fail) && !options.key?(:status)
-            puts "Must specify either a --gid, --parse-fail or --status"
-            return
-          end
+        if options[:job]
+          client = Client::JobPage.new(options)
+          puts "#{client.reparse(options[:job])}"
+        else
+          client = Client::ScraperJobPage.new(options)
+          puts "#{client.reparse(scraper_name)}"
+        end
+      end
 
-          if options[:job]
-            client = Client::JobPage.new(options)
-            puts "#{client.reparse(options[:job])}"
-          else
-            client = Client::ScraperJobPage.new(options)
-            puts "#{client.reparse(scraper_name)}"
-          end
+      desc "limbo <scraper_name>", "Move pages on a scraper's current job to limbo"
+      long_desc <<-LONGDESC
+        Move pages in a scraper's current job to limbo. You need to specify either a --gid or --status.\x5
+      LONGDESC
+      option :gid, :aliases => :g, type: :string, desc: 'Move a specific GID to limbo'
+      option :status, type: :string, desc: 'Move pages with a specific status to limbo.'
+      option :job, :aliases => :j, type: :numeric, desc: 'Set a specific job ID'
+      def limbo(scraper_name)
+        if !options.key?(:gid) && !options.key?(:status)
+          puts "Must specify either a --gid or --status"
+          return
+        end
 
-        rescue JSON::ParserError
-          if options[:vars]
-            puts "Error: #{options[:vars]} on vars is not a valid JSON"
-          end
+        if options[:job]
+          client = Client::JobPage.new(options)
+          puts "#{client.limbo(options[:job])}"
+        else
+          client = Client::ScraperJobPage.new(options)
+          puts "#{client.limbo(scraper_name)}"
         end
       end
 
@@ -224,7 +238,10 @@ module Datahen
 
         if result['available'] == true
           puts "Preview content url: \"#{result['preview_url']}\""
-          `open "#{result['preview_url']}"`
+          begin
+            `open "#{result['preview_url']}"`
+          rescue
+          end
         else
           puts "Content does not exist"
         end
@@ -244,7 +261,10 @@ module Datahen
 
         if result['available'] == true
           puts "Preview failed content url: \"#{result['preview_url']}\""
-          `open "#{result['preview_url']}"`
+          begin
+            `open "#{result['preview_url']}"`
+          rescue
+          end
         else
           puts "Failed Content does not exist"
         end

data/lib/datahen/client/auth_token.rb

@@ -16,7 +16,7 @@ module Datahen
             role: role,
             description: description}
 
-        params = @options.merge({body: body.to_json})
+        params = @options.merge({body: body.to_json}).merge(opts)
         self.class.post("/auth_tokens", params)
       end
 

data/lib/datahen/client/job.rb

@@ -71,6 +71,11 @@ module Datahen
         self.class.get("/jobs/#{job_id}/profile", params)
       end
 
+      def delete(job_id, opts={})
+        params = @options.merge(opts)
+        self.class.delete("/jobs/#{job_id}", params)
+      end
+
     end
 
   end

data/lib/datahen/client/job_page.rb

@@ -72,6 +72,11 @@ module Datahen
         params = @options.merge(opts)
         self.class.put("/jobs/#{job_id}/pages/refetch", params)
       end
+
+      def limbo(job_id, opts={})
+        params = @options.merge(opts)
+        self.class.put("/jobs/#{job_id}/pages/limbo", params)
+      end
     end
   end
 end

data/lib/datahen/client/scraper.rb

@@ -26,6 +26,8 @@ module Datahen
         body[:schedule] = opts[:schedule] if opts[:schedule]
         body[:timezone] = opts[:timezone] if opts[:timezone]
         body[:profile] = opts[:profile] if opts[:profile]
+        body[:multiple_jobs] = opts[:multiple_jobs] if opts[:multiple_jobs]
+        body[:max_job_count] = opts[:max_job_count] if opts[:max_job_count]
         params = @options.merge({body: body.to_json})
         self.class.post("/scrapers", params)
       end
@@ -45,6 +47,8 @@ module Datahen
         body[:schedule] = opts[:schedule] if opts[:schedule]
         body[:timezone] = opts[:timezone] if opts[:timezone]
         body[:profile] = opts[:profile] if opts[:profile]
+        body[:multiple_jobs] = opts[:multiple_jobs] if opts.has_key?("multiple_jobs") || opts.has_key?(:multiple_jobs)
+        body[:max_job_count] = opts[:max_job_count] if opts.has_key?("max_job_count") || opts.has_key?(:max_job_count)
         params = @options.merge({body: body.to_json})
 
         self.class.put("/scrapers/#{scraper_name}", params)

data/lib/datahen/client/scraper_job.rb

@@ -55,6 +55,11 @@ module Datahen
 
         self.class.get("/scrapers/#{scraper_name}/current_job/profile", params)
       end
+
+      def delete(scraper_name, opts={})
+        params = @options.merge(opts)
+        self.class.delete("/scrapers/#{scraper_name}/current_job", params)
+      end
     end
   end
 end

data/lib/datahen/client/scraper_job_page.rb

@@ -26,7 +26,7 @@ module Datahen
         self.class.put("/scrapers/#{scraper_name}/current_job/pages/refetch", params)
       end
 
-      # Deprecated, please use Datahen::Client::JobVar#refetch instead.
+      # Deprecated, please use Datahen::Client::JobPage#refetch instead.
       #
       # @note This method will be removed at some point in the future.
       def refetch_by_job(job_id, opts={})
@@ -39,6 +39,11 @@ module Datahen
         self.class.put("/scrapers/#{scraper_name}/current_job/pages/reparse", params)
       end
 
+      def limbo(scraper_name, opts={})
+        params = @options.merge(opts)
+        self.class.put("/scrapers/#{scraper_name}/current_job/pages/limbo", params)
+      end
+
       def enqueue(scraper_name, method, url, opts={})
         body = {}
         body[:method] =  method != "" ? method : "GET"

data/lib/datahen/error.rb

@@ -0,0 +1,6 @@
+require 'datahen/error/safe_terminate_error'
+
+module Datahen
+  module Error
+  end
+end

data/lib/datahen/error/safe_terminate_error.rb

@@ -0,0 +1,6 @@
+module Datahen
+  module Error
+    class SafeTerminateError < Exception
+    end
+  end
+end

data/lib/datahen/scraper.rb

@@ -1,3 +1,4 @@
+require "datahen/error"
 require "datahen/plugin"
 require "datahen/scraper/parser"
 require "datahen/scraper/seeder"

data/lib/datahen/scraper/ruby_parser_executor.rb

@@ -112,7 +112,7 @@ module Datahen
         raise ArgumentError.new("page_gid needs to be a String.") unless page_gid.is_a?(String)
         if page_gid == gid
           self.refetch_self = true
-          return
+          raise Error::SafeTerminateError
         end
         refetch_page page_gid
       end
@@ -130,7 +130,7 @@ module Datahen
         raise ArgumentError.new("page_gid needs to be a String.") unless page_gid.is_a?(String)
         if page_gid == gid
           self.reparse_self = true
-          return
+          raise Error::SafeTerminateError
         end
         reparse_page page_gid
       end
@@ -153,6 +153,8 @@ module Datahen
               page: page
             })
             eval_with_context filename, context
+          rescue Error::SafeTerminateError => e
+            # do nothing, this is fine
           rescue SyntaxError => e
             handle_error(e) if save
             raise e
@@ -163,7 +165,7 @@ module Datahen
 
           puts "=========== Parsing Executed ==========="
           begin
-            save_pages_and_outputs(pages, outputs, :parsing)
+            save_pages_and_outputs(pages, outputs, :parsing) unless refetch_self
           rescue => e
             handle_error(e) if save
             raise e

data/lib/datahen/version.rb

@@ -1,3 +1,3 @@
 module Datahen
-  VERSION = "0.14.11"
+  VERSION = "0.14.18"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datahen
 version: !ruby/object:Gem::Version
-  version: 0.14.11
+  version: 0.14.18
 platform: ruby
 authors:
 - Parama Danoesubroto
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-08-24 00:00:00.000000000 Z
+date: 2020-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -233,6 +233,8 @@ files:
 - lib/datahen/client/scraper_job_page.rb
 - lib/datahen/client/scraper_job_var.rb
 - lib/datahen/client/scraper_var.rb
+- lib/datahen/error.rb
+- lib/datahen/error/safe_terminate_error.rb
 - lib/datahen/plugin.rb
 - lib/datahen/plugin/context_exposer.rb
 - lib/datahen/scraper.rb