cotton-tail 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e28c658ff57af1125016e3d0f724c394e0f1fccd7d7a0469cd134e3c9d27c25
-  data.tar.gz: 2f3ab5875ea30192dc19db744e4bd2475bc2a2f097aed1e7e7bac95ff5be3b43
+  metadata.gz: 59a0b8fe6472fc78f13f5347a249a85118ec1df3e1274b13e31a32f79aafd290
+  data.tar.gz: 7db834f63293c4bb811dbff278a2dec964e1b55317476e2b2819852bafc9217b
 SHA512:
-  metadata.gz: 3f69be6c25098a9887163647752484e867f70a6ee215fa3288e6424f84379436e7f2d6b2c8eedf40580f41dc46a49378c623a70c19456fd2921b413bf64e9d04
-  data.tar.gz: cb1a4b9742e75461a208731894b009ab99cac03912890f158130d0c7820410f62979c71139c5e3a3441d8dd1d2e2147384ab0076323b43d725ac8c4b4948e0e9
+  metadata.gz: 44fe3a5e0a10a005dc7ded35338770324d1f487cc411d61975023b05a30bdbbeae5a6c759195cf577c5d055b2a5d395b2067088aea4abdc120d25980bab7be94
+  data.tar.gz: 5fca20076db46c78e1c49b40da3725e8f5863d3c1165845699bb1f6167cd1fd0c86658ce567e26fcf1010868cc5c9054a71c90019a4a5927e783440cd3c2e7ff

data/.circleci/config.yml

@@ -44,7 +44,7 @@ jobs:
           name: unit tests
           command: |
             mkdir /tmp/test-results
-            TEST_FILES="$(circleci tests glob "spec/**/*_spec.rb" | circleci tests split --split-by=timings)"
+            TEST_FILES="$(circleci tests glob "spec/unit/**/*_spec.rb" | circleci tests split --split-by=timings)"
 
             bundle exec rspec --format progress \
                             --format RspecJunitFormatter \
@@ -55,7 +55,7 @@ jobs:
       - run:
           name: integration tests
           command: |
-            TEST_FILES="$(circleci tests glob "integration/**/*_spec.rb" | circleci tests split --split-by=timings)"
+            TEST_FILES="$(circleci tests glob "spec/integration/**/*_spec.rb" | circleci tests split --split-by=timings)"
 
             bundle exec rspec --format progress \
                             --format RspecJunitFormatter \

data/.rspec

@@ -1,5 +1,4 @@
 --format documentation
 --color
 --require spec_helper
---require integration_helper
--I integration
+--require integration/integration_helper

data/.ruby-version

@@ -1 +1 @@
-2.5.1@cotton
+2.6.0@cotton

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cotton-tail (0.6.1)
+    cotton-tail (0.7.0)
       bunny (~> 2.12)
       ibsciss-middleware (~> 0.4.2)
 
@@ -14,6 +14,9 @@ GEM
     benchmark-trend (0.2.0)
     bunny (2.13.0)
       amq-protocol (~> 2.3, >= 2.3.0)
+    debase (0.2.3.beta5)
+      debase-ruby_core_source (>= 0.10.2)
+    debase-ruby_core_source (0.10.4)
     diff-lcs (1.3)
     faraday (0.13.1)
       multipart-post (>= 1.2, < 3)
@@ -65,6 +68,8 @@ GEM
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.4.0)
+    ruby-debug-ide (0.7.0.beta7)
+      rake (>= 0.8.1)
     ruby-progressbar (1.10.0)
     unicode-display_width (1.4.1)
 
@@ -74,6 +79,7 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 1.16)
   cotton-tail!
+  debase (= 0.2.3.beta5)
   rabbitmq_http_api_client (~> 1.9)
   rake (~> 12.0)
   rspec (~> 3.0)
@@ -81,6 +87,7 @@ DEPENDENCIES
   rspec-its (~> 1.2)
   rspec_junit_formatter
   rubocop (~> 0.60)
+  ruby-debug-ide (= 0.7.0.beta7)
 
 BUNDLED WITH
-   1.17.1
+   1.17.3

data/cotton-tail.gemspec

@@ -32,6 +32,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'ibsciss-middleware', '~> 0.4.2'
 
   spec.add_development_dependency 'bundler', '~> 1.16'
