allq_rest 1.2.2 → 1.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3599f2ab5c85ed438b31d09771ef480342786201aa4d3e544297d0caa1d71eec
-  data.tar.gz: 0fd186fae23fe932802a42d6bed8e5df8f8f8277b8de4a999fedd32d08c0c9f8
+  metadata.gz: 1408b8a497b82506fd034da76191cad3d63532784dc93126b21a22aa7301e4ff
+  data.tar.gz: 902c1bff0103082afef6a355ed407ea5cf7c0a64d8cae21e9e70f329a233df72
 SHA512:
-  metadata.gz: 4402103362c503e0e208f7b977a7c836da0f72e37e8884e08601fb5834436d79f6f659b5d9be4eaf1b4a1fa687ff0c2821784de2968e8e909dc2affe770e6ee9
-  data.tar.gz: c30efefd28bef740423fe768fea991f65364c70547e40112fd5ef3e2889c4307f1f1c20cbedca0299dc1946281555e6743737c6386b11e40837d4212d84db2df
+  metadata.gz: bc3060e0d79318cff373dbf151aae42268548f136cabdc1170d55fb8ce94be248abceccecf4b0b59492d9bf7575ca744c0ef7d455ae1f8d7c8a7b9594d4218f0
+  data.tar.gz: 52e03790fcce1e8fc5bc83ade3cc91532e2645755a242fe51617da9f7cfcd500c580010bab1a0ff5c06f2596cb213fe8e651ab3e717897eb4254604a6d29fec6

data/Gemfile.lock

@@ -1,49 +1,49 @@
 PATH
   remote: .
   specs:
-    allq_rest (1.0.0)
+    allq_rest (1.2.5)
       json (~> 2.1, >= 2.1.0)
       typhoeus (~> 1.0, >= 1.0.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    ZenTest (4.11.1)
-    addressable (2.5.2)
-      public_suffix (>= 2.0.2, < 4.0)
+    ZenTest (4.12.0)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
     autotest (4.4.6)
       ZenTest (>= 4.4.1)
-    autotest-fsevent (0.2.14)
+    autotest-fsevent (0.2.17)
       sys-uname
     autotest-growl (0.2.16)
     autotest-rails-pure (4.1.2)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
-    diff-lcs (1.3)
-    ethon (0.11.0)
-      ffi (>= 1.3.0)
-    ffi (1.9.25)
-    hashdiff (0.3.7)
-    json (2.1.0)
-    public_suffix (3.0.3)
+    diff-lcs (1.4.4)
+    ethon (0.14.0)
+      ffi (>= 1.15.0)
+    ffi (1.15.1)
+    hashdiff (1.0.1)
+    json (2.5.1)
+    public_suffix (4.0.6)
     rake (12.0.0)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.0)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.2)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.2)
+      rspec-support (~> 3.9.3)
+    rspec-expectations (3.9.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.0)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.0)
-    safe_yaml (1.0.4)
-    sys-uname (1.0.3)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.3)
+    safe_yaml (1.0.5)
+    sys-uname (1.2.1)
       ffi (>= 1.0.0)
-    typhoeus (1.3.0)
+    typhoeus (1.4.0)
       ethon (>= 0.9.0)
     vcr (3.0.3)
     webmock (1.24.6)
@@ -66,4 +66,4 @@ DEPENDENCIES
   webmock (~> 1.24, >= 1.24.3)
 
 BUNDLED WITH
-   1.16.2
+   2.2.3

data/allq_rest.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
   s.summary     = "Ruby REST client for Allq platform"
   s.description = "Allq API Client"
   # TODO uncommnet and update below with a proper license 
-  #s.license     = "Apache 2.0"
+  s.license     = "Apache 2.0"
   s.required_ruby_version = "> 2.3"
 
   s.add_runtime_dependency 'typhoeus', '~> 1.0', '>= 1.0.1'

data/deploy.sh

