add-to-org 3.0.1 → 3.0.3

data/spec/add-to-org_spec.rb

@@ -1,7 +1,9 @@
-require "spec_helper"
+# frozen_string_literal: true
 
-describe "config" do
-  [:views_dir, :public_dir, :validator].each do |var|
+require 'spec_helper'
+
+describe 'config' do
+  %i[views_dir public_dir validator].each do |var|
     after do
       AddToOrg.send("#{var}=", nil)
     end
@@ -14,23 +16,21 @@ describe "config" do
   end
 end
 
-describe "logged out user" do
-
+describe 'logged out user' do
   include Rack::Test::Methods
 
   def app
     AddToOrg::App
   end
 
-  it "asks you to log in" do
-    get "/"
-    expect(last_response.status).to eql(302)
+  it 'asks you to log in' do
+    get '/'
+    expect(last_response.status).to be(302)
     expect(last_response.headers['Location']).to match(%r{^https://github\.com/login/oauth/authorize})
   end
 end
 
-describe "logged in user" do
-
+describe 'logged in user' do
   include Rack::Test::Methods
 
   def app
@@ -42,92 +42,96 @@ describe "logged in user" do
     login_as @user
   end
 
-  it "redirects if the user is a member" do
-    with_env "GITHUB_ORG_ID", "some_org" do
-      stub_request(:get, "https://api.github.com/orgs/some_org/members/benbaltertest").
-      to_return(:status => 204)
-      get "/"
-      expect(last_response.status).to eql(302)
-      expect(last_response.headers['Location']).to eql("https://github.com/")
-
-      get "/foo"
-      expect(last_response.status).to eql(302)
-      expect(last_response.headers['Location']).to eql("https://github.com/foo")
-
-      get "/foo/bar"
-      expect(last_response.status).to eql(302)
-      expect(last_response.headers['Location']).to eql("https://github.com/foo/bar")
+  it 'redirects if the user is a member' do
+    with_env 'GITHUB_ORG_ID', 'some_org' do
+      stub_request(:get, 'https://api.github.com/orgs/some_org/members/benbaltertest')
+        .to_return(status: 204)
+      get '/'
+      expect(last_response.status).to be(302)
+      expect(last_response.headers['Location']).to eql('https://github.com/')
+
+      get '/foo'
+      expect(last_response.status).to be(302)
+      expect(last_response.headers['Location']).to eql('https://github.com/foo')
+
+      get '/foo/bar'
+      expect(last_response.status).to be(302)
+      expect(last_response.headers['Location']).to eql('https://github.com/foo/bar')
     end
   end
 
-  [:proc, :block, :lambda].each do |method|
+  %i[proc block lambda].each do |method|
     describe "with validator passed as a #{method}" do
-
-      before(:each) do
-        if method == :block
-          AddToOrg.set_validator do |github_user, verified_emails, client|
+      before do
+        case method
+        when :block
+          AddToOrg.set_validator do |_github_user, verified_emails, _client|
             verified_emails.any? { |email| email[:email] =~ /@github\.com$/ }
           end
-        elsif method == :proc
-          AddToOrg.validator = proc { |github_user, verified_emails, client|
+        when :proc
+          AddToOrg.validator = proc { |_github_user, verified_emails, _client|
             verified_emails.any? { |email| email[:email] =~ /@github\.com$/ }
           }
-        elsif method == :lambda
-          AddToOrg.validator = lambda { |github_user, verified_emails, client|
+        when :lambda
+          AddToOrg.validator = lambda { |_github_user, verified_emails, _client|
             verified_emails.any? { |email| email[:email] =~ /@github\.com$/ }
           }
         end
       end
 
-      it "denies acccess to invalid users" do
-        with_env "GITHUB_ORG_ID", "some_org" do
-          stub_request(:get, "https://api.github.com/orgs/some_org/members/benbaltertest").
-          to_return(:status => 404)
+      it 'denies acccess to invalid users' do
+        with_env 'GITHUB_ORG_ID', 'some_org' do
+          stub_request(:get, 'https://api.github.com/orgs/some_org/members/benbaltertest')
+            .to_return(status: 404)
 
-          stub_request(:get, "https://api.github.com/user/emails").
-          to_return(:status => 200, :body => fixture("invalid_emails.json"), :headers => { 'Content-Type'=>'application/json' })
+          stub_request(:get, 'https://api.github.com/user/emails')
+            .to_return(status: 200, body: fixture('invalid_emails.json'), headers: { 'Content-Type' => 'application/json' })
 
-          get "/"
-          expect(last_response.status).to eql(403)
+          get '/'
+          expect(last_response.status).to be(403)
           expect(last_response.body).to match(/We're unable to verify your eligibility at this time/)
         end
       end
 
-      it "tries to add valid users" do
-        with_env "GITHUB_ORG_ID", "some_org" do
-          stub_request(:get, "https://api.github.com/orgs/some_org/members/benbaltertest").
-          to_return(:status => 404)
+      it 'tries to add valid users' do
+        with_env 'GITHUB_ORG_ID', 'some_org' do
+          with_env 'GITHUB_TEAM_ID', '1234' do
+            stub_request(:get, 'https://api.github.com/orgs/some_org/members/benbaltertest')
+              .to_return(status: 404)
 
-          stub_request(:get, "https://api.github.com/user/emails").
-          to_return(:status => 200, :body => fixture("emails.json"), :headers => { 'Content-Type'=>'application/json' })
+            stub_request(:get, 'https://api.github.com/user/emails')
+              .to_return(status: 200, body: fixture('emails.json'), headers: { 'Content-Type' => 'application/json' })
 
-          stub = stub_request(:put, "https://api.github.com/teams/memberships/benbaltertest").
-          to_return(:status => 204)
+            stub = stub_request(:put, 'https://api.github.com/teams/1234/memberships/benbaltertest')
+                   .to_return(status: 204)
 
-          get "/foo"
-          expect(stub).to have_been_requested
-          expect(last_response.status).to eql(200)
-          expect(last_response.body).to match(/confirm your invitation to join the organization/)
-          expect(last_response.body).to match(/https:\/\/github.com\/orgs\/some_org\/invitation/)
-          expect(last_response.body).to match(/\?return_to=https:\/\/github.com\/foo/)
+            get '/foo'
+            expect(stub).to have_been_requested
+            expect(last_response.status).to be(200)
+            expect(last_response.body).to match(/confirm your invitation to join the organization/)
+            expect(last_response.body).to match(%r{https://github.com/orgs/some_org/invitation})
+            expect(last_response.body).to match(%r{\?return_to=https://github.com/foo})
+          end
         end
       end
 
-      it "includes the requested URL" do
-        with_env "GITHUB_ORG_ID", "some_org" do
-          stub_request(:get, "https://api.github.com/orgs/some_org/members/benbaltertest").
-          to_return(:status => 404)
+      it 'includes the requested URL' do
+        with_env 'GITHUB_ORG_ID', 'some_org' do
+          with_env 'GITHUB_TEAM_ID', '1234' do
+            stub_request(:get, 'https://api.github.com/orgs/some_org/members/benbaltertest')
+              .to_return(status: 404)
 
-          stub_request(:get, "https://api.github.com/user/emails").
-          to_return(:status => 200, :body => fixture("emails.json"), :headers => { 'Content-Type'=>'application/json' })
+            stub_request(:get, 'https://api.github.com/user/emails')
+              .to_return(status: 200, body: fixture('emails.json'), headers: { 'Content-Type' => 'application/json' })
 
-          stub = stub_request(:put, "https://api.github.com/teams/memberships/benbaltertest").
-          to_return(:status => 204)
+            stub = stub_request(:put, 'https://api.github.com/teams/1234/memberships/benbaltertest')
+                   .to_return(status: 204)
 
-          get "/foo/bar"
-          expect(stub).to have_been_requested
-          expect(last_response.status).to eql(200)
-          expect(last_response.body).to match(Regexp.new('<a href="https://github.com/foo/bar">https://github.com/foo/bar</a>'))
+            get '/foo/bar'
+            expect(stub).to have_been_requested
+            expect(last_response.status).to be(200)
+            expect(last_response.body).to match(Regexp.new('<a href="https://github.com/foo/bar">https://github.com/foo/bar</a>'))
+          end
         end
       end
     end

data/spec/spec_helper.rb

@@ -1,18 +1,20 @@
-require "bundler/setup"
+# frozen_string_literal: true
+
+require 'bundler/setup'
 require 'fileutils'
 require 'securerandom'
 
 ENV['RACK_ENV'] = 'test'
-ENV['GITHUB_CLIENT_ID'] = "CLIENT_ID"
+ENV['GITHUB_CLIENT_ID'] = 'CLIENT_ID'
 ENV['GITHUB_CLIENT_SECRET'] = 'CLIENT_SECRET'
-$:.push File.join(File.dirname(__FILE__), '..', 'lib')
+$LOAD_PATH.push File.join(File.dirname(__FILE__), '..', 'lib')
 
 require 'rack/test'
 require 'sinatra/auth/github'
 require 'sinatra/auth/github/test/test_helper'
 require 'webmock/rspec'
 
-require_relative "../lib/add-to-org"
+require_relative '../lib/add-to-org'
 WebMock.disable_net_connect!
 
 RSpec.configure do |config|
@@ -35,16 +37,16 @@ def with_env(key, value)
 end
 
 class User < Warden::GitHub::User
-  def self.make(attrs = {}, token=nil)
+  def self.make(attrs = {}, token = nil)
     default_attrs = {
-      'login'   => "test_user",
-      'name'    => "Test User",
-      'email'   => "test@example.com",
-      'company' => "GitHub",
-      'gravatar_id' => 'a'*32,
-      'avatar_url'  => 'https://a249.e.akamai.net/assets.github.com/images/gravatars/gravatar-140.png?d=https://a248.e.akamai.net/assets.github.com%2Fimages%2Fgravatars%2Fgravatar-user-420.png'
+      'login' => 'test_user',
+      'name' => 'Test User',
+      'email' => 'test@example.com',
+      'company' => 'GitHub',
+      'gravatar_id' => 'a' * 32,
+      'avatar_url' => 'https://a249.e.akamai.net/assets.github.com/images/gravatars/gravatar-140.png?d=https://a248.e.akamai.net/assets.github.com%2Fimages%2Fgravatars%2Fgravatar-user-420.png'
     }
     default_attrs.merge! attrs
-    User.new(default_attrs,token)
+    User.new(default_attrs, token)
   end
 end

metadata

@@ -1,73 +1,73 @@
 --- !ruby/object:Gem::Specification
 name: add-to-org
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.3
 platform: ruby
 authors:
 - Ben Balter
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-12-29 00:00:00.000000000 Z
+date: 2021-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: warden-github
+  name: dotenv
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: sinatra_auth_github
+  name: octokit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
-  name: octokit
+  name: rack-ssl-enforcer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '0.2'
 - !ruby/object:Gem::Dependency
-  name: rack-ssl-enforcer
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: dotenv
+  name: sinatra_auth_github
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -81,19 +81,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.3'
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  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: '10.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -109,47 +123,61 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
-  name: rack-test
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: webmock
+  name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.10'
+        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
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0'
 description: A simple Oauth App to automatically add users to an organization.
 email: ben.balter@github.com
 executables: []
@@ -157,8 +185,10 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".bowerrc"
+- ".github/workflows/ci.yml"
 - ".gitignore"
-- ".ruby-version"
+- ".rubocop.yml"
+- ".rubocop_todo.yml"
 - ".travis.yml"
 - Gemfile
 - LICENSE.md
@@ -168,31 +198,6 @@ files:
 - bower.json
 - lib/add-to-org.rb
 - lib/add-to-org/helpers.rb
-- lib/add-to-org/public/vendor/bootstrap/.bower.json
-- lib/add-to-org/public/vendor/bootstrap/LICENSE
-- lib/add-to-org/public/vendor/bootstrap/bower.json
-- lib/add-to-org/public/vendor/bootstrap/dist/css/bootstrap-theme.css
-- lib/add-to-org/public/vendor/bootstrap/dist/css/bootstrap-theme.css.map
-- lib/add-to-org/public/vendor/bootstrap/dist/css/bootstrap-theme.min.css
-- lib/add-to-org/public/vendor/bootstrap/dist/css/bootstrap-theme.min.css.map
-- lib/add-to-org/public/vendor/bootstrap/dist/css/bootstrap.css
-- lib/add-to-org/public/vendor/bootstrap/dist/css/bootstrap.css.map
-- lib/add-to-org/public/vendor/bootstrap/dist/css/bootstrap.min.css
-- lib/add-to-org/public/vendor/bootstrap/dist/css/bootstrap.min.css.map
-- lib/add-to-org/public/vendor/bootstrap/dist/fonts/glyphicons-halflings-regular.eot
-- lib/add-to-org/public/vendor/bootstrap/dist/fonts/glyphicons-halflings-regular.svg
-- lib/add-to-org/public/vendor/bootstrap/dist/fonts/glyphicons-halflings-regular.ttf
-- lib/add-to-org/public/vendor/bootstrap/dist/fonts/glyphicons-halflings-regular.woff
-- lib/add-to-org/public/vendor/bootstrap/dist/fonts/glyphicons-halflings-regular.woff2
-- lib/add-to-org/public/vendor/bootstrap/dist/js/bootstrap.js
-- lib/add-to-org/public/vendor/bootstrap/dist/js/bootstrap.min.js
-- lib/add-to-org/public/vendor/bootstrap/dist/js/npm.js
-- lib/add-to-org/public/vendor/bootstrap/fonts/glyphicons-halflings-regular.eot
-- lib/add-to-org/public/vendor/bootstrap/fonts/glyphicons-halflings-regular.svg
-- lib/add-to-org/public/vendor/bootstrap/fonts/glyphicons-halflings-regular.ttf
-- lib/add-to-org/public/vendor/bootstrap/fonts/glyphicons-halflings-regular.woff
-- lib/add-to-org/public/vendor/bootstrap/fonts/glyphicons-halflings-regular.woff2
-- lib/add-to-org/public/vendor/bootstrap/package.json
 - lib/add-to-org/version.rb
 - lib/add-to-org/views/error.erb
 - lib/add-to-org/views/forbidden.erb
@@ -211,7 +216,7 @@ homepage: https://github.com/benbalter/add-to-org
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -226,9 +231,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
-signing_key: 
+rubygems_version: 3.2.28
+signing_key:
 specification_version: 4
 summary: A simple Oauth App to automatically add users to an organization
 test_files:

data/.ruby-version

@@ -1 +0,0 @@
-2.3.0

data/lib/add-to-org/public/vendor/bootstrap/.bower.json

@@ -1,45 +0,0 @@
-{
-  "name": "bootstrap",
-  "description": "The most popular front-end framework for developing responsive, mobile first projects on the web.",
-  "keywords": [
-    "css",
-    "js",
-    "less",
-    "mobile-first",
-    "responsive",
-    "front-end",
-    "framework",
-    "web"
-  ],
-  "homepage": "http://getbootstrap.com",
-  "license": "MIT",
-  "moduleType": "globals",
-  "main": [
-    "less/bootstrap.less",
-    "dist/js/bootstrap.js"
-  ],
-  "ignore": [
-    "/.*",
-    "_config.yml",
-    "CNAME",
-    "composer.json",
-    "CONTRIBUTING.md",
-    "docs",
-    "js/tests",
-    "test-infra"
-  ],
-  "dependencies": {
-    "jquery": "1.9.1 - 2"
-  },
-  "version": "3.3.6",
-  "_release": "3.3.6",
-  "_resolution": {
-    "type": "version",
-    "tag": "v3.3.6",
-    "commit": "81df608a40bf0629a1dc08e584849bb1e43e0b7a"
-  },
-  "_source": "git://github.com/twbs/bootstrap.git",
-  "_target": "~3.3.6",
-  "_originalSource": "bootstrap",
-  "_direct": true
-}

data/lib/add-to-org/public/vendor/bootstrap/LICENSE

@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2011-2015 Twitter, Inc
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.

data/lib/add-to-org/public/vendor/bootstrap/bower.json

@@ -1,34 +0,0 @@
-{
-  "name": "bootstrap",
-  "description": "The most popular front-end framework for developing responsive, mobile first projects on the web.",
-  "keywords": [
-    "css",
-    "js",
-    "less",
-    "mobile-first",
-    "responsive",
-    "front-end",
-    "framework",
-    "web"
-  ],
-  "homepage": "http://getbootstrap.com",
-  "license": "MIT",
-  "moduleType": "globals",
-  "main": [
-    "less/bootstrap.less",
-    "dist/js/bootstrap.js"
-  ],
-  "ignore": [
-    "/.*",
-    "_config.yml",
-    "CNAME",
-    "composer.json",
-    "CONTRIBUTING.md",
-    "docs",
-    "js/tests",
-    "test-infra"
-  ],
-  "dependencies": {
-    "jquery": "1.9.1 - 2"
-  }
-}