uppityrobot 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9397823fd8a288fb052f7a4dcc0278279e16375e9182183298334a6c7228ae77
-  data.tar.gz: 819f188c12700edbbfc415619f603b8a1ba73fdbc24e4dc7346aa55a580d501e
+  metadata.gz: c6413d2b0150549b68586c168ef6d6a7976254bbeae5b45c6b633d2df3e0d012
+  data.tar.gz: c92eafba695a8dba78ecb4a3a5a885db86a263aa43cdd81965f36877cc1bd326
 SHA512:
-  metadata.gz: '08f3bd70fc1565abed8e97987db929e3e9146f57f36ff751cde51111b9e3d238bfd787fb13be27d736a5eaedf870434f648d301c43822f3daeebbf513b57ee6d'
-  data.tar.gz: 44b1f4ba2c5f16520805fe8bf658996d324760e86fe956c9e9778afe19f63249db476e8f6692d757fdd544b88202bcc9cd538819895b05991f2d13d041843f52
+  metadata.gz: 8f1c839b6cb1e08466e5a7eb1f78e6decb0d3256e37fab2aab655d9e66ef421e5e1e2c42e40ca63257517504ce2262ce03cf3cfc18cff2febb28cc4fe2f5bf4f
+  data.tar.gz: d7fc01dbfb3baf5452150267a86d6127bb4c303d2e96262646111479c3a20bb18a96ca86c7524a800e386a5d3ae177402f9c44b061d5f1391fb5a91fd10a26ff

data/.github/workflows/main.yml

@@ -7,10 +7,15 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
+
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
         ruby-version: 2.7.4
         bundler-cache: true
+
+    - name: Lint
+      run: bundle exec standardrb
+
     - name: Run the default task
       run: bundle exec rake

data/.rubocop.yml

@@ -1,20 +1,4 @@
-AllCops:
-  NewCops: enable
-  TargetRubyVersion: 2.7
+require: standard
 
-Style/StringLiterals:
-  Enabled: true
-  EnforcedStyle: double_quotes
-
-Style/StringLiteralsInInterpolation:
-  Enabled: true
-  EnforcedStyle: double_quotes
-
-Layout/LineLength:
-  Max: 120
-
-Metrics/BlockLength:
-  IgnoredMethods: ['describe', 'context']
-
-Metrics/MethodLength:
-  Max: 20
+inherit_gem:
+  standard: config/base.yml

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    uppityrobot (0.4.0)
+    uppityrobot (0.4.1)
       dry-cli (~> 0.7)
       json (~> 2.5)
       uptimerobot (~> 0.2)
@@ -68,7 +68,7 @@ GEM
       cucumber-messages (~> 17.0, >= 17.0.1)
     diff-lcs (1.4.4)
     dry-cli (0.7.0)
-    faraday (1.10.0)
+    faraday (1.10.2)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
       faraday-excon (~> 1.1)
@@ -156,6 +156,9 @@ GEM
       unicode-display_width (>= 1.4.0, < 3.0)
     rubocop-ast (1.11.0)
       parser (>= 3.0.1.1)
+    rubocop-performance (1.11.5)
+      rubocop (>= 1.7.0, < 2.0)
+      rubocop-ast (>= 0.4.0)
     ruby-progressbar (1.11.0)
     ruby2_keywords (0.0.5)
     sinatra (2.1.0)
@@ -163,6 +166,9 @@ GEM
       rack (~> 2.2)
       rack-protection (= 2.1.0)
       tilt (~> 2.0)
+    standard (1.3.0)
+      rubocop (= 1.20.0)
+      rubocop-performance (= 1.11.5)
     sys-uname (1.2.2)
       ffi (~> 1.1)
     thor (1.1.0)
@@ -192,6 +198,7 @@ DEPENDENCIES
   rspec (~> 3.2)
   rubocop (~> 1.7)
   sinatra
+  standard
   uppityrobot!
   webmock
 

data/Rakefile

@@ -11,7 +11,9 @@ RuboCop::RakeTask.new
 require "cucumber/rake/task"
 Cucumber::Rake::Task.new
 
-task default: %i[spec cucumber rubocop]
+require "standard/rake"
+
+task default: %i[spec cucumber]
 
 load File.join("lib", "uppityrobot", "Rakefile")
 

data/lib/uppityrobot/cli/commands/exec.rb

@@ -9,8 +9,8 @@ module UppityRobot
 
         argument :task, required: true, values: UptimeRobot::Client::METHODS, desc: "API task to be executed"
 
