allq_rest 1.2.0 → 1.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8686500c26bb7b3aed2588730c25b94afa670e69bcde92d7ca8c45fa47411b5c
-  data.tar.gz: df4ff43537955e1f842c56a1804c8f00c0131196d666448df3bf6f4f03ecbda9
+  metadata.gz: edfdc643e9c8a7043876f6c202be451cb23513ed35555c70f28974acc2252b60
+  data.tar.gz: ea9ebce349d569b9b2d57d4fee5b0daee69dae2335d9d06208b4118ab4731bb5
 SHA512:
-  metadata.gz: 76720a631bf7f5a2b0d7b881b7ad44d724ea5a5631e713c32f4c04e1b3e03d779d95cca316b1d73745b241234cb8ac3f5c79ea45f76ea16d649c95b8bbc2b9e8
-  data.tar.gz: a6528bb6d7bdf5d4143f7b18d5d74bcefc5caf73c73d480aff72113519528005eea1e75e3820740396c7d75e8073a3573e0b23efbd658782547b508d3faa564e
+  metadata.gz: 70691e5b359e0a440e442e0babd7680c1ce1d40643d8d4343af890230f1c3b456c0dab8b16ec94f1b7c406df1cbfaee51c9fb672019bcc5039a33da1a0875176
+  data.tar.gz: 18785fea81c30649ddda7a1d31703caf63b80d3b4c980a50c125cd2a82a9c2258046ed2959e2ad704581a7631cafce4bd7a3d80e0432601ee64c67a4345a07a8

data/Gemfile.lock

@@ -1,49 +1,49 @@
 PATH
   remote: .
   specs:
-    allq_client (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)
@@ -55,7 +55,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  allq_client!
+  allq_rest!
   autotest (~> 4.4, >= 4.4.6)
   autotest-fsevent (~> 0.2, >= 0.2.12)
   autotest-growl (~> 0.2, >= 0.2.16)
@@ -66,4 +66,4 @@ DEPENDENCIES
   webmock (~> 1.24, >= 1.24.3)
 
 BUNDLED WITH
-   1.16.2
+   2.2.3

data/README.md

@@ -1,4 +1,4 @@
-# allq_client
+# allq_rest
 
 Allq - the Ruby gem for the AllQ
 
