neetob 0.5.31 → 0.5.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f8882c4e2293a3dc0c4eb58244d1ec1ad3361e402e892c2b171b0f351fa7e6bf
-  data.tar.gz: 60214f801b4a0c0d5b1f44b87a2b9fa6de2dbe0ba395539494d2b75611332a0d
+  metadata.gz: 315137a3063a9384543accfc6d0c867ab9ef7cbb65f2276c8779cd35452e186f
+  data.tar.gz: 5a42415390bd8082a0bb8ae5311bb424ded01b63535c4c7d4e1c03361ea10be0
 SHA512:
-  metadata.gz: e6230b2c8aac65c478dfa6795c06fd85ddc7f18d4b4f3134b8fe1f2f43bce5f5e3aa8fc4bc9beb4c5ea169fbcb8553f2f4aa809c2081eafbcae7e42df963269d
-  data.tar.gz: 890f6afa8d41ceb454cf3e947a6e794df153f29eda9abbbfb206fd11d002ca332e1f07156812872564f0d8d1d355ecadbadbe7b2f7c44d7e032fef42c297cc92
+  metadata.gz: 9e2a555d3c6b85713699ae105cfa334d8e8c7669715ad904315b87e19d2f3fe2db2195ac68f3a675c1a08387620e7a7cfe03887e20d80a83dc215aeb11964e51
+  data.tar.gz: 3c30f7697de99a9b77f52f5884f8630dc3d8d252f2094ffd138396f3eae94e88b22afdc4f4c00723160f8243531649f1556e63800dbf2ac070cb318b0e49eb41

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    neetob (0.5.31)
+    neetob (0.5.33)
       brakeman (~> 5.0)
       chronic
       dotenv (~> 2.8.1)

data/lib/neetob/cli/cronitor/base.rb

@@ -32,16 +32,32 @@ module Neetob
           end
 
           def get(username:, password:, headers: { "Accept" => "application/json" })
-            uri = URI(MONITORS_URL)
-            request = Net::HTTP::Get.new(uri)
-            headers.each { |key, value| request[key] = value }
-            request.basic_auth(username, password)
+            monitors = []
+            move_to_next_page = true
+            page = 1
+            while move_to_next_page
+              url_to_fetch_from = MONITORS_URL
+              url_to_fetch_from += "?page=#{page}" if page > 1
+              uri = URI(url_to_fetch_from)
+              request = Net::HTTP::Get.new(uri)
+              headers.each { |key, value| request[key] = value }
+              request.basic_auth(username, password)
 
-            response = Net::HTTP.start(uri.hostname, uri.port, use_ssl: uri.scheme == "https") do |http|
-              http.request(request)
-            end
+              response = Net::HTTP.start(uri.hostname, uri.port, use_ssl: uri.scheme == "https") do |http|
+                http.request(request)
+              end
 
-            parse_response(response)
+              parsed_response = parse_response(response)
+              total_monitor_count = parsed_response[:total_monitor_count]
+              page_size = parsed_response[:page_size]
+              if total_monitor_count > (page * page_size)
+                page += 1
+              else
+                move_to_next_page = false
+              end
+              monitors += parsed_response[:monitors]
+            end
+            monitors
           end
       end
     end

data/lib/neetob/cli/cronitor/get_all_monitors.rb

@@ -11,8 +11,8 @@ module Neetob
         end
 
         def run
-          cronitor_one_monitors = get(username: ENV["CRONITOR_ONE_API_KEY"], password: "")[:monitors]
-          cronitor_three_monitors = get(username: ENV["CRONITOR_THREE_API_KEY"], password: "")[:monitors]
+          cronitor_one_monitors = get(username: ENV["CRONITOR_ONE_API_KEY"], password: "")
+          cronitor_three_monitors = get(username: ENV["CRONITOR_THREE_API_KEY"], password: "")
           cronitor_one_monitors + cronitor_three_monitors
         end
       end

data/lib/neetob/cli/monthly_audit/instances_and_addons/cronitor/main.rb

@@ -10,16 +10,19 @@ module Neetob
       module InstancesAndAddons
         module Cronitor
           class Main < CLI::Base
