repofetch 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4fcfbdc976dd0c5345c0b46b617491569f862dfca0b770f7e8ba7a140580a799
-  data.tar.gz: 6367a3ec9d1604ca2f9ca3bcc1916a4550cc9c05044f580233f62a0583b57f9e
+  metadata.gz: 3ad5af8ce1827ff6413451767fc8040cc710a057ecfde81d2d5db8c33282a15d
+  data.tar.gz: 3b9658cdeaf490accc551548464ea534e49b86a15dde562b16eec7da0d2d9d05
 SHA512:
-  metadata.gz: c1cf7e66ceaa403c241adb2423882fcbc66e123f52f29311525bef0b13a98f45db205dc696374042cc1917e025b294e9256690f251ca1557c94360cf8d1a616b
-  data.tar.gz: fb091b4fc478ec7a9ea70b334cdf01b388602da811dda13c970d99d9aa03fa34a5fd68db0083a46401c1040da2c5012d31cf01a395d6b35b17741ad8cb470335
+  metadata.gz: 07a62248fa6ff9248b85b01fc7f8376ae6b17fd5b9f30fce25a7e1ad139892b4ee230e84e3eb43b1aa2d1b94c66ee0be8f330100b2949b3ba95edbe7bb7cb2b2
+  data.tar.gz: 814a0249c286baf5523a461c50acadd75c2f31149185e5c8f8886e2f48feddcc770445fac5f6441092663cd1dbdea6dd40c2a457526d2740774be67bdafdc709

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    repofetch (0.4.3)
+    repofetch (0.4.4)
       actionview (~> 7.0, >= 7.0.4)
       dotenv (~> 2.8)
       faraday-retry (~> 2.0)
@@ -41,7 +41,7 @@ GEM
     faraday-net_http (3.0.2)
     faraday-retry (2.0.0)
       faraday (~> 2.0)
-    git (1.13.0)
+    git (1.13.1)
       addressable (~> 2.8)
       rchardet (~> 1.8)
     i18n (1.12.0)
@@ -52,7 +52,7 @@ GEM
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     minitest (5.17.0)
-    nokogiri (1.13.10-x86_64-linux)
+    nokogiri (1.14.0-x86_64-linux)
       racc (~> 1.4)
     octokit (6.0.1)
       faraday (>= 1, < 3)
@@ -107,7 +107,7 @@ GEM
       parser (>= 3.1.1.0)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (2.16.0)
+    rubocop-rspec (2.17.0)
       rubocop (~> 1.33)
     ruby-progressbar (1.11.0)
     ruby2_keywords (0.0.5)

data/RELEASE_NOTES

@@ -1,30 +1,6 @@
-0.4.3
-
-## Added
-
-- Bitbucket Cloud plugin
-- Simple help message for the GitLab plugin (`repofetch --plugin Repofetch::Gitlab -- --help`)
-- `--path` option, which is an alias for `--repository`
-- SSH url stat to GitHub and GitLab plugins
-
-## Changed
-
-- "URL" stat in GitHub and GitLab plugins to "HTTP(S)"
-- GitLab header to be styled
+Bitbucket Cloud Bugfix
 
 ## Fixed
 
-- Confusing error on incorrect CLI args for the GitLab plugin
-
-## Breaking for users
-
-### Changed
-
-- The `--plugin` short option to `-P`
-- `-p` to be the short option for `--path`
-
-## Breaking for 3rd-party plugins
-
-### Changed
-
-- The exception that is caught when initializing a plugin from `ArgumentError` to `Repofetch::PluginUsageError`
+- Bitbucket Cloud not getting automatically detected when running `repofetch` in a
+  Bitbucket Cloud repository

data/lib/repofetch/bitbucketcloud.rb

@@ -11,6 +11,8 @@ class Repofetch
   class BitbucketCloud < Repofetch::Plugin
     include ActionView::Helpers::NumberHelper
 
+    HTTP_REMOTE_REGEX = %r{https?://bitbucket\.org/(?<owner>[\w._-]+)/(?<repo>[\w._-]+)}.freeze
+    SSH_REMOTE_REGEX = %r{git@bitbucket\.org:(?<owner>[\w._-]+)/(?<repo>[\w._-]+)}.freeze
     ASCII = File.read(File.expand_path('bitbucketcloud/ASCII', __dir__))
 
     attr_reader :repo_identifier
@@ -45,12 +47,43 @@ class Repofetch
       ENV.fetch('BITBUCKET_TOKEN', nil)
     end
 
-    def self.matches_repo?(*)
-      false
+    # Detects that the repository is a Bitbucket repository.
+    def self.matches_repo?(git)
+      default_remote = Repofetch.default_remote(git)
+      matches_remote?(default_remote&.url)
     end
 
-    def self.from_git(*)
-      new
+    # Detects that the remote URL is for a Bitbucket Cloud repository.
+    def self.matches_remote?(remote)
+      HTTP_REMOTE_REGEX.match?(remote) || SSH_REMOTE_REGEX.match?(remote)
+    end
+
+    # Gets the owner and repository from a GitHub local repository.
+    def self.repo_identifiers(git)
+      default_remote = Repofetch.default_remote(git)
+      remote_identifiers(default_remote&.url)
+    end
+
+    # Gets the owner and repository from a GitHub remote URL.
+    #
+    # Returns nil if there is no match.
+    def self.remote_identifiers(remote)
+      match = HTTP_REMOTE_REGEX.match(remote)
+      match = SSH_REMOTE_REGEX.match(remote) if match.nil?
+      raise "Remote #{remote.inspect} doesn't look like a Bitbucket Cloud remote" if match.nil?
+
+      [match[:owner], match[:repo].delete_suffix('.git')]
+    end
+
+    # Creates an instance from a +Git::Base+ instance.
+    #
+    # @raise [Repofetch::PluginUsageError] if this plugin was selected *and* arguments were passed.
+    def self.from_git(git, args)
+      raise Repofetch::PluginUsageError, 'Explicitly activate this plugin to CLI arguments' unless args.empty?
+
+      owner, repository = repo_identifiers(git)
+
+      new("#{owner}/#{repository}")
     end
 
     def self.from_args(args)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: repofetch
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - Spenser Black
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-01-12 00:00:00.000000000 Z
+date: 2023-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionview