cutting_edge 0.2 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9345fa39664217f3d25636af4855abfa9f4e684237c0038fbeb4fa57e83ec40d
-  data.tar.gz: de6eaa52e75463fed82b1aae4723e6685a80522086ed28cc3a8ded7e6b3189cb
+  metadata.gz: 4457b31dd15da9184bb394f6d85b9197228e9cadbe6640b0c8b50bfd8ad08650
+  data.tar.gz: e74cbee369cb51b73c3a0ef2822580913774f6d5a6aa8440b01fe5a2aef83130
 SHA512:
-  metadata.gz: c866cf8788242847e16b65f0b8a21481b5b57df936241d9bdf68044d62d55083d12dc827f6eeedd4978716ad131a2ac7993ea2ad0f6b6a23a150dc35f4ca6359
-  data.tar.gz: afcee66340cc2f542d45ab6bb4f5a5427d57c69ec7d925f49f22909cf2c0de2f767b8ecf8ab4b295dba6f514177309607ad1a185455f257a35ff40884b802652
+  metadata.gz: 98f7e1eb93eec5ef97fb942b81b2ab982f3bea1f4b660dfa1356f3930ca68a3dfe35396c610bde83919a7877256e40d2d4a6df5661ac21936111d7f096be3491
+  data.tar.gz: 655323d084a16337cc5aeee7e271fdd3500eb119380540589b3d6a63027b075ab44651453a67ad2e671fdbcc0e320e8a727f7f12fe8c090f0c43ba0f3285cb50

data/Gemfile.lock

@@ -1,25 +1,25 @@
 PATH
   remote: .
   specs:
-    cutting_edge (0.2)
+    cutting_edge (0.2.1)
       gemnasium-parser (~> 0.1.9)
       hashdiff (~> 1.0)
-      http (~> 4.3)
+      http (~> 5.0)
       mail (~> 2.7)
       moneta (~> 1.2)
       rufus-scheduler (~> 3.6)
       sinatra (~> 2.0)
       sinatra-logger (~> 0.3)
-      sucker_punch (~> 2.1)
+      sucker_punch (~> 3.0)
       toml-rb (~> 2.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.7.0)
+    addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
     citrus (3.0.2)
-    concurrent-ruby (1.1.7)
+    concurrent-ruby (1.1.9)
     coveralls (0.8.23)
       json (>= 1.8, < 3)
       simplecov (~> 0.16.1)
@@ -32,30 +32,31 @@ GEM
       unf (>= 0.0.5, < 1.0.0)
     et-orbi (1.2.4)
       tzinfo
-    ffi (1.13.1)
+    ffi (1.15.3)
     ffi-compiler (1.0.1)
       ffi (>= 1.0.0)
       rake
-    fugit (1.4.0)
+    fugit (1.5.1)
       et-orbi (~> 1.1, >= 1.1.8)
       raabro (~> 1.4)
     gemnasium-parser (0.1.9)
     hashdiff (1.0.1)
-    http (4.4.1)
+    http (5.0.1)
       addressable (~> 2.3)
       http-cookie (~> 1.0)
       http-form_data (~> 2.2)
-      http-parser (~> 1.2.0)
-    http-cookie (1.0.3)
+      llhttp-ffi (~> 0.3.0)
+    http-cookie (1.0.4)
       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)
+    llhttp-ffi (0.3.1)
+      ffi-compiler (~> 1.0)
+      rake (~> 13.0)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
-    mini_mime (1.0.2)
-    moneta (1.4.1)
+    mini_mime (1.1.1)
+    moneta (1.4.2)
     mustermann (1.1.1)
       ruby2_keywords (~> 0.0.1)
     public_suffix (4.0.6)
@@ -65,7 +66,7 @@ GEM
       rack
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rake (13.0.1)
+    rake (13.0.6)
     redis (4.2.2)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
@@ -80,10 +81,10 @@ GEM
       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)
+    ruby2_keywords (0.0.5)
+    rufus-scheduler (3.8.0)
       fugit (~> 1.1, >= 1.1.6)
-    semantic_logger (4.7.3)
+    semantic_logger (4.8.2)
       concurrent-ruby (~> 1.0)
     simplecov (0.16.1)
       docile (~> 1.1)
@@ -98,7 +99,7 @@ GEM
     sinatra-logger (0.3.2)
       semantic_logger
       sinatra
-    sucker_punch (2.1.2)
+    sucker_punch (3.0.1)
       concurrent-ruby (~> 1.0)
     sync (0.5.0)
     term-ansicolor (1.7.1)
@@ -109,7 +110,7 @@ GEM
       sync
     toml-rb (2.0.1)
       citrus (~> 3.0, > 3.0)
-    tzinfo (2.0.2)
+    tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
     unf (0.1.4)
       unf_ext

data/README.md

@@ -207,13 +207,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/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.2.1'
+  s.date              = '2021-09-02'
   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'

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/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.rb

@@ -1,3 +1,3 @@
 module CuttingEdge
-  VERSION = '0.2'
+  VERSION = '0.2.1'
 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) {
@@ -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'})

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: cutting_edge
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: 0.2.1
 platform: ruby
 authors:
 - Dawa Ometto
 - Bart Kamphorst
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-05 00:00:00.000000000 Z
+date: 2021-09-02 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
@@ -212,7 +212,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
@@ -228,7 +228,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.3
-signing_key: 
+signing_key:
 specification_version: 2
 summary: Self-hosted dependency monitoring, including shiny badges.
 test_files: []