-        option   :data, type: :string, desc: "JSON data file"
-        option   :params, type: :string, default: "{}", desc: "JSON params"
+        option :data, type: :string, desc: "JSON data file"
+        option :params, type: :string, default: "{}", desc: "JSON params"
 
         example [
           "getMonitors --data $json_data_file",
@@ -18,11 +18,11 @@ module UppityRobot
         ]
 
         def call(task:, data: nil, params: "{}", **)
-          task   = task.to_sym
+          task = task.to_sym
           params = data.nil? ? JSON.parse(params) : parse_file(data)
           puts UppityRobot::Client.new(task, params).execute.to_json
         rescue JSON::ParserError => e
-          puts JSON.generate({ stat: "fail", error: "JSON parser #{e.message}" })
+          puts JSON.generate({stat: "fail", error: "JSON parser #{e.message}"})
         end
 
         def parse_file(file)

data/lib/uppityrobot/cli/commands/monitors/create.rb

@@ -30,7 +30,7 @@ module UppityRobot
             response = UppityRobot::Client.new(:newMonitor, data).execute
             puts response.to_json
           rescue URI::InvalidURIError => e
-            puts JSON.generate({ stat: "fail", error: "URI parser #{e.message}" })
+            puts JSON.generate({stat: "fail", error: "URI parser #{e.message}"})
           end
 
           def check_subtype(uri)
@@ -39,8 +39,8 @@ module UppityRobot
             elsif uri.instance_of?(URI::HTTPS)
               UptimeRobot::Monitor::SubType::HTTPS
             else
-              abort({ stat: "fail",
-                      error: "Monitor URL must be HTTP/S" }.to_json)
+              abort({stat: "fail",
+                     error: "Monitor URL must be HTTP/S"}.to_json)
             end
           end
         end

data/lib/uppityrobot/cli/commands/monitors/delete.rb

@@ -19,15 +19,15 @@ module UppityRobot
           def call(field:, value:, **)
             check_field(field)
             monitor = find_monitor(field, value)
-            response = UppityRobot::Client.new(:deleteMonitor, { id: monitor["id"] }).execute
+            response = UppityRobot::Client.new(:deleteMonitor, {id: monitor["id"]}).execute
             puts response.to_json
           end
 
           def check_field(field)
             return if %w[id name].include? field
 
-            abort({ stat: "fail",
-                    error: "Field not recognized, must be one of: [id, name]" }.to_json)
+            abort({stat: "fail",
+                   error: "Field not recognized, must be one of: [id, name]"}.to_json)
           end
 
           def find_monitor(field, value)

data/lib/uppityrobot/cli/commands/monitors/exec.rb

@@ -20,14 +20,14 @@ module UppityRobot
 
           # rubocop:disable Metrics/AbcSize
           def call(task:, search:, filter: "{}", **)
-            status   = check_task(task)
-            filter   = JSON.parse(filter)
-            filtered = { stat: "ok", total: 0, monitors: [] }
-            params   = { search: search }
-            total    = 0
+            status = check_task(task)
+            filter = JSON.parse(filter)
+            filtered = {stat: "ok", total: 0, monitors: []}
+            params = {search: search}
+            total = 0
 
             UppityRobot::Client.new(:getMonitors, params).filter(filter).each do |m|
-              data = { id: m["id"], status: status }
+              data = {id: m["id"], status: status}
               filtered[:monitors] << UppityRobot::Client.new(:editMonitor, data).execute
               total += 1
             end
@@ -35,7 +35,7 @@ module UppityRobot
             filtered[:total] = total
             puts filtered.to_json
           rescue JSON::ParserError => e
-            puts JSON.generate({ stat: "fail", error: "JSON parser #{e.message}" })
+            puts JSON.generate({stat: "fail", error: "JSON parser #{e.message}"})
           end
           # rubocop:enable Metrics/AbcSize
 
@@ -46,8 +46,8 @@ module UppityRobot
             when "start"
               UptimeRobot::Monitor::Status::NotCheckedYet
             else
-              abort({ stat: "fail",
-                      error: "Task not recognized, must be one of: [pause, start]" }.to_json)
+              abort({stat: "fail",
+                     error: "Task not recognized, must be one of: [pause, start]"}.to_json)
             end
           end
         end

data/lib/uppityrobot/cli/commands/monitors/list.rb

@@ -19,10 +19,10 @@ module UppityRobot
           ]
 
           def call(csv: nil, filter: "{}", search: nil, **)
-            filter   = JSON.parse(filter)
-            filtered = { stat: "ok", total: 0, monitors: [] }
-            params   = search ? { search: search } : {}
-            total    = 0
+            filter = JSON.parse(filter)
+            filtered = {stat: "ok", total: 0, monitors: []}
+            params = search ? {search: search} : {}
+            total = 0
 
             UppityRobot::Client.new(:getMonitors, params).filter(filter).each do |m|
               filtered[:monitors] << m
