datahen 0.14.5 → 0.14.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e81f515b9874f6b9cd2943873e7ce54249d0c4662833e4eb9133bb8827901a3f
-  data.tar.gz: 02f860429555067ab0d034c7e46164ee3537844c34f40ea0949300a2de294187
+  metadata.gz: b3dc2db62e50655c78bb70aceac56a3f1fb3f8ec87d155c65bbaf4e521d10fc5
+  data.tar.gz: 57de5a7b0e9271dcfbb05d7ac22df37a127cd3c427e03d93bb448359b7d30edc
 SHA512:
-  metadata.gz: 8cffdec9fa56f0d5ee22215b0eb64c0f2de45b1a3f031729f9929625ccf69e270fea2e554a34d583de71e02c7bbc4f0acc82ca6ad5c0f3ea496176277afd8818
-  data.tar.gz: 66b108bc587b3381a6202877f7915653a4ee1c1e058eeeab192aa1ba3614d7843c8dbcb67a7f08d57c6131ac03398a20a09ac7f309acdd0c244f06c46aa84d30
+  metadata.gz: 73888c3cabdb2c4f20371fff2f73294a71eb105a282ffff9e85ab675865fe1a7ffd8efb768cd8f0e82667158b6c249bbfef0f883088538dfc1c2c1fc4cdab527
+  data.tar.gz: e15616500c7994d3c537b42c38dd4965035f7ef825181053ad05ece46a42194d8574c322ec3f3e24121ca0c7aac2c4a9351cd93dff64814855500b04a536d61d

data/lib/datahen/cli.rb

@@ -16,6 +16,7 @@ require 'datahen/cli/parser'
 require 'datahen/cli/seeder'
 require 'datahen/cli/finisher'
 require 'datahen/cli/env_var'
+require 'datahen/cli/account'
 
 
 
@@ -41,5 +42,8 @@ module Datahen
 
     desc "var SUBCOMMAND ...ARGS", "for environment variable related activities"
     subcommand "var", EnvVar
+
+    desc "account SUBCOMMAND ...ARGS", "for account related activities"
+    subcommand "account", Account
   end
 end

data/lib/datahen/cli/account.rb

@@ -0,0 +1,17 @@
+module Datahen
+  class CLI < Thor
+    class Account < Thor
+
+      desc "profile", "displays the account applied profile"
+      long_desc <<-LONGDESC
+        Displays the account applied profile
+      LONGDESC
+      def profile()
+        client = Client::Account.new(options)
+        puts "#{client.profile()}"
+      end
+
+    end
+  end
+
+end

data/lib/datahen/cli/env_var.rb

@@ -2,7 +2,7 @@ module Datahen
   class CLI < Thor
     class EnvVar < Thor
       desc "list", "List environment variables on the account"
-      
+
       long_desc <<-LONGDESC
         List all environment variables on the account.
       LONGDESC
@@ -19,7 +19,7 @@ module Datahen
           <name>: Var name can only consist of alphabets, numbers, underscores. Name must be unique to your account, otherwise it will be overwritten.\x5
           <value>: Value of variable.\x5
           LONGDESC
-      option :secret, type: :boolean, desc: 'Set true to make it decrypt the value. Default: false' 
+      option :secret, type: :boolean, desc: 'Set true to make it decrypt the value. Default: false'
       def set(name, value)
         # puts "options #{options}"
         client = Client::EnvVar.new(options)
@@ -38,10 +38,6 @@ module Datahen
         puts "#{client.unset(name)}"
       end
 
-
-      
-
-
     end
   end
 

data/lib/datahen/cli/job.rb

@@ -6,10 +6,10 @@ 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.'
+      option :status, type: :string, desc: 'Returns jobs with a certain status'
       long_desc <<-LONGDESC
         List scrape jobs.
       LONGDESC
@@ -34,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

@@ -1,8 +1,8 @@
 module Datahen
   class CLI < Thor
     class Scraper < Thor
-      desc "list", "List scrapers"
 
+      desc "list", "List scrapers"
       long_desc <<-LONGDESC
         List all scrapers.
       LONGDESC
