uptimerobot_cmd 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8947cfccf925bba284bb80334b79395f45420001
-  data.tar.gz: 73b2cc369a4a25da56723cfa3b474d936857b5bb
+  metadata.gz: 02f5f7e56ee4cff14f89ab3b86186f3d476142e8
+  data.tar.gz: 32d053ab4394994e861aac0bc26a3fcbf7e7eab3
 SHA512:
-  metadata.gz: f0b85944e9801a4e24287bbdc5ec1979556dc894c2bfd588552dab16d4bc2c788b53f758e5d727fa22418f762193b4eee48e033775951b4229ae5edf86cea38b
-  data.tar.gz: 0c0077413cbfa6ea07f217a8baaf90ab6a03845a8974dea6860c176f9e4c3ad3771cc6b0a12e976468a28ebf5f70ed57c09ef145d73ca430f9a230dea6eff0dc
+  metadata.gz: 766f2ea20adbce5d7e2a3d5c1b1a1c29f47daa2e2813f1bca43b96c839c517032de86c6fc39c033a77afdeb2ad7146e9ea065876fec1cbf532b990c21e6ae1a2
+  data.tar.gz: 8f940133b8cd5bdd79e5b048e377c9ca6a86573e794cb63e2f49bee5a0760463d4c93c774099caec388b8aa9615dd3a0e4ab2dec89cf98d6eda058287b6814b2

data/README.md

@@ -36,13 +36,38 @@ All commands:
 
 ```bash
 Commands:
-  uptimerobot_cmd add_new_monitor --contact-id=CONTACT_ID --url=URL  # Add new service for monitor
-  uptimerobot_cmd delete_monitor --monitor-id=MONITOR_ID             # Delete monitor via given monitor_id
-  uptimerobot_cmd help [COMMAND]                                     # Describe available commands or one specific command
-  uptimerobot_cmd list_contacts                                      # List current contacts for monitors
-  uptimerobot_cmd list_monitors                                      # List current monitors
+  uptimerobot_cmd add                 # Add new service for monitoring
+  uptimerobot_cmd contacts            # List current contacts for monitors
+  uptimerobot_cmd delete              # Delete monitor
+  uptimerobot_cmd help [COMMAND]      # Describe available commands or one specific command
+  uptimerobot_cmd list                # List current monitors
+  uptimerobot_cmd search NAME or URL  # Search in monitored services
+
+Options:
+  [--color], [--no-color]  
 ```
 
+### add
+
+You can set `UPTIMEROBOT_DEFAULT_CONTACT` environment variable for default
+contact. This will help you to add more quicker. You don’t need to pass
+`--contact` if you have `UPTIMEROBOT_DEFAULT_CONTACT` environment variable set.
+
+```bash
+# without UPTIMEROBOT_DEFAULT_CONTACT
+uptimerobot_cmd add http://example.com --contact=1234567
+uptimerobot_cmd add http://example.com --name=Example --contact=1234567
+uptimerobot_cmd add http://example.com --name="Example Website" --contact=1234567
+
+# with UPTIMEROBOT_DEFAULT_CONTACT
+uptimerobot_cmd add http://example.com
+uptimerobot_cmd add http://example.com --name=Example
+uptimerobot_cmd add http://example.com --name="Example Website"
+```
+
+Will be more features for **add** soon!
+
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, 
@@ -65,10 +90,6 @@ bundle exec rake TEST=test/private_test.rb
 Due to Security and Privacy, most of the test cases are private. You can find
 example private tests under `test/` folder.
 
-## TODO
-
-- `add_new_monitor` will have more options/features...
-
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at 

data/lib/uptimerobot_cmd.rb

@@ -1,5 +1,4 @@
 require 'uptimerobot_cmd/version'
-require 'colorize'
 require 'httparty'
 require 'terminal-table'
 
@@ -24,17 +23,18 @@ module UptimerobotCmd
   def self.human_readable_status(status_code)
     case status_code
     when '0'
-      ['paused', :light_black]
+      ['paused', :black]
     when '1'
       ['not checked yet', :black]
     when '2'
       ['up', :yellow]
     when '8'
-      ['seems down', :light_red]
+      ['seems down', :red]
     when '9'
       ['down', :red]
     end
   end
+
   def self.apikey_defined
     raise ::UptimerobotCmd::APIKEYError, "Please set UPTIMEROBOT_APIKEY environment variable." unless ENV['UPTIMEROBOT_APIKEY']
     true
