Merge pull request #133 from riemann/mod

Moderize root

.github/workflows/ci.yml

@@ -0,0 +1,30 @@
+---
+name: CI
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - main
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version:
+          - 2.7
+          - 3.0
+          - 3.1
+      fail-fast: false
+    steps:
+      - uses: actions/checkout@v2
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+          bundler-cache: true
+      - name: Run the test suite
+        run: bundle exec rake test

Gemfile

@@ -1,7 +1,6 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 gemspec
 
-group :test do
-  gem 'pry'
-end

Gemfile.lock

@@ -2,7 +2,7 @@ PATH
   remote: .
   specs:
     riemann-dash (0.2.14)
-      erubis (>= 2.7.0)
+      erubi (~> 1.9.0)
       multi_json (= 1.3.6)
       sass (>= 3.1.14)
       sinatra (>= 1.4.5, < 2.3.0)
@@ -11,19 +11,76 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    coderay (1.1.2)
-    erubis (2.7.0)
+    activesupport (7.0.3)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+    addressable (2.8.0)
+      public_suffix (>= 2.0.2, < 5.0)
+    async (1.30.3)
+      console (~> 1.10)
+      nio4r (~> 2.3)
+      timers (~> 4.1)
+    async-http (0.56.6)
+      async (>= 1.25)
+      async-io (>= 1.28)
+      async-pool (>= 0.2)
+      protocol-http (~> 0.22.0)
+      protocol-http1 (~> 0.14.0)
+      protocol-http2 (~> 0.14.0)
+      traces (~> 0.4.0)
+    async-http-faraday (0.11.0)
+      async-http (~> 0.42)
+      faraday
+    async-io (1.33.0)
+      async
+    async-pool (0.3.10)
+      async (>= 1.25)
+    concurrent-ruby (1.1.10)
+    console (1.15.3)
+      fiber-local
+    erubi (1.9.0)
+    faraday (2.3.0)
+      faraday-net_http (~> 2.0)
+      ruby2_keywords (>= 0.0.4)
+    faraday-http-cache (2.4.0)
+      faraday (>= 0.8)
+    faraday-net_http (2.0.3)
     ffi (1.15.5)
-    method_source (0.9.2)
+    fiber-local (1.0.0)
+    github_changelog_generator (1.16.4)
+      activesupport
+      async (>= 1.25.0)
+      async-http-faraday
+      faraday-http-cache
+      multi_json
+      octokit (~> 4.6)
+      rainbow (>= 2.2.1)
+      rake (>= 10.0)
+    i18n (1.10.0)
+      concurrent-ruby (~> 1.0)
+    minitest (5.16.1)
     multi_json (1.3.6)
     mustermann (1.1.1)
       ruby2_keywords (~> 0.0.1)
-    pry (0.12.2)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
+    nio4r (2.5.8)
+    octokit (4.25.0)
+      faraday (>= 1, < 3)
+      sawyer (~> 0.9)
+    protocol-hpack (1.4.2)
+    protocol-http (0.22.6)
+    protocol-http1 (0.14.4)
+      protocol-http (~> 0.22)
+    protocol-http2 (0.14.2)
+      protocol-hpack (~> 1.4)
+      protocol-http (~> 0.18)
+    public_suffix (4.0.7)
     rack (2.2.3.1)
     rack-protection (2.2.0)
       rack
+    rainbow (3.1.1)
+    rake (13.0.6)
     rb-fsevent (0.11.1)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
@@ -33,20 +90,29 @@ GEM
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
+    sawyer (0.9.2)
+      addressable (>= 2.3.5)
+      faraday (>= 0.17.3, < 3)
     sinatra (2.2.0)
       mustermann (~> 1.0)
       rack (~> 2.2)
       rack-protection (= 2.2.0)
       tilt (~> 2.0)
     tilt (2.0.10)
+    timers (4.3.3)
+    traces (0.4.1)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
     webrick (1.7.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  pry
+  github_changelog_generator
+  minitest
+  rake
   riemann-dash!
 
 BUNDLED WITH
-   1.17.1
+   1.17.2

Rakefile.rb → Rakefile

@@ -1,5 +1,3 @@
-#$:.unshift(File.join(File.dirname(__FILE__), 'lib'))
-#require 'rubygems'
 require "bundler/gem_tasks"
 require 'github_changelog_generator/task'
 

lib/riemann/dash/app.rb

@@ -5,8 +5,8 @@ class App < Sinatra::Base
 
       require 'yaml'
       require 'find'
-      require 'tilt/erubis'
-      require 'erubis'
+      require 'tilt/erubi'
+      require 'erubi'
       require 'sass'
 
       def self.config

riemann-dash.gemspec

@@ -4,8 +4,6 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'riemann/dash/version'
 
 Gem::Specification.new do |gem|
-  gem.rubyforge_project = 'riemann-dash'
-
   gem.name          = "riemann-dash"
   gem.version       = Riemann::Dash::VERSION
   gem.authors       = ["Kyle Kingsbury"]
@@ -15,11 +13,14 @@ Gem::Specification.new do |gem|
   gem.homepage      = 'https://github.com/riemann/riemann-dash'
   gem.platform      = Gem::Platform::RUBY
 
-  gem.add_dependency 'erubis', '>= 2.7.0'
-  gem.add_dependency 'sinatra', '>= 1.4.5', '< 2.3.0'
-  gem.add_dependency 'sass', '>= 3.1.14'
-  gem.add_dependency 'webrick'
-  gem.add_dependency 'multi_json', '1.3.6'
+  gem.add_runtime_dependency 'erubi', '~> 1.9.0'
+  gem.add_runtime_dependency 'sinatra', '>= 1.4.5', '< 2.3.0'
+  gem.add_runtime_dependency 'sass', '>= 3.1.14'
+  gem.add_runtime_dependency 'webrick'
+  gem.add_runtime_dependency 'multi_json', '1.3.6'
+  gem.add_development_dependency 'minitest'
+  gem.add_development_dependency 'github_changelog_generator'
+  gem.add_development_dependency 'rake'
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})

test/test_helper.rb

@@ -1,11 +1,7 @@
-require 'rubygems'
-require 'bundler'
-Bundler.setup(:default, :test)
-
 require 'minitest/autorun'
 require 'minitest/spec'
 require 'minitest/mock'
 #require "mocha/setup"
 
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
-require 'riemann/dash'
+require 'riemann/dash'