@@ -29,6 +29,9 @@ module Datahen
       option :cancel_current_job, type: :boolean, desc: 'Set true to cancel currently active job if scheduler starts. Default: false'
       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)
@@ -51,6 +54,9 @@ module Datahen
       option :cancel_current_job, type: :boolean, desc: 'Set true to cancel currently active job if scheduler starts. Default: false'
       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)}"
@@ -175,6 +181,14 @@ module Datahen
         end
       end
 
+      desc "profile <scraper_name>", "displays the scraper applied profile"
+      long_desc <<-LONGDESC
+        Displays the account applied profile
+      LONGDESC
+      def profile(scraper_name)
+        client = Client::Scraper.new(options)
+        puts "#{client.profile(scraper_name)}"
+      end
 
       desc "job SUBCOMMAND ...ARGS", "manage scrapers jobs"
       subcommand "job", ScraperJob

data/lib/datahen/cli/scraper_job.rb

@@ -26,6 +26,7 @@ module Datahen
       LONGDESC
       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.'
+      option :status, type: :string, desc: 'Returns jobs with a certain status'
       def list(scraper_name)
         client = Client::ScraperJob.new(options)
         puts "#{client.all(scraper_name)}"
@@ -47,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
@@ -64,16 +80,17 @@ module Datahen
 
       desc "pause <scraper_name>", "pauses a scraper's current job"
       long_desc <<-LONGDESC
-        pauses a scraper's current job
+        Pauses a scraper's current job
       LONGDESC
       option :job, :aliases => :j, type: :numeric, desc: 'Set a specific job ID'
+      option :force, :aliases => :f, type: :boolean, desc: 'Force a job to be paused from a done or cancelled status'
       def pause(scraper_name)
         if options[:job]
           client = Client::Job.new(options)
-          puts "#{client.pause(options[:job])}"
+          puts "#{client.pause(options[:job], options)}"
         else
           client = Client::ScraperJob.new(options)
-          puts "#{client.pause(scraper_name)}"
+          puts "#{client.pause(scraper_name, options)}"
         end
       end
 
@@ -85,6 +102,7 @@ module Datahen
       option :workers, :aliases => :w, type: :numeric, desc: 'Set how many standard workers to use. Scraper job must be restarted(paused then resumed, or cancelled then resumed) for it to take effect. Default: 1. '
       option :browsers, type: :numeric, desc: 'Set how many browser workers to use. Scraper job must be restarted(paused then resumed, or cancelled then resumed) for it to take effect. Default: 0. '
       option :proxy_type, desc: 'Set the Proxy type. Default: standard'
+      option :profile, type: :string, desc: 'Set the profiles (comma separated) to apply to the job. Default: default'
       option :job, :aliases => :j, type: :numeric, desc: 'Set a specific job ID'
       def update(scraper_name)
         if options[:job]
@@ -96,6 +114,21 @@ module Datahen
         end
       end
 
+      desc "profile <scraper_name>", "displays a scraper's current job applied profile"
+      long_desc <<-LONGDESC
+        Displays a scraper's current job applied profile
+      LONGDESC
+      option :job, :aliases => :j, type: :numeric, desc: 'Set a specific job ID'
+      def profile(scraper_name)
+        if options[:job]
+          client = Client::Job.new(options)
+          puts "#{client.profile(options[:job])}"
+        else
+          client = Client::ScraperJob.new(options)
+          puts "#{client.profile(scraper_name)}"
+        end
+      end
+
       desc "var SUBCOMMAND ...ARGS", "for managing scraper's job variables"
       subcommand "var", ScraperJobVar
 

data/lib/datahen/client.rb

@@ -1,4 +1,5 @@
 require "datahen/client/base"
+require "datahen/client/account"
 require "datahen/client/auth_token"
 require "datahen/client/deploy_key"
 require 'datahen/client/export'
@@ -24,7 +25,6 @@ require "datahen/client/job_var"
 require "datahen/client/scraper_job_var"
 require "datahen/client/job_finisher"
 