@@ -33,7 +33,7 @@ module UppityRobot
             write_csv(csv, filtered[:monitors])
             puts filtered.to_json
           rescue JSON::ParserError => e
-            puts JSON.generate({ stat: "fail", error: "JSON parser #{e.message}" })
+            puts JSON.generate({stat: "fail", error: "JSON parser #{e.message}"})
           end
 
           def write_csv(file, data)

data/lib/uppityrobot/cli/commands/monitors/update.rb

@@ -23,11 +23,11 @@ module UppityRobot
             data = parse_data(format, data)
             unless data.is_a? Array
               abort(
-                { stat: "fail", error: "Data must be an array: #{data.inspect}" }.to_json
+                {stat: "fail", error: "Data must be an array: #{data.inspect}"}.to_json
               )
             end
 
-            updated = { stat: "ok", total: 0, updated: 0, monitors: [], errors: [] }
+            updated = {stat: "ok", total: 0, updated: 0, monitors: [], errors: []}
             data.each do |d|
               original = d.dup # UptimeRobot::Client modifies `d`, avoid this for errors
               updated[:total] += 1
@@ -39,15 +39,15 @@ module UppityRobot
 
             puts updated.to_json
           rescue CSV::MalformedCSVError, JSON::ParserError => e
-            puts JSON.generate({ stat: "fail", error: "Invalid input: #{e.message}" })
+            puts JSON.generate({stat: "fail", error: "Invalid input: #{e.message}"})
           end
           # rubocop:enable Metrics/AbcSize
 
           def check_format(format)
             return if %w[csv json].include? format
 
-            abort({ stat: "fail",
-                    error: "Format not recognized, must be one of: [csv, json]" }.to_json)
+            abort({stat: "fail",
+                   error: "Format not recognized, must be one of: [csv, json]"}.to_json)
           end
 
           def parse_data(format, data)
@@ -62,7 +62,7 @@ module UppityRobot
               end
               rows
             else
-              abort({ stat: "fail", error: "Error parsing data: #{format}, #{data.inspect}" }.to_json)
+              abort({stat: "fail", error: "Error parsing data: #{format}, #{data.inspect}"}.to_json)
             end
           end
         end

data/lib/uppityrobot/cli/commands/registry.rb

@@ -12,8 +12,8 @@ module UppityRobot
       register "monitors", aliases: ["m"] do |prefix|
         prefix.register "create", Monitors::Create
         prefix.register "delete", Monitors::Delete
-        prefix.register "exec",   Monitors::Exec
-        prefix.register "list",   Monitors::List
+        prefix.register "exec", Monitors::Exec
+        prefix.register "list", Monitors::List
         prefix.register "update", Monitors::Update
       end
     end

data/lib/uppityrobot/client.rb

@@ -11,9 +11,9 @@ module UppityRobot
     }.freeze
 
     def initialize(task, params)
-      @client   = client
-      @task     = verify_task(task)
-      @params   = params
+      @client = client
+      @task = verify_task(task)
+      @params = params
       @response = nil
     end
 
@@ -40,14 +40,14 @@ module UppityRobot
       Enumerator.new do |yielder|
         @params.delete :offset # we want to start from the beginning
         response = execute # initial connection
-        offset   = 0
-        limit    = response["pagination"]["limit"]
-        total    = response["pagination"]["total"]
+        offset = 0
+        limit = response["pagination"]["limit"]
+        total = response["pagination"]["total"]
 
         loop do
           raise StopIteration if offset >= total
 
-          @params  = @params.merge({ offset: offset })
+          @params = @params.merge({offset: offset})
           response = execute
           yielder << [response, offset, total]
           offset += limit
@@ -67,11 +67,11 @@ module UppityRobot
     private
 
     def client
-      options = { api_key: ENV.fetch("UPTIMEROBOT_API_KEY") }
+      options = {api_key: ENV.fetch("UPTIMEROBOT_API_KEY")}
       options[:url] = ENV["UPTIMEROBOT_ENDPOINT"] if ENV["UPTIMEROBOT_ENDPOINT"]
       UptimeRobot::Client.new(options)
     rescue KeyError => e
-      abort({ stat: "fail", error: "Error, #{e.message}" }.to_json)
+      abort({stat: "fail", error: "Error, #{e.message}"}.to_json)
     end
 
     def parse_total(response)
@@ -82,7 +82,7 @@ module UppityRobot
       return if @params.key?(:search) || @params.key?(RECORD_TYPES[@task].to_sym)
 
       abort(
-        { stat: "fail", error: "Attempted fetch without required params" }.to_json
+        {stat: "fail", error: "Attempted fetch without required params"}.to_json
       )
     end
 