@@ -1,3 +1,3 @@
 echo "Did you update the version?"
 gem build allq_rest.gemspec
-gem push allq_rest-1.2.1.gem
+gem push allq_rest-1.2.6.gem

data/lib/allq_rest/api_client.rb

@@ -27,9 +27,10 @@ module Allq
     # @return [Hash]
     attr_accessor :default_headers
 
-    # Initializes the ApiRest
+    # Initializes the ApiClient
     # @option config [Configuration] Configuration for initializing the object, default to Configuration.default
     def initialize(config = Configuration.default)
+      Ethon.logger = Logger.new(nil)
       @config = config
       @user_agent = "Swagger-Codegen/#{VERSION}/ruby"
       @default_headers = {
@@ -39,7 +40,7 @@ module Allq
     end
 
     def self.default
-      @@default ||= ApiRest.new
+      @@default ||= ApiClient.new
     end
 
     # Call an API with given options.
@@ -263,7 +264,7 @@ module Allq
     def build_request_url(path)
       # Add leading and trailing slashes to path
       path = "/#{path}".gsub(/\/+/, '/')
-      URI.encode(@config.base_url + path)
+      @config.base_url + path
     end
 
     # Builds the HTTP request body

data/lib/allq_rest/configuration.rb

@@ -10,8 +10,6 @@ Swagger Codegen version: 2.4.2
 
 =end
 
-require 'uri'
-
 module Allq
   class Configuration
     # Defines url scheme
@@ -144,7 +142,6 @@ module Allq
       @inject_format = false
       @force_ending_format = false
       @logger = defined?(Rails) ? Rails.logger : Logger.new(STDOUT)
-
       yield(self) if block_given?
     end
 
@@ -175,7 +172,7 @@ module Allq
 
     def base_url
       url = "#{scheme}://#{[host, base_path].join('/').gsub(/\/+/, '/')}".sub(/\/+\z/, '')
-      URI.encode(url)
+      url
     end
 
     # Gets API key (with prefix if set).

data/lib/allq_rest/models/stats_tube.rb

@@ -6,7 +6,7 @@
 OpenAPI spec version: 1.0
 
 Generated by: https://github.com/swagger-api/swagger-codegen.git
-Swagger Codegen version: 2.4.2
+Swagger Codegen version: 2.4.21
 
 =end
 
@@ -33,6 +33,9 @@ module Allq
     # TPS of throttle
     attr_accessor :throttle_size
 
+    # Average duration of job
+    attr_accessor :avg
+
     # Name of tube
     attr_accessor :tube
 
@@ -45,6 +48,7 @@ module Allq
         :'buried' => :'buried',
         :'parents' => :'parents',
         :'throttle_size' => :'throttle_size',
+        :'avg' => :'avg',
         :'tube' => :'tube'
       }
     end
@@ -58,6 +62,7 @@ module Allq
         :'buried' => :'Integer',
         :'parents' => :'Integer',
         :'throttle_size' => :'Integer',
+        :'avg' => :'Integer',
         :'tube' => :'String'
       }
     end
@@ -104,6 +109,10 @@ module Allq
         self.throttle_size = attributes[:'throttle_size']
       end
 
+      if attributes.has_key?(:'avg')
+        self.avg = attributes[:'avg']
+      end
+
       if attributes.has_key?(:'tube')
         self.tube = attributes[:'tube']
       end
@@ -163,6 +172,7 @@ module Allq
           buried == o.buried &&
           parents == o.parents &&
           throttle_size == o.throttle_size &&
+          avg == o.avg &&
           tube == o.tube
     end
 
@@ -175,7 +185,7 @@ module Allq
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [ready, delayed, reserved, buried, parents, throttle_size, tube].hash
+      [ready, delayed, reserved, buried, parents, throttle_size, avg, tube].hash
     end
 
     # Builds the object from hash
@@ -185,7 +195,7 @@ module Allq
       return nil unless attributes.is_a?(Hash)
       self.class.swagger_types.each_pair do |key, type|
         if type =~ /\AArray<(.*)>/i
