uptime_monitor 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 75b1b3732cc2d08241cdca4d5697b17c7f503235
-  data.tar.gz: 9d037db9abeab5d6b7406cda2e228f6fee582c37
+  metadata.gz: 89464c2c9a951210f005a692dbf01e523d60b171
+  data.tar.gz: 6c03f8db541703010ada4c9445d5c18fc2d4853c
 SHA512:
-  metadata.gz: 8298862f36218c41d2bffdb7d3265c675cc83735315c1f1cd1aca00d4ea4412149a74dd14ccfeb65c66cdbd9aad262252f5a944d103a5b6fbea942dbdc4b55ab
-  data.tar.gz: c5be927e6a32bb61b37f2714ee98822bfe9f22e0b081420085b0af30c7875bdbe0660c8544b6bb53d76e75060844b472841c1663e6ebcb89eb0124dd2fcae25b
+  metadata.gz: 21a848684aa53946047ae56cbf28506ae65c979f48f1cb8838bcc71b89038d14ced4a4761351cecd60f759e128e3df9334bbb94c95ffd1b2b727d657990f20c0
+  data.tar.gz: e73eb6afa058f1842c9e2623ad3ac90dbfba7c3e351c0c90af3d751346226f159b65b6dcac32ee8fe01f03fd77e497858343f55271fce2ce2f61244eb59166ef

data/README.md

@@ -379,7 +379,9 @@ monitor = {
 ragios.create(monitor)
 ```
 
-## Running Uptime Monitor outside Ragios with Docker Compose
+## Using Uptime Monitor without Ragios
+
+### Running Uptime Monitor outside Ragios with Docker Compose
 
 First clone the uptime_monitor Repo on github.
 
@@ -405,7 +407,7 @@ docker-compose run  --rm uptime_monitor
 This will give you access to the entire uptime_monitor and all its objects loaded into PRY console. It will also run Selenium Grid and firefox in separate docker containers already connected to the uptime_monitor.
 
 
-## Testing the validations outside Ragios
+### Testing the validations outside Ragios
 Sometimes it's useful to run validations outside Ragios to verify that the validations are syntactically correct and don't raise any exceptions. This is best done by running the uptime_monitor plugin as a Plain Old Ruby Object.
 
 First load uptime_monitor into PRY console:
@@ -455,7 +457,7 @@ u.test_result
 In the above example the *test_command?* method runs the validations and returns true when all validations passes, returns false when any of the validation fails. *test_result* is a hash that contains the result of the tests ran by *test_command?*.
 
 
-## Testing individual validations
+### Testing individual validations
 It can be very useful to test validations/actions individually before adding them to Ragios. This can be done by running plugin's browser directly.
 ```ruby
 url= "http://obi-akubue.org"
@@ -517,9 +519,9 @@ u.test_result
 ```
 Notice that *test_result* includes a url to the screenshot  of the webpage when the test failed. This test result is also included in the notifications sent to site admin by Ragios when a test fails. So this way the admin can see exactly what webpage looked like when the transaction failed.
 
-## Disable screenshots on individual monitors
-While using Ragios, to disable screenshots on a particular monitor add the key/value pair ```disable_screenshots: true```
-example:
+### Disable screenshots on individual monitors
+To disable screenshots on a particular monitor in Ragios add the key/value pair ```disable_screenshots: true``` to the monitor.
+For example:
 ```ruby
 monitor = {
   url: "http://obi-akubue.org",

data/VERSION

@@ -1 +1 @@
-0.7.1
+0.7.2

data/docker-compose.yml

@@ -20,6 +20,8 @@ services:
 
   hub:
     image: selenium/hub:3.8.1-erbium
+    environment:
+      GRID_BROWSER_TIMEOUT: 60
     ports:
       - "4444:4444"
 
@@ -27,26 +29,33 @@ services:
     build: .
     volumes:
       - .:/usr/src/uptime_monitor
+    depends_on:
+      - firefox
+      - chrome
     links:
-      - firefox:firefox
+      - hub:hub
     environment:
       S3_AWS_ACCESS_KEY_ID:
       S3_AWS_SECRET_ACCESS_KEY:
       RAGIOS_HERCULES_S3_DIR:
       RAGIOS_HERCULES_ENABLE_SCREENSHOTS:
-      BROWSER: firefox
+      HUB_HOST: hub
+      HUB_PORT: 4444
     entrypoint: bundle exec rake repl
 
   unit_tests:
     build: .
     volumes:
       - .:/usr/src/uptime_monitor
+    depends_on:
+      - firefox
     links:
-      - firefox:firefox
+      - hub:hub
     environment:
       S3_AWS_ACCESS_KEY_ID:
       S3_AWS_SECRET_ACCESS_KEY:
       RAGIOS_HERCULES_S3_DIR:
       RAGIOS_HERCULES_ENABLE_SCREENSHOTS:
-      BROWSER: firefox
+      HUB_HOST: hub
+      HUB_PORT: 4444
     entrypoint: bundle exec rspec -fd spec

data/lib/uptime_monitor/browser.rb

@@ -116,13 +116,18 @@ module Hercules
         uploader = Hercules::UptimeMonitor::ScreenShotUploader.new
         uploader.store(file)
       end
+
     private
+
       def goto(url, browser_name)
         client = Selenium::WebDriver::Remote::Http::Default.new
         client.read_timeout = 180 # seconds – default is 60
 
         options = {http_client: client}
-        options[:url] = "http://#{ENV['BROWSER']}:5555/wd/hub" if ENV['BROWSER']
+
+        if ENV['HUB_HOST'] && ENV['HUB_PORT']
+          options[:url] = "http://#{ENV['HUB_HOST']}:4444/wd/hub"
+        end
 
         @browser = Watir::Browser.new browser_name, options
         @browser.goto url

data/uptime_monitor.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: uptime_monitor 0.7.1 ruby lib
+# stub: uptime_monitor 0.7.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "uptime_monitor".freeze
-  s.version = "0.7.1"
+  s.version = "0.7.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["obi-a".freeze]
-  s.date = "2018-01-27"
+  s.date = "2018-03-10"
   s.description = "A Ragios plugin that uses a real web browser to monitor transactions on a website for availability".freeze
   s.email = "obioraakubue@yahoo.com".freeze
   s.extra_rdoc_files = [

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uptime_monitor
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - obi-a
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-27 00:00:00.000000000 Z
+date: 2018-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: watir