git-lint 1.4.0 → 2.3.0

data/lib/git/lint/analyzers/commit_trailer_collaborator_name.rb

@@ -24,16 +24,14 @@ module Git
         end
         # rubocop:enable Metrics/ParameterLists
 
-        def valid?
-          affected_commit_trailer_lines.empty?
-        end
+        def valid? = affected_commit_trailers.empty?
 
         def issue
           return {} if valid?
 
           {
             hint: "Name must follow key and consist of #{minimum} parts (minimum).",
-            lines: affected_commit_trailer_lines
+            lines: affected_commit_trailers
           }
         end
 
@@ -48,9 +46,7 @@ module Git
 
         attr_reader :parser, :validator
 
-        def minimum
-          settings.fetch :minimum
-        end
+        def minimum = settings.fetch(:minimum)
       end
     end
   end

data/lib/git/lint/branches/environments/circle_ci.rb

@@ -6,21 +6,17 @@ module Git
       module Environments
         # Provides Circle CI build environment feature branch information.
         class CircleCI
-          def initialize repo: Git::Kit::Repo.new
-            @repo = repo
+          def initialize repository: GitPlus::Repository.new
+            @repository = repository
           end
 
-          def name
-            "origin/#{repo.branch_name}"
-          end
+          def name = "origin/#{repository.branch_name}"
 
-          def shas
-            repo.shas start: "origin/master", finish: name
-          end
+          def commits = repository.commits("origin/#{repository.branch_default}..#{name}")
 
           private
 
-          attr_reader :repo
+          attr_reader :repository
         end
       end
     end

data/lib/git/lint/branches/environments/git_hub_action.rb

@@ -6,21 +6,17 @@ module Git
       module Environments
         # Provides GitHub Action build environment feature branch information.
         class GitHubAction
-          def initialize repo: Git::Kit::Repo.new
-            @repo = repo
+          def initialize repository: GitPlus::Repository.new
+            @repository = repository
           end
 
-          def name
-            "origin/#{repo.branch_name}"
-          end
+          def name = "origin/#{repository.branch_name}"
 
-          def shas
-            repo.shas start: "origin/master", finish: name
-          end
+          def commits = repository.commits("origin/#{repository.branch_default}..#{name}")
 
           private
 
-          attr_reader :repo
+          attr_reader :repository
         end
       end
     end

data/lib/git/lint/branches/environments/local.rb

@@ -6,21 +6,17 @@ module Git
       module Environments
         # Provides local build environment feature branch information.
         class Local
-          def initialize repo: Git::Kit::Repo.new
-            @repo = repo
+          def initialize repository: GitPlus::Repository.new
+            @repository = repository
           end
 
-          def name
-            repo.branch_name
-          end
+          def name = repository.branch_name
 
-          def shas
-            repo.shas start: "master", finish: name
-          end
+          def commits = repository.commits("#{repository.branch_default}..#{name}")
 
           private
 
-          attr_reader :repo
+          attr_reader :repository
         end
       end
     end

data/lib/git/lint/branches/environments/netlify_ci.rb

@@ -8,25 +8,23 @@ module Git
       module Environments
         # Provides Netlify CI build environment feature branch information.
         class NetlifyCI
-          def initialize environment: ENV, repo: Git::Kit::Repo.new, shell: Open3
-            @environment = environment
-            @repo = repo
+          def initialize repository: GitPlus::Repository.new, shell: Open3, environment: ENV
+            @repository = repository
             @shell = shell
+            @environment = environment
           end
 
-          def name
-            environment["HEAD"]
-          end
+          def name = environment["HEAD"]
 
-          def shas
-            shell.capture2e "git remote add -f origin #{environment["REPOSITORY_URL"]}"
-            shell.capture2e "git fetch origin #{name}:#{name}"
-            repo.shas start: "origin/master", finish: "origin/#{name}"
+          def commits
+            shell.capture3 "git remote add -f origin #{environment["REPOSITORY_URL"]}"
+            shell.capture3 "git fetch origin #{name}:#{name}"
+            repository.commits "origin/#{repository.branch_default}..origin/#{name}"
           end
 
           private
 
-          attr_reader :environment, :repo, :shell
+          attr_reader :repository, :shell, :environment
         end
       end
     end

data/lib/git/lint/branches/environments/travis_ci.rb

@@ -8,48 +8,40 @@ module Git
       module Environments
         # Provides Travis CI build environment feature branch information.
         class TravisCI