-          # check to ensure the input is an array given that the the attribute
+          # check to ensure the input is an array given that the attribute
           # is documented as an array but the input is not
           if attributes[self.class.attribute_map[key]].is_a?(Array)
             self.send("#{key}=", attributes[self.class.attribute_map[key]].map { |v| _deserialize($1, v) })
@@ -281,5 +291,6 @@ module Allq
         value
       end
     end
+
   end
 end

data/lib/allq_rest/version.rb

@@ -11,5 +11,5 @@ Swagger Codegen version: 2.4.2
 =end
 
 module Allq
-  VERSION = '1.2.2'
+  VERSION = '1.2.6'
 end

data/spec/api/actions_api_spec.rb

@@ -21,8 +21,16 @@ ALT_TUBE = ""
 describe 'ActionsApi' do
   before do
     # run before each test
-    @instance = Allq::ActionsApi.new
-    stats_result = AllQTools::get_stats[0]
+    allq_conf = Allq::Configuration.new do |config|
+      config.host = ENV['ALLQ_CLIENT_LOCATION'] || 'localhost:8091'
+    end
+    raw_client = Allq::ApiClient.new(allq_conf)
+    @instance = Allq::ActionsApi.new(raw_client)
+    @admin_tools = Allq::AdminApi.new(raw_client)
+
+    @allq_tool = AllQTools.new(@instance, @admin_tools)
+
+    stats_result = @allq_tool.get_stats[0]
     stats_result.stats.each do |stat|
       @instance.tube_delete(stat.tube)
     end
@@ -46,12 +54,12 @@ describe 'ActionsApi' do
   # @return [BasicResponse]
   describe 'bury_put test' do
     it "should work" do
-      AllQTools::add_job
-      expect(AllQTools::get_ready(DEFAULT_TUBE)).to eq(1)
+      @allq_tool.add_job
+      expect(@allq_tool.get_ready(DEFAULT_TUBE)).to eq(1)
       job = @instance.job_get(DEFAULT_TUBE)
       @instance.bury_put(job.id)
-      expect(AllQTools::get_buried(DEFAULT_TUBE)).to eq(1)
-      expect(AllQTools::get_ready(DEFAULT_TUBE)).to eq(0)
+      expect(@allq_tool.get_buried(DEFAULT_TUBE)).to eq(1)
+      expect(@allq_tool.get_ready(DEFAULT_TUBE)).to eq(0)
     end
   end
 
@@ -64,11 +72,11 @@ describe 'ActionsApi' do
   # @return [BasicResponse]
   describe 'job_delete test' do
     it "should work" do
-      AllQTools::add_job
-      expect(AllQTools::get_ready(DEFAULT_TUBE)).to eq(1)
+      @allq_tool.add_job
+      expect(@allq_tool.get_ready(DEFAULT_TUBE)).to eq(1)
       job = @instance.peek_get(DEFAULT_TUBE)
       @instance.job_delete(job.id, tube: DEFAULT_TUBE)
-      expect(AllQTools::get_ready(DEFAULT_TUBE)).to eq(0)
+      expect(@allq_tool.get_ready(DEFAULT_TUBE)).to eq(0)
     end
   end
 
@@ -80,9 +88,9 @@ describe 'ActionsApi' do
   # @return [JobResponse]
   describe 'job_get test' do
     it "should work" do
-      AllQTools::add_job
+      @allq_tool.add_job
       job = @instance.job_get(DEFAULT_TUBE)
-      expect(AllQTools::get_reserved(DEFAULT_TUBE)).to eq(1)
+      expect(@allq_tool.get_reserved(DEFAULT_TUBE)).to eq(1)
       expect(job.id).to be_truthy
     end
   end
@@ -96,19 +104,19 @@ describe 'ActionsApi' do
   describe 'mulitple_job_get test' do
     it "should work" do
       1.upto(6) do
-        AllQTools::add_job
+        @allq_tool.add_job
       end
       multiple_jobs = @instance.multiple_job_get(DEFAULT_TUBE, 4)
       expect(multiple_jobs.jobs.length).to eq(4)
-      expect(AllQTools::get_ready(DEFAULT_TUBE)).to eq(2)
+      expect(@allq_tool.get_ready(DEFAULT_TUBE)).to eq(2)
       multiple_jobs.jobs.each do |job|
          @instance.job_delete(job.id)
       end
-      expect(AllQTools::get_reserved(DEFAULT_TUBE)).to eq(0)
+      expect(@allq_tool.get_reserved(DEFAULT_TUBE)).to eq(0)
 
       multiple_jobs = @instance.multiple_job_get(DEFAULT_TUBE, 4)
       expect(multiple_jobs.jobs.length).to eq(2)
-      expect(AllQTools::get_ready(DEFAULT_TUBE)).to eq(0)
+      expect(@allq_tool.get_ready(DEFAULT_TUBE)).to eq(0)
     end
   end
 
@@ -120,8 +128,8 @@ describe 'ActionsApi' do
   # @return [JobRef]
   describe 'job_post test' do
     it "should work" do
-      AllQTools::add_job
-      expect(AllQTools::get_ready(DEFAULT_TUBE)).to eq(1)
+      @allq_tool.add_job
+      expect(@allq_tool.get_ready(DEFAULT_TUBE)).to eq(1)
       job = @instance.job_get(DEFAULT_TUBE)
       expect(job.id).to be_truthy
     end
@@ -144,18 +152,18 @@ describe 'ActionsApi' do
                          run_on_timeout: false,
                          limit: 2)
       new_parent_job_response = @instance.parent_job_post(new_parent_job)
-      expect(AllQTools::get_parents(DEFAULT_TUBE)).to eq(1)
-      job = AllQTools::new_job(DEFAULT_TUBE, nil, new_parent_job_response.job_id)
+      expect(@allq_tool.get_parents(DEFAULT_TUBE)).to eq(1)
+      job = @allq_tool.new_job(DEFAULT_TUBE, nil, new_parent_job_response.job_id)
       @instance.job_post(job)
-      job = AllQTools::new_job(DEFAULT_TUBE, nil, new_parent_job_response.job_id)
+      job = @allq_tool.new_job(DEFAULT_TUBE, nil, new_parent_job_response.job_id)
       @instance.job_post(job)
-      expect(AllQTools::get_ready(DEFAULT_TUBE)).to eq(2)
-      AllQTools::get_finish(DEFAULT_TUBE)
-      AllQTools::get_finish(DEFAULT_TUBE)
-      expect(AllQTools::get_ready(DEFAULT_TUBE)).to eq(1)
-      expect(AllQTools::get_parents(DEFAULT_TUBE)).to eq(0)
-      AllQTools::get_finish(DEFAULT_TUBE)
-      expect(AllQTools::get_ready(DEFAULT_TUBE)).to eq(0)
+      expect(@allq_tool.get_ready(DEFAULT_TUBE)).to eq(2)
+      @allq_tool.get_finish(DEFAULT_TUBE)
+      @allq_tool.get_finish(DEFAULT_TUBE)
+      expect(@allq_tool.get_ready(DEFAULT_TUBE)).to eq(1)
+      expect(@allq_tool.get_parents(DEFAULT_TUBE)).to eq(0)
+      @allq_tool.get_finish(DEFAULT_TUBE)
+      expect(@allq_tool.get_ready(DEFAULT_TUBE)).to eq(0)
     end
   end
 
@@ -176,19 +184,19 @@ describe 'ActionsApi' do
                          run_on_timeout: false,
                          limit: 2)
       new_parent_job_response = @instance.parent_job_post(new_parent_job)
-      expect(AllQTools::get_parents(DEFAULT_TUBE)).to eq(1)
+      expect(@allq_tool.get_parents(DEFAULT_TUBE)).to eq(1)
 
-      job = AllQTools::new_job('foo', nil, new_parent_job_response.job_id)
+      job = @allq_tool.new_job('foo', nil, new_parent_job_response.job_id)
       @instance.job_post(job)
-      job = AllQTools::new_job('foo', nil, new_parent_job_response.job_id)
+      job = @allq_tool.new_job('foo', nil, new_parent_job_response.job_id)
       @instance.job_post(job)
-      expect(AllQTools::get_ready('foo')).to eq(2)
-      AllQTools::get_finish('foo')
-      AllQTools::get_finish('foo')
-      expect(AllQTools::get_ready(DEFAULT_TUBE)).to eq(1)
-      expect(AllQTools::get_parents(DEFAULT_TUBE)).to eq(0)
-      AllQTools::get_finish(DEFAULT_TUBE)
-      expect(AllQTools::get_ready(DEFAULT_TUBE)).to eq(0)
+      expect(@allq_tool.get_ready('foo')).to eq(2)
+      @allq_tool.get_finish('foo')
+      @allq_tool.get_finish('foo')
+      expect(@allq_tool.get_ready(DEFAULT_TUBE)).to eq(1)
+      expect(@allq_tool.get_parents(DEFAULT_TUBE)).to eq(0)
+      @allq_tool.get_finish(DEFAULT_TUBE)
+      expect(@allq_tool.get_ready(DEFAULT_TUBE)).to eq(0)
     end
   end
 
@@ -209,16 +217,16 @@ describe 'ActionsApi' do
                          run_on_timeout: true,
                          limit: 2)
       new_parent_job_response = @instance.parent_job_post(new_parent_job)
-      expect(AllQTools::get_parents(DEFAULT_TUBE)).to eq(1)
+      expect(@allq_tool.get_parents(DEFAULT_TUBE)).to eq(1)
 
-      job = AllQTools::new_job('foo', nil, new_parent_job_response.job_id)
+      job = @allq_tool.new_job('foo', nil, new_parent_job_response.job_id)
       @instance.job_post(job)
-      expect(AllQTools::get_ready('foo')).to eq(1)
-      expect(AllQTools::get_parents(DEFAULT_TUBE)).to eq(1)
+      expect(@allq_tool.get_ready('foo')).to eq(1)
+      expect(@allq_tool.get_parents(DEFAULT_TUBE)).to eq(1)
 
       sleep(7)
-      expect(AllQTools::get_parents(DEFAULT_TUBE)).to eq(0)
-      expect(AllQTools::get_ready(DEFAULT_TUBE)).to eq(1)
+      expect(@allq_tool.get_parents(DEFAULT_TUBE)).to eq(0)
+      expect(@allq_tool.get_ready(DEFAULT_TUBE)).to eq(1)
     end
   end
 
@@ -231,7 +239,7 @@ describe 'ActionsApi' do
   # @return [JobResponse]
   describe 'peek_get test' do
     it "should work" do
-      AllQTools::add_job
+      @allq_tool.add_job
       job = @instance.peek_get(DEFAULT_TUBE)
       expect(job.id).to be_truthy
     end
@@ -239,7 +247,7 @@ describe 'ActionsApi' do
 
   describe 'peek_get buried test' do
     it "should work" do
-      AllQTools::add_job
+      @allq_tool.add_job
       job = @instance.peek_get(DEFAULT_TUBE, buried: true)
       expect(job.id).to be_falsey
       job = @instance.job_get(DEFAULT_TUBE)
@@ -272,20 +280,20 @@ describe 'ActionsApi' do
   # @return [BasicResponse]
   describe 'release_put test' do
     it "should work" do
-      AllQTools::add_job
-      expect(AllQTools::get_ready(DEFAULT_TUBE)).to eq(1)
+      @allq_tool.add_job
+      expect(@allq_tool.get_ready(DEFAULT_TUBE)).to eq(1)
       job = @instance.job_get(DEFAULT_TUBE)
-      expect(AllQTools::get_reserved(DEFAULT_TUBE)).to eq(1)
+      expect(@allq_tool.get_reserved(DEFAULT_TUBE)).to eq(1)
       expect(job.id).to be_truthy
       @instance.release_put(job.id)
-      expect(AllQTools::get_ready(DEFAULT_TUBE)).to eq(1)
+      expect(@allq_tool.get_ready(DEFAULT_TUBE)).to eq(1)
     end
   end
 
     describe 'release should increment release' do
     it "should work" do
-      AllQTools::add_job
-      expect(AllQTools::get_ready(DEFAULT_TUBE)).to eq(1)
+      @allq_tool.add_job
+      expect(@allq_tool.get_ready(DEFAULT_TUBE)).to eq(1)
       job = @instance.job_get(DEFAULT_TUBE)
       expect(job.releases).to eq(0)
       @instance.release_put(job.id)
@@ -317,25 +325,25 @@ describe 'ActionsApi' do
                          run_on_timeout: false,
                          limit: nil)
       new_parent_job_response = @instance.parent_job_post(new_parent_job)
-      expect(AllQTools::get_parents(DEFAULT_TUBE)).to eq(1)
-      job = AllQTools::new_job(DEFAULT_TUBE, nil, new_parent_job_response.job_id)
+      expect(@allq_tool.get_parents(DEFAULT_TUBE)).to eq(1)
+      job = @allq_tool.new_job(DEFAULT_TUBE, nil, new_parent_job_response.job_id)
       @instance.job_post(job)
-      job = AllQTools::new_job(DEFAULT_TUBE, nil, new_parent_job_response.job_id)
+      job = @allq_tool.new_job(DEFAULT_TUBE, nil, new_parent_job_response.job_id)
       @instance.job_post(job)
-      expect(AllQTools::get_ready(DEFAULT_TUBE)).to eq(2)
-      AllQTools::get_finish(DEFAULT_TUBE)
-      AllQTools::get_finish(DEFAULT_TUBE)
+      expect(@allq_tool.get_ready(DEFAULT_TUBE)).to eq(2)
+      @allq_tool.get_finish(DEFAULT_TUBE)
+      @allq_tool.get_finish(DEFAULT_TUBE)
       # After jobs have already finished
-      expect(AllQTools::get_ready(DEFAULT_TUBE)).to eq(0)
+      expect(@allq_tool.get_ready(DEFAULT_TUBE)).to eq(0)
       # Parent still waiting
-      expect(AllQTools::get_parents(DEFAULT_TUBE)).to eq(1)
+      expect(@allq_tool.get_parents(DEFAULT_TUBE)).to eq(1)
       # Set limit on parent
       @instance.set_children_started_put(new_parent_job_response.job_id)
       # Now parent gets moved to ready
-      expect(AllQTools::get_ready(DEFAULT_TUBE)).to eq(1)
-      expect(AllQTools::get_parents(DEFAULT_TUBE)).to eq(0)
-      AllQTools::get_finish(DEFAULT_TUBE)
-      expect(AllQTools::get_ready(DEFAULT_TUBE)).to eq(0)
+      expect(@allq_tool.get_ready(DEFAULT_TUBE)).to eq(1)
+      expect(@allq_tool.get_parents(DEFAULT_TUBE)).to eq(0)
+      @allq_tool.get_finish(DEFAULT_TUBE)
+      expect(@allq_tool.get_ready(DEFAULT_TUBE)).to eq(0)
     end
   end
 
@@ -360,10 +368,10 @@ describe 'ActionsApi' do
   # @return [TubeRef]
   describe 'throttle_post test' do
     it "should work" do
-      AllQTools::add_job
-      expect(AllQTools::get_ready(DEFAULT_TUBE)).to eq(1)
+      @allq_tool.add_job
+      expect(@allq_tool.get_ready(DEFAULT_TUBE)).to eq(1)
       @instance.job_get(DEFAULT_TUBE)