@@ -54,53 +54,20 @@ module UptimerobotCmd
     end
   end
   
-  def self.get_alert_contacts
+  def self.search_in_monitors(input)
     if ::UptimerobotCmd.apikey_defined
-      response = HTTParty.get(::UptimerobotCmd.build_service_url(:get_alert_contacts))
-      response["alertcontacts"]["alertcontact"]
-    end
-  end
-  
-  def self.list_alert_contacts
-    if ::UptimerobotCmd.apikey_defined
-      contacts = ::UptimerobotCmd.get_alert_contacts
-      rows = []
-      table_title = 'Listing %d contact(s)' % contacts.count
-      table_title = table_title.colorize(:yellow) if ENV['UPTIMEROBOT_COLORIZE']
-      contacts.each do |contact|
-        contact_id = contact['id']
-        contact_id = contact_id.colorize(:green) if ENV['UPTIMEROBOT_COLORIZE']
-        contact_info = contact['value']
-        contact_info = contact_info.colorize(:light_green) if ENV['UPTIMEROBOT_COLORIZE']
-        rows << [contact_id, contact_info]
-      end
-      Terminal::Table.new :headings => ['ID', 'Info'],
-                          :rows => rows,
-                          :title => table_title
+      monitors = ::UptimerobotCmd.get_monitors
+      monitors.select{|monitor|
+        monitor['friendlyname'] =~ /#{input}/i ||
+        monitor['url'] =~ /#{input}/i
+      }
     end
   end
   
-  def self.get_list_monitors
+  def self.get_alert_contacts
     if ::UptimerobotCmd.apikey_defined
-      monitors = ::UptimerobotCmd.get_monitors
-      table_title = 'Monitoring %d site(s)' % monitors.count
-      table_title = table_title.colorize(:yellow) if ENV['UPTIMEROBOT_COLORIZE']
-      rows = []
-      monitors.each do |monitor|
-        monitor_id = monitor['id']
-        monitor_id = monitor_id.colorize(:green) if ENV['UPTIMEROBOT_COLORIZE']
-        status_data = ::UptimerobotCmd.human_readable_status(monitor['status'])
-        status = status_data[0]
-        status = status_data[0].colorize(status_data[1]) if ENV['UPTIMEROBOT_COLORIZE']
-        friendly_name = monitor['friendlyname']
-        friendly_name = friendly_name.colorize(:light_white) if ENV['UPTIMEROBOT_COLORIZE']
-        url = monitor['url']
-        url = url.colorize(:default) if ENV['UPTIMEROBOT_COLORIZE']
-        rows << [monitor_id, status, friendly_name, url]
-      end
-      Terminal::Table.new :headings => ['ID', 'Status', 'Name', 'Url'],
-                          :rows => rows,
-                          :title => table_title
+      response = HTTParty.get(::UptimerobotCmd.build_service_url(:get_alert_contacts))
+      response["alertcontacts"]["alertcontact"]
     end
   end
   

data/lib/uptimerobot_cmd/cli.rb

@@ -1,92 +1,159 @@
 require 'thor'
 require 'uptimerobot_cmd'
+require 'uri'
 
 module UptimerobotCmd
   class CLI < Thor
+    class_option :color, :type => :boolean
 
-    option :color, :type => :boolean
-    desc "list_monitors", "List current monitors"
+    desc "list", "List current monitors"
     long_desc <<-LONGDESC
-        `uptimerobot_cmd list_monitors` will print out all available monitors
-        with ID/Status/Name/URL format. Use `--color` option for colorized
-        output.
-        
-        \x5
-        \x5> uptimerobot_cmd list_monitors
-        \x5> uptimerobot_cmd list_monitors --color
+      List current monitored services.\n
+      
+      $ uptimerobot_cmd list\n
+      $ uptimerobot_cmd list --color
     LONGDESC
-    def list_monitors
+    def list
       ENV['UPTIMEROBOT_COLORIZE'] = '1' if options[:color]
-      puts UptimerobotCmd.get_list_monitors
+      monitors = UptimerobotCmd.get_monitors
+      table_title = 'Monitoring %d site(s)' % monitors.count
+      puts print_monitors(monitors, table_title)
     end
 
-    option :color, :type => :boolean
-    desc "list_contacts", "List current contacts for monitors"
+    desc "contacts", "List current contacts for monitors"
     long_desc <<-LONGDESC