data/lib/uppityrobot/tasks/uppityrobot.rake

@@ -7,7 +7,7 @@ namespace :uppityrobot do
     def alert_contacts
       ENV.fetch("UPTIMEROBOT_ALERT_CONTACTS") do
         contacts = UppityRobot::Client.new(:getAlertContacts, {}).execute
-        contact  = contacts["alert_contacts"].find { |c| c["friendly_name"] == friendly_name }
+        contact = contacts["alert_contacts"].find { |c| c["friendly_name"] == friendly_name }
         raise "CONTACT NOT FOUND" unless contact
 
         contact["id"]
@@ -45,16 +45,16 @@ namespace :uppityrobot do
       raise "UPTIMEROBOT_API_KEY is required" unless ENV["UPTIMEROBOT_API_KEY"]
 
       prefix = args[:prefix]
-      csv    = args.fetch(:csv, File.join(Dir.getwd, "files", "monitors", "uptimerobot.csv"))
+      csv = args.fetch(:csv, File.join(Dir.getwd, "files", "monitors", "uptimerobot.csv"))
       raise "CSV not found" unless File.file? csv
 
-      contacts         = alert_contacts
+      contacts = alert_contacts
       current_monitors = monitors(prefix: prefix)
 
       CSV.read(csv, headers: true).each do |row|
-        data     = row.to_hash
-        name     = data["friendly_name"]
-        url      = data["url"]
+        data = row.to_hash
+        name = data["friendly_name"]
+        url = data["url"]
         interval = data.fetch("interval", 300)
 
         begin
@@ -70,10 +70,10 @@ namespace :uppityrobot do
             }
             UppityRobot::Client.new(:newMonitor, d).execute
           elsif current_monitors.key?(name) &&
-                (current_monitors[name]["url"] != url || current_monitors[name]["interval"] != interval)
+              (current_monitors[name]["url"] != url || current_monitors[name]["interval"] != interval)
             puts "Updating monitor: #{current_monitors[name]["url"]} TO #{url} [#{interval}] WITH CONTACTS #{contacts}"
             # avoid uptimerobot client weirdness
-            d = { id: current_monitors[name]["id"], url: url, interval: interval, alert_contacts: contacts }.dup
+            d = {id: current_monitors[name]["id"], url: url, interval: interval, alert_contacts: contacts}.dup
             UppityRobot::Client.new(:editMonitor, d).execute
           end
         rescue UptimeRobot::Error => e

data/lib/uppityrobot/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module UppityRobot
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

data/uppityrobot.gemspec

@@ -3,15 +3,15 @@
 require_relative "lib/uppityrobot/version"
 
 Gem::Specification.new do |spec|
-  spec.name          = "uppityrobot"
-  spec.version       = UppityRobot::VERSION
-  spec.authors       = ["Mark Cooper"]
-  spec.email         = ["mark.c.cooper@outlook.com"]
+  spec.name = "uppityrobot"
+  spec.version = UppityRobot::VERSION
+  spec.authors = ["Mark Cooper"]
+  spec.email = ["mark.c.cooper@outlook.com"]
 
-  spec.summary       = "Command line wrapper for the UptimeRobot API (wrapper)."
-  spec.description   = "Command line wrapper for the UptimeRobot API (wrapper)."
-  spec.homepage      = "https://github.com/lyrasis/uppityrobot.git"
-  spec.license       = "MIT"
+  spec.summary = "Command line wrapper for the UptimeRobot API (wrapper)."
+  spec.description = "Command line wrapper for the UptimeRobot API (wrapper)."
+  spec.homepage = "https://github.com/lyrasis/uppityrobot.git"
+  spec.license = "MIT"
   spec.required_ruby_version = ">= 2.7.0"
 
   spec.metadata["homepage_uri"] = spec.homepage
@@ -20,8 +20,8 @@ Gem::Specification.new do |spec|
   spec.files = Dir.chdir(File.expand_path(__dir__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{\A(?:test|spec|features)/}) }
   end
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
+  spec.bindir = "exe"
+  spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
   spec.add_dependency "dry-cli", "~> 0.7"
@@ -37,5 +37,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec", "~> 3.2"
   spec.add_development_dependency "rubocop", "~> 1.7"
   spec.add_development_dependency "sinatra"
+  spec.add_development_dependency "standard"
   spec.add_development_dependency "webmock"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uppityrobot
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Mark Cooper
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-07-19 00:00:00.000000000 Z
+date: 2022-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-cli
@@ -178,6 +178,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: standard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -257,7 +271,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.18
+rubygems_version: 3.3.26
 signing_key: 
 specification_version: 4
 summary: Command line wrapper for the UptimeRobot API (wrapper).