autocronitor 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4334ec51866f0f902f5c4a5fa001226434fdba70
-  data.tar.gz: 3af9bb04c359f60413a0bf74a6317a833f8c3698
+  metadata.gz: f147f3bfb273ce8a257216566f9c2da8bd1ce99b
+  data.tar.gz: 77925a1f8fc30e30489433def65c0cc87ab82627
 SHA512:
-  metadata.gz: fecee7908256c2413572797156d6a6cd63e2e8ad29b4224a6f0ba186637c14d97c56f39a947d9bb467dec5ab24c3c5cea90cb0ed75e0ae3d2f2b3f6b953838cf
-  data.tar.gz: f12b4218c4c9d38aefde4e7d825d4b2eb3bed2c9d4d7e410a12b35575c3bd609cf072e71be7a88cec966ac1a26f6ade64e97bab6cf8d84a83b055b8e54c73792
+  metadata.gz: fe0b93395126992d15b54b79ab96a86171cc553f7aaa4863e43e509608cd09dc2c1b59b6adbecf766e2af477b5bcda5fdfc305b984fcfce83a30bb7db268f296
+  data.tar.gz: f2df409a03a48810a675e76b2cbdf306652d34af23a1390ceadf4a44ddff2cec0f7cf9cf69868e9c9a872a264cb2439c493b0b6025e498ef34dc411e12cbc3d7

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.0.5(22nd June, 2017)
+
+Features:
+
+    - Update to v3 of Cronitor API (Thanks to @cronitorio https://github.com/jonlives/autocronitor/pull/2)
+	
 ## 0.0.1(14th Dec, 2015)
 
 Bugfixes:

data/Gemfile

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+source "https://rubygems.org"
+gemspec
+
+# gem "rails"

data/Gemfile.lock

@@ -0,0 +1,29 @@
+PATH
+  remote: .
+  specs:
+    autocronitor (0.0.4)
+      choice (~> 0.2, >= 0.2.0)
+      unirest (~> 1.1, >= 1.1.2)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    addressable (2.3.8)
+    choice (0.2.0)
+    json (1.8.6)
+    mime-types (1.25.1)
+    rest-client (1.6.9)
+      mime-types (~> 1.16)
+    unirest (1.1.2)
+      addressable (~> 2.3.5)
+      json (~> 1.8.1)
+      rest-client (~> 1.6.7)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  autocronitor!
+
+BUNDLED WITH
+   1.13.6

data/README.md

@@ -38,9 +38,9 @@ Text to exclude:
 * Mandatory Parameters (you must specify one or the other)
   * -a, --api-key APIKEY             Your cronitor.io API key
   * -f, --filename FILENAME          The crontab files to read
-  * -t, --templace *TEMPLATES        The Cronitor.io template(s) to use for notifications
 
 * Optional Parameters
+  * -t, --templace *TEMPLATES        The Cronitor.io template(s) to use for notifications. If not provided Cronitor will default to using the email address of your account to send notifications.
   * -c,  --common-text *COMMONTEXT   A space separated list of common text to exclude from cron names
   * -i, --common-include-text *COMMONINCLUDETEXT    A space separated list of common text to exclude from cron names (includes strings which contain each phrase)
 
@@ -54,8 +54,6 @@ Processing file test.conf
 
 Cron expression: 10 * * * *
 Cron name: testcron
-Suggested rules:
-[{"rule_type"=>"ran_longer_than", "duration"=>1, "human_readable"=>"Ran for longer than 1 hour", "time_unit"=>"hours", "hours_to_followup_alert"=>24}, {"rule_type"=>"not_completed_in", "duration"=>61, "human_readable"=>"Has not received a complete ping in over 61 minutes", "time_unit"=>"minutes", "hours_to_followup_alert"=>24}]
 Creating monitor testcron...
 Monitor 'testcron' created with ID abc123
 

data/autocronitor.gemspec

@@ -2,7 +2,7 @@ $:.push File.expand_path('../lib', __FILE__)
 
 Gem::Specification.new do |gem|
   gem.name          = 'autocronitor'
-  gem.version       = '0.0.4'
+  gem.version       = '0.0.5'
   gem.authors       = ["Jon Cowie"]
   gem.email         = 'jonlives@gmail.com'
   gem.homepage      = 'https://github.com/jonlives/autocronitor'

data/bin/autocronitor

@@ -26,7 +26,7 @@ Choice.options do
   separator ''
   separator 'Email Options: '
 
-  option :template_name, :required => true do
+  option :template_name do
     short '-t'
     long '--templace *TEMPLATES'
     desc 'The Cronitor.io templates to send alerts for this monitor to'
@@ -73,8 +73,8 @@ else
   # Read all lines from file
   File.readlines(file_name).each do |line|
 
-    # Skip the current line if it's a comment
-    if line.include?("#") or line == "\n"
+    # Skip the current line if it's a comment, empty, or MAILTO
+    if line.include?("#") or line.start_with?("MAILTO") or line == "\n"
       new_file_lines << line
       next
     end
@@ -97,18 +97,12 @@ else
 
     puts "Cron expression: #{cron_expression}"
     puts "Cron name: #{filtered_line}"
-
-    # Talk to cronitor's suggest API to get auto-generated rules for our cron expression
-    rules = helper.monitor_suggest(cron_expression)
-    puts "Suggested rules:"
-    puts rules.inspect
-
-    # Create a new monitor via cronitor's API with the name and rules we've created
     puts "Creating monitor #{filtered_line}..."
-    monitor_id = helper.monitor_create(filtered_line,rules,template_names)
+
+    monitor_id = helper.monitor_create(filtered_line, cron_expression, template_names)
 
     # Construct the replacement line to be written back to the file
-    cronitored_line = "#{cron_expression} curl #{monitor_id + '/run'} -m 10 && #{remaining_line.join(" ")} && curl #{monitor_id + '/complete'} -m 10"
+    cronitored_line = "#{cron_expression} curl #{monitor_id + '/run'} -m 10 ; #{remaining_line.join(" ")} && curl #{monitor_id + '/complete'} -m 10"
     new_file_lines << cronitored_line
     puts ""
   end

data/lib/autocronitor/helper.rb

@@ -5,25 +5,29 @@ module Autocronitor
 
     def initialize(api_key)
       @monitor_template = {
-          name: '',
-          notifications: {
-            templates: [],
-      },
-          rules: [
-      ],
-          note: 'A human-friendly description of this monitor'
+        name: '',
+        notifications: {
+          templates: [],
+        },
+        rules: [],
+        type: 'heartbeat'
       }
 
-      @api_url = 'https://cronitor.io/v1'
+      @api_url = 'https://cronitor.io/v3'
       @monitor_url = 'https://cronitor.link'
       @monitor_details = {}
       @api_key = api_key
     end
 
-    def monitor_create(monitor_name,rules,template_names)
-      @monitor_template[:name] = monitor_name
-      @monitor_template[:rules] = rules
-      @monitor_template[:notifications][:templates] = rules.kind_of?(Array) ? template_names : [template_names]
+    def monitor_create(monitor_name, cron_expression, template_names)
+      @monitor_template[:name] = monitor_name[0..99]
+      @monitor_template[:rules] = [
+        { 
+          rule_type: 'not_on_schedule',
+          value: cron_expression
+        }
+      ]
+      @monitor_template[:notifications][:templates] = template_names.kind_of?(Array) ? template_names : [template_names]
 
       response = Unirest.post(
           "#{@api_url}/monitors",
@@ -34,21 +38,16 @@ module Autocronitor
       monitor_id = response.body["code"]
       if response.code == 201
         puts "Monitor '#{monitor_name}' created with ID #{monitor_id}"
+      elsif response.code == 400 && JSON.parse(response.body)['name'] == ["name must be unique"]
+        puts "Monitor '#{monitor_name}' already exists, skipping \n"
       else
         puts "Error code: #{response.code} returned, exiting"
+        puts "Response: \n\n #{response.body}"
         exit 1
       end
       @monitor_details[monitor_name] = monitor_id
       return "#{@monitor_url}/#{monitor_id}"
     end
 
-    def monitor_suggest(cron_expression)
-      response = Unirest.get(
-          "#{@api_url}/rules/suggest",
-          auth: { user: @api_key },
-          parameters:{ 'cron-expression' => cron_expression }
-      )
-      return response.body
-    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: autocronitor
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Jon Cowie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-08 00:00:00.000000000 Z
+date: 2017-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: unirest
@@ -64,6 +64,8 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - CHANGELOG.md
+- Gemfile
+- Gemfile.lock
 - LICENSE
 - README.md
 - autocronitor.gemspec
@@ -90,7 +92,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
 summary: A tool to automatically pass a standard-format crontab file and add jobs