-      `uptimerobot_cmd list_contacts` will print out all available contacts
-      for monitors. Use `--color` option for colorized
-        \x5
-        \x5> uptimerobot_cmd list_contacts
-        \x5> uptimerobot_cmd list_contacts --color
+      List available contact information.\n
+
+      $ uptimerobot_cmd contacts\n
+      $ uptimerobot_cmd contacts --color
     LONGDESC
-    def list_contacts
+    def contacts
       ENV['UPTIMEROBOT_COLORIZE'] = '1' if options[:color]
-      puts UptimerobotCmd.list_alert_contacts
+      contacts = UptimerobotCmd.get_alert_contacts
+      table_title = 'Listing %d contact(s)' % contacts.count
+      puts print_contacts(contacts, table_title)
     end
     
-    option :url, :required => true
-    option :contact_id
-    option :name
-    desc "add_new_monitor", "Add new service for monitor"
+    option :contact, :banner => "<contact_id>"
+    option :name, :banner => "<friendly name>"
+    desc "add", "Add new service for monitoring"
     long_desc <<-LONGDESC
-        `uptimerobot_cmd add_new_monitor` will add new site for monitoring.
-        Required options are: `--url`, `--contact-id`. You can get your
-        desired CONTACT ID via `uptimerobot_cmd list_contacts` first column is the ID.
-        `--name` is optional. It's the friendly name...
+      You need to provide `--contact` option or must set `UPTIMEROBOT_DEFAULT_CONTACT`
+      environment variable.
+
+      $ uptimerobot_cmd add http://example.com --contact=1234567\n
+      $ uptimerobot_cmd add http://example.com --name=Example --contact=1234567\n
+      $ uptimerobot_cmd add http://example.com --name="Example Website" --contact=1234567
     LONGDESC
-    def add_new_monitor
+    def add(url)
+      ENV['UPTIMEROBOT_COLORIZE'] = '1' if options[:color]
+
       my_options = {}
-      my_options[:monitor_url] = options[:url]
-      if ENV['UPTIMEROBOT_DEFAULT_CONTACT']
-        my_options[:contact_id] = ENV['UPTIMEROBOT_DEFAULT_CONTACT']
-      else
-        my_options[:contact_id] = options[:contact_id] if options[:contact_id]
+      my_options[:monitor_url] = url if url =~ /\A#{URI::regexp}\z/
+      unless my_options[:monitor_url]
+        puts "Please enter valid url. Example: http://example.com or https://example.com"
+        exit
       end
-      
+      my_options[:contact_id] = options[:contact] || ENV['UPTIMEROBOT_DEFAULT_CONTACT'] || nil
       unless my_options[:contact_id]
-        puts "Please provice --contact-id or set UPTIMEROBOT_DEFAULT_CONTACT environment variable"
+        puts "Please set contact or set UPTIMEROBOT_DEFAULT_CONTACT environment variable"
         exit
       end
-      
       my_options[:friendly_name] = options[:name] if options[:name]
-      begin
-        response = UptimerobotCmd.add_new_monitor(my_options)
-        if response[0] == 200 and response[1] == "ok"
-          message = "#{my_options[:monitor_url]} has been added." 
-        else
-          message = "Error. Response code: #{response[0]}, status: #{response[1]}"
+
+      duplicate_entries = UptimerobotCmd.search_in_monitors(url)
+      if duplicate_entries.count > 0
+        table_title = 'Found duplicate %d monitor(s)' % duplicate_entries.count
+        puts print_monitors(duplicate_entries, table_title)
+        exit
+      else
+        begin
+          response = UptimerobotCmd.add_new_monitor(my_options)
+          if response[0] == 200 and response[1] == "ok"
+            message = "#{my_options[:monitor_url]} has been added."
+          else
+            message = "Error. Response code: #{response[0]}, status: #{response[1]}"
+          end
+          puts message
+        rescue UptimerobotCmd::OptionsError => e
+          puts e
         end
-        puts message
-      rescue UptimerobotCmd::OptionsError => e
-        puts e
       end
     end
     
