uptime_monitor 0.3.3 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c0116273368ccfafed06df5380c1b58751af19b7
-  data.tar.gz: 12410c001e8de232fa8fab96f33811950095afc3
+  metadata.gz: d31072fda959108755276c4be18050a230e4c682
+  data.tar.gz: cdf3a21d0f302854bee9306dd64c09dbfd025bf8
 SHA512:
-  metadata.gz: 006b19fccefec570eed27736c5be23abcb744d775d4075218f7793dd5c771174669277ad51d558abd6da8fee039ed9ab469d423a8171e7d249ccfc09f66bb490
-  data.tar.gz: 91c449d451342bd44ec997c927b7086f77c276663c9a304fd3bd33aaf22ccf14e9dd4ca723fea47479191dea2b012478ad191fb0f71851d82419ecacd6d87998
+  metadata.gz: 36414722c61033a0c0d1e29573f5daa6f7dad7481f439c18dff68551085aca591607a4b04db9e41429f91d63bcede6728227baeda01bdb8769a91f85a3139232
+  data.tar.gz: 6d65089d839bb555c3454f83ba2eae73d21de0a3a6064827e7ed199d7b1aeac09dabb136b6041589d4c6b11c77e377ffd1e9b114212027792396414869ce4d44

data/Gemfile

@@ -6,8 +6,6 @@ gem 'headless', "~> 1.0.2"
 gem 'watir-webdriver', git: 'https://github.com/watir/watir-webdriver.git'
 gem 'watir-webdriver-performance', "~> 0.2.4"
 gem 'activesupport'
-gem 'carrierwave', "0.4.10"
-gem 'aws'
 gem "aws-s3"
 gem "treetop"
 

data/Gemfile.lock

@@ -15,16 +15,11 @@ GEM
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     addressable (2.4.0)
-    aws (2.10.2)
-      http_connection
-      uuidtools
-      xml-simple
     aws-s3 (0.6.3)
       builder
       mime-types
       xml-simple
     builder (3.2.2)
-    carrierwave (0.4.10)
     childprocess (0.5.9)
       ffi (~> 1.0, >= 1.0.11)
     coderay (1.1.1)
@@ -45,7 +40,6 @@ GEM
     hashie (3.4.3)
     headless (1.0.2)
     highline (1.7.8)
-    http_connection (1.4.4)
     i18n (0.7.0)
     jeweler (2.0.1)
       builder
@@ -109,7 +103,6 @@ GEM
       polyglot (~> 0.3)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    uuidtools (2.1.5)
     watir-webdriver-performance (0.2.4)
       watir-webdriver
     websocket (1.2.2)
@@ -120,10 +113,8 @@ PLATFORMS
 
 DEPENDENCIES
   activesupport
-  aws
   aws-s3
   bundler (~> 1.0)
-  carrierwave (= 0.4.10)
   headless (~> 1.0.2)
   jeweler (~> 2.0.1)
   pry

data/VERSION

@@ -1 +1 @@
-0.3.3
+0.4.0

data/lib/uptime_monitor.rb

@@ -3,8 +3,7 @@ require 'watir-webdriver'
 require 'watir-webdriver-performance'
 require 'ostruct'
 require 'active_support'
-require 'carrierwave'
-require 'aws'
+require 'aws/s3'
 
 def require_all(path)
   Dir.glob(File.dirname(__FILE__) + path + '/*.rb') do |file|
@@ -20,14 +19,24 @@ end
 RAGIOS_HERCULES_SCREENSHOT_DIR = "#{Dir.pwd}/screenshots/tmp"
 RAGIOS_HERCULES_ENABLE_SCREENSHOTS = ENV['RAGIOS_HERCULES_ENABLE_SCREENSHOTS'] == 'true' ? true : false
 
+RAGIOS_HERCULES_S3_DIR = ENV["RAGIOS_HERCULES_S3_DIR"]
+
+def file_age(name)
+  (Time.now - File.ctime(name))/(24*3600)
+end
+
+def clear_screenshots_cache!
+  Dir.chdir(RAGIOS_HERCULES_SCREENSHOT_DIR)
+  Dir.glob("*.*").each { |filename| File.delete(filename) if file_age(filename) > 1 }
+end
+
 if RAGIOS_HERCULES_ENABLE_SCREENSHOTS
   setup_screenshot_dir