-      stats_result = AllQTools::get_stats[0]
+      stats_result = @allq_tool.get_stats[0]
       expect(stats_result.action_count > 1).to eq(true)
     end
   end
@@ -376,8 +384,8 @@ describe 'ActionsApi' do
   # @return [BasicResponse]
   describe 'touch_put test' do
     it "should work" do
-      AllQTools::add_job
-      expect(AllQTools::get_ready(DEFAULT_TUBE)).to eq(1)
+      @allq_tool.add_job
+      expect(@allq_tool.get_ready(DEFAULT_TUBE)).to eq(1)
       job = @instance.job_get(DEFAULT_TUBE)
       @instance.touch_put(job.id)
     end
@@ -427,31 +435,31 @@ describe 'ActionsApi' do
                        priority: 5,
                        parent_id: nil)
       @instance.job_post(new_job)
-      expect(AllQTools::get_ready("alt_tube2")).to eq(2) # OK..it's there
+      expect(@allq_tool.get_ready("alt_tube2")).to eq(2) # OK..it's there
       reserved_job = @instance.job_get("alt_tube2")
 
       # Other tube has 1 ready, 1 reserved
-      expect(AllQTools::get_ready("alt_tube2")).to eq(1)
-      expect(AllQTools::get_reserved("alt_tube2")).to eq(1)
+      expect(@allq_tool.get_ready("alt_tube2")).to eq(1)
+      expect(@allq_tool.get_reserved("alt_tube2")).to eq(1)
 
       # Get 1 into buried, 1 into reserved, and 1 in ready so we can clear it
-      expect(AllQTools::get_ready(alt_tube_name)).to eq(3) # OK..it's there
+      expect(@allq_tool.get_ready(alt_tube_name)).to eq(3) # OK..it's there
       reserved_job = @instance.job_get(alt_tube_name)
-      expect(AllQTools::get_reserved(alt_tube_name)).to eq(1) # OK..it's there
+      expect(@allq_tool.get_reserved(alt_tube_name)).to eq(1) # OK..it's there
       reserved_job = @instance.job_get(alt_tube_name)
-      expect(AllQTools::get_reserved(alt_tube_name)).to eq(2) # OK..it's there
+      expect(@allq_tool.get_reserved(alt_tube_name)).to eq(2) # OK..it's there
       @instance.bury_put(reserved_job.id)
-      expect(AllQTools::get_buried(alt_tube_name)).to eq(1)
+      expect(@allq_tool.get_buried(alt_tube_name)).to eq(1)
 
       # Now check that first tube is empty
       @instance.tube_delete(alt_tube_name)
-      expect(AllQTools::get_buried(alt_tube_name)).to eq(0)
-      expect(AllQTools::get_reserved(alt_tube_name)).to eq(0) # OK..it's there
-      expect(AllQTools::get_ready(alt_tube_name)).to eq(0)
+      expect(@allq_tool.get_buried(alt_tube_name)).to eq(0)
+      expect(@allq_tool.get_reserved(alt_tube_name)).to eq(0) # OK..it's there
+      expect(@allq_tool.get_ready(alt_tube_name)).to eq(0)
       
       # ..and other tubes are fine
-      expect(AllQTools::get_ready("alt_tube2")).to eq(1)
-      expect(AllQTools::get_reserved("alt_tube2")).to eq(1)
+      expect(@allq_tool.get_ready("alt_tube2")).to eq(1)
+      expect(@allq_tool.get_reserved("alt_tube2")).to eq(1)
     end
   end
 
@@ -466,9 +474,9 @@ describe 'ActionsApi' do
                        priority: 5,
                        parent_id: nil)
       @instance.job_post(new_job)
-      expect(AllQTools::get_ready(DEFAULT_TUBE)).to eq(0) # Too soon to show up
+      expect(@allq_tool.get_ready(DEFAULT_TUBE)).to eq(0) # Too soon to show up
       sleep(4)