-          def initialize environment: ENV, repo: Git::Kit::Repo.new, shell: Open3
-            @environment = environment
-            @repo = repo
+          def initialize repository: GitPlus::Repository.new, shell: Open3, environment: ENV
+            @repository = repository
             @shell = shell
+            @environment = environment
           end
 
-          def name
-            pull_request_branch.empty? ? ci_branch : pull_request_branch
-          end
+          def name = pull_request_branch.empty? ? ci_branch : pull_request_branch
 
-          def shas
+          def commits
             prepare_project
-            repo.shas start: "origin/master", finish: name
+            repository.commits "origin/#{repository.branch_default}..#{name}"
           end
 
           private
 
-          attr_reader :environment, :repo, :shell
+          attr_reader :environment, :repository, :shell
 
           def prepare_project
             slug = pull_request_slug
 
             unless slug.empty?
-              shell.capture2e "git remote add -f original_branch https://github.com/#{slug}.git"
-              shell.capture2e "git fetch original_branch #{name}:#{name}"
+              shell.capture3 "git remote add -f original_branch https://github.com/#{slug}.git"
+              shell.capture3 "git fetch original_branch #{name}:#{name}"
             end
 
-            shell.capture2e "git remote set-branches --add origin master"
-            shell.capture2e "git fetch"
+            shell.capture3 "git remote set-branches --add origin #{repository.branch_default}"
+            shell.capture3 "git fetch"
           end
 
-          def ci_branch
-            environment["TRAVIS_BRANCH"]
-          end
+          def ci_branch = environment["TRAVIS_BRANCH"]
 
-          def pull_request_branch
-            environment["TRAVIS_PULL_REQUEST_BRANCH"]
-          end
+          def pull_request_branch = environment["TRAVIS_PULL_REQUEST_BRANCH"]
 
-          def pull_request_slug
-            environment["TRAVIS_PULL_REQUEST_SLUG"]
-          end
+          def pull_request_slug = environment["TRAVIS_PULL_REQUEST_SLUG"]
         end
       end
     end

data/lib/git/lint/branches/feature.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "forwardable"
+require "refinements/strings"
 
 module Git
   module Lint
@@ -9,9 +10,11 @@ module Git
       class Feature
         extend Forwardable
 
-        def_delegators :selected_environment, :name, :shas
+        using ::Refinements::Strings
 
-        def initialize environment: ENV, git_repo: Git::Kit::Repo.new
+        def_delegators :selected_environment, :name, :commits
+
+        def initialize environment: ENV, git_repo: GitPlus::Repository.new
           message = "Invalid repository. Are you within a Git-enabled project?"
           fail Errors::Base, message unless git_repo.exist?
 
@@ -19,10 +22,6 @@ module Git
           @selected_environment = load_environment
         end
 
-        def commits
-          shas.map { |sha| Commits::Saved.new sha: sha }
-        end
-
         private
 
         attr_reader :current_environment, :selected_environment
@@ -36,9 +35,7 @@ module Git
           end
         end
 
-        def key? key
-          current_environment[key] == "true"
-        end
+        def key?(key) = current_environment.fetch(key, "false").to_bool
       end
     end
   end

data/lib/git/lint/cli.rb

@@ -3,6 +3,7 @@
 require "thor"
 require "thor/actions"
 require "runcom"
+require "pathname"
 require "pastel"
 
 module Git
@@ -60,7 +61,9 @@ module Git
                     type: :array,
                     default: []
       def analyze
-        collector = analyze_commits options.commits
+        # FIX: Need to accept SHAs.
+        # collector = analyze_commits options.commits
+        collector = analyze_commits
         abort if collector.errors?
       rescue Errors::Base => error
         abort colorizer.red("#{Identity::LABEL}: #{error.message}")
@@ -68,17 +71,14 @@ module Git
 
       desc "--hook", "Add Git Hook support."
       map "--hook" => :hook
-      method_option :commit_message,
-                    desc: "Analyze commit message.",
-                    banner: "PATH",
-                    type: :string
+      method_option :commit_message, desc: "Analyze commit message.", banner: "PATH", type: :string
       def hook
         if options.commit_message?
           check_commit_message options.commit_message
         else
           help "--hook"
         end
-      rescue Errors::Base => error
+      rescue Errors::Base, GitPlus::Errors::Base => error
         abort colorizer.red("#{Identity::LABEL}: #{error.message}")
       end
 
@@ -98,21 +98,16 @@ module Git
 
       attr_reader :configuration, :runner, :colorizer
 
