cutting_edge 0.2 → 0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9345fa39664217f3d25636af4855abfa9f4e684237c0038fbeb4fa57e83ec40d
-  data.tar.gz: de6eaa52e75463fed82b1aae4723e6685a80522086ed28cc3a8ded7e6b3189cb
+  metadata.gz: f2b2c4c5c7d23ff00b0f4124b7040aa7733b48b6474178f596d35358df8e779a
+  data.tar.gz: de40b5d1c93e556ab5387352cbc3cb9bf5d13b7e2f0db06ba044f7189d000889
 SHA512:
-  metadata.gz: c866cf8788242847e16b65f0b8a21481b5b57df936241d9bdf68044d62d55083d12dc827f6eeedd4978716ad131a2ac7993ea2ad0f6b6a23a150dc35f4ca6359
-  data.tar.gz: afcee66340cc2f542d45ab6bb4f5a5427d57c69ec7d925f49f22909cf2c0de2f767b8ecf8ab4b295dba6f514177309607ad1a185455f257a35ff40884b802652
+  metadata.gz: e26af96def69913fcb64680de7a45d1e5faa34f497994d5b7970f136c0d87eb6a4430fa8d68ccab031e7c77d5662778cd084714db74caf52cb41e90f7602e814
+  data.tar.gz: da2caeadbed7b997c22ecd0943ad97eed25996199d1355386c758d7d47ada429adde0384b1ee27bece5958b5ecd1c758362f1c1befa22470fd3db95447a9ff82

data/Dockerfile

@@ -0,0 +1,29 @@
+FROM ruby:3.0.4-alpine AS builder
+
+RUN apk add \
+    build-base \
+    git \
+    cmake \
+    libffi-dev
+
+COPY Gemfile* /tmp/
+COPY cutting_edge.gemspec* /tmp/
+WORKDIR /tmp
+RUN bundle install
+
+WORKDIR /app
+COPY . /app
+RUN bundle exec rake install
+
+FROM ruby:3.0.4-alpine
+
+COPY --from=builder /usr/local/bundle/ /usr/local/bundle/
+
+RUN apk add \
+    bash \
+    tzdata
+
+VOLUME /cutting_edge
+WORKDIR /cutting_edge
+COPY docker-run.sh /docker-run.sh
+ENTRYPOINT ["/docker-run.sh"]

data/Gemfile

@@ -1,13 +1,13 @@
 source 'https://rubygems.org'
 
 gem 'redis', require: false
+gem 'thin', require: false
 
 group :development do
   gem 'rspec', '~> 3.9'
   gem 'simplecov'
+  gem 'simplecov-lcov', '~> 0.8.0'
   gem 'rack-test'
 end
 
-gem 'coveralls', '~>0.8.23', require: false
-
-gemspec
+gemspec

data/HISTORY.md

@@ -0,0 +1,3 @@
+# v0.2.1 / 2021-09-02
+
+* Add ~= comparator and translate it to ~>. Resolves #66 (@bartkamphorst)

data/LATEST_CHANGES.md

@@ -0,0 +1,7 @@
+# 0.3
+
+* Added the `--redis` command line argument.
+* Added Docker support.
+* Use Redis on Heroku by default to avoid flakiness caused by Heroku's dynos.
+* Change default branch name to `main`
+* Do not mail when the diff is empty.

data/README.md

@@ -1,11 +1,14 @@
 # CuttingEdge -- Simple, self-hosted dependency monitoring
 
