Fix the bug with non-working membership (#25)

* Fix the bug with non-working membership
  - Create Client as a Singleton class
  - Remove Membership class, delegate to an instance method of Client
* Add linting
  - Add SuperLinter workflow
  - Add linter config for Ruby

Author: dshevtsov

.github/linters/.ruby-lint.yml

@@ -0,0 +1,11 @@
+---
+#######################
+# Rubocop Config file #
+#######################
+
+inherit_gem:
+  rubocop-github:
+    - config/default.yml
+
+Style/StringLiterals:
+  EnforcedStyle: single_quotes

.github/workflows/linter.yml

@@ -0,0 +1,48 @@
+---
+###########################
+###########################
+## Linter GitHub Actions ##
+###########################
+###########################
+name: Lint Code Base
+
+#
+# Documentation:
+# https://help.github.com/en/articles/workflow-syntax-for-github-actions
+#
+
+###################################
+# Start the job on a pull request #
+###################################
+on:
+  pull_request
+
+###############
+# Set the Job #
+###############
+jobs:
+  super-lint:
+    # Set the agent to run on
+    runs-on: ubuntu-latest
+
+    ##################
+    # Load all steps #
+    ##################
+    steps:
+      ##########################
+      # Checkout the code base #
+      ##########################
+      - name: Checkout Code
+        uses: actions/checkout@v2
+        with:
+          # Full git history is needed to get a proper list of changed files within `super-linter`
+          fetch-depth: 0
+
+      ################################
+      # Run Linter against code base #
+      ################################
+      - name: Lint Code Base
+        uses: github/super-linter@v3
+        env:
+          VALIDATE_ALL_CODEBASE: false
+          DEFAULT_BRANCH: main

CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## 0.4.2
+
+Fixes:
+
+- Fixed a bug with non-working membership
+
+Maintenance:
+
+- Added code linting
+
 ## 0.4.1
 
 - Added authentication via an environment variable `WHATSUP_GITHUB_ACCESS_TOKEN`

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    whatsup_github (0.4.1)
+    whatsup_github (0.4.2)
       netrc (~> 0.11)
       octokit (~> 4.20)
       thor (~> 1.1)

lib/whatsup_github/client.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+require 'singleton'
+
+# Client authorization
+module WhatsupGithub
+  # Create a singleton object for Client.
+  # Authorize with a GitHub token from $WHATSUP_GITHUB_ACCESS_TOKEN if available
+  # Otherwise, use credentials from ~/.netrc
+  # Otherwise, continue as a Guest
+  class Client
+    include Singleton
+
+    WHATSUP_GITHUB_ACCESS_TOKEN = ENV['WHATSUP_GITHUB_ACCESS_TOKEN']
+    private_constant :WHATSUP_GITHUB_ACCESS_TOKEN
+
+    def initialize
+      @client =
+        if WHATSUP_GITHUB_ACCESS_TOKEN
+          Octokit::Client.new(access_token: WHATSUP_GITHUB_ACCESS_TOKEN)
+        elsif File.exist? "#{ENV['HOME']}/.netrc"
+          Octokit::Client.new(netrc: true)
+        else
+          Octokit::Client.new
+        end
+    end
+
+    def search_issues(query)
+      @client.search_issues(query)
+    end
+
+    def pull_request(repo, number)
+      @client.pull_request(repo, number)
+    end
+
+    def org_members(org)
+      @client.org_members(org)
+    end
+  end
+end

lib/whatsup_github/members.rb

@@ -2,6 +2,7 @@
 
 require 'octokit'
 require_relative 'config_reader'
+require_relative 'client'
 
 module WhatsupGithub
   # Gets issues found on GitHub by query
@@ -51,16 +52,7 @@ def base_branch
     # Otherwise, use credentials from ~/.netrc
     # Otherwise, continue as a Guest
     def client
-      return @client if @client
-
-      @client =
-        if ENV['WHATSUP_GITHUB_ACCESS_TOKEN']
-          Octokit::Client.new(access_token: ENV['WHATSUP_GITHUB_ACCESS_TOKEN'])
-        elsif File.exist? "#{ENV['HOME']}/.netrc"
-          Octokit::Client.new(netrc: true)
-        else
-          Octokit::Client.new
-        end
+      Client.instance
     end
 
     def search_issues(label)

lib/whatsup_github/pulls.rb

@@ -3,7 +3,6 @@
 require_relative 'row'
 require_relative 'pulls'
 require_relative 'config_reader'
-require_relative 'members'
 
 module WhatsupGithub
   # Creates Row objects for the future table
@@ -82,7 +81,7 @@ def pulls(repo)
     def load_members
       return if @members
 
-      @members = Members.new(config.membership).members
+      @members = client.org_members(config.membership)
     end
 
     def member_logins
@@ -93,5 +92,9 @@ def member_logins
     def config
       Config.instance
     end
+
+    def client
+      Client.instance
+    end
   end
 end

lib/whatsup_github/row_collector.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module WhatsupGithub
-  VERSION = '0.4.1'
+  VERSION = '0.4.2'
 end