Remove core from hub

.travis.yml

@@ -1,7 +1,8 @@
+sudo: false
 language: ruby
 
 rvm:
-  - 1.9.3
+  - 2.2
   - jruby-19mode
   - jruby-head
 
@@ -12,18 +13,18 @@ jdk:
 services:
   - rabbitmq
 
-sudo: false
-
 cache: bundler
 
 matrix:
   exclude:
-    - rvm: 1.9.3
+    - rvm: 2.2
       jdk: openjdk7
-    - rvm: 1.9.3
+    - rvm: 2.2
       jdk: oraclejdk7
     - rvm: jruby-head
       jdk: openjdk6
   allow_failures:
     - rvm: jruby-head
       jdk: openjdk7
+
+script: bundle exec rspec --require spec_helper

CLEANUP

@@ -0,0 +1,19 @@
+Extract:
+
+* core-ext to travis-core-ext
+* Amqp to travis-amqp
+* Async to travis-async
+* Database to travis-db
+* Exceptions to travis-exceptions
+* Instrumentation to travis-instrumentation (also move Notification from travis-core)
+* LogSubscriber and Metrics to travis-metrics
+* Logger and Logging to travis-logging
+
+Delete?
+
+* Who uses Assertions?
+* Who uses EventLogger?
+* Who uses Helpers
+* Who uses Memory?
+* Who uses Retryable?
+* Who uses testing/webmock?

Gemfile

@@ -2,13 +2,15 @@ source 'https://rubygems.org'
 
 gem 'activerecord',    '~> 3.2.12'
 gem 'activesupport',   '~> 3.2.12'
-gem 'hashr',           '~> 0.0.20'
 gem 'multi_json'
-gem 'json',            '~> 1.8.3'
+gem 'json'
 gem 'gem-patching'
 
-gem 'metriks',         :git => 'https://github.com/roidrage/metriks.git', :ref => 'source'
-gem 'sentry-raven',    :github => 'getsentry/raven-ruby'
+gem 'dalli'
+gem 'connection_pool'
+
+gem 'metriks',         github: 'roidrage/metriks'
+gem 'sentry-raven',    github: 'getsentry/raven-ruby'
 
 platform :mri do
   gem 'amq-client',    '>= 0.9.0'
@@ -24,10 +26,10 @@ end
 
 group :test do
   gem 'rake',          '~> 0.9.2'
-  gem 'mocha',         '~> 0.11.0'
-  gem 'rspec',         '~> 2.14'
-  gem 'rspec-its',     '~> 1.0.1'
-  gem 'simplecov',     '>= 0.4.0', :require => false
+  gem 'mocha'
+  gem 'rspec'
+  gem 'rspec-its'
+  gem 'simplecov',     '>= 0.4.0', require: false
   gem 'guard'
   gem 'guard-rspec'
 end

lib/travis/support.rb

@@ -2,19 +2,17 @@
 require 'core_ext/securerandom'
 
 module Travis
-  require 'travis/support/assertions'
-  require 'travis/support/async'
-  require 'travis/support/chunkifier'
-  require 'travis/support/exceptions'
-  require 'travis/support/helpers'
+  # require 'travis/support/assertions'
+  # require 'travis/support/async'
+  # require 'travis/support/chunkifier'
+  # require 'travis/support/exceptions'
+  # require 'travis/support/helpers'
   require 'travis/support/instrumentation'
   require 'travis/support/log_subscriber'
   require 'travis/support/logger'
   require 'travis/support/logging'
   require 'travis/support/metrics'
-  if RUBY_PLATFORM == 'java'
-    require 'travis/support/memory'
-  end
+  require 'travis/support/memory' if RUBY_PLATFORM == 'java'
   require 'travis/support/retryable'
 
   class << self

lib/travis/support/amqp/bunny.rb

@@ -4,11 +4,17 @@ module Amqp
     require 'travis/support/amqp/bunny/consumer'
 
     class << self
+      def setup(config)
+        self.send(:config=, config.to_h, false)
+      end
+
       def config
         @config
       end
 
-      def config=(config)
+      def config=(config, deprecated = true)
+        puts 'Calling Travis::Amqp.config= is deprecated. Call Travis::Amqp.setup(config) instead.' if deprecated
+
         config = config.dup
         config[:user] = config.delete(:username) if config[:username]
         config[:pass] = config.delete(:password) if config[:password]

lib/travis/support/amqp/bunny/publisher.rb

@@ -4,6 +4,12 @@
 module Travis
   module Amqp
     class Publisher
+      class << self
+        def channel
+          @channel ||= Amqp.connection.create_channel
+        end
+      end
+
       attr_reader :name, :type, :routing_key, :options
 
       def initialize(routing_key, options = {})
@@ -30,7 +36,7 @@ def default_data
         end
 
         def exchange
-          @exchange ||= Amqp.connection.exchange(name, :type => type.to_sym, :durable => true, :auto_delete => false)
+          @exchange ||= self.class.channel.exchange(name, :type => type.to_sym, :durable => true, :auto_delete => false)
         end
 
         def deep_merge(hash, other)

lib/travis/support/amqp/march_hare.rb

@@ -6,11 +6,16 @@ module Amqp
     require 'travis/support/amqp/march_hare/publisher'
 
     class << self
+      def setup(config)
+        self.send(:config=, config.to_h, false)
+      end
+
       def config
-        @config ||= {}
+        @config
       end
 
-      def config=(config)
+      def config=(config, deprecated = true)
+        puts 'Calling Travis::Amqp.config= is deprecated. Call Travis::Amqp.setup(config) instead.' if deprecated
         @config = config
       end
 

lib/travis/support/amqp/march_hare/consumer.rb

@@ -1,4 +1,3 @@
-require 'hashr'
 require 'travis/support/logging'
 
 module Travis
@@ -10,21 +9,21 @@ class << self
       include Logging
 
       DEFAULTS = {
-        :subscribe => { :ack => false, :blocking => false },
-        :queue     => { :durable => true, :exclusive => false },
-        :channel   => { :prefetch => 1 },
-        :exchange  => { :name => nil, :routing_key => nil }
+        subscribe: { ack: false, blocking: false },
+        queue:     { durable: true, exclusive: false },
+        channel:   { prefetch: 1 },
+        exchange:  { name: nil, routing_key: nil }
       }
 
       attr_reader :name, :options, :subscription
 
       def initialize(name, options = {})
         @name    = name
-        @options = Hashr.new(DEFAULTS.deep_merge(options))
+        @options = deep_merge(DEFAULTS, options)
       end
 
       def subscribe(options = {}, &block)
-        options = deep_merge(self.options.subscribe, options)
+        options = deep_merge(self.options[:subscribe], options)
         debug "subscribing to #{name.inspect} with #{options.inspect}"
         @subscription = queue.subscribe(options, &block)
       end
@@ -37,10 +36,10 @@ def unsubscribe
       protected
 
         def queue
-          @queue ||= channel.queue(name, options.queue).tap do |queue|
-            if options.exchange.name
-              routing_key = options.exchange.routing_key || name
-              queue.bind(options.exchange.name, :routing_key => routing_key)
+          @queue ||= channel.queue(name, options[:queue]).tap do |queue|
+            if options[:exchange][:name]
+              routing_key = options[:exchange][:routing_key] || name
+              queue.bind(options[:exchange][:name], routing_key: routing_key)
             end
           end
         end

lib/travis/support/amqp/march_hare/publisher.rb

@@ -14,13 +14,13 @@ def channel
       def initialize(routing_key, options = {})
         @routing_key = routing_key
         @options = options.dup
-        @name = @options.delete(:name) || ""
-        @type = @options.delete(:type) || "direct"
+        @name = @options.delete(:name) || ''
+        @type = @options.delete(:type) || 'direct'
       end
 
       def publish(data, options = {})
         data = MultiJson.encode(data)
-        defaults = { :routing_key => routing_key, :properties => { :message_id => rand(100000000000).to_s } }
+        defaults = { routing_key: routing_key, properties: { message_id: rand(100000000000).to_s } }
         retrying do
           exchange.publish(data, deep_merge(defaults, options))
         end
@@ -29,7 +29,7 @@ def publish(data, options = {})
       protected
 
         def exchange
-          @exchange ||= self.class.channel.exchange(name, :durable => true, :auto_delete => false, :type => type)
+          @exchange ||= self.class.channel.exchange(name, durable: true, auto_delete: false, type: type)
         end
 
         def retrying(&block)

lib/travis/support/amqp/ruby_amqp.rb

@@ -7,11 +7,16 @@ module Amqp
     require 'travis/support/amqp/ruby_amqp/publisher'
 
     class << self
+      def setup(config)
+        self.send(:config=, config.to_h, false)
+      end
+
       def config
         @config
       end
 
-      def config=(config)
+      def config=(config, deprecated = true)
+        puts 'Calling Travis::Amqp.config= is deprecated. Call Travis::Amqp.setup(config) instead.' if deprecated
         @config = config
       end
 

lib/travis/support/amqp/ruby_amqp/consumer.rb

@@ -1,4 +1,3 @@
-require 'hashr'
 require 'travis/support/logging'
 
 module Travis
@@ -7,21 +6,21 @@ class Consumer
       include Logging
 
       DEFAULTS = {
-        :subscribe => { :ack => false, :blocking => false },
-        :queue     => { :durable => true, :exclusive => false },
-        :channel   => { :prefetch => 1 },
-        :exchange  => { :name => nil, :routing_key => nil }
+        subscribe: { ack: false, blocking: false },
+        queue:     { durable: true, exclusive: false },
+        channel:   { prefetch: 1 },
+        exchange:  { name: nil, routing_key: nil }
       }
 
       attr_reader :name, :options, :subscription
 
       def initialize(name, options = {})
         @name    = name
-        @options = Hashr.new(DEFAULTS.deep_merge(options))
+        @options = deep_merge(DEFAULTS, options)
       end
 
       def subscribe(options = {}, &block)
-        options = deep_merge(self.options.subscribe, options)
+        options = deep_merge(self.options[:subscribe], options)
         debug "subscribing to #{name.inspect} with #{options.inspect}"
         @subscription = queue.subscribe(options, &block)
       end
@@ -34,13 +33,13 @@ def unsubscribe
       protected
 
         def queue
-          @queue ||= channel.queue(name, options.queue)
+          @queue ||= channel.queue(name, options[:queue])
 
           @queue ||= begin
-            queue = channel.queue(name, options.queue)
-            if options.exchange.name
-              routing_key = options.exchange.routing_key || name
-              queue.bind(options.exchange.name, :key => routing_key)
+            queue = channel.queue(name, options[:queue])
+            if options[:exchange][:name]
+              routing_key = options[:exchange][:routing_key] || name
+              queue.bind(options[:exchange][:name], key: routing_key)
             end
           end
         end

lib/travis/support/async/sidekiq.rb

@@ -12,9 +12,6 @@ class Worker
         def perform(uuid, target, method, *args)
           Travis.uuid = uuid
           eval(target).send(method, *args)
-        # rescue Exception => e
-        #   TODO make sure the exception can be caught here, pipe it to raven and
-        #   requeue the job appropriately
         end
       end
 
@@ -26,11 +23,19 @@ def setup(url, options = {})
         end
 
         def run(target, method, options, *args)
-          queue   = options[:queue]
-          retries = options[:retries]
           target  = target.name if target.is_a?(Module)
-          args    = [Travis.uuid, target, method, *args]
-          ::Sidekiq::Client.push('queue' => queue, 'retry' => retries, 'class' => Worker, 'args' => args)
+          now     = Time.now.to_f
+          at      = now + options[:in].to_f
+
+          payload = {
+            'queue' => options[:queue],
+            'retry' => options[:retries],
+            'class' => Worker,
+            'args'  => [Travis.uuid, target, method, *args]
+          }
+          payload = payload.merge('at' => at) if at > now
+
+          ::Sidekiq::Client.push(payload)
         end
       end
     end

lib/travis/support/database.rb

@@ -9,18 +9,11 @@
 module Travis
   module Database
     class << self
-      def connect
+      def connect(config = nil)
+        ActiveRecord::Base.establish_connection(config.try(:to_h) || Travis.config.database.to_h)
         ActiveRecord::Base.default_timezone = :utc
         ActiveRecord::Base.logger = Travis.logger
-
-        ActiveRecord::Base.configurations = {
-          Travis.env => Travis.config.database,
-          'logs_database' => Travis.config.logs_database || Travis.config.database
-        }
-
-        ActiveRecord::Base.establish_connection(Travis.env)
       end
     end
   end
 end
-

lib/travis/support/exceptions.rb

@@ -1,10 +1,20 @@
 module Travis
   module Exceptions
-	require 'travis/support/exceptions/adapter'
+    require 'travis/support/exceptions/adapter'
     require 'travis/support/exceptions/handling'
     require 'travis/support/exceptions/reporter'
 
     class << self
+      def setup(config)
+        @config = config.to_h
+        Exceptions::Reporter.start
+      end
+
+      def config
+        puts 'Relying on Travis.config is deprecated: Call Travis::Exceptions.setup(config) instead.' unless @config
+        @config || Travis.config
+      end
+
       def handle(exception, options = {})
         Reporter.enqueue(exception, options)
       end