routemaster-client 3.2.0 → 3.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: '0384440865d526f1b3dbe9efd6546ce97f434955973584a33282bc03d507f0a8'
-  data.tar.gz: d48c76712c3091bc8740960a67d29d82413355423dad308b4b7b7d9fae47ab75
+SHA1:
+  metadata.gz: 627c0568340810467b70f553df4292a01cedf3cf
+  data.tar.gz: 2e91bec4303b96bbd1819e5ede9646d67111b0fe
 SHA512:
-  metadata.gz: 34fc6f879ce1b79f629ad744948657e5173e38939dcc7c48012a79b81dfcf47719e8906a65ea0dd3bc23adc4825afeb84f18b5d5b932650a05d1130d57f87b9e
-  data.tar.gz: d095b52a84f3f6f4e55ca53e3a95513eda7e204309a3b087bf619b40b6c0c1b353c636067e27ca61f308e6aa94694c0f4cfe98d9e80add440bdaa1449d1e1ef9
+  metadata.gz: d998d48e8c50c92ff2151587820e129226d5e72ada2e849ed272dc5e4e4ac12b88c5fc2742d0ad13f4878ef9e6211bb58ee73b1ac31522899af21909527f5c6d
+  data.tar.gz: f3981ac1cd2c3f075225fbc3979ecb44d0c61243e057c61f17d47f2eeff03dca9ff6afcf16489146cb555f5b20638340c3d035afc662c37366fdf5b3f9da973b

data/.ruby-version

@@ -1 +1 @@
-2.4.1
+2.4.3

data/.travis.yml

@@ -2,8 +2,9 @@ language: ruby
 cache: bundler
 rvm:
   - 2.2.7
-  - 2.3.4
-  - 2.4.1
+  - 2.3.6
+  - 2.4.3
+  - 2.5.0
   - ruby-head
 script:
   - bundle exec rspec

data/CHANGELOG.md

@@ -1,3 +1,25 @@
+# HEAD
+
+## 3.2.3 (2018-10-08)
+
+Bug fixes:
+
+- Fix Gemfile.lock
+
+## 3.2.2 (2018-10-08)
+
+Changes:
+
+- Show UUID of subscribers in output of `rtm sub list` (#36)
+
+## 3.2.1 (2018-07-05)
+
+Bug fixes:
+
+- Subscription now includes max_events and timeout details so they
+  get printed
+- `$LOAD_PATH` is fixed so `./exe/rtm` can now be run directly
+
 ## 3.2.0 (2018-01-08)
 
 Changes:

data/Gemfile

@@ -14,6 +14,6 @@ gem 'webmock'
 gem 'pry-byebug'
 gem 'rack-test'
 gem 'simplecov'
-gem 'codeclimate-test-reporter', require: nil
+gem 'codeclimate-test-reporter', '~> 1.0.8', require: nil
 gem 'sidekiq'
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    routemaster-client (3.2.0)
+    routemaster-client (3.2.3)
       faraday (>= 0.9.0)
       hashie
       oj (>= 2.17)
@@ -11,12 +11,12 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.5.1)
-      public_suffix (~> 2.0, >= 2.0.2)
-    byebug (9.0.6)
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
+    byebug (10.0.0)
     codeclimate-test-reporter (1.0.8)
       simplecov (<= 0.13)
-    coderay (1.1.1)
+    coderay (1.1.2)
     concurrent-ruby (1.0.5)
     connection_pool (2.2.1)
     crack (0.4.3)
@@ -25,14 +25,14 @@ GEM
     docile (1.1.5)
     ethon (0.11.0)
       ffi (>= 1.3.0)
-    faraday (0.13.1)
+    faraday (0.15.3)
       multipart-post (>= 1.2, < 3)
-    ffi (1.9.18)
+    ffi (1.9.23)
     formatador (0.2.5)
