easymon 1.5 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 46eed6312dd05be2f1cc453b481dbbe26cbed28e6a9954d68aee4ed96b5d2935
-  data.tar.gz: 57a512d8baf55d331a7386ccc80ea9879820cb2775327d321ba8d11d0b630660
+  metadata.gz: cb55744be4fa12e4c7af34ae59091721967aaf08d1bd07e4bc0cca4bd2937c4a
+  data.tar.gz: ed1822f256bea98b6982f634487c676fad7e292ca093c10315ce72990ffb6778
 SHA512:
-  metadata.gz: cfe6ee337e9353b08dd9dcb7b807f2f8881d471e884257fd8a21e48bf29f79fb6680ba29a56b2cea2b40ac365d46ca9566fa89c1df98808832e11bf93d45ee66
-  data.tar.gz: 13e4c388db907301c04ed04a3fe25b8eba77b78e88496d3b1ac1a993980fb65ecf75db24c91b1f90ad230b47ad4c70919b973b587280a7ec9bd95d6b09433291
+  metadata.gz: bd39994e506c00177688ae9ecb7ff660326cc44eec4374cdeb42873c3128bec45da18dfb54969b9a6494fb0d79ef1d87be4d223c4ef162a70bfc5d4db4345e9a
+  data.tar.gz: a6515ddbd1f7a0bce037815d8804c2c7689dfc943c1ad9c7f037d711ff41700efcc6367e261b2bd3a80b43590e30ef2523ec2bd639537aac7eada9fa5f000bbd

data/README.md

@@ -203,7 +203,7 @@ module Easymon
       end
     end
     def database_configuration
-      env = "#{Rails.env}_slave"
+      env = "#{Rails.env}_replica"
       config = YAML.load_file(Rails.root.join('config/database.yml'))[env]
     end
   end

data/lib/easymon/checks/split_active_record_check.rb

@@ -2,10 +2,10 @@ module Easymon
   class SplitActiveRecordCheck
     attr_accessor :block
     attr_accessor :results
-    
+
     # Here we pass a block so we get a fresh instance of ActiveRecord::Base or
     # whatever other class we might be using to make database connections
-    # 
+    #
     # For example, given the following other class:
     # module Easymon
     #   class Base < ActiveRecord::Base
@@ -18,12 +18,12 @@ module Easymon
     #     end
     #
     #     def database_configuration
-    #       env = "#{Rails.env}_slave"
+    #       env = "#{Rails.env}_replica"
     #       config = YAML.load_file(Rails.root.join('config/database.yml'))[env]
     #     end
     #   end
     # end
-    # 
+    #
     # We would check both it and ActiveRecord::Base like so:
     # check = Easymon::SplitActiveRecordCheck.new {
     #   [ActiveRecord::Base.connection, Easymon::Base.connection] 
@@ -31,20 +31,20 @@ module Easymon
     # Easymon::Repository.add("split-database", check)
     def initialize(&block)
       self.block = block
-    end 
-    
+    end
+
     # Assumes only 2 connections
     def check
       connections = Array(@block.call)
 
       results = connections.map{|connection| database_up?(connection) }
-      
-      master_status = results.first ? "Master: Up" : "Master: Down"
-      slave_status = results.last ? "Slave: Up" : "Slave: Down"
-      
-      [(results.all? && results.count > 0), "#{master_status} - #{slave_status}"]
+
+      primary_status = results.first ? "Primary: Up" : "Primary: Down"
+      replica_status = results.last ? "Replica: Up" : "Replica: Down"
+
+      [(results.all? && results.count > 0), "#{primary_status} - #{replica_status}"]
     end
-    
+
     private
       def database_up?(connection)
         connection.active?

data/lib/easymon/version.rb

@@ -1,3 +1,3 @@
 module Easymon
-  VERSION = "1.5"
+    VERSION = "1.6.0"
 end

data/test/dummy/config/database.yml

@@ -17,10 +17,10 @@ test:
   host: 127.0.0.1
   port: 3306
 
-test_slave:
+test_replica:
   adapter: mysql2
   encoding: utf8
-  database: dummy_test_slave
+  database: dummy_test_replica
   username: root
   host: 127.0.0.1
   port: 3306

data/test/test_helper.rb

@@ -34,4 +34,4 @@ end
 
 # setting up mocha *after* we load the test libraries as per
 # http://gofreerange.com/mocha/docs/
-require 'mocha/mini_test'
+require 'mocha/minitest'

data/test/unit/checks/split_active_record_check_test.rb

@@ -3,50 +3,50 @@ require 'test_helper'
 class SplitActiveRecordCheckTest < ActiveSupport::TestCase
 
   test "#run sets success conditions on successful run" do
