dpu 0.4.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d4e5362a3f5be5dd2a03b88cf4d9223a492dbc0612721ae90e0235cc7440bfd
-  data.tar.gz: 36f99c5337c5810d9c0daf40ea10cc2588e54e129ca7839faad50170772b093d
+  metadata.gz: dac668681b4d1ec193e02d8f9762392b575a944e3d5f6c14401af8df6ce48059
+  data.tar.gz: 51a3a6f5eb287a6ed2a190cdcb0054e641e51adb9b88a27d9a24802a2a6ee7ac
 SHA512:
-  metadata.gz: e278b4267be87dd61903c6b18b3283c47bb35c2cd2a08a1cb6f9c18ef2a5f1e6ce0e135845b59ceba18b0cc269bd6f976a220968111f7116992e9710cd7cb24f
-  data.tar.gz: 9c4bda05c75bb0a19f01352a45309c17276a5f15ea6f5c5446922b4f8042f0ceb747355216163c1bc18023c5c65190829b56f6e19937f619736447ae83792176
+  metadata.gz: c1a2519ff236aa25fef3ac00807f0a1e2e172deeb8492e9a3612863b5b306755568d2ecf0ec786ff4df5ead9f31df0483046c3639a709bc8b137d72421c67e3d
+  data.tar.gz: b0dae8f855296d97ef063f60b94bf28e7d8c2593ce38ab423f9a6064c0496040c8f670e4b5ac459f601a9fda82eea87e159fdcd7fbfe268592f4bce9d98afc91

data/Gemfile

@@ -4,5 +4,3 @@ source "https://rubygems.org"
 
 # Specify your gem's dependencies in dpu.gemspec
 gemspec
-
-gem "rake", "~> 13.0"

data/README.md

@@ -67,7 +67,7 @@ Then type `C-x L` to copy permanent URI. `C-y` to paste it.
 define_command(:copy_permanent_uri, doc: "Copy permanent URI") do
   require "dpu"
   b = Buffer.current
-  uri = Dpu.determine_permanent_uri(Pathname(b.file_name), b.current_line)
+  uri = Dpu.determine_permanent_uri(Pathname(b.file_name), start_line_number: b.current_line)
   KILL_RING.push(uri)
   Clipboard.copy(uri) if CLIPBOARD_AVAILABLE
   message("Copied: #{uri}")

data/lib/dpu/cli.rb

@@ -15,7 +15,11 @@ class Dpu::Cli
       start_line_number = s_start_line_number&.to_i
       end_line_number = s_end_line_number&.to_i
 
-      uri = Dpu.determine_permanent_uri(path, start_line_number, end_line_number)
+      uri = Dpu.determine_permanent_uri(
+        path,
+        start_line_number: start_line_number,
+        end_line_number: end_line_number,
+      )
       puts(uri)
     end
   end

data/lib/dpu/scm_service/base.rb

@@ -0,0 +1,25 @@
+class Dpu::ScmService::Base
+  def determine_repository_uri(repository_http_or_ssh_url)
+    md = self.class::REMOTE_URL_PATTERN.match(repository_http_or_ssh_url)
+    return nil if !md
+
+    url = self.class::REPOSITORY_URI_TEMPLATE % {
+      account_name: md[:account_name],
+      repository_name: md[:repository_name],
+    }
+    return URI(url)
+  end
+
+  def ref_prefix
+    return self.class::REF_PREFIX
+  end
+
+  def determine_fragment(start_line_number, end_line_number)
+    return nil if !start_line_number
+    return "L#{start_line_number}" if !end_line_number || start_line_number == end_line_number
+    return self.class::START_AND_END_LINE_NUMBER_FRAGMENT_TEMPLATE % {
+      start_line_number: start_line_number,
+      end_line_number: end_line_number,
+    }
+  end
+end

data/lib/dpu/scm_service/github.rb

