datahen 0.14.12 → 0.14.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 19a6cfd035a3cd5ba9bd10c1cf34e6baa0590cb2f07664e2bdd3ee2f8e032ebf
-  data.tar.gz: b7cd0aa204baa98013c5853df68b93eb8562c1b4c202bf65b8a3c931ca2135d1
+  metadata.gz: b3dc2db62e50655c78bb70aceac56a3f1fb3f8ec87d155c65bbaf4e521d10fc5
+  data.tar.gz: 57de5a7b0e9271dcfbb05d7ac22df37a127cd3c427e03d93bb448359b7d30edc
 SHA512:
-  metadata.gz: 8ac98d022003ea6db219c1a07518f127bed088db30ebca3791569bd643acdf8ddc2ad01ddc553f42976a0a6983dfe2928fceadc2f91ed4464b4c2539939df28b
-  data.tar.gz: 33a65a6ffe29cb8ab0e75283436909f683354365a07e11ee672fac4311367ec55c31d2db6e8bcc02de0569768169360fb2120d4e6149aae8e0151cabea8b6752
+  metadata.gz: 73888c3cabdb2c4f20371fff2f73294a71eb105a282ffff9e85ab675865fe1a7ffd8efb768cd8f0e82667158b6c249bbfef0f883088538dfc1c2c1fc4cdab527
+  data.tar.gz: e15616500c7994d3c537b42c38dd4965035f7ef825181053ad05ece46a42194d8574c322ec3f3e24121ca0c7aac2c4a9351cd93dff64814855500b04a536d61d

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

@@ -31,6 +31,7 @@ module Datahen
       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)
@@ -55,6 +56,7 @@ module Datahen
       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_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/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/scraper.rb

@@ -27,6 +27,7 @@ module Datahen
         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
@@ -47,6 +48,7 @@ module Datahen
         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/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datahen
 version: !ruby/object:Gem::Version
-  version: 0.14.12
+  version: 0.14.15
 platform: ruby
 authors:
 - Parama Danoesubroto
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-09-01 00:00:00.000000000 Z
+date: 2020-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor