allq_rest 1.2.4 → 1.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d549d56163c4c43d207acc92e7d5b747d8863f6841cebfc5e446335da449755
-  data.tar.gz: 60f839763817c0faf3c0cf613562d08cdd0b92a373441f80cb56c77ce05dedd7
+  metadata.gz: c894f6fe084a132d3a7c91b3950eb33720577989fe902f5b2e932fdd9906f5b1
+  data.tar.gz: c223af34965d58659dd116568268ef12dad30c473dba5db0d894a8fbd01958e5
 SHA512:
-  metadata.gz: e93e53b383f42d0fc447aa5d03e445c36fd1428ca6a3eb9b1e17196741f9fad948cb7741d63291b571343cda79f6a8a5ecd78dde6b0b83dd20c8f83104ca4e88
-  data.tar.gz: d5bd05dd99290d7dcac8a11b20d6b8a3b84374d06fe76cd85154ff84e7a6f0bc5e5f70cf24be30c0154891ca9489a8bdd59a7c9d3e5da4fc797e4128d3b085e6
+  metadata.gz: da34829fbc9288c6161c74b8f4595608c3e16568e34ae977e41960b2e9b36225af3acbece2b96f49df6245bbcc4c93e3f8aea608e0836a25402b7f73a5466e2d
+  data.tar.gz: c69151989a83c5d1bf2344876430254dd88e32fdc9eeeba7e99cb562cde2ff4cc96dca19972231de53e0372d3f4c82db3901a3af82656bf02bc1676dc57a60ff

data/Gemfile.lock

@@ -1,31 +1,18 @@
 PATH
   remote: .
   specs:
-    allq_rest (1.2.2)
+    allq_rest (1.2.7)
       json (~> 2.1, >= 2.1.0)
       typhoeus (~> 1.0, >= 1.0.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    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.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.4.4)
-    ethon (0.12.0)
-      ffi (>= 1.3.0)
-    ffi (1.13.1)
-    hashdiff (1.0.1)
-    json (2.3.1)
-    public_suffix (4.0.6)
+    ethon (0.15.0)
+      ffi (>= 1.15.0)
+    ffi (1.15.5)
+    json (2.6.1)
     rake (12.0.0)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
@@ -40,28 +27,16 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       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.4.0)
       ethon (>= 0.9.0)
-    vcr (3.0.3)
-    webmock (1.24.6)
-      addressable (>= 2.3.6)
-      crack (>= 0.3.2)
-      hashdiff
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   allq_rest!
-  autotest (~> 4.4, >= 4.4.6)
-  autotest-fsevent (~> 0.2, >= 0.2.12)
-  autotest-growl (~> 0.2, >= 0.2.16)
-  autotest-rails-pure (~> 4.1, >= 4.1.2)
   rake (~> 12.0.0)
   rspec (~> 3.6, >= 3.6.0)
-  vcr (~> 3.0, >= 3.0.1)
-  webmock (~> 1.24, >= 1.24.3)
 
+BUNDLED WITH
+   2.2.3

data/allq_rest.gemspec

@@ -13,20 +13,14 @@ 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'
   s.add_runtime_dependency 'json', '~> 2.1', '>= 2.1.0'
 
   s.add_development_dependency 'rspec', '~> 3.6', '>= 3.6.0'
-  s.add_development_dependency 'vcr', '~> 3.0', '>= 3.0.1'
-  s.add_development_dependency 'webmock', '~> 1.24', '>= 1.24.3'
-  s.add_development_dependency 'autotest', '~> 4.4', '>= 4.4.6'
-  s.add_development_dependency 'autotest-rails-pure', '~> 4.1', '>= 4.1.2'
-  s.add_development_dependency 'autotest-growl', '~> 0.2', '>= 0.2.16'
-  s.add_development_dependency 'autotest-fsevent', '~> 0.2', '>= 0.2.12'
-
+  
   s.files         = `find *`.split("\n").uniq.sort.select{|f| !f.empty? }
   s.test_files    = `find spec/*`.split("\n")
   s.executables   = []