-    master = ActiveRecord::Base.connection
+    primary = ActiveRecord::Base.connection
     Easymon::Base.establish_connection
-    slave = Easymon::Base.connection
+    replica = Easymon::Base.connection
 
-    check = Easymon::SplitActiveRecordCheck.new { [master, slave] }
+    check = Easymon::SplitActiveRecordCheck.new { [primary, replica] }
 
     results = check.check
 
-    assert_equal("Master: Up - Slave: Up", results[1])
+    assert_equal("Primary: Up - Replica: Up", results[1])
     assert_equal(true, results[0])
   end
 
-  test "#run sets failed conditions when slave is down" do
-    master = ActiveRecord::Base.connection
+  test "#run sets failed conditions when replica is down" do
+    primary = ActiveRecord::Base.connection
     Easymon::Base.establish_connection
-    slave = Easymon::Base.connection
+    replica = Easymon::Base.connection
 
-    slave.stubs(:active?).raises("boom")
+    replica.stubs(:active?).raises("boom")
 
-    check = Easymon::SplitActiveRecordCheck.new { [master, slave] }
+    check = Easymon::SplitActiveRecordCheck.new { [primary, replica] }
     results = check.check
 
-    assert_equal("Master: Up - Slave: Down", results[1])
+    assert_equal("Primary: Up - Replica: Down", results[1])
     assert_equal(false, results[0])
   end
 
-  test "#run sets failed conditions when master is down" do
-    master = ActiveRecord::Base.connection
+  test "#run sets failed conditions when primary is down" do
+    primary = ActiveRecord::Base.connection
     Easymon::Base.establish_connection
-    slave = Easymon::Base.connection
+    replica = Easymon::Base.connection
 
-    master.stubs(:active?).raises("boom")
+    primary.stubs(:active?).raises("boom")
 
-    check = Easymon::SplitActiveRecordCheck.new { [master, slave] }
+    check = Easymon::SplitActiveRecordCheck.new { [primary, replica] }
     results = check.check
 
-    assert_equal("Master: Down - Slave: Up", results[1])
+    assert_equal("Primary: Down - Replica: Up", results[1])
     assert_equal(false, results[0])
   end
 
   test "given nil as a config" do
     check = Easymon::SplitActiveRecordCheck.new { }
     results = check.check
-    assert_equal("Master: Down - Slave: Down", results[1])
+    assert_equal("Primary: Down - Replica: Down", results[1])
     assert_equal(false, results[0])
   end
 end
@@ -63,8 +63,8 @@ module Easymon
     end
 
     def database_configuration
-      env = "#{Rails.env}_slave"
-      config = YAML.load_file(Rails.root.join('config/database.yml'))[env]
+      env = "#{Rails.env}_replica"
+      YAML.load_file(Rails.root.join('config/database.yml'))[env]
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: easymon
 version: !ruby/object:Gem::Version
-  version: '1.5'
+  version: 1.6.0
 platform: ruby
 authors:
 - Nathan Anderson
@@ -70,28 +70,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.18'
+        version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.18'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.11'
 - !ruby/object:Gem::Dependency
   name: dalli
   requirement: !ruby/object:Gem::Requirement
@@ -142,6 +142,7 @@ files:
 - test/controllers/easymon/checks_controller_test.rb
 - test/dummy/README.rdoc
 - test/dummy/Rakefile
+- test/dummy/app/assets/config/manifest.js
 - test/dummy/app/assets/javascripts/application.js
 - test/dummy/app/assets/javascripts/easymon.js
 - test/dummy/app/assets/stylesheets/application.css
@@ -173,6 +174,7 @@ files:
 - test/dummy/config/memcached.yml
 - test/dummy/config/redis.yml
 - test/dummy/config/routes.rb
+- test/dummy/config/storage.yml
 - test/dummy/log/development.log
 - test/dummy/log/test.log
 - test/dummy/public/404.html
@@ -237,6 +239,7 @@ test_files:
 - test/dummy/app/views/easymon/index.html.erb
 - test/dummy/app/views/easymon/show.html.erb
 - test/dummy/app/views/layouts/application.html.erb
+- test/dummy/app/assets/config/manifest.js
 - test/dummy/app/assets/javascripts/easymon.js
 - test/dummy/app/assets/javascripts/application.js
 - test/dummy/app/assets/stylesheets/application.css
@@ -250,6 +253,7 @@ test_files:
 - test/dummy/config/environments/test.rb
 - test/dummy/config/environment.rb
 - test/dummy/config/redis.yml
+- test/dummy/config/storage.yml
 - test/dummy/config/application.rb
 - test/dummy/config/memcached.yml
 - test/dummy/config/database.yml