+            attr_accessor :cumulative_monitors_data
+
             def initialize
               super()
+              @cumulative_monitors_data = Neetob::CLI::Cronitor::GetAllMonitors.new.run
             end
 
             def run
-              SetupCorrectlyForApps.new.run
+              SetupCorrectlyForApps.new(cumulative_monitors_data).run
               ui.info "\n"
-              SetupCorrectlyForHelpCenter.new.run
+              SetupCorrectlyForHelpCenter.new(cumulative_monitors_data).run
               ui.info "\n"
-              SetupCorrectlyForLandingPages.new.run
+              SetupCorrectlyForLandingPages.new(cumulative_monitors_data).run
             end
           end
         end

data/lib/neetob/cli/monthly_audit/instances_and_addons/cronitor/setup_correctly_for_apps.rb

@@ -8,15 +8,16 @@ module Neetob
       module InstancesAndAddons
         module Cronitor
           class SetupCorrectlyForApps < CLI::Base
-            def initialize
+            attr_reader :all_monitors
+
+            def initialize(cumulative_monitors_data)
               super()
+              @all_monitors = cumulative_monitors_data
             end
 
             def run
               ui.success "### 3.3.1. Checking whether Cronitor monitors are set up correctly for apps"
 
-              all_monitors = Neetob::CLI::Cronitor::GetAllMonitors.new.run
-
               apps_data = [["App", "Monitor for Application present", "Monitor for Application enabled", "Comments",
 "Audit Passed"]]
               ui.info("\n", print_to_audit_log: false)

data/lib/neetob/cli/monthly_audit/instances_and_addons/cronitor/setup_correctly_for_help_center.rb

@@ -10,15 +10,16 @@ module Neetob
               "NeetoTower"
             ]
 
-            def initialize
+            attr_reader :all_monitors
+
+            def initialize(cumulative_monitors_data)
               super()
+              @all_monitors = cumulative_monitors_data
             end
 
             def run
               ui.success "### 3.3.2. Checking whether Cronitor monitors are set up correctly for Help Centers"
 
-              all_monitors = Neetob::CLI::Cronitor::GetAllMonitors.new.run
-
               apps_data = [["App", "Monitor for Application help center present",
 "Monitor for Application help center enabled", "Comments", "Audit Passed"]]
               ui.info("\n", print_to_audit_log: false)

data/lib/neetob/cli/monthly_audit/instances_and_addons/cronitor/setup_correctly_for_landing_pages.rb

@@ -11,15 +11,16 @@ module Neetob
               "NeetoTower"
             ]
 
-            def initialize
+            attr_reader :all_monitors
+
+            def initialize(cumulative_monitors_data)
               super()
+              @all_monitors = cumulative_monitors_data
             end
 
             def run
               ui.success "### 3.3.3. Checking whether Cronitor monitors are set up correctly for landing pages"
 
-              all_monitors = Neetob::CLI::Cronitor::GetAllMonitors.new.run
-
               apps_data = [["App", "Monitor for Application landing page present",
 "Monitor for Application landing page enabled", "Comments", "Audit Passed"]]
               ui.info("\n", print_to_audit_log: false)

data/lib/neetob/cli/ui.rb

@@ -69,7 +69,7 @@ module Neetob
           markdown_table = "| " + header.map.with_index { |h, i| h.to_s.ljust(column_widths[i]) }.join(" | ") + " |\n"
           markdown_table += "|-" + column_widths.map { |w| "-" * w }.join("-|-") + "-|\n"
           rows.each do |row|
-            markdown_table += "| " + row.map.with_index { |cell, i| cell.to_s.ljust(column_widths[i]) }.join(" | ") + " |\n"
+            markdown_table += "| " + row.map.with_index { |cell, i| cell.to_s.gsub("\|", "\\|").ljust(column_widths[i]) }.join(" | ") + " |\n"
           end
           File.open(markdown_file, "a") do |f|
             f.puts markdown_table

data/lib/neetob/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Neetob
-  VERSION = "0.5.31"
+  VERSION = "0.5.33"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: neetob
 version: !ruby/object:Gem::Version
-  version: 0.5.31
+  version: 0.5.33
 platform: ruby
 authors:
 - Udai Gupta