dboard 1.1.1 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 60c9af8ba57dc09e45ec0f39a2e8394705c4cfadd771f52210578438f4f64219
-  data.tar.gz: d1422616d6c609c49cd32c1a88481ae929391d5d3d937cc81b5abb1e37457a90
+  metadata.gz: 4961ca57023a24d013d4e60b2d0506663f96abfa413f46b312a8a64dce3c41ff
+  data.tar.gz: d3d7d4bb2bef67839f7fe36d5885ebef72e82d48def60bea272930548096321f
 SHA512:
-  metadata.gz: '091c5bebede637161ece4d905ec07acb12d018c2d7dde186bb427639edbebe43211393ea6279b9ec212f02cdaff847b9812d21e6f1e1bc98dd9dbf117d0ee33a'
-  data.tar.gz: dcc00cb4d504f0911b19f68c98af3db66e76a4cef444a8efcbb0e1a8daaa2a281da11f12eb3ae132bee5c7b06c09e0e228c17b2ad1ad2af005e47d379d71c5b0
+  metadata.gz: d72cad351cfa34e55144425cdad8b2c66df645b6dcb6a0d73c01dfe09de4b16555d083ceff192d00cb0abad49f082791641d4dd8e658480bf75d8845219ad498
+  data.tar.gz: 2c5ed9dbbdf1f0ac6c0b9b1319aab5ac653e87ccbb447fe115ae5464a7fe4328b2584947ad5dbd05465e744058cbb4b44d31f6832bc9ffccc1314c7e7993efee

data/.github/workflows/ci.yml

@@ -13,7 +13,7 @@ jobs:
 
     strategy:
       matrix:
-        ruby-version: ["3.0", "2.7", "2.6", "2.5"]
+        ruby-version: ["3.0", "2.7", "2.6"]
 
     steps:
       - uses: actions/checkout@v2

data/Gemfile

@@ -2,6 +2,8 @@ source "https://rubygems.org"
 gemspec
 
 group :development, :test do
-  gem "barsoom_utils", github: "barsoom/barsoom_utils"
+  gem "barsoom_utils"
+  gem "rspec"
   gem "rubocop"
+  gem "webmock"
 end

data/dboard.gemspec

@@ -17,10 +17,10 @@ Gem::Specification.new do |s|
   s.files         = `git ls-files`.split("\n")
   s.require_paths = [ "lib" ]
 
+  s.add_dependency "net_http_timeout_errors"
+  s.add_dependency "dalli"
   s.add_dependency "httparty"
-  s.add_dependency "rake"
   s.add_dependency "json"
-  s.add_dependency "dalli"
+  s.add_dependency "rake"
   s.add_dependency "sinatra"
-  s.add_development_dependency "rspec", "~> 3.9"
 end

data/lib/api.rb

@@ -3,6 +3,7 @@ require File.expand_path(File.join(File.dirname(__FILE__), "collector.rb"))
 require "digest/md5"
 require "json"
 require "httparty"
+require "net_http_timeout_errors"
 
 module Dboard
   class Api
@@ -11,6 +12,27 @@ module Dboard
 
     class Client
       include HTTParty
+
+      def self.post(*, **)
+        with_retries { super }
+      end
+
+      private
+
+      private_class_method \
+      def self.with_retries
+        remaining_attempts = 3
+
+        begin
+          remaining_attempts -= 1
+          yield
+        rescue *NetHttpTimeoutErrors.all
+          raise if remaining_attempts == 0
+
+          sleep((ENV["RACK_ENV"] == "test") ? 0 : 5)
+          retry
+        end
+      end
     end
 
     def self.get(params)

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Dboard
-  VERSION = "1.1.1"
+  VERSION = "2.0.3"
 end

data/spec/collector_spec.rb

@@ -1,6 +1,6 @@
 require File.expand_path(File.join(File.dirname(__FILE__), "spec_helper"))
 
-describe Dboard::Collector, "register_source" do
+describe Dboard::Collector, ".register_source" do
   before do
     Dboard::Collector.instance.sources.clear
   end
@@ -48,14 +48,14 @@ describe Dboard::Collector, "update_source" do
     Dboard::Collector.instance.sources.clear
   end
 
-  it "should collect and publish data from sources" do
+  it "collects and publishes data from sources" do
     new_relic = double
     allow(new_relic).to receive(:fetch).and_return({ db: "100%" })
     expect(Dboard::Publisher).to receive(:publish).with(:new_relic, { db: "100%" })
     Dboard::Collector.instance.update_source(:new_relic, new_relic)
   end
 
-  it "should print out debugging info" do
+  it "prints out debugging info" do
     new_relic = double
     allow(new_relic).to receive(:fetch).and_raise(Exception.new("some error"))
     expect(Dboard::Collector.instance).to receive(:puts).twice

data/spec/publisher_spec.rb

@@ -1,12 +1,31 @@
 require File.expand_path(File.join(File.dirname(__FILE__), "spec_helper"))
 
-describe "Publisher", "publish" do
-  it "should send data to the dashboard server" do
+describe "Publisher", ".publish" do
+  it "sends data to the dashboard server" do
     expect(Dboard::Api::Client).to receive(:post).with("/sources/new_relic", body: { data: { db: "80%" }.to_json }, timeout: 10000)
     Dboard::Publisher.publish(:new_relic, { db: "80%" })
   end
 
-  it "should handle and log socket errors" do
+  it "retries network errors" do
+    stub_request(:post, "http://api.example/sources/new_relic").
+      to_timeout.times(2).
+      to_return({ body: "OK!" })
+
+    Dboard::Publisher.publish(:new_relic, {})
+  end
+
+  it "raises network errors if we run out of retries" do
+    stub_request(:post, "http://api.example/sources/new_relic").
+      to_timeout.times(3).
+      to_return({ body: "OK!" })
+
+    expect {
+      Dboard::Publisher.publish(:new_relic, {})
+    }.to raise_error(Net::OpenTimeout)
+  end
+
+  # 2021-12-07: No idea why we've treated this one specially, but keeping it for now.
+  it "logs socket errors if we run out of retries" do
     expect(Dboard::Api::Client).to receive(:post).and_raise(SocketError.new("failed to connect"))
     expect(Dboard::Publisher).to receive(:puts).with("SocketError: failed to connect")
     Dboard::Publisher.publish(:new_relic, {})

data/spec/spec_helper.rb

@@ -1,7 +1,8 @@
 require "rspec"
+require 'webmock/rspec'
 
 ENV["RACK_ENV"] ||= "test"
-ENV["API_URL"] = "http://localhost:20843"
+ENV["API_URL"] = "http://api.example"
 ENV["API_USER"] = "test"
 ENV["API_PASSWORD"] = "test"
 

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: dboard
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 2.0.3
 platform: ruby
 authors:
 - Joakim Kolsjö
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-19 00:00:00.000000000 Z
+date: 2021-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: httparty
+  name: net_http_timeout_errors
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: dalli
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: json
+  name: httparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: dalli
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sinatra
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,19 +81,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.9'
-  type: :development
+        version: '0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '0'
 description: Dashboard framework
 email:
 - joakim.kolsjo@gmail.com
@@ -139,7 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.28
+rubygems_version: 3.2.32
 signing_key: 
 specification_version: 4
 summary: Dashboard framework