-[![Build Status](https://travis-ci.org/repotag/cutting_edge.svg?branch=master)](https://travis-ci.org/repotag/cutting_edge)
-[![Coverage Status](https://coveralls.io/repos/github/repotag/cutting_edge/badge.svg?branch=master)](https://coveralls.io/github/repotag/cutting_edge?branch=master)
+[![Ruby Build](https://github.com/repotag/cutting_edge/actions/workflows/test.yaml/badge.svg)](https://github.com/repotag/cutting_edge/actions/workflows/test.yaml)
+[![Coverage Status](https://coveralls.io/repos/github/repotag/cutting_edge/badge.svg?branch=main)](https://coveralls.io/github/repotag/cutting_edge?branch=main)
 [![Cutting Edge Dependency Status](https://dometto-cuttingedge.herokuapp.com/github/repotag/cutting_edge/svg 'Cutting Edge Dependency Status')](https://dometto-cuttingedge.herokuapp.com/github/repotag/cutting_edge/info)
+[![Docker Pulls](https://img.shields.io/docker/pulls/dometto/cuttingedge)](https://hub.docker.com/r/dometto/cuttingedge)
 
 CuttingEdge monitors the status of the dependencies of your projects and lets you know when any of them go out of date.
 
+**View the web front end of a [live instance](https://dometto-cuttingedge.herokuapp.com/)**.
+
 ## Features
 
 * Generates badge images that you can include in your projects' Readme, like the one above!
@@ -21,8 +24,6 @@ CuttingEdge monitors the status of the dependencies of your projects and lets yo
   * Gitlab (both gitlab.com and [self-hosted instances](#Adding-self-hosted-repository-servers))
   * Gitea ([self-hosted](#Adding-self-hosted-repository-servers))
   * Both public and [private repositories](#Authorization-and-private-repositories)
-
-**View the web front end of a [live instance](https://dometto-cuttingedge.herokuapp.com/)**.
  
 ## Requirements
 
@@ -36,24 +37,19 @@ CuttingEdge is lightweight and easy to deploy:
 
 ## Installation
 
-Simply:
+### Using Docker
 
-```
-$ gem install cutting_edge
-$ cutting_edge
-```
+To run CuttingEdge on port 4567 on the host machine, with config.rb and projects.yml in the current working directory, simply:
 
-Or run from source:
+`docker pull dometto/cuttingedge`
+`docker run -d --rm -p 4567:4567 -v $(pwd):/cutting_edge dometto/cuttingedge:main -c config.r`
 
-```
-$ git clone https://github.com/repotag/cutting_edge.git
-$ cd cutting_edge
-$ bundle install
-$ bundle exec cutting_edge
-```
+(Instead of using `main`, you can also use a release tag, e.g. `dometto/cuttingedge:v0.2.1`.)
 
 Before running, define your repositories in [projects.yml](#projects-yml). You may also want to change some settings in [config.rb](#config-rb).
 
+Also see our example [docker-compose](docker-compose.yml) file for an example of how to use CuttingEdge with [Redis as a datastore](#Using-Redis-and-other-data-stores) via Docker.
+
 ### Deploying on Heroku
 
 CuttingEdge runs out of the box on Heroku, and is lightweight enough to function on the Heroku free plan. This repository already contains the `Procfile` needed for deployment.
@@ -63,11 +59,14 @@ CuttingEdge runs out of the box on Heroku, and is lightweight enough to function
 Steps:
 
 1. Clone/fork this repository, as it already contains some settings (in `heroku.config.rb`) relevant to Heroku
-1. Edit `projects.yml` and commit it to the repo
-1. `heroku create my-cuttingedge`
-1. `heroku config:add HEROKU_APP_NAME=my-cuttingedge`
-1. `git push heroku master`
-1. *Optional, if you want to receive [email notifications](#Email-Notifications)*:
+1. Edit `projects.yml` and commit it to the repo.
+1. `gem install bundler && bundle install`
+2. `git add Gemfile.lock && git commit -m "Commit Gemfile.lock for use on Heroku"
+3. `heroku create my-cuttingedge`
+4. `heroku config:add HEROKU_APP_NAME=my-cuttingedge`
+5. `heroku addons:create heroku-redis:hobby-dev -a my-cuttingedge` (using Redis is highly recommended on Heroku)
+6. `git push heroku master`
+7. *Optional, if you want to receive [email notifications](#Email-Notifications)*:
   * `heroku addons:create mailgun:starter`
   * `heroku config:add CUTTING_EDGE_MAIL_TO=mydependencies@mydependencymonitoring.com`
   * If you are on the free plan: [add your email addresses as Authorized Recipients](https://help.mailgun.com/hc/en-us/articles/217531258-Authorized-Recipients) in [Mailgun](https://app.mailgun.com/) (login via Heroku)
@@ -76,6 +75,26 @@ You may also want to set some [Heroku config variables](https://devcenter.heroku
 
 Note that Heroku switches off apps running on their free plan when they idle, so you may want to look at [this](https://medium.com/better-programming/keeping-my-heroku-app-alive-b19f3a8c3a82).
 
+### As a gem
+
+Simply:
+
+```
+$ gem install cutting_edge
+$ cutting_edge
+```
+
+Or run from source:
+
+```
+$ git clone https://github.com/repotag/cutting_edge.git
+$ cd cutting_edge
+$ bundle install
+$ bundle exec cutting_edge
+```
+
+Before running, define your repositories in [projects.yml](#projects-yml). You may also want to change some settings in [config.rb](#config-rb).
+
 ## Usage
 
 When your instance of CuttingEdge is running, you can visit the landing page by pointing your browser to the root URL of the app. Locally, it is by default accessible at:
@@ -106,7 +125,7 @@ This will make CuttingEdge monitor the GitHub project `my_org/my_project`. You c
 * `auth_token`: see [here](#Authorization-and-private-repositories)
 * `hide`: see [here](#Hide-repositories)
 * `locations`: use to change the default path to dependency definition files. For instance, for a Ruby project, CuttingEdge will by default try to monitor `Gemfile` and `my_project.gemspec`. You can override this with `language: [Gemfile, alternative/file.gemspec]`
-* `branch`: use a different branch than the default `master`
+* `branch`: use a different branch than the default `main`
 * `email`:
   * disable email notifications for a single project by setting this to `false`
   * use a non-default address delivery address for this project by setting this to e.g. `myproject@mydependencymonitoring.com`
@@ -207,13 +226,15 @@ If you don't want to expose information about a project in (**such as an [API to
 module CuttingEdge
     require './lib/cutting_edge/repo.rb'
     REPOSITORIES = {
-      "gitlab/#{ENV['SECRET_REPO1_ORG']}/#{ENV['SECRET_REPO1_NAME']}" => GitlabRepository.new(org: ENV['SECRET_REPO1_ORG'], name: ENV['SECRET_REPO1_NAME'], auth_token: ENV['SECRET_REPO1_AUTH_TOKEN'], hide: ENV['SECRET_REPO1_HIDE_TOKEN'])
+      "gitlab/#{ENV['SECRET_REPO1_ORG']}/#{ENV['SECRET_REPO1_NAME']}" => GitlabRepository.new(org: ENV['SECRET_REPO1_ORG'], name: ENV['SECRET_REPO1_NAME'], auth_token: ENV['SECRET_REPO1_AUTH_TOKEN'], hide: ENV['SECRET_REPO1_HIDE_TOKEN'], email: 'myemail@mydomain.org')
     }
 end
 ```
 
 This approach is especially useful on Heroku, where you can use [Heroku config variables](https://devcenter.heroku.com/articles/config-vars).
 
+**NB: When adding repositories in config.rb, you must explicitly set the email attribute (or else email will be considered disabled for the repo).**
+
 ### Hide Repositories
 
 You may want the name and dependency monitoring information for private repositories (see above) not to be visible on the internet. To achieve this, you can use `hide: token` in `projects.yml`:

data/Rakefile

@@ -1,5 +1,6 @@
 require 'rubygems'
 require 'date'
+require 'tempfile'
 require 'rspec/core/rake_task'
 
 task :default => :rspec
@@ -26,6 +27,14 @@ def version
   line.match(/.*VERSION\s*=\s*['"](.*)['"]/)[1]
 end
 
+def latest_changes_file
+  'LATEST_CHANGES.md'
+end
+
+def history_file
+  'HISTORY.md'
+end
+
 # assumes x.y.z all digit version
 def next_version
   # x.y.z
@@ -86,14 +95,15 @@ end
 
 desc 'Create a release build and push to rubygems'
 task :release => :build do
-  unless `git branch` =~ /^\* master$/
-    puts "You must be on the master branch to release!"
+  unless `git branch` =~ /^\* main$/
+    puts "You must be on the main branch to release!"
     exit!
   end
+  Rake::Task[:changelog].execute
   sh "git commit --allow-empty -a -m 'Release #{version}'"
-  sh "git pull --rebase origin master"
+  sh "git pull --rebase origin main"
   sh "git tag v#{version}"
-  sh "git push origin master"
+  sh "git push origin main"
   sh "git push origin v#{version}"
   sh "gem push pkg/#{name}-#{version}.gem"
 end
@@ -152,3 +162,43 @@ task :validate do
     exit!
   end
 end
+
+desc 'Build changelog'
+task :changelog do
+  [latest_changes_file, history_file].each do |f|
+    unless File.exists?(f)
+      puts "#{f} does not exist but is required to build a new release."
+      exit!
+    end
+  end
+
+  latest_changes = File.open(latest_changes_file)
+  version_pattern = "# #{version}"
+
+  if !`grep "#{version_pattern}" #{history_file}`.empty?
+    puts "#{version} is already described in #{history_file}"
+    exit!
+  end
+
+  begin
+    unless latest_changes.readline.chomp! =~ %r{#{version_pattern}}
+      puts "#{latest_changes_file} should begin with '#{version_pattern}'"
+      exit!
+    end
+  rescue EOFError
+    puts "#{latest_changes_file} is empty!"
+    exit!
+  end
+
+  body = latest_changes.read
+  body.scan(/\s*#\s+\d\.\d.*/) do |match|
+    puts "#{latest_changes_file} may not contain multiple markdown headers!"
+    exit!
+  end
+
+  temp = Tempfile.new
+  temp.puts("#{version_pattern} / #{date}\n#{body}\n")
+  temp.close
+  `cat #{history_file} >> #{temp.path}`
+  `cat #{temp.path} > #{history_file}`
+end

data/bin/cutting_edge

@@ -4,6 +4,7 @@ require 'yaml'
 require 'rufus-scheduler'
 require 'optparse'
 require 'semantic_logger'
+require 'moneta'
 
 module CuttingEdge
   REFRESH_SCHEDULE = '1h'
@@ -42,6 +43,10 @@ opts = OptionParser.new do |opts|
   opts.on('-c', '--config [FILE]', 'Specify path to a .rb configuration file. Default: config.rb') do |file|
     options[:config] = file || 'config.rb'
   end
+
+  opts.on('-r', '--redis [URL]', 'Use Redis as a datastore. Optionally specify the Redis URL. Default URL: `redis://localhost/.`') do |url|
+    ::CuttingEdge::STORE =  ::Moneta.new(:Redis, url: (url || 'redis://localhost/'))
+  end
 end
 
 begin

data/cutting_edge.gemspec

@@ -5,8 +5,8 @@ Gem::Specification.new do |s|
   s.required_ruby_version = '>= 2.4'
 
   s.name              = 'cutting_edge'
-  s.version           = '0.2'
-  s.date              = '2020-12-05'
+  s.version           = '0.3'
+  s.date              = '2022-10-15'
   s.license           = 'GPL-3.0-only'
 
   s.summary     = 'Self-hosted dependency monitoring, including shiny badges.'
@@ -22,8 +22,8 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'gemnasium-parser', '~> 0.1.9'
   s.add_dependency 'hashdiff', '~> 1.0'
-  s.add_dependency 'http', '~> 4.3'
-  s.add_dependency 'sucker_punch', '~> 2.1'
+  s.add_dependency 'http', '~> 5.0'
+  s.add_dependency 'sucker_punch', '~> 3.0'
   s.add_dependency 'sinatra', '~> 2.0'
   s.add_dependency 'moneta', '~> 1.2'
   s.add_dependency 'rufus-scheduler', '~> 3.6'
@@ -33,8 +33,10 @@ Gem::Specification.new do |s|
   
   # = MANIFEST =
   s.files = %w[
+    Dockerfile
     Gemfile
-    Gemfile.lock
+    HISTORY.md
+    LATEST_CHANGES.md
     LICENSE
     Procfile
     README.md
@@ -42,6 +44,8 @@ Gem::Specification.new do |s|
     bin/cutting_edge
     config.rb
     cutting_edge.gemspec
+    docker-compose.yml
+    docker-run.sh
     heroku.config.rb
     lib/cutting_edge.rb
     lib/cutting_edge/app.rb

data/docker-compose.yml

@@ -0,0 +1,23 @@
+# Example of a simple docker-compose file to run CuttingEdge with a redis datastore
+# Simply run `docker-compose up`
+version: '3.8'
+services:
+  cache:
+    image: redis:7.0.5-alpine
+    restart: always
+    ports:
+      - '6379:6379'
+  cuttingedge:
+    image: dometto/cuttingedge:main
+    environment:
+      REDIS_HOST: cache
+    command:
+      - -r redis://cache
+    depends_on:
+      - cache
+    ports:
+      - 4567:4567
+    links:
+      - cache
+    volumes:
+      - ./:/cutting_edge

data/docker-run.sh

@@ -0,0 +1,2 @@
+#!/bin/bash
+exec cutting_edge $@

data/heroku.config.rb

@@ -4,10 +4,19 @@ module CuttingEdge
   SERVER_HOST = "#{ENV['HEROKU_APP_NAME']}.herokuapp.com" # At what domain is this CuttingEdge instance running?
   SERVER_URL = "https://#{SERVER_HOST}"
   MAIL_TO = ENV['CUTTING_EDGE_MAIL_TO'] if ENV['CUTTING_EDGE_MAIL_TO']
-  
+  if ENV['REDIS_TLS_URL']
+    require 'moneta'
+    require 'openssl'
+    STORE = ::Moneta.new(:Redis,
+      url: ENV['REDIS_TLS_URL'],
+      ssl_params: {
+        verify_mode: OpenSSL::SSL::VERIFY_NONE
+      }
+    )
+  end
   # Your additional configuration goes here.
   # If you are going to host the repository containing this file publically (e.g. on GitHub), please read:
-  # https://github.com/repotag/cutting_edge/blob/master/README.md#Defining-repositories-in-configrb
+  # https://github.com/repotag/cutting_edge/blob/main/README.md#Defining-repositories-in-configrb
 end
 
 # Needed to write to Heroku logs.

data/lib/cutting_edge/langs/python.rb

@@ -4,7 +4,7 @@ require 'http'
 class PythonLang < Language
   # For Requirements.txt
   # See https://iscompatible.readthedocs.io/en/latest/
-  COMPARATORS = />=|>|<=|<|==/
+  COMPARATORS = />=|>|<=|<|==|~=/
   VERSION_NUM = /\d[\.\w]*/
   SUFFIX_OPTION = /\s*(\[.*\])?/
   NAME = /[^,]+/
@@ -55,6 +55,7 @@ class PythonLang < Language
           name, first_comp, first_version, _ignore, second_comp, second_version = match.captures
           first_comp = '=' if first_comp == '=='
           second_comp = '=' if second_comp == '=='
+          first_comp = '~>' if first_comp == '~='
           dep = Gem::Dependency.new(name.strip, "#{first_comp} #{first_version}")
           dep.requirement.concat(["#{second_comp} #{second_version}"]) if second_comp && second_version
         else

data/lib/cutting_edge/repo.rb

@@ -92,7 +92,7 @@ module CuttingEdge
       @org     = org
       @name    = name
       @auth_token = auth_token
-      @branch  = branch  || 'master'
+      @branch  = branch  || 'main'
       @hidden  = hide
       @lang    = lang || DEFAULT_LANG
       @contact_email = email

data/lib/cutting_edge/templates/mail.html.erb

@@ -124,6 +124,7 @@
                         This is <a href="<%= url %>">CuttingEdge</a> informing you that the dependency status for <a href="<%= "#{url}/#{project}/info" %>"><%= project %></a> has changed.
                         </p>
                         <% specs[:locations].each do |filename, spec| %>
+                        <% next if spec.values.flatten.empty? %>
                           <p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;">
                           In <b><%= filename %></b>:
                           <% spec.each do |type, dependencies|

data/lib/cutting_edge/workers/dependency.rb

@@ -146,7 +146,7 @@ class DependencyWorker < GenericWorker
     begin
       response = HTTP.headers(@provider.headers(@auth_token)).get(url)
       response.status == 200 ? response.to_s : nil
-    rescue HTTP::TimeoutError => e
+    rescue HTTP::Error, OpenSSL::SSL::SSLError, Addressable::URI::InvalidURIError => e
       log_info("Encountered error when fetching latest version of #{url}: #{e.class} #{e.message}")
     end
   end

data/lib/cutting_edge/workers/mail.rb

@@ -22,6 +22,8 @@ class MailWorker < GenericWorker
       diff = {}
     end
 
+    return if diff.empty?
+
     Mail.deliver do
       from     "CuttingEdge <#{CuttingEdge::MAIL_FROM}>"
       to       to_addr

data/lib/cutting_edge.rb

@@ -1,3 +1,3 @@
 module CuttingEdge
-  VERSION = '0.2'
+  VERSION = '0.3'
 end

data/projects.yml

@@ -16,6 +16,7 @@ github:
     flask-dance:
       language: python
       email: false
+      branch: main
   rust-lang:
     crates.io:
       language: rust

data/spec/email_worker_spec.rb

@@ -20,7 +20,19 @@ describe MailWorker do
     it 'returns nil' do
       expect(worker.perform(identifier, test_email)).to eq nil
     end
-  end 
+  end
+  
+  it 'does not list empty locations' do
+    dependencies[:locations]['Gemfile'] = DependencyWorker::EMPTY_STATUS_HASH
+    params = {
+      project: identifier,
+      url: CuttingEdge::SERVER_URL,
+      diff: {},
+      specs: dependencies
+    }
+    result = ERB.new(CuttingEdge::MAIL_TEMPLATE).result_with_hash(params)
+    expect(result).to_not include('Gemfile')
+  end
   
   context 'with valid dependencies' do
     before(:each) {
@@ -35,7 +47,7 @@ describe MailWorker do
       expect(worker.perform(identifier, nil)).to eq nil
     end
     
-    it 'handles nil for diff' do
+    it 'do not mail for empty diff' do
       params = {
         project: identifier,
         url: CuttingEdge::SERVER_URL,
@@ -43,7 +55,7 @@ describe MailWorker do
         specs: dependencies
       }
       expect(worker).to receive(:delete_from_store).with("diff-#{identifier}").and_return(nil)
-      expect_any_instance_of(ERB).to receive(:result_with_hash).with(params).and_call_original
+      expect_any_instance_of(ERB).not_to receive(:result_with_hash)
       worker.perform(identifier, test_email)
     end
     
@@ -74,6 +86,16 @@ describe MailWorker do
         expect(html_body).to include('<li>rake ~> 12.3, >= 12.3.3 (latest: 13.0.1)</li>')
         expect(html_body).to include('<li style="color:green;">foobar = 1.0 (latest: 1.0)</li>')
       end
+      
+      context 'with multiple email' do
+        let(:test_email) { ['test1@test.org', 'test2@test.org'] }
+        
+        it 'sends an update mail' do
+          worker.perform(identifier, test_email)
+          mail = Mail::TestMailer.deliveries.first
+          expect(mail.to).to eq test_email
+        end
+      end
     end
   end
 end

data/spec/langs/python_spec.rb

@@ -5,6 +5,7 @@ requests-oauthlib>=1.0.0 [PDF]
 -e svn+http://myrepo/svn/MyApp#egg=MyApp
 Flask>=0.7
 urlobject==1.0
+email-validator ~= 1.1.2
 six
 EOF
 
@@ -44,6 +45,7 @@ describe PythonLang do
       'requests-oauthlib': Gem::Version.new('1.3.0'),
       'Flask': Gem::Version.new('1.1.2'),
       'urlobject': Gem::Version.new('2.4.3'),
+      'email-validator': Gem::Version.new('1.1.2'),
       'six': Gem::Version.new('1.15.0'),
     }
   }
@@ -84,7 +86,7 @@ describe PythonLang do
       expect(PythonLang).to receive(:latest_version).and_return(*requirements_latest_versions.values)
       result = PythonLang.parse_file('requirements.txt', REQUIREMENT_TXT)
       expect(result).to be_a Array
-      expect(result.length).to eq 6
+      expect(result.length).to eq 7
       result.each do |dep, version|
         expect(dep).to be_a Gem::Dependency
         expect(dep.type).to eq :runtime

data/spec/repo_spec.rb

@@ -12,6 +12,11 @@ describe CuttingEdge::Repository do
     expect(CuttingEdge::Repository.headers(nil)).to eq ({})
   end
   
+  it 'can take an array of email addresses' do
+    repo = CuttingEdge::GithubRepository.new(org: 'org', name: 'name', email: ['test1@test.org', 'test2@test2.org'])
+    expect(repo.contact_email).to eq ['test1@test.org', 'test2@test2.org']
+  end
+  
   context 'GitHub' do
     it 'has a headers method' do
       expect(CuttingEdge::GithubRepository.headers(nil)).to eq ({:accept => 'application/vnd.github.v3.raw'})
@@ -22,7 +27,7 @@ describe CuttingEdge::Repository do
       expect(CuttingEdge::GithubRepository).to_not be_nil
       github = CuttingEdge::GithubRepository.new(org: 'org', name: 'name')
       expect(github.source).to eq 'github'
-      expect(github.url_for_file('file')).to eq 'https://api.github.com/repos/org/name/contents/file?ref=master'
+      expect(github.url_for_file('file')).to eq 'https://api.github.com/repos/org/name/contents/file?ref=main'
       expect(github.url_for_project).to eq 'https://github.com/org/name'
     end
   end
@@ -35,7 +40,7 @@ describe CuttingEdge::Repository do
       expect(CuttingEdge::GitlabRepository.headers('token')).to eq ({:authorization => 'Bearer token'})
       gitlab = CuttingEdge::GitlabRepository.new(org: 'org', name: 'name')
       expect(gitlab.source).to eq 'gitlab'
-      expect(gitlab.url_for_file('file')).to eq 'https://gitlab.com/api/v4/projects/org%2fname/repository/files/file/raw?ref=master'
+      expect(gitlab.url_for_file('file')).to eq 'https://gitlab.com/api/v4/projects/org%2fname/repository/files/file/raw?ref=main'
       expect(gitlab.url_for_project).to eq 'https://gitlab.com/org/name'
     end
     
@@ -45,7 +50,7 @@ describe CuttingEdge::Repository do
       expect(defined?(CuttingEdge::GiteaRepository)).to_not be_nil
       gitea = CuttingEdge::GiteaRepository.new(org: 'org', name: 'name')
       expect(gitea.source).to eq 'gitea'
-      expect(gitea.url_for_file('file')).to eq 'https://mydependencymonitoring.com/api/v1/repos/org/name/raw/master/file'
+      expect(gitea.url_for_file('file')).to eq 'https://mydependencymonitoring.com/api/v1/repos/org/name/raw/main/file'
       expect(gitea.url_for_project).to eq 'https://mydependencymonitoring.com/org/name'
     end
   end

data/spec/spec_helper.rb

@@ -1,11 +1,14 @@
 require 'simplecov'
+require 'simplecov-lcov'
 require 'fixtures'
 require 'rack/test'
 
-if ENV['TRAVIS']
-  require 'coveralls'
-  Coveralls.wear!
+if ENV['CI']
+  SimpleCov::Formatter::LcovFormatter.config.report_with_single_file = true
+  SimpleCov::Formatter::LcovFormatter.config.single_report_path = 'coverage/lcov.info'
+  SimpleCov.formatter = SimpleCov::Formatter::LcovFormatter
 end
+SimpleCov.start
 
 ENV['RACK_ENV'] = 'test'
 
@@ -116,4 +119,4 @@ RSpec.configure do |config|
   config.include Rack::Test::Methods
   config.include ::CuttingEdgeHelpers
   config.include ::WorkerHelpers
-end
+end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: cutting_edge
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: '0.3'
 platform: ruby
 authors:
 - Dawa Ometto
 - Bart Kamphorst
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-05 00:00:00.000000000 Z
+date: 2022-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gemnasium-parser
@@ -45,28 +45,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.3'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.3'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: sucker_punch
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -158,8 +158,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- Dockerfile
 - Gemfile
-- Gemfile.lock
+- HISTORY.md
+- LATEST_CHANGES.md
 - LICENSE
 - Procfile
 - README.md
@@ -167,6 +169,8 @@ files:
 - bin/cutting_edge
 - config.rb
 - cutting_edge.gemspec
+- docker-compose.yml
+- docker-run.sh
 - heroku.config.rb
 - lib/cutting_edge.rb
 - lib/cutting_edge/app.rb
@@ -212,7 +216,7 @@ homepage: http://github.com/repotag/cutting_edge
 licenses:
 - GPL-3.0-only
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -227,8 +231,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 2
 summary: Self-hosted dependency monitoring, including shiny badges.
 test_files: []

data/Gemfile.lock

@@ -1,130 +0,0 @@
-PATH
-  remote: .
-  specs:
-    cutting_edge (0.2)
-      gemnasium-parser (~> 0.1.9)
-      hashdiff (~> 1.0)
-      http (~> 4.3)
-      mail (~> 2.7)
-      moneta (~> 1.2)
-      rufus-scheduler (~> 3.6)
-      sinatra (~> 2.0)
-      sinatra-logger (~> 0.3)
-      sucker_punch (~> 2.1)
-      toml-rb (~> 2.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    addressable (2.7.0)
-      public_suffix (>= 2.0.2, < 5.0)
-    citrus (3.0.2)
-    concurrent-ruby (1.1.7)
-    coveralls (0.8.23)
-      json (>= 1.8, < 3)
-      simplecov (~> 0.16.1)
-      term-ansicolor (~> 1.3)
-      thor (>= 0.19.4, < 2.0)
-      tins (~> 1.6)
-    diff-lcs (1.4.4)
-    docile (1.3.2)
-    domain_name (0.5.20190701)
-      unf (>= 0.0.5, < 1.0.0)
-    et-orbi (1.2.4)
-      tzinfo
-    ffi (1.13.1)
-    ffi-compiler (1.0.1)
-      ffi (>= 1.0.0)
-      rake
-    fugit (1.4.0)
-      et-orbi (~> 1.1, >= 1.1.8)
-      raabro (~> 1.4)
-    gemnasium-parser (0.1.9)
-    hashdiff (1.0.1)
-    http (4.4.1)
-      addressable (~> 2.3)
-      http-cookie (~> 1.0)
-      http-form_data (~> 2.2)
-      http-parser (~> 1.2.0)
-    http-cookie (1.0.3)
-      domain_name (~> 0.5)
-    http-form_data (2.3.0)
-    http-parser (1.2.1)
-      ffi-compiler (>= 1.0, < 2.0)
-    json (2.3.1)
-    mail (2.7.1)
-      mini_mime (>= 0.1.1)
-    mini_mime (1.0.2)
-    moneta (1.4.1)
-    mustermann (1.1.1)
-      ruby2_keywords (~> 0.0.1)
-    public_suffix (4.0.6)
-    raabro (1.4.0)
-    rack (2.2.3)
-    rack-protection (2.1.0)
-      rack
-    rack-test (1.1.0)
-      rack (>= 1.0, < 3)
-    rake (13.0.1)
-    redis (4.2.2)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.0)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.0)
-    ruby2_keywords (0.0.2)
-    rufus-scheduler (3.6.0)
-      fugit (~> 1.1, >= 1.1.6)
-    semantic_logger (4.7.3)
-      concurrent-ruby (~> 1.0)
-    simplecov (0.16.1)
-      docile (~> 1.1)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.2)
-    sinatra (2.1.0)
-      mustermann (~> 1.0)
-      rack (~> 2.2)
-      rack-protection (= 2.1.0)
-      tilt (~> 2.0)
-    sinatra-logger (0.3.2)
-      semantic_logger
-      sinatra
-    sucker_punch (2.1.2)
-      concurrent-ruby (~> 1.0)
-    sync (0.5.0)
-    term-ansicolor (1.7.1)
-      tins (~> 1.0)
-    thor (1.0.1)
-    tilt (2.0.10)
-    tins (1.26.0)
-      sync
-    toml-rb (2.0.1)
-      citrus (~> 3.0, > 3.0)
-    tzinfo (2.0.2)
-      concurrent-ruby (~> 1.0)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.7.7)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  coveralls (~> 0.8.23)
-  cutting_edge!
-  rack-test
-  redis
-  rspec (~> 3.9)
-  simplecov
-
-BUNDLED WITH
-   2.1.4