@@ -17,27 +17,27 @@ This SDK is automatically generated by the [Swagger Codegen](https://github.com/
 To build the Ruby code into a gem:
 
 ```shell
-gem build allq_client.gemspec
+gem build allq_rest.gemspec
 ```
 
 Then either install the gem locally:
 
 ```shell
-gem install ./allq_client-1.0.0.gem
+gem install ./allq_rest-1.0.0.gem
 ```
-(for development, run `gem install --dev ./allq_client-1.0.0.gem` to install the development dependencies)
+(for development, run `gem install --dev ./allq_rest-1.0.0.gem` to install the development dependencies)
 
 or publish the gem to a gem hosting service, e.g. [RubyGems](https://rubygems.org/).
 
 Finally add this to the Gemfile:
 
-    gem 'allq_client', '~> 1.0.0'
+    gem 'allq_rest', '~> 1.0.0'
 
 ### Install from Git
 
 If the Ruby gem is hosted at a git repository: https://github.com/YOUR_GIT_USERNAME/YOUR_GIT_REPO, then add the following in the Gemfile:
 
-    gem 'allq_client', :git => 'https://github.com/YOUR_GIT_USERNAME/YOUR_GIT_REPO.git'
+    gem 'allq_rest', :git => 'https://github.com/YOUR_GIT_USERNAME/YOUR_GIT_REPO.git'
 
 ### Include the Ruby code directly
 
@@ -52,7 +52,7 @@ ruby -Ilib script.rb
 Please follow the [installation](#installation) procedure and then run the following code:
 ```ruby
 # Load the gem
-require 'allq_client'
+require 'allq_rest'
 
 api_instance = Allq::ActionsApi.new
 

data/allq_rest.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 
 $:.push File.expand_path("../lib", __FILE__)
-require "allq_client/version"
+require "allq_rest/version"
 
 Gem::Specification.new do |s|
   s.name        = "allq_rest"
@@ -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.0.gem
+gem push allq_rest-1.2.5.gem

data/docs/ActionsApi.md

@@ -27,7 +27,7 @@ Bury Job
 ### Example
 ```ruby
 # load the gem
-require 'allq_client'
+require 'allq_rest'
 
 api_instance = Allq::ActionsApi.new
 
@@ -74,7 +74,7 @@ Finished Job
 ### Example
 ```ruby
 # load the gem
-require 'allq_client'
+require 'allq_rest'
 
 api_instance = Allq::ActionsApi.new
 
@@ -125,7 +125,7 @@ Get job from queue
 ### Example
 ```ruby
 # load the gem
-require 'allq_client'
+require 'allq_rest'
 
 api_instance = Allq::ActionsApi.new
 
@@ -172,7 +172,7 @@ Put job into queue
 ### Example
 ```ruby
 # load the gem
-require 'allq_client'
+require 'allq_rest'
 
 api_instance = Allq::ActionsApi.new
 
@@ -219,7 +219,7 @@ Create a parent job
 ### Example
 ```ruby
 # load the gem
-require 'allq_client'
+require 'allq_rest'
 
 api_instance = Allq::ActionsApi.new
 
@@ -266,7 +266,7 @@ Peek at next job
 ### Example
 ```ruby
 # load the gem
-require 'allq_client'
+require 'allq_rest'
 
 api_instance = Allq::ActionsApi.new
 
@@ -317,7 +317,7 @@ Releases job back into queue
 ### Example
 ```ruby
 # load the gem
-require 'allq_client'
+require 'allq_rest'
 
 api_instance = Allq::ActionsApi.new
 
@@ -364,7 +364,7 @@ When a parent job doesn't know how many children are going to be added, this is
 ### Example
 ```ruby
 # load the gem
-require 'allq_client'
+require 'allq_rest'
 
 api_instance = Allq::ActionsApi.new
 
@@ -411,7 +411,7 @@ Creates a throttle on a tube
 ### Example
 ```ruby
 # load the gem
-require 'allq_client'
+require 'allq_rest'
 
 api_instance = Allq::ActionsApi.new
 
@@ -458,7 +458,7 @@ Touch job
 ### Example
 ```ruby
 # load the gem
-require 'allq_client'
+require 'allq_rest'
 
 api_instance = Allq::ActionsApi.new
 
@@ -505,7 +505,7 @@ Delete all contents of tube
 ### Example
 ```ruby
 # load the gem
-require 'allq_client'
+require 'allq_rest'
 
 api_instance = Allq::ActionsApi.new
 

data/docs/AdminApi.md

@@ -18,7 +18,7 @@ Get Stats
 ### Example
 ```ruby
 # load the gem
-require 'allq_client'
+require 'allq_rest'
 
 api_instance = Allq::AdminApi.new
 
@@ -59,7 +59,7 @@ Change server URLs
 ### Example
 ```ruby
 # load the gem
-require 'allq_client'
+require 'allq_rest'
 
 api_instance = Allq::AdminApi.new
 

data/lib/allq_rest.rb

@@ -0,0 +1,53 @@
+=begin
+#AllQ
+
+#No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+
+OpenAPI spec version: 1.0
+
+Generated by: https://github.com/swagger-api/swagger-codegen.git
+Swagger Codegen version: 2.4.2
+
+=end
+
+# Common files
+require 'allq_rest/api_client'
+require 'allq_rest/api_error'
+require 'allq_rest/version'
+require 'allq_rest/configuration'
+
+# Models
+require 'allq_rest/models/basic_payload'
+require 'allq_rest/models/basic_response'
+require 'allq_rest/models/job_ref'
+require 'allq_rest/models/job_response'
+require 'allq_rest/models/multiple_job_response'
+require 'allq_rest/models/new_job'
+require 'allq_rest/models/new_parent_job'
+require 'allq_rest/models/stats_info'
+require 'allq_rest/models/stats_results'
+require 'allq_rest/models/stats_tube'
+require 'allq_rest/models/throttle'
+require 'allq_rest/models/tube_ref'
+
+# APIs
+require 'allq_rest/api/actions_api'
+require 'allq_rest/api/admin_api'
+
+module Allq
+  class << self
+    # Customize default settings for the SDK using block.
+    #   Allq.configure do |config|
+    #     config.username = "xxx"
+    #     config.password = "xxx"
+    #   end
+    # If no block given, return the default Configuration object.
+    def configure
+      if block_given?
+        yield(Configuration.default)
+      else
+        Configuration.default
+      end
+    end
+  end
+end

data/lib/{allq_client → 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 = {
@@ -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_client → 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_client → allq_rest}/models/new_job.rb

@@ -33,6 +33,9 @@ module Allq
     # Parent job id (if applicable)
     attr_accessor :parent_id
 
+    # Shard key (if applicable)
+    attr_accessor :shard_key
+
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
@@ -41,7 +44,8 @@ module Allq
         :'ttl' => :'ttl',
         :'delay' => :'delay',
         :'priority' => :'priority',
-        :'parent_id' => :'parent_id'
+        :'parent_id' => :'parent_id',
+        :'shard_key' => :'shard_key'
       }
     end
 
@@ -53,7 +57,8 @@ module Allq
         :'ttl' => :'Integer',
         :'delay' => :'Integer',
         :'priority' => :'Integer',
-        :'parent_id' => :'String'
+        :'parent_id' => :'String',
+        :'shard_key' => :'String'
       }
     end
 
@@ -98,6 +103,11 @@ module Allq
       if attributes.has_key?(:'parent_id')
         self.parent_id = attributes[:'parent_id']
       end
+
+      if attributes.has_key?(:'shard_key')
+        self.shard_key = attributes[:'shard_key']
+      end
+
     end
 
     # Show invalid properties with the reasons. Usually used together with valid?
@@ -148,7 +158,8 @@ module Allq
           ttl == o.ttl &&
           delay == o.delay &&
           priority == o.priority &&
-          parent_id == o.parent_id
+          parent_id == o.parent_id &&
+          shard_key = o.shard_key
     end
 
     # @see the `==` method
@@ -160,7 +171,7 @@ module Allq
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [tube, body, ttl, delay, priority, parent_id].hash
+      [tube, body, ttl, delay, priority, parent_id, shard_key].hash
     end
 
     # Builds the object from hash

data/lib/{allq_client → allq_rest}/models/stats_results.rb

@@ -202,7 +202,7 @@ module Allq
           end
         end
       else # model
-        temp_model = SwaggerClient.const_get(type).new
+        temp_model = Allq.const_get(type).new
         temp_model.build_from_hash(value)
       end
     end

data/lib/{allq_client → allq_rest}/version.rb

@@ -11,5 +11,5 @@ Swagger Codegen version: 2.4.2
 =end
 
 module Allq
-  VERSION = '1.2.0'
+  VERSION = '1.2.5'
 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

@@ -11,7 +11,7 @@ Swagger Codegen version: 2.3.1
 =end
 
 # load the gem
-require 'allq_client'
+require 'allq_rest'
 
 # The following  was generated by the `rspec --init` command. Conventionally, all
 # specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
@@ -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.0
+  version: 1.2.5
 platform: ruby
 authors:
 - support@blitline.com
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-05 00:00:00.000000000 Z
+date: 2021-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typhoeus
@@ -34,42 +34,42 @@ dependencies:
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.1.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.1.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.6.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.6'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.6.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.6'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.6.0
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
@@ -201,8 +201,6 @@ files:
 - Gemfile.lock
 - README.md
 - Rakefile
-- allq_client-1.2.0.gem
-- allq_client.gemspec
 - allq_rest.gemspec
 - deploy.sh
 - docs/ActionsApi.md
@@ -220,26 +218,26 @@ files:
 - docs/TubeRef.md
 - git_push.sh
 - lib/.DS_Store
-- lib/allq_client.rb
-- lib/allq_client/.DS_Store
-- lib/allq_client/api/actions_api.rb
-- lib/allq_client/api/admin_api.rb
-- lib/allq_client/api_client.rb
-- lib/allq_client/api_error.rb
-- lib/allq_client/configuration.rb
-- lib/allq_client/models/basic_payload.rb
-- lib/allq_client/models/basic_response.rb
-- lib/allq_client/models/job_ref.rb
-- lib/allq_client/models/job_response.rb
-- lib/allq_client/models/multiple_job_response.rb
-- lib/allq_client/models/new_job.rb
-- lib/allq_client/models/new_parent_job.rb
-- lib/allq_client/models/stats_info.rb
-- lib/allq_client/models/stats_results.rb
-- lib/allq_client/models/stats_tube.rb
-- lib/allq_client/models/throttle.rb
-- lib/allq_client/models/tube_ref.rb
-- lib/allq_client/version.rb
+- lib/allq_rest.rb
+- lib/allq_rest/.DS_Store
+- lib/allq_rest/api/actions_api.rb
+- lib/allq_rest/api/admin_api.rb
+- lib/allq_rest/api_client.rb
+- lib/allq_rest/api_error.rb
+- lib/allq_rest/configuration.rb
+- lib/allq_rest/models/basic_payload.rb
+- lib/allq_rest/models/basic_response.rb
+- lib/allq_rest/models/job_ref.rb
+- lib/allq_rest/models/job_response.rb
+- lib/allq_rest/models/multiple_job_response.rb
+- lib/allq_rest/models/new_job.rb
+- lib/allq_rest/models/new_parent_job.rb
+- lib/allq_rest/models/stats_info.rb
+- lib/allq_rest/models/stats_results.rb
+- lib/allq_rest/models/stats_tube.rb
+- lib/allq_rest/models/throttle.rb
+- lib/allq_rest/models/tube_ref.rb
+- lib/allq_rest/version.rb
 - spec/.DS_Store
 - spec/api/actions_api_spec.rb
 - spec/api/admin_api_spec.rb
@@ -258,7 +256,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: []
@@ -275,8 +274,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.2.3
 signing_key:
 specification_version: 4
 summary: Ruby REST client for Allq platform

data/allq_client.gemspec

@@ -1,46 +0,0 @@
-# -*- encoding: utf-8 -*-
-#
-=begin
-#AllQ
-
-#No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
-
-OpenAPI spec version: 1.0
-
-Generated by: https://github.com/swagger-api/swagger-codegen.git
-Swagger Codegen version: 2.3.1
-
-=end
-
-$:.push File.expand_path("../lib", __FILE__)
-require "allq_client/version"
-
-Gem::Specification.new do |s|
-  s.name        = "allq_client"
-  s.version     = Allq::VERSION
-  s.platform    = Gem::Platform::RUBY
-  s.authors     = ["support@blitline.com"]
-  s.email       = ["support@blitline.com"]
-  s.homepage    = "http://www.blitline.com"
-  s.summary     = "Ruby client for Allq platform"
-  s.description = "Allq API Client"
-  # TODO uncommnet and update below with a proper license 
-  #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   = []
-  s.require_paths = ["lib"]
-end

data/lib/allq_client.rb

@@ -1,53 +0,0 @@
-=begin
-#AllQ
-
-#No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
-
-OpenAPI spec version: 1.0
-
-Generated by: https://github.com/swagger-api/swagger-codegen.git
-Swagger Codegen version: 2.4.2
-
-=end
-
-# Common files
-require 'allq_client/api_client'
-require 'allq_client/api_error'
-require 'allq_client/version'
-require 'allq_client/configuration'
-
-# Models
-require 'allq_client/models/basic_payload'
-require 'allq_client/models/basic_response'
-require 'allq_client/models/job_ref'
-require 'allq_client/models/job_response'
-require 'allq_client/models/multiple_job_response'
-require 'allq_client/models/new_job'
-require 'allq_client/models/new_parent_job'
-require 'allq_client/models/stats_info'
-require 'allq_client/models/stats_results'
-require 'allq_client/models/stats_tube'
-require 'allq_client/models/throttle'
-require 'allq_client/models/tube_ref'
-
-# APIs
-require 'allq_client/api/actions_api'
-require 'allq_client/api/admin_api'
-
-module Allq
-  class << self
-    # Customize default settings for the SDK using block.
-    #   Allq.configure do |config|
-    #     config.username = "xxx"
-    #     config.password = "xxx"
-    #   end
-    # If no block given, return the default Configuration object.
-    def configure
-      if block_given?
-        yield(Configuration.default)
-      else
-        Configuration.default
-      end
-    end
-  end
-end