whatsup_github 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d76d974b6feb2663b6234906cde7aee2011f6fe1c87c2e90f7e4791e4f2b04a7
-  data.tar.gz: fb62023682520d065cfdf326300f576b38e85fea9fcf7e203b8105cae4278b94
+  metadata.gz: 47baad7941df565f9c94827246aac88071c87bda1a975500e7365f0e225ec558
+  data.tar.gz: de4dc002c57c8a5cf7adb7a440ece5cbd135ba0941b450c3406308838a492ddc
 SHA512:
-  metadata.gz: d50707d1f9eb818a36aec8bdc46d19d3543b037b94f9452b3734888184cf77c319364bdd5dc1a5675a4cd90718c808ad7b12052ffcba80d0ac43bd4652eb3d70
-  data.tar.gz: 2032e86160a162ba96521fcb3f7f4ae042c9494e12786e22e28ac4a75d0fcb0ae5c3154f03fe69c1616e0f1cd81eacc2c4166393287708d9535dd1e79eaf46cd
+  metadata.gz: 83358141ba037b13e106d49e9d1bf23c22b2f41ddada945e87c8e3a5319c9f26e664f67e3db68a27799786f866d93b634cf6f9949ef3e0266a91dd2bfa65d3d6
+  data.tar.gz: 55babd4c4a276620f8c4ba198c1e6cd0e40eabc9385b674d6567d6f4607be2bb8b2ba19fa25164fae49c5f327f5b52dae55022f7defc09c6f93f3d1a3f8ec1b1

data/.github/linters/.ruby-lint.yml

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

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

data/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`

data/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)

data/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

data/lib/whatsup_github/pulls.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 @@ module WhatsupGithub
     # 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)

data/lib/whatsup_github/row_collector.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 @@ module WhatsupGithub
     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 @@ module WhatsupGithub
     def config
       Config.instance
     end
+
+    def client
+      Client.instance
+    end
   end
 end

data/lib/whatsup_github/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: whatsup_github
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Dima Shevtsov
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-04-06 00:00:00.000000000 Z
+date: 2021-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: netrc
@@ -144,6 +144,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/linters/.ruby-lint.yml"
+- ".github/workflows/linter.yml"
 - ".gitignore"
 - ".rspec"
 - ".ruby-version"
@@ -160,9 +162,9 @@ files:
 - lib/template/.whatsup.yml
 - lib/whatsup_github.rb
 - lib/whatsup_github/cli.rb
+- lib/whatsup_github/client.rb
 - lib/whatsup_github/config_reader.rb
 - lib/whatsup_github/generator.rb
-- lib/whatsup_github/members.rb
 - lib/whatsup_github/pulls.rb
 - lib/whatsup_github/row.rb
 - lib/whatsup_github/row_collector.rb
@@ -193,7 +195,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.0.9
 signing_key:
 specification_version: 4
 summary: Collect info from GitHub pull requests.

data/lib/whatsup_github/members.rb

@@ -1,18 +0,0 @@
-# frozen_string_literal: true
-
-module WhatsupGithub
-  # Members of an organization
-  class Members
-    def initialize(org)
-      @org = org
-    end
-
-    def client
-      Octokit::Client.new(netrc: true)
-    end
-
-    def members
-      client.org_members @org
-    end
-  end
-end