+  spec.add_development_dependency 'debase', '0.2.3.beta5'
   spec.add_development_dependency 'rabbitmq_http_api_client', '~> 1.9'
   spec.add_development_dependency 'rake', '~> 12.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
@@ -39,4 +40,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec-its', '~> 1.2'
   spec.add_development_dependency 'rspec_junit_formatter'
   spec.add_development_dependency 'rubocop', '~> 0.60'
+  spec.add_development_dependency 'ruby-debug-ide', '0.7.0.beta7'
 end

data/lib/cotton_tail/app.rb

@@ -19,11 +19,6 @@ module CottonTail
       routes.queues
     end
 
-    # Get a single message queue
-    def queue(name)
-      queues[name]
-    end
-
     # Start the app, process all pending messages, and then shutdown
     def run
       supervisors.map(&:run).each(&:join)
@@ -43,7 +38,7 @@ module CottonTail
     private
 
     def supervisors
-      @supervisors ||= queues.map do |_name, queue|
+      @supervisors ||= queues.map do |queue|
         Queue::Supervisor.new(queue, app: self)
       end
     end

data/lib/cotton_tail/dsl/routes.rb

@@ -10,7 +10,7 @@ module CottonTail
       def initialize(queue_strategy:, connection:)
         @queue_strategy = queue_strategy
         @connection = connection
-        @queues = {}
+        @queues = []
       end
 
       def draw(&block)
@@ -18,9 +18,9 @@ module CottonTail
       end
 
       # Define a new queue
-      def queue(name, **opts, &block)
+      def queue(name = '', **opts, &block)
         @queue_strategy.call(name: name, connection: @connection, **opts).tap do |queue_instance|
-          @queues[name] = queue_instance
+          @queues << queue_instance
           queue_dsl = Queue.new(name, queue_instance, self)
           queue_dsl.instance_eval(&block) if block_given?
         end

data/lib/cotton_tail/queue/bunny.rb

@@ -8,8 +8,6 @@ module CottonTail
     # A wrapper around a ::Bunny::Queue that makes it interchangeable with a
     # standard Ruby Queue
     class Bunny < SimpleDelegator
-      extend Forwardable
-
       def self.call(**opts)
         new(**opts)
       end
@@ -17,9 +15,8 @@ module CottonTail
       def initialize(name:, connection:, manual_ack: false, **opts)
         super ::Queue.new
 
-        @name = name
-        @source_opts = opts
         @connection = connection
+        @source = build_source(name, opts)
 
         watch_source manual_ack
       end
@@ -40,14 +37,20 @@ module CottonTail
 
       private
 
-      attr_reader :connection
+      attr_reader :connection, :source
+
+      def nil_opts(opts)
+        { exclusive: true }.merge(opts)
+      end
 
       def watch_source(manual_ack)
         source.subscribe(manual_ack: manual_ack) { |*args| self << args }
       end
 
-      def source
-        @source ||= channel.queue(@name, **@source_opts)
+      def build_source(name, opts)
+        return channel.queue('', **nil_opts(opts)) if name.nil?
+
+        channel.queue(name, **opts)
       end
 
       def channel

data/lib/cotton_tail/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module CottonTail
-  VERSION = '0.6.1'
+  VERSION = '0.7.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cotton-tail
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - James Brennan
@@ -30,7 +30,7 @@ cert_chain:
   fXe/xr/Sc+2wCjHPVE2J+auN5hk3KCp1I4s2fKqyLIwyhTEF3shuYfCpC8rt/YdN
   cy9/lg5LCI3OvakzxL4Xt1Sq4h/xJZ06ydTVJ1wxfk6BXHrg
   -----END CERTIFICATE-----
-date: 2019-01-16 00:00:00.000000000 Z
+date: 2019-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny
@@ -74,6 +74,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.16'
+- !ruby/object:Gem::Dependency
+  name: debase
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.2.3.beta5
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.2.3.beta5
 - !ruby/object:Gem::Dependency
   name: rabbitmq_http_api_client
   requirement: !ruby/object:Gem::Requirement
@@ -172,6 +186,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.60'
+- !ruby/object:Gem::Dependency
+  name: ruby-debug-ide
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.7.0.beta7
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.7.0.beta7
 description: |-
   Simply and easily add AMQP messaging capabilities to
                             your services
@@ -244,8 +272,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: A simple multi-threaded amqp server