-    guard (2.14.1)
+    guard (2.14.2)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
-      lumberjack (~> 1.0)
+      lumberjack (>= 1.0.12, < 2.0)
       nenv (~> 0.1)
       notiffany (~> 0.0)
       pry (>= 0.9.12)
@@ -43,71 +43,69 @@ GEM
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
-    hashdiff (0.3.4)
-    hashie (3.5.7)
+    hashdiff (0.3.7)
+    hashie (3.6.0)
     json (2.1.0)
     listen (3.1.5)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
       ruby_dep (~> 1.2)
     lumberjack (1.0.12)
-    method_source (0.8.2)
+    method_source (0.9.0)
     multipart-post (2.0.0)
     nenv (0.3.0)
     notiffany (0.1.1)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    oj (3.3.10)
-    pry (0.10.4)
+    oj (3.6.11)
+    pry (0.11.3)
       coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    pry-byebug (3.4.2)
-      byebug (~> 9.0)
+      method_source (~> 0.9.0)
+    pry-byebug (3.6.0)
+      byebug (~> 10.0)
       pry (~> 0.10)
-    psych (2.2.4)
-    public_suffix (2.0.5)
-    rack (2.0.3)
-    rack-protection (2.0.0)
+    psych (3.0.2)
+    public_suffix (3.0.2)
+    rack (2.0.4)
+    rack-protection (2.0.1)
       rack
-    rack-test (0.7.0)
+    rack-test (0.8.3)
       rack (>= 1.0, < 3)
-    rake (12.0.0)
-    rb-fsevent (0.10.2)
+    rake (12.3.0)
+    rb-fsevent (0.10.3)
     rb-inotify (0.9.10)
       ffi (>= 0.5.0, < 2)