-      def load_collector shas
-        commits = shas.map { |sha| Commits::Saved.new sha: sha }
-        commits.empty? ? runner.call : runner.call(commits: commits)
-      end
-
-      def analyze_commits shas
-        load_collector(shas).tap do |collector|
+      def analyze_commits
+        runner.call.tap do |collector|
           reporter = Reporters::Branch.new collector: collector
           say reporter.to_s
         end
       end
 
       def check_commit_message path
-        commit = Commits::Unsaved.new path: path
-        collector = runner.call commits: commit
+        commit = GitPlus::Repository.new.unsaved Pathname(path)
+        collector = runner.call commits: [commit]
         reporter = Reporters::Branch.new collector: collector
         say reporter.to_s
         abort if collector.errors?

data/lib/git/lint/collector.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require "refinements/strings"
+require "refinements/hashes"
 
 module Git
   module Lint
     class Collector
-      using Refinements::Strings
+      using ::Refinements::Hashes
 
       def initialize
         @collection = Hash.new { |default, missing_id| default[missing_id] = [] }
@@ -16,45 +16,25 @@ module Git
         analyzer
       end
 
-      def retrieve id
-        collection[id]
-      end
+      def retrieve(id) = collection[id]
 
-      def empty?
-        collection.empty?
-      end
+      def empty? = collection.empty?
 
-      def warnings?
-        collection.values.flatten.any?(&:warning?)
-      end
+      def warnings? = collection.values.flatten.any?(&:warning?)
 
-      def errors?
-        collection.values.flatten.any?(&:error?)
-      end
+      def errors? = collection.values.flatten.any?(&:error?)
 
-      def issues?
-        collection.values.flatten.any?(&:invalid?)
-      end
+      def issues? = collection.values.flatten.any?(&:invalid?)
 
-      def total_warnings
-        collection.values.flatten.count(&:warning?)
-      end
+      def total_warnings = collection.values.flatten.count(&:warning?)
 
-      def total_errors
-        collection.values.flatten.count(&:error?)
-      end
+      def total_errors = collection.values.flatten.count(&:error?)
 
-      def total_issues
-        collection.values.flatten.count(&:invalid?)
-      end
+      def total_issues = collection.values.flatten.count(&:invalid?)
 
-      def total_commits
-        collection.keys.size
-      end
+      def total_commits = collection.keys.size
 
-      def to_h
-        collection
-      end
+      def to_h = collection
 
       private
 

data/lib/git/lint/identity.rb

@@ -6,7 +6,7 @@ module Git
     module Identity
       NAME = "git-lint"
       LABEL = "Git Lint"
-      VERSION = "1.4.0"
+      VERSION = "2.3.0"
       VERSION_LABEL = "#{LABEL} #{VERSION}"
     end
   end

data/lib/git/lint/kit/filter_list.rb

@@ -9,17 +9,11 @@ module Git
           @list = Array list
         end
 
-        def to_hint
-          to_regexp.map(&:inspect).join ", "
-        end
+        def to_hint = to_regexp.map(&:inspect).join(", ")
 
-        def to_regexp
-          list.map { |item| Regexp.new item }
-        end
+        def to_regexp = list.map { |item| Regexp.new item }
 
-        def empty?
-          list.empty?
-        end
+        def empty? = list.empty?
 
         private
 

data/lib/git/lint/parsers/trailers/collaborator.rb

@@ -5,7 +5,7 @@ module Git
     module Parsers
       module Trailers
         class Collaborator
-          DEFAULT_KEY_PATTERN = /\ACo.*Authored.*By.*\Z/i.freeze
+          DEFAULT_KEY_PATTERN = /\ACo.*Authored.*By.*\Z/i
 
           DEFAULT_MATCH_PATTERN = /
             (?<key>\A.+)         # Key (anchored to start of line).
@@ -15,7 +15,7 @@ module Git
             (?<name_space>\s?)   # Space delimiter (optional).
             (?<email><.+>)?      # Collaborator email (optional).
             \Z                   # End of line.
-          /x.freeze
+          /x
 
           def initialize text,
                          key_pattern: DEFAULT_KEY_PATTERN,
@@ -27,21 +27,13 @@ module Git
             @matches = build_matches
           end
 
-          def key
-            String matches["key"]
-          end
+          def key = String(matches["key"])
 
-          def name
-            String matches["name"]
-          end
+          def name = String(matches["name"])
 
-          def email
-            String(matches["email"]).delete_prefix("<").delete_suffix(">")
-          end
+          def email = String(matches["email"]).delete_prefix("<").delete_suffix(">")
 
-          def match?
-            text.match? key_pattern
-          end
+          def match? = text.match?(key_pattern)
 
           private