-  CarrierWave.configure do |config|
-    config.s3_access_key_id =  ENV['AWS_ACCESS_KEY_ID']
-    config.s3_secret_access_key = ENV['AWS_SECRET_ACCESS_KEY']
-    config.s3_bucket = ENV['RAGIOS_HERCULES_S3_DIR']
-  end
-  CarrierWave.clean_cached_files! 
+  AWS::S3::Base.establish_connection!(
+    :access_key_id     => ENV['AMAZON_ACCESS_KEY_ID'],
+    :secret_access_key => ENV['AMAZON_SECRET_ACCESS_KEY']
+  )
+  clear_screenshots_cache!
 end
 
 require_all '/uptime_monitor'

data/lib/uptime_monitor/browser.rb

@@ -114,8 +114,7 @@ module Hercules
         @browser.screenshot.save(filename)
         file = File.open(filename)
         uploader = Hercules::UptimeMonitor::ScreenShotUploader.new
-        uploader.store!(file)
-        uploader.url
+        uploader.store(file)
       end
     private
       def goto(url, browser_name)

data/lib/uptime_monitor/parser.rb

@@ -14,7 +14,7 @@ module Hercules
           return (description ? ast.description : ast.content)
         else
           parser.failure_reason =~ /^(Expected .+) after/m
-          raise(Hercules::UptimeMonitor::ParserSyntaxError.new(error: "syntax error"), "syntax error") if $1.blank?
+          raise(Hercules::UptimeMonitor::ParserSyntaxError.new(error: "syntax error"), "syntax error") if ($1.nil? || $1.blank?)
           message =
           "#{$1.gsub("\n", '$NEWLINE')}:" << "\n" <<
           data.lines.to_a[parser.failure_line - 1] << "\n" <<

data/lib/uptime_monitor/screen_shot_uploader.rb

@@ -1,7 +1,16 @@
 module Hercules
   module UptimeMonitor
-    class ScreenShotUploader < CarrierWave::Uploader::Base
-      storage :s3
+    class ScreenShotUploader
+      def store(file)
+        current_key = "screenshot#{Time.now.to_i}.png"
+        AWS::S3::S3Object.store(current_key, open(file), RAGIOS_HERCULES_S3_DIR)
+        AWS::S3::S3Object.url_for(
+          current_key,
+          RAGIOS_HERCULES_S3_DIR,
+          use_ssl: true,
+          expires_in: 31557600
+        )
+      end
     end
   end
 end

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.3.3 ruby lib
+# stub: uptime_monitor 0.4.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "uptime_monitor"
-  s.version = "0.3.3"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["obi-a"]
-  s.date = "2016-02-21"
+  s.date = "2016-03-06"
   s.description = "A Ragios plugin that uses a real web browser to monitor transactions on a website for availability"
   s.email = "obioraakubue@yahoo.com"
   s.extra_rdoc_files = [
@@ -55,8 +55,6 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<watir-webdriver>, [">= 0"])
       s.add_runtime_dependency(%q<watir-webdriver-performance>, ["~> 0.2.4"])
       s.add_runtime_dependency(%q<activesupport>, [">= 0"])
-      s.add_runtime_dependency(%q<carrierwave>, ["= 0.4.10"])
-      s.add_runtime_dependency(%q<aws>, [">= 0"])
       s.add_runtime_dependency(%q<aws-s3>, [">= 0"])
       s.add_runtime_dependency(%q<treetop>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
@@ -69,8 +67,6 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<watir-webdriver>, [">= 0"])
       s.add_dependency(%q<watir-webdriver-performance>, ["~> 0.2.4"])
       s.add_dependency(%q<activesupport>, [">= 0"])
-      s.add_dependency(%q<carrierwave>, ["= 0.4.10"])
-      s.add_dependency(%q<aws>, [">= 0"])
       s.add_dependency(%q<aws-s3>, [">= 0"])
       s.add_dependency(%q<treetop>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 0"])
@@ -84,8 +80,6 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<watir-webdriver>, [">= 0"])
     s.add_dependency(%q<watir-webdriver-performance>, ["~> 0.2.4"])
     s.add_dependency(%q<activesupport>, [">= 0"])
-    s.add_dependency(%q<carrierwave>, ["= 0.4.10"])
-    s.add_dependency(%q<aws>, [">= 0"])
     s.add_dependency(%q<aws-s3>, [">= 0"])
     s.add_dependency(%q<treetop>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 0"])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uptime_monitor
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.0
 platform: ruby
 authors:
 - obi-a
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-21 00:00:00.000000000 Z
+date: 2016-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: headless
@@ -66,34 +66,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: carrierwave
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.4.10
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.4.10
-- !ruby/object:Gem::Dependency
-  name: aws
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: aws-s3
   requirement: !ruby/object:Gem::Requirement