-    redis (3.3.3)
-    rspec (3.6.0)
-      rspec-core (~> 3.6.0)
-      rspec-expectations (~> 3.6.0)
-      rspec-mocks (~> 3.6.0)
-    rspec-core (3.6.0)
-      rspec-support (~> 3.6.0)
-    rspec-expectations (3.6.0)
+    redis (4.0.1)
+    rspec (3.7.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+    rspec-core (3.7.1)
+      rspec-support (~> 3.7.0)
+    rspec-expectations (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
-    rspec-mocks (3.6.0)
+      rspec-support (~> 3.7.0)
+    rspec-mocks (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
-    rspec-support (3.6.0)
+      rspec-support (~> 3.7.0)
+    rspec-support (3.7.1)
     ruby_dep (1.5.0)
     safe_yaml (1.0.4)
     shellany (0.0.1)
-    sidekiq (5.0.4)
+    sidekiq (5.1.1)
       concurrent-ruby (~> 1.0)
       connection_pool (~> 2.2, >= 2.2.0)
       rack-protection (>= 1.5.0)
-      redis (~> 3.3, >= 3.3.3)
+      redis (>= 3.3.5, < 5)
     simplecov (0.13.0)
       docile (~> 1.1.0)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.1)
-    slop (3.6.0)
-    thor (0.19.4)
+    simplecov-html (0.10.2)
+    thor (0.20.0)
     typhoeus (1.3.0)
       ethon (>= 0.9.0)
-    webmock (3.0.1)
+    webmock (3.3.0)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
@@ -118,7 +116,7 @@ PLATFORMS
 
 DEPENDENCIES
   bundler
-  codeclimate-test-reporter
+  codeclimate-test-reporter (~> 1.0.8)
   guard-rspec
   pry-byebug
   psych
@@ -130,4 +128,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   1.16.0
+   1.16.4

data/exe/rtm

@@ -1,5 +1,8 @@
 #!/usr/bin/env ruby
 
+dir = File.expand_path('..', __dir__)
+$LOAD_PATH.unshift(dir) unless $LOAD_PATH.include?(dir)
+
 require 'rubygems'
 require 'routemaster/cli/top_level'
 

data/routemaster/client/subscription.rb

@@ -6,7 +6,10 @@ module Routemaster
 
       def initialize(options)
         @subscriber = options.fetch('subscriber')
+        @uuid       = options.fetch('uuid')
         @callback   = options.fetch('callback')
+        @max_events = options['max_events']
+        @timeout    = options['timeout']
         @topics     = options.fetch('topics')
         @events     = _symbolize_keys options.fetch('events')
       end
@@ -14,9 +17,12 @@ module Routemaster
       def attributes
         {
           subscriber: @subscriber,
+          uuid:       @uuid,
           callback:   @callback,
+          max_events: @max_events,
+          timeout:    @timeout,
           topics:     @topics,
-          events:     @events
+          events:     @events,
         }
       end
 

data/routemaster/client/version.rb

@@ -1,5 +1,5 @@
 module Routemaster
   module Client
-    VERSION = '3.2.0'
+    VERSION = '3.2.3'
   end
 end

data/spec/cli/sub_spec.rb

@@ -49,6 +49,7 @@ describe Routemaster::CLI::Sub, type: :cli do
         allow(client).to receive(:monitor_subscriptions).and_return([
           Routemaster::Client::Subscription.new(
             'subscriber' => 'service--f000-b44r-b44r',
+            'uuid' => 'service--af000-b44r-b44r',
             'callback' => 'https://serviced.dev',
             'topics' => %w[cats dogs],
             'events' => {

data/spec/client/subscription_spec.rb

@@ -3,15 +3,18 @@ require 'routemaster/client/subscription'
 
 describe Routemaster::Client::Subscription do
   describe '#initialize' do
-    let(:options) {{ 
-      'subscriber' => 'alice', 
+    let(:options) {{
+      'subscriber' => 'alice',
+      'uuid'       => 'sub-one--12345',
       'callback'   => 'https://example.com/events',
+      'max_events' => 100,
+      'timeout'    => 500,
       'topics'     => %w[widgets],
       'events'     => {},
     }}
 
     subject { described_class.new(options) }
-    
+
     it 'passes' do
       expect { subject }.not_to raise_error
     end

data/spec/client_spec.rb

@@ -487,9 +487,12 @@ describe Routemaster::Client do
       let(:expected_result) do
         [{
           subscriber: 'bob',
+          uuid:       'service--af000-b44r-b44r',
           callback:   'https://app.example.com/events',
           topics:     ['widgets', 'kitten'],
-          events:     { sent: 1, queued: 100, oldest: 10_000 }
+          events:     { sent: 1, queued: 100, oldest: 10_000 },
+          max_events: nil,
+          timeout:    nil,
         }]
       end
 
@@ -498,7 +501,7 @@ describe Routemaster::Client do
 
         it 'expects a collection of subscriptions' do
           expect(perform.map(&:attributes)).to eql(expected_result)
-      end
+        end
       end
 
       context 'the connection to the bus errors' do
@@ -510,7 +513,7 @@ describe Routemaster::Client do
       end
     end
   end
-  
+
   describe '#reset_connection' do
     context 'can reset class vars to change params' do
       let(:instance_uuid) { SecureRandom.uuid }
@@ -520,15 +523,15 @@ describe Routemaster::Client do
           verify_ssl: false,
           lazy: true
       }}
-      
+
       before do
           Routemaster::Client::Connection.reset_connection
           @stub = stub_request(:get, 'https://@bus.example.com/topics').with({basic_auth: [instance_uuid, 'x']})
           .to_return(status: 200, body: [{ name: "topic.name", publisher: "topic.publisher", events: "topic.get_count" }].to_json)
       end
-      
+
       after { Routemaster::Client::Connection.reset_connection }
-      
+
       it 'connects with new params' do
           subject.monitor_topics
           expect(@stub).to have_been_requested

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: routemaster-client
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.2.3
 platform: ruby
 authors:
 - Julien Letessier
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-01-08 00:00:00.000000000 Z
+date: 2018-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typhoeus
@@ -153,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.0
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Client API for the Routemaster event bus