cronitor 1.1.5 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c234da3ffd469dc74eefc0ee50a369c5c3b967c
-  data.tar.gz: c89a778d71c9b27463777699eed0b2fc21a2cd12
+  metadata.gz: 67371ddbb668fc2c736994aadb6b1610bd807aa4
+  data.tar.gz: 22381ccb4ee4157fe32c3d518642976aa58a63d9
 SHA512:
-  metadata.gz: 958007209685433235f3387c29cddbdb6e976c27cf1539bfa5ce2e7fdd58d0e9e8057c6089ba28635005368ae658cb96370a51c9863f338671aff78860f0d38e
-  data.tar.gz: 64db58946e2287628ba325387cccb469a07d7bdd6bffbf965b69111f8c5f7dcd172d5dec0a61588f4e5d94b29c823c23a8394ee89563bb5770553be82b09337e
+  metadata.gz: fde7ed9489dd3b82435766ed0013dcef88fb2fe7f67ecca2e3cd7d954c3fff2c164df8e5af2a9b59343b5587c5d287df4a229968d1b4d306ea916605b81a0329
+  data.tar.gz: 0e342c25712223f1b1f8e67c11b606bf75369a494c00f0bd3aacb6bc0c87272b8b6b44f5b2e0f81d5613779eabdaf95289716a0e2d639f20ba2e0453c252cad3

data/.travis.yml

@@ -1,4 +1,3 @@
 language: ruby
 rvm:
-  - 2.2
-before_install: gem install bundler -v 1.10
+  - 2.4

data/cronitor.gemspec

@@ -18,14 +18,11 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'unirest', '~> 1.1'
-  spec.add_dependency 'hashie', '~> 3.4'
-
   spec.add_development_dependency 'bundler', '~> 1.10'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.3'
   spec.add_development_dependency 'pry', '~> 0.10'
-  spec.add_development_dependency 'webmock', '~> 1.21'
-  spec.add_development_dependency 'sinatra', '~> 1.4'
+  spec.add_development_dependency 'webmock', '~> 3.1'
+  spec.add_development_dependency 'sinatra', '~> 2.0'
   spec.add_development_dependency 'bump', '~> 0.1'
 end

data/lib/cronitor.rb

@@ -1,15 +1,15 @@
 require 'cronitor/version'
 require 'cronitor/error'
+require 'json'
 require 'net/http'
-require 'unirest'
-require 'hashie'
+require 'uri'
 
 class Cronitor
   attr_accessor :token, :opts, :code
   API_URL = 'https://cronitor.io/v1'.freeze
   PING_URL = 'https://cronitor.link'.freeze
 
-  def initialize(token: nil, opts: {}, code: nil)
+  def initialize(token: ENV['CRONITOR_TOKEN'], opts: {}, code: nil)
     @token = token
     @opts = opts
     @code = code
@@ -23,7 +23,7 @@ class Cronitor
     end
 
     if @opts
-      Hashie.symbolize_keys! @opts
+      @opts = symbolize_keys @opts
       exists? @opts[:name] if @opts.key? :name
       human_readable @opts[:rules] if @opts.key? :rules
     end
@@ -32,34 +32,52 @@ class Cronitor
   end
 
   def create
-    response = Unirest.post(
-      "#{API_URL}/monitors",
-      headers: default_headers.merge('Content-Type' => 'application/json'),
-      auth: { user: token },
-      parameters: opts.to_json
-    )
-
-    @code = response.body['code'] if valid? response
+    uri = URI.parse "#{API_URL}/monitors"
+
+    http = Net::HTTP.new uri.host, uri.port
+    http.use_ssl = uri.scheme == 'https'
+
+    request = Net::HTTP::Post.new uri.path, default_headers
+    request.basic_auth token, nil
+    request.content_type = 'application/json'
+    request.body = JSON.generate opts
+
+    response = http.request request
+
+    @code = JSON.parse(response.body).fetch 'code' if valid? response
   end
 
   def exists?(name)
-    response = Unirest.get(
-      "#{API_URL}/monitors/#{URI.escape(name).gsub('[', '%5B').gsub(']', '%5D')}",
-      headers: default_headers,
-      auth: { user: token }
-    )
-    return false unless response.code == 200
+    uri = URI.parse "#{API_URL}/monitors/#{URI.escape name}"
+
+    http = Net::HTTP.new uri.host, uri.port
+    http.use_ssl = uri.scheme == 'https'
 
-    @code = response.body['code']
+    request = Net::HTTP::Get.new uri.path, default_headers
+    request.basic_auth token, nil
+
+    response = http.request request
+
+    return false unless response.is_a? Net::HTTPSuccess
+
+    @code = JSON.parse(response.body).fetch 'code'
 
     true
   end
 
   def ping(type, msg = nil)
-    url = "#{PING_URL}/#{code}/#{type}"
-    url += "?msg=#{URI.escape msg}" if %w(run complete fail).include?(type) && !msg.nil?
+    uri = URI.parse "#{PING_URL}/#{URI.escape code}/#{URI.escape type}"
+    if %w[run complete fail].include?(type) && !msg.nil?
+      uri.query = URI.encode_www_form 'msg' => msg
+    end
+
+    http = Net::HTTP.new uri.host, uri.port
+    http.use_ssl = uri.scheme == 'https'
+
+    request = Net::HTTP::Get.new uri, default_headers
+
+    response = http.request request
 
-    response = Unirest.get url
     valid? response
   end
 
@@ -75,10 +93,15 @@ class Cronitor
   private
 
   def valid?(response)
-    return true if [200, 201].include? response.code
-    server_error? response
+    return true if response.is_a? Net::HTTPSuccess
+
+    msg = if response.content_type.match? 'json'
+            error_msg JSON.parse(response.body)
+          else
+            "Something else has gone awry. HTTP status: #{response.code}"
+          end
 
-    raise Cronitor::Error, error_msg(response.body)
+    raise Cronitor::Error, msg
   end
 
   def error_msg(body, msg = [])
@@ -95,16 +118,13 @@ class Cronitor
     msg.join ' '
   end
 
-  def server_error?(response)
-    return unless [301, 302, 404, 500, 502, 503, 504].include? response.code
-
-    raise(
-      Cronitor::Error,
-      "Something else has gone awry. HTTP status: #{response.code}"
-    )
-  end
-
   def default_headers
     { 'Accept' => 'application/json' }
   end
+
+  def symbolize_keys(hash)
+    hash.each_with_object({}) do |(k, v), h|
+      h[k.to_sym] = v.is_a?(Hash) ? symbolize_keys(v) : v
+    end
+  end
 end

data/lib/cronitor/version.rb

@@ -1,3 +1,3 @@
 class Cronitor
-  VERSION = '1.1.5'
+  VERSION = '2.0.0'.freeze
 end

metadata

@@ -1,43 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: cronitor
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 2.0.0
 platform: ruby
 authors:
 - Jeff Byrnes
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-19 00:00:00.000000000 Z
+date: 2017-11-30 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: unirest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-- !ruby/object:Gem::Dependency
-  name: hashie
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.4'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.4'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -100,28 +72,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.21'
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.21'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: bump
   requirement: !ruby/object:Gem::Requirement
@@ -176,7 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: An interface for the Cronitor API