beetle 1.0.3 → 2.0.0rc1

data/test/beetle/message_test.rb

@@ -127,36 +127,6 @@ module Beetle
       end
     end
 
-    test "should be able to garbage collect expired keys" do
-      Beetle.config.expects(:gc_threshold).returns(10)
-      header = header_with_params({:ttl => 0})
-      message = Message.new("somequeue", header, 'foo', :store => @store)
-      assert !message.key_exists?
-      assert message.key_exists?
-      @store.redis.expects(:del).with(*@store.keys(message.msg_id))
-      @store.garbage_collect_keys(Time.now.to_i+11)
-    end
-
-    test "should be able to garbage collect expired keys using master and slave" do
-      Beetle.config.expects(:gc_threshold).returns(10)
-      header = header_with_params({:ttl => 0})
-      message = Message.new("somequeue", header, 'foo', :store => @store)
-      assert !message.key_exists?
-      assert message.key_exists?
-      @store.redis.expects(:del).with(*@store.keys(message.msg_id))
-      @store.garbage_collect_keys_using_master_and_slave(Time.now.to_i+11)
-    end
-
-    test "should not garbage collect not yet expired keys" do
-      Beetle.config.expects(:gc_threshold).returns(10)
-      header = header_with_params({:ttl => 0})
-      message = Message.new("somequeue", header, 'foo', :store => @store)
-      assert !message.key_exists?
-      assert message.key_exists?
-      @store.redis.expects(:del).never
-      @store.garbage_collect_keys(Time.now.to_i)
-    end
-
     test "successful processing of a non redundant message should delete all keys from the database" do
       header = header_with_params({})
       header.expects(:ack)
@@ -263,7 +233,7 @@ module Beetle
       header.expects(:ack)
       message = Message.new("somequeue", header, 'foo', :store => @store)
 
-      assert_equal nil, @store.get(message.msg_id, :ack_count)
+      assert_nil @store.get(message.msg_id, :ack_count)
       message.process(lambda {|*args|})
       assert message.redundant?
       assert_equal "1", @store.get(message.msg_id, :ack_count)

data/test/beetle/publisher_test.rb

@@ -24,7 +24,8 @@ module Beetle
         :pass => "guest",
         :vhost => "/",
         :socket_timeout => 0,
-        :frame_max => 131072
+        :frame_max => 131072,
+        :spec => '09'
       }
       Bunny.expects(:new).with(expected_bunny_options).returns(m)
       m.expects(:start)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beetle
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 2.0.0rc1
 platform: ruby
 authors:
 - Stefan Kaes
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-20 00:00:00.000000000 Z
+date: 2017-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uuid4r
@@ -113,19 +113,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.3.4
 - !ruby/object:Gem::Dependency
-  name: eventmachine_httpserver
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.1
-  type: :runtime
+        version: '5.0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: cucumber
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.4.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 2.4.0
+- !ruby/object:Gem::Dependency
+  name: daemon_controller
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.2.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: daemons
   requirement: !ruby/object:Gem::Requirement
@@ -133,17 +161,142 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.0
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.0
+- !ruby/object:Gem::Dependency
+  name: i18n
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.1'
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+- !ruby/object:Gem::Dependency
+  name: mysql2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.4.4
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.4.4
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '11.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '11.2'
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.12.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.12.0
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.21.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.21.0
+- !ruby/object:Gem::Dependency
+  name: websocket-eventmachine-client
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A highly available, reliable messaging infrastructure
 email: opensource@xing.com
-executables:
-- beetle
+executables: []
 extensions: []
 extra_rdoc_files:
 - examples/README.rdoc
@@ -159,7 +312,6 @@ files:
 - RELEASE_NOTES.rdoc
 - Rakefile
 - beetle.gemspec
-- bin/beetle
 - examples/README.rdoc
 - examples/attempts.rb
 - examples/consume_many_messages_and_shutdown_randomly.rb
@@ -187,10 +339,6 @@ files:
 - lib/beetle.rb
 - lib/beetle/base.rb
 - lib/beetle/client.rb
-- lib/beetle/commands.rb
-- lib/beetle/commands/configuration_client.rb
-- lib/beetle/commands/configuration_server.rb
-- lib/beetle/commands/garbage_collect_deduplication_store.rb
 - lib/beetle/configuration.rb
 - lib/beetle/dead_lettering.rb
 - lib/beetle/deduplication_store.rb
@@ -199,16 +347,11 @@ files:
 - lib/beetle/message.rb
 - lib/beetle/publisher.rb
 - lib/beetle/r_c.rb
-- lib/beetle/redis_configuration_client.rb
-- lib/beetle/redis_configuration_http_server.rb
-- lib/beetle/redis_configuration_server.rb
 - lib/beetle/redis_ext.rb
 - lib/beetle/redis_master_file.rb
-- lib/beetle/redis_server_info.rb
 - lib/beetle/subscriber.rb
 - lib/beetle/version.rb
 - script/console
-- script/docker-run-beetle-tests-
 - script/start_rabbit
 - test/beetle/amqp_gem_behavior_test.rb
 - test/beetle/base_test.rb
@@ -221,8 +364,6 @@ files:
 - test/beetle/message_test.rb
 - test/beetle/publisher_test.rb
 - test/beetle/r_c_test.rb
-- test/beetle/redis_configuration_client_test.rb
-- test/beetle/redis_configuration_server_test.rb
 - test/beetle/redis_ext_test.rb
 - test/beetle/redis_master_file_test.rb
 - test/beetle/subscriber_test.rb
@@ -248,7 +389,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.7
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 3
 summary: High Availability AMQP Messaging with Redundant Queues
@@ -264,8 +405,6 @@ test_files:
 - test/beetle/message_test.rb
 - test/beetle/publisher_test.rb
 - test/beetle/r_c_test.rb
-- test/beetle/redis_configuration_client_test.rb
-- test/beetle/redis_configuration_server_test.rb
 - test/beetle/redis_ext_test.rb
 - test/beetle/redis_master_file_test.rb
 - test/beetle/subscriber_test.rb

data/bin/beetle

@@ -1,9 +0,0 @@
-#!/usr/bin/env ruby
-
-begin
-  require 'beetle/commands'
-rescue LoadError
-  beetle_path = File.expand_path("../../lib", __FILE__)
-  $:.unshift(beetle_path)
-  require 'beetle/commands'
-end

data/lib/beetle/commands.rb

@@ -1,35 +0,0 @@
-require 'rubygems'
-require 'active_support'
-
-module Beetle
-  module Commands
-    # invokes given command by instantiating an appropriate command class
-    def self.execute(command)
-      if commands.include? command
-        require File.expand_path("../commands/#{command}", __FILE__)
-        "Beetle::Commands::#{command.classify}".constantize.execute
-      else
-        # me no likez no frikin heredocs
-        puts "\nCommand #{command} not known\n" if command
-        puts "Available commands are:"
-        puts
-        commands.each {|c| puts "\t #{c}"}
-        puts
-        exit 1
-      end
-    end
-
-    private
-    def self.commands
-      commands_dir = File.expand_path('../commands', __FILE__)
-      Dir[commands_dir + '/*.rb'].map {|f| File.basename(f)[0..-4]}
-    end
-  end
-end
-
-if ARGV.first.to_s.sub(/\A--/,'') == "version"
-  require 'beetle/version'
-  puts Beetle::VERSION
-else
-  Beetle::Commands.execute(ARGV.shift)
-end

data/lib/beetle/commands/configuration_client.rb

@@ -1,98 +0,0 @@
-require 'optparse'
-require 'daemons'
-require 'beetle'
-
-module Beetle
-  module Commands
-    # Command to start a RedisConfigurationClient daemon.
-    #
-    #   Usage: beetle configuration_client  [options] -- [client options]
-    #
-    #   client options:
-    #           --redis-master-file FILE     Write redis master server string to FILE
-    #           --id, --client-id ID         Set unique client id (default is minastirith.local)
-    #           --amqp-servers LIST          AMQP server list (e.g. 192.168.0.1:5672,192.168.0.2:5672)
-    #           --config-file PATH           Path to an external yaml config file
-    #           --pid-dir DIR                Write pid and log to DIR
-    #           --multiple                   Allow multiple clients started in parallel (for testing only)
-    #       -v, --verbose                    Set log level to DEBUG
-    #       -h, --help                       Show this message
-    #
-    class ConfigurationClient
-      # parses command line options and starts Beetle::RedisConfigurationClient as a daemon
-      def self.execute
-        command, controller_options, app_options = Daemons::Controller.split_argv(ARGV)
-
-        opts = OptionParser.new
-        opts.banner = "Usage: beetle configuration_client #{command} [options] -- [client options]"
-        opts.separator ""
-        opts.separator "client options:"
-
-        opts.on("--redis-master-file FILE", String, "Write redis master server string to FILE") do |val|
-          Beetle.config.redis_server = val
-        end
-
-        client_id = nil
-        opts.on("--id ID", "--client-id ID", String, "Set unique client id (default is #{RedisConfigurationClient.new.id})") do |val|
-          client_id = val
-        end
-
-        opts.on("--amqp-servers LIST", String, "AMQP server list (e.g. 192.168.0.1:5672,192.168.0.2:5672)") do |val|
-          Beetle.config.servers = val
-        end
-
-        opts.on("--config-file PATH", String, "Path to an external yaml config file") do |val|
-          Beetle.config.config_file = val
-        end
-
-        dir_mode = nil
-        dir = nil
-        opts.on("--pid-dir DIR", String, "Write pid and output to DIR") do |val|
-          dir_mode = :normal
-          dir = val
-        end
-
-        multiple = false
-        opts.on("--multiple", "Allow multiple clients") do |val|
-          multiple = true
-        end
-
-        opts.on("-v", "--verbose", "Set log level to DEBUG") do |val|
-          Beetle.config.logger.level = Logger::DEBUG
-        end
-
-        foreground = false
-        opts.on("-f", "--foreground", "Run in foreground") do |val|
-          foreground = true
-        end
-
-        opts.on_tail("-h", "--help", "Show this message") do
-          puts opts
-          exit
-        end
-
-        opts.parse!(app_options)
-
-        if foreground
-          client = Beetle::RedisConfigurationClient.new
-          client.id = client_id if client_id
-          client.start
-        else
-          daemon_options = {
-            :multiple   => multiple,
-            :log_output => true,
-            :dir_mode   => dir_mode,
-            :dir        => dir,
-            :force      => true
-          }
-
-          Daemons.run_proc("redis_configuration_client", daemon_options) do
-            client = Beetle::RedisConfigurationClient.new
-            client.id = client_id if client_id
-            client.start
-          end
-        end
-      end
-    end
-  end
-end