data/deploy.sh

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

data/lib/allq_rest/api_client.rb

@@ -30,6 +30,7 @@ module Allq
     # 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 = {

data/lib/allq_rest/configuration.rb

@@ -142,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
 

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,12 @@ module Allq
     # TPS of throttle
     attr_accessor :throttle_size
 
+    # Average duration of job
+    attr_accessor :avg
+
+    # Average duration of job
+    attr_accessor :tps
+
     # Name of tube
     attr_accessor :tube
 
@@ -45,6 +51,8 @@ module Allq
         :'buried' => :'buried',
         :'parents' => :'parents',
         :'throttle_size' => :'throttle_size',
+        :'avg' => :'avg',
+        :'tps' => :'tps',
         :'tube' => :'tube'
       }
     end
@@ -58,6 +66,8 @@ module Allq
         :'buried' => :'Integer',
         :'parents' => :'Integer',
         :'throttle_size' => :'Integer',
+        :'avg' => :'Integer',
+        :'tps' => :'tps',
         :'tube' => :'String'
       }
     end
@@ -104,6 +114,14 @@ module Allq
         self.throttle_size = attributes[:'throttle_size']
       end
 
+      if attributes.has_key?(:'avg')
+        self.avg = attributes[:'avg']
+      end
+
+      if attributes.has_key?(:'tps')
+        self.tps = attributes[:'tps']
+      end
+
       if attributes.has_key?(:'tube')
         self.tube = attributes[:'tube']
       end
@@ -163,6 +181,8 @@ module Allq
           buried == o.buried &&
           parents == o.parents &&
           throttle_size == o.throttle_size &&
+          avg == o.avg &&
+          tps == o.tps &&
           tube == o.tube
     end
 
@@ -175,7 +195,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 +205,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 +301,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.4'
+  VERSION = '1.2.7'
 end

data/spec/api/actions_api_spec.rb

@@ -24,10 +24,13 @@ describe 'ActionsApi' do
     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)
-    stats_result = AllQTools::get_stats[0]
+    @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
@@ -51,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
 
@@ -69,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
 
@@ -85,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
@@ -101,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
 
@@ -125,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
@@ -149,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
 
@@ -181,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
 
@@ -214,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
 
@@ -236,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
@@ -244,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)
@@ -277,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)
@@ -322,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
 
@@ -365,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
@@ -381,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
@@ -432,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
 
@@ -471,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  
 
@@ -490,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
@@ -516,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
 
@@ -576,5 +582,4 @@ module AllQTools
         end
       end
     end
-  end
 end

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.4
+  version: 1.2.7
 platform: ruby
 authors:
 - support@blitline.com
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-23 00:00:00.000000000 Z
+date: 2022-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typhoeus
@@ -70,126 +70,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.6'
-- !ruby/object:Gem::Dependency
-  name: vcr
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.1
-- !ruby/object:Gem::Dependency
-  name: webmock
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.24'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.24.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.24'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.24.3
-- !ruby/object:Gem::Dependency
-  name: autotest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.4'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.4.6
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.4'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.4.6
-- !ruby/object:Gem::Dependency
-  name: autotest-rails-pure
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.1.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.1.2
-- !ruby/object:Gem::Dependency
-  name: autotest-growl
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.2.16
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.2.16
-- !ruby/object:Gem::Dependency
-  name: autotest-fsevent
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.2.12
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.2.12
 description: Allq API Client
 email:
 - support@blitline.com
@@ -201,7 +81,8 @@ files:
 - Gemfile.lock
 - README.md
 - Rakefile
-- allq_rest-1.2.3.gem
+- allq_rest-1.2.5.gem
+- allq_rest-1.2.6.gem
 - allq_rest.gemspec
 - deploy.sh
 - docs/ActionsApi.md
@@ -257,7 +138,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: []
@@ -274,8 +156,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