-      expect(AllQTools::get_ready(DEFAULT_TUBE)).to eq(1) # OK..it's there
+      expect(@allq_tool.get_ready(DEFAULT_TUBE)).to eq(1) # OK..it's there
     end
   end  
 
@@ -485,18 +493,21 @@ describe 'ActionsApi' do
       @instance.job_post(new_job)
       sleep(1)
       @instance.job_get(DEFAULT_TUBE)
-      expect(AllQTools::get_reserved(DEFAULT_TUBE)).to eq(1)
+      expect(@allq_tool.get_reserved(DEFAULT_TUBE)).to eq(1)
       sleep(5)
-      expect(AllQTools::get_reserved(DEFAULT_TUBE)).to eq(0) # Should expire
-      expect(AllQTools::get_ready(DEFAULT_TUBE)).to eq(1) # ..and be back in ready
+      expect(@allq_tool.get_reserved(DEFAULT_TUBE)).to eq(0) # Should expire
+      expect(@allq_tool.get_ready(DEFAULT_TUBE)).to eq(1) # ..and be back in ready
     end
   end  
 
 end
 
 
-module AllQTools
-  class << self
+class AllQTools
+    def initialize(action_client, admin_client)
+      @action_client = action_client
+      @admin_client = admin_client
+    end
 
     def new_job(tube = 'default', body = nil, parent_id = nil)
       body = (0...8).map { (65 + rand(26)).chr }.join unless body
@@ -511,20 +522,20 @@ module AllQTools
     end 
 
     def add_job(tube = DEFAULT_TUBE)
-      client = Allq::ActionsApi.new
+      client = @action_client
       job = new_job(tube)
       job = client.job_post(new_job)
       return job
     end
 
     def get_finish(tube)
-      client = Allq::ActionsApi.new
+      client = @action_client
       job = client.job_get(tube)
       client.job_delete(job.id)
     end
 
     def get_stats
-      client = Allq::AdminApi.new
+      client = @admin_client
       client.stats_get
     end
 
@@ -571,5 +582,4 @@ module AllQTools
         end
       end
     end
-  end
 end

data/spec/configuration_spec.rb

@@ -18,11 +18,11 @@ describe Allq::Configuration do
   before(:each) do
     # uncomment below to setup host and base_path
     #require 'URI'
-    #uri = URI.parse("http://localhost:8090")
-    #Allq.configure do |c|
-    #  c.host = uri.host
-    #  c.base_path = uri.path
-    #end
+    uri = URI.parse("http://localhost:8091")
+    Allq.configure do |c|
+      c.host = uri.host
+      c.base_path = uri.path
+    end
   end
 
   describe '#base_url' do

data/spec/spec_helper.rb

@@ -55,6 +55,8 @@ RSpec.configure do |config|
     mocks.verify_partial_doubles = true
   end
 
+  config.warnings = true
+
 # The settings below are suggested to provide a good initial experience
 # with RSpec, but feel free to customize to your heart's content.
 =begin

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: allq_rest
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.6
 platform: ruby
 authors:
 - support@blitline.com
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-07 00:00:00.000000000 Z
+date: 2021-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typhoeus
@@ -201,6 +201,7 @@ files:
 - Gemfile.lock
 - README.md
 - Rakefile
+- allq_rest-1.2.5.gem
 - allq_rest.gemspec
 - deploy.sh
 - docs/ActionsApi.md
@@ -256,7 +257,8 @@ files:
 - spec/models/tube_ref_spec.rb
 - spec/spec_helper.rb
 homepage: http://www.blitline.com
-licenses: []
+licenses:
+- Apache 2.0
 metadata: {}
 post_install_message:
 rdoc_options: []
@@ -273,8 +275,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.7.9
+rubygems_version: 3.0.9
 signing_key:
 specification_version: 4
 summary: Ruby REST client for Allq platform