-    option :monitor_id, :required => true
-    desc "delete_monitor", "Delete monitor via given monitor_id"
-    def delete_monitor
-      my_options = {}
-      my_options[:monitor_id] = options[:monitor_id]
-      begin
-        response = UptimerobotCmd.delete_monitor(my_options)
+    desc "delete", "Delete monitor"
+    def delete(input)
+      ENV['UPTIMEROBOT_COLORIZE'] = '1' if options[:color]
+      search = UptimerobotCmd.search_in_monitors(input)
+      delete_id = nil
+      if search.count > 1
+        puts print_monitors(search, 'Found %d monitor(s)' % search.count)
+        ask_delete_id = ask("Please enter ID number:").to_i
+        delete_id = ask_delete_id if ask_delete_id > 0
+      else
+        ask_user = "You are going to delete %{name} [%{url}]" % {
+          name: search.first['friendlyname'],
+          url: search.first['url'],
+        }
+        result = ask(ask_user, :limited_to => ['y', 'n'])
+        delete_id = search.first['id'] if result == 'y'
+      end
+      
+      if delete_id
+        response = UptimerobotCmd.delete_monitor(monitor_id: delete_id)
         if response[0] == 200 and response[1] == "ok"
-          message = "Site has been deleted." 
+          message = "Site has been deleted."
         else
           message = "Error. Response code: #{response[0]}, status: #{response[1]}"
         end
         puts message
-      rescue UptimerobotCmd::OptionsError => e
-        puts e
+      else
+        puts "Delete canceled..."
+      end
+    end
+    
+    desc "search NAME or URL", "Search in monitored services"
+    def search(input)
+      ENV['UPTIMEROBOT_COLORIZE'] = '1' if options[:color]
+      results = UptimerobotCmd.search_in_monitors(input)
+      table_title = 'Found %d monitor(s)' % results.count
+      puts print_monitors(results, table_title)
+    end
+    
+    no_commands do
+      def print_contacts(contacts, table_title)
+        table_title = set_color(table_title, :yellow) if ENV['UPTIMEROBOT_COLORIZE']
+        rows = []
+        contacts.each do |contact|
+          contact_id = contact['id']
+          contact_id = set_color(contact_id, :green) if ENV['UPTIMEROBOT_COLORIZE']
+          contact_info = contact['value']
+          contact_info = set_color(contact_info, :white) if ENV['UPTIMEROBOT_COLORIZE']
+          rows << [contact_id, contact_info]
+        end
+        Terminal::Table.new :headings => ['ID', 'Info'],
+                            :rows => rows,
+                            :title => table_title
+      end
+      
+      def print_monitors(monitors, table_title)
+        table_title = set_color(table_title, :yellow) if ENV['UPTIMEROBOT_COLORIZE']
+        rows = []
+        monitors.each do |monitor|
+          monitor_id = monitor['id']
+          monitor_id = set_color(monitor_id, :green) if ENV['UPTIMEROBOT_COLORIZE']
+          status_data = ::UptimerobotCmd.human_readable_status(monitor['status'])
+          status = status_data[0]
+          status = set_color(status, status_data[1], :bold) if ENV['UPTIMEROBOT_COLORIZE']
+          friendly_name = monitor['friendlyname']
+          friendly_name = set_color(friendly_name, :white) if ENV['UPTIMEROBOT_COLORIZE']
+          url = monitor['url']
+          url = set_color(url, :cyan) if ENV['UPTIMEROBOT_COLORIZE']
+          rows << [monitor_id, status, friendly_name, url]
+        end
+        Terminal::Table.new :headings => ['ID', 'Status', 'Name', 'Url'],
+                            :rows => rows,
+                            :title => table_title
       end
     end
 

data/lib/uptimerobot_cmd/version.rb

@@ -1,3 +1,3 @@
 module UptimerobotCmd
-  VERSION = "0.1.2"
+  VERSION = "0.2.0"
 end

data/uptimerobot_cmd.gemspec

@@ -25,7 +25,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'minitest-reporters', '~> 1.1', '>= 1.1.10'
 
   spec.add_runtime_dependency 'httparty', '~> 0.13.7'
-  spec.add_runtime_dependency 'colorize', '~> 0.8.1'
   spec.add_runtime_dependency 'terminal-table', '~> 1.6'
   spec.add_runtime_dependency 'thor', '~> 0.19.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uptimerobot_cmd
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Uğur Özyılmazel
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-22 00:00:00.000000000 Z
+date: 2016-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -86,20 +86,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.13.7
-- !ruby/object:Gem::Dependency
-  name: colorize
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.8.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.8.1
 - !ruby/object:Gem::Dependency
   name: terminal-table
   requirement: !ruby/object:Gem::Requirement