@@ -0,0 +1,18 @@
+class Dpu::ScmService::Github < Dpu::ScmService::Base
+  REPOSITORY_URI_TEMPLATE = "https://github.com/%{account_name}/%{repository_name}"
+
+  REMOTE_URL_PATTERN = [
+    %r{\Agit://github\.com/(?<account_name>[^/]+)/(?<repository_name>[^/]+(?=\.git)|[^/]+)},
+    %r{\Ahttps?://github\.com/(?<account_name>[^/]+)/(?<repository_name>[^/]+(?=\.git)|[^/]+)},
+    %r{\Agit@github\.com:(?<account_name>[^/]+)/(?<repository_name>[^/]+(?=\.git)|[^/]+)},
+    %r{\Assh://git@github\.com/(?<account_name>[^/]+)/(?<repository_name>[^/]+(?=\.git)|[^/]+)},
+  ].then { |patterns|
+    Regexp.union(*patterns)
+  }
+
+  REF_PREFIX = "blob"
+
+  START_AND_END_LINE_NUMBER_FRAGMENT_TEMPLATE = "L%{start_line_number}-L%{end_line_number}"
+end
+
+Dpu::SCM_SERVICES << Dpu::ScmService::Github.new

data/lib/dpu/scm_service/sourcehut.rb

@@ -0,0 +1,16 @@
+class Dpu::ScmService::Sourcehut < Dpu::ScmService::Base
+  REPOSITORY_URI_TEMPLATE = "https://git.sr.ht/~%{account_name}/%{repository_name}"
+
+  REMOTE_URL_PATTERN = [
+    %r{\Ahttps://git\.sr\.ht/\~(?<account_name>[^/]+)/(?<repository_name>.+)},
+    %r{\Agit@git\.sr\.ht:\~(?<account_name>[^/]+)/(?<repository_name>.+)},
+  ].then { |patterns|
+    Regexp.union(*patterns)
+  }
+
+  REF_PREFIX = "tree"
+
+  START_AND_END_LINE_NUMBER_FRAGMENT_TEMPLATE = "L%{start_line_number}-%{end_line_number}"
+end
+
+Dpu::SCM_SERVICES << Dpu::ScmService::Sourcehut.new

data/lib/dpu/scm_service.rb

@@ -0,0 +1,2 @@
+module Dpu::ScmService
+end

data/lib/dpu/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Dpu
-  VERSION = "0.4.2"
+  VERSION = "0.5.0"
 end

data/lib/dpu.rb

@@ -2,57 +2,30 @@ require "open3"
 require "pathname"
 require "uri"
 
+require "version_sorter"
+
 module Dpu
   autoload :Cli, "dpu/cli"
   autoload :VERSION, "dpu/vesion"
 
+  SCM_SERVICES = []
+
   class << self
-    GITHUB_REPOSITORY_URI_TEMPLATE = "https://github.com/%{account_name}/%{repository_name}"
-    SOURCEHUT_REPOSITORY_URI_TEMPLATE = "https://git.sr.ht/~%{account_name}/%{repository_name}"
-    REPOSITORY_URI_TEMPLATES = {
-      github: GITHUB_REPOSITORY_URI_TEMPLATE,
-      sourcehut: SOURCEHUT_REPOSITORY_URI_TEMPLATE,
-    }
-
-    GITHUB_REMOTE_URL_PATTERN = [
-      %r{\Agit://github\.com/(?<account_name>[^/]+)/(?<repository_name>[^/]+(?=\.git)|[^/]+)},
-      %r{\Ahttps?://github\.com/(?<account_name>[^/]+)/(?<repository_name>[^/]+(?=\.git)|[^/]+)},
-      %r{\Agit@github\.com:(?<account_name>[^/]+)/(?<repository_name>[^/]+(?=\.git)|[^/]+)},
-      %r{\Assh://git@github\.com/(?<account_name>[^/]+)/(?<repository_name>[^/]+(?=\.git)|[^/]+)},
-    ].then { |patterns|
-      Regexp.union(*patterns)
-    }
-    SOURCEHUT_REMOTE_URL_PATTERN = [
-      %r{\Ahttps://git\.sr\.ht/\~(?<account_name>[^/]+)/(?<repository_name>.+)},
-      %r{\Agit@git\.sr\.ht:\~(?<account_name>[^/]+)/(?<repository_name>.+)},
-    ].then { |patterns|
-      Regexp.union(*patterns)
-    }
-    REMOTE_URL_PATTERNS = {
-      github: GITHUB_REMOTE_URL_PATTERN,
-      sourcehut: SOURCEHUT_REMOTE_URL_PATTERN,
-    }
-
-    REF_PREFIX = {
-      github: 'blob',
-      sourcehut: 'tree',
-    }
-
-    def determine_permanent_uri(path_or_link, start_line_number = nil, end_line_number = nil)
+    def determine_permanent_uri(path_or_link, start_line_number: nil, end_line_number: nil)
       path = path_or_link.realpath
       relative_path = determine_relative_path(path)
 
       remote_url = get_remote_url(path)
-      vcs_service = determine_vcs_service(remote_url)
+      scm_service, repository_uri = determine_scm_service_and_repository_uri(remote_url)
 
       permanent_uri_parts = [
-        determine_repository_uri(vcs_service, remote_url),
-        REF_PREFIX[vcs_service],
+        repository_uri,
+        scm_service.ref_prefix,
         find_same_content_version(path, relative_path) || determine_commit_id(path),
         relative_path,
       ]
       permanent_uri = URI(permanent_uri_parts.join("/"))
-      permanent_uri.fragment = determine_fragment(vcs_service, start_line_number, end_line_number)
+      permanent_uri.fragment = scm_service.determine_fragment(start_line_number, end_line_number)
       return permanent_uri
     end
 
@@ -77,28 +50,13 @@ module Dpu
       return run_command("git remote get-url origin", chdir: path.dirname).chomp
     end
 
-    def determine_vcs_service(repository_http_or_ssh_url)
-      if GITHUB_REMOTE_URL_PATTERN.match?(repository_http_or_ssh_url)
-        return :github
-      end
-      if SOURCEHUT_REMOTE_URL_PATTERN.match?(repository_http_or_ssh_url)
-        return :sourcehut
-      end
-
-      raise "unknown VCS service: #{repository_http_or_ssh_url}"
-    end
-
-    def determine_repository_uri(vcs_service, repository_http_or_ssh_url)
-      md = REMOTE_URL_PATTERNS[vcs_service].match(repository_http_or_ssh_url)
-      if !md
-        return URI(repository_http_or_ssh_url)
+    def determine_scm_service_and_repository_uri(repository_http_or_ssh_url)
+      SCM_SERVICES.each do |scm_service|
+        repository_uri = scm_service.determine_repository_uri(repository_http_or_ssh_url)
+        return scm_service, repository_uri if repository_uri
       end
 
-      url = REPOSITORY_URI_TEMPLATES[vcs_service] % {
-        account_name: md[:account_name],
-        repository_name: md[:repository_name],
-      }
-      return URI(url)
+      raise "unknown SCM service: #{repository_http_or_ssh_url}"
     end
 
     def determine_commit_id(path)
@@ -109,12 +67,7 @@ module Dpu
 
     def find_same_content_version(path, relative_path_from_repository_root)
       stdout = run_command(*%w[git tag --list [0-9]* v[0-9]*], chdir: path.dirname)
-      versions = stdout.each_line(chomp: true).sort_by { |v|
-        comparable_version =
-          v.sub(/\Av/, "").
-            gsub(/[_@]+/, ".") # https://github.com/ruby/ruby/tree/v1_8_5_55%4013008
-        Gem::Version.new(comparable_version)
-      }
+      versions = VersionSorter.sort(stdout.each_line(chomp: true).select(&:ascii_only?))
 
       content_in_head = path.read
       same_content_version = versions.reverse_each.find { |version|
@@ -126,12 +79,10 @@ module Dpu
       }
       return same_content_version
     end
-
-    def determine_fragment(vcs_service, start_line_number, end_line_number)
-      return nil if !start_line_number
-      return "L#{start_line_number}" if !end_line_number || start_line_number == end_line_number
-      return "L#{start_line_number}-L#{end_line_number}" if vcs_service == :github
-      return "L#{start_line_number}-#{end_line_number}" if vcs_service == :sourcehut
-    end
   end
 end
+
+require "dpu/scm_service"
+require "dpu/scm_service/base"
+require "dpu/scm_service/github"
+require "dpu/scm_service/sourcehut"

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: dpu
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors:
 - Yuya.Nishida.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-07-15 00:00:00.000000000 Z
+date: 2023-07-29 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: version_sorter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement
@@ -24,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  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'
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
@@ -53,6 +81,10 @@ files:
 - exe/dpu
 - lib/dpu.rb
 - lib/dpu/cli.rb
+- lib/dpu/scm_service.rb
+- lib/dpu/scm_service/base.rb
+- lib/dpu/scm_service/github.rb
+- lib/dpu/scm_service/sourcehut.rb
 - lib/dpu/version.rb
 - sig/dpu.rbs
 homepage: https://github.com/nishidayuya/dpu