-
 module Datahen
   module Client
   end

data/lib/datahen/client/account.rb

@@ -0,0 +1,13 @@
+module Datahen
+  module Client
+    class Account < Datahen::Client::Base
+
+      def profile(opts={})
+        params = @options.merge(opts)
+
+        self.class.get("/profile", params)
+      end
+
+    end
+  end
+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/base.rb

@@ -58,6 +58,7 @@ module Datahen
         query[:limit] = opts[:limit] if opts[:limit]
         query[:order] = opts[:order] if opts[:order]
         query[:filter] = opts[:filter] if opts[:filter]
+        query[:force] = opts[:force] if opts[:force]
 
         if opts[:query]
           if opts[:query].is_a?(Hash)

data/lib/datahen/client/job.rb

@@ -20,6 +20,7 @@ module Datahen
         body[:standard_worker_count] = opts[:workers] if opts[:workers]
         body[:browser_worker_count] = opts[:browsers] if opts[:browsers]
         body[:proxy_type] = opts[:proxy_type] if opts[:proxy_type]
+        body[:profile] = opts[:profile] if opts[:profile]
         params = @options.merge({body: body.to_json})
 
         self.class.put("/jobs/#{job_id}", params)
@@ -64,6 +65,17 @@ module Datahen
         self.class.put("/jobs/#{job_id}/finisher_update", params)
       end
 
+      def profile(job_id, opts={})
+        params = @options.merge(opts)
+
+        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/scraper.rb

@@ -25,6 +25,9 @@ module Datahen
         body[:cancel_current_job] = opts[:cancel_current_job] if opts[:cancel_current_job]
         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
@@ -43,6 +46,9 @@ module Datahen
         body[:cancel_current_job] = opts[:cancel_current_job] if opts.has_key?("cancel_current_job") || opts.has_key?(:cancel_current_job)
         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)
@@ -52,6 +58,12 @@ module Datahen
         params = @options.merge(opts)
         self.class.delete("/scrapers/#{scraper_name}", params)
       end
+
+      def profile(scraper_name, opts={})
+        params = @options.merge(opts)
+
+        self.class.get("/scrapers/#{scraper_name}/profile", params)
+      end
     end
   end
 end

data/lib/datahen/client/scraper_job.rb

@@ -29,6 +29,7 @@ module Datahen
         body[:standard_worker_count] = opts[:workers] if opts[:workers]
         body[:browser_worker_count] = opts[:browsers] if opts[:browsers]
         body[:proxy_type] = opts[:proxy_type] if opts[:proxy_type]
+        body[:profile] = opts[:profile] if opts[:profile]
         params = @options.merge({body: body.to_json})
 
         self.class.put("/scrapers/#{scraper_name}/current_job", params)
@@ -48,6 +49,17 @@ module Datahen
         opts[:status] = 'paused'
         update(scraper_name, opts)
       end
+
+      def profile(scraper_name, opts={})
+        params = @options.merge(opts)
+
+        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/version.rb

@@ -1,3 +1,3 @@
 module Datahen
-  VERSION = "0.14.5"
+  VERSION = "0.14.15"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datahen
 version: !ruby/object:Gem::Version
-  version: 0.14.5
+  version: 0.14.15
 platform: ruby
 authors:
 - Parama Danoesubroto
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-08-04 00:00:00.000000000 Z
+date: 2020-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -189,6 +189,7 @@ files:
 - exe/hen
 - lib/datahen.rb
 - lib/datahen/cli.rb
+- lib/datahen/cli/account.rb
 - lib/datahen/cli/env_var.rb
 - lib/datahen/cli/finisher.rb
 - lib/datahen/cli/global_page.rb
@@ -206,6 +207,7 @@ files:
 - lib/datahen/cli/scraper_var.rb
 - lib/datahen/cli/seeder.rb
 - lib/datahen/client.rb
+- lib/datahen/client/account.rb
 - lib/datahen/client/auth_token.rb
 - lib/datahen/client/backblaze_content.rb
 - lib/datahen/client/base.rb
@@ -264,7 +266,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