fustigit 0.1.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c751ca9b2b4344d7ffdfe8135e75415cc6c56e17
-  data.tar.gz: 59c43e03ed9c4c51507bf4db11d54c3a47bb7979
+SHA256:
+  metadata.gz: a001868c87f7c087d968121a2fda96b844ea25913e7dcdb72eb1693a758aeec7
+  data.tar.gz: 7b62afbd47f09af6912c714f99fc4eee50f0389318250c06b5ad9bdd8aa218bb
 SHA512:
-  metadata.gz: 19fcae6c47cbc194ec192839a64f85bae11d26431d2a2215c56f5314f34f37d406389e49b543a7b72a6bef0dce40a282925860b1bfbd523c8edc0860c9e5630f
-  data.tar.gz: f52b1964f4dd1fe5ba16000d20eb75172afd0b8ba89951985fadfc8f65ef95a21c77f3cb3e3a83edd946ba710acfc6311ad659441a713dfef5205fbfe6eb9eb8
+  metadata.gz: b8e293b6873be3478c0217713d6863be53589a1e06726bda8697be709ae8f4167198243824527342f75d739d8c5562f2739fcd4df1949b8582ad397e07da3b6f
+  data.tar.gz: 014c3dfcf9a79842a31df6cdd035ad4395dde4b6ab4496261ef76657635d1a66405bb1ecbd3d45f4479e0649cbe519068ec13cfaa2e96eba78e34b718926825b

data/CHANGELOG.md

@@ -3,9 +3,22 @@ All notable changes to this project will be documented in this file.
 This project attempts to adhere to [Semantic Versioning](http://semver.org/).
 This changelog attempts to adhere to [Keep a CHANGELOG](http://keepachangelog.com/).
 
+## [0.2.0] - 24 October 2019
+### Changed
+- Updated semantics to address use of frozen string literals
+- Updated minitest semantics to address global `must_equal` deprecations
+- Dropped support for Ruby versions older than 2.5.0
+- Numerous Rubocop related fixups
+
+## [0.1.4] - 06 March 2017
+### Added
+- Fixed a missing '-' in the regex pattern that defined the parts of a triplet
+- Numerous Rubocop related fixups
+
 ## [0.1.3] - 07 July 2016
 ### Added
 - Triplets#split method returns the expected array of values for parsed triplets
+
 ### Changed
 - Improved Triplets#triplet? functionality
 
@@ -23,3 +36,9 @@ This changelog attempts to adhere to [Keep a CHANGELOG](http://keepachangelog.co
 ### Added
 - Initial release
 - README covers usage, licensing, and rationale
+
+[0.1.4]: https://github.com/mckern/fustigit/compare/0.1.3...0.1.4
+[0.1.3]: https://github.com/mckern/fustigit/compare/0.1.2...0.1.3
+[0.1.2]: https://github.com/mckern/fustigit/compare/0.1.1...0.1.2
+[0.1.1]: https://github.com/mckern/fustigit/compare/0.1.0...0.1.1
+[0.1.0]: https://github.com/mckern/fustigit/tree/0.1.0

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright 2014-2016 Ryan McKern
+Copyright 2014-2022 Ryan McKern
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

data/README.md

@@ -6,17 +6,17 @@
     <dd>To criticize harshly.</dd>
 </dl>
 
-[![Build Status](https://travis-ci.org/mckern/fustigit.svg?branch=master)](https://travis-ci.org/mckern/fustigit)
+[![Test & Lint](https://github.com/mckern/fustigit/actions/workflows/tests.yaml/badge.svg)](https://github.com/mckern/fustigit/actions/workflows/tests.yaml)
 
 ### TL;DR
 
-Fustigit will let you "parse" SCP-like address triplets using Ruby's baked-in [URI library](http://ruby-doc.org/stdlib-2.3.1/libdoc/uri/rdoc/index.html) (... and just a *moderate* amount of monkey-patching) and turn them into probably-valid URI objects.
+Fustigit will let you "parse" SCP-like address triplets using Ruby's baked-in [URI library](https://ruby-doc.org/stdlib-2.5.7/libdoc/uri/rdoc/index.html) (... and just a *moderate* amount of monkey-patching) and turn them into probably-valid URI objects.
 
 ### What's a Triplet?
 
-<a href="https://www.debuggex.com/r/UF-0ESZoWXFewi8q"><img src="https://www.debuggex.com/i/UF-0ESZoWXFewi8q.png"></a>
+<a href="https://www.debuggex.com/r/NtHqyDI9LUz-UMia"><img src="readme/railroad-diagram.jpg"></a>
 
-A triplet is a format for specifying a remote resource, much like a URI. It looks like this: 
+A triplet is a format for specifying a remote resource, much like a URI. It looks like this:
 
     # The username is optional but the hostname and pathname are not
     <username>@<hostname>:<pathname>
@@ -59,7 +59,7 @@ URI::InvalidURIError: bad URI(is not URI?): git@github.com:mckern/fustigit.git [
 => "mckern/fustigit.git"
 >> uri.to_s
 => "git@github.com:mckern/fustigit.git"
->> 
+>>
 ```
 
 ### How (does it work)?
@@ -76,11 +76,11 @@ In the spirit of Jordan Sissel (a hero to admins and operations people everywher
 
 ### License
 
-Fustigate is licensed under the Apache License, Version 2.0.  
+Fustigate is licensed under the Apache License, Version 2.0.
 
-> "When in doubt, use brute force."  
+> "When in doubt, use brute force."
 >    &#8213; <cite>Ken Thompson</cite>
 
 ### Maintainer
 
-Ryan McKern &lt;ryan@orangefort.com&gt;
+Ryan McKern &lt;ryan@mckern.sh&gt;

data/lib/fustigit/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module Fustigit
   module Version
-    VERSION = "0.1.3".freeze
+    VERSION = "0.3.0"
   end
 end

data/lib/fustigit.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "uri/triplets"
 require "uri/git"
 require "uri/scp"

data/lib/uri/git.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "uri/generic"
 
 module URI
@@ -7,11 +9,15 @@ module URI
     DEFAULT_PORT = 9418
     USE_REGISTRY = false
 
-    COMPONENT = [
-      :scheme,
-      :userinfo,
-      :host, :port, :path
+    COMPONENT = %i[
+      scheme
+      userinfo
+      host port path
     ].freeze
   end
-  @@schemes["GIT"] = Git
+  if respond_to? :register_scheme
+    register_scheme "GIT", Git
+  else
+    @@schemes["GIT"] = Git
+  end
 end

data/lib/uri/rsync.rb

@@ -1,8 +1,14 @@
+# frozen_string_literal: true
+
 require "uri/generic"
 
 module URI
   class RSYNC < Generic
     DEFAULT_PORT = 873
   end
-  @@schemes["RSYNC"] = RSYNC
+  if respond_to? :register_scheme
+    register_scheme "RSYNC", RSYNC
+  else
+    @@schemes["RSYNC"] = RSYNC
+  end
 end

data/lib/uri/scp.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "uri/generic"
 
 module URI
@@ -6,11 +8,15 @@ module URI
 
     DEFAULT_PORT = 22
 
-    COMPONENT = [
-      :scheme,
-      :userinfo,
-      :host, :port, :path
+    COMPONENT = %i[
+      scheme
+      userinfo
+      host port path
     ].freeze
   end
-  @@schemes["SCP"] = SCP
+  if respond_to? :register_scheme
+    register_scheme "SCP", SCP
+  else
+    @@schemes["SCP"] = SCP
+  end
 end

data/lib/uri/ssh.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "uri/generic"
 
 module URI
@@ -6,11 +8,15 @@ module URI
 
     DEFAULT_PORT = 22
 
-    COMPONENT = [
-      :scheme,
-      :userinfo,
-      :host, :port, :path
+    COMPONENT = %i[
+      scheme
+      userinfo
+      host port path
     ].freeze
   end
-  @@schemes["SSH"] = SSH
+  if respond_to? :register_scheme
+    register_scheme "SSH", SSH
+  else
+    @@schemes["SSH"] = SSH
+  end
 end

data/lib/uri/triplets.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "uri"
 
 # Triplets is a mix-in for subclasses of URI::Generic, which
@@ -9,9 +11,10 @@ module Triplets
   # @return [String] a string representation of the URI components
   # as an SCP-style Triplet
   def triplet
-    str = ""
+    str = []
     str << "#{user}@" if user && !user.empty?
     str << "#{host}:#{path}".squeeze("/")
+    str.join
   end
   private :triplet
 
@@ -19,7 +22,7 @@ module Triplets
   # as a valid RFC compliant URI
   # rubocop:disable Metrics/AbcSize
   def rfc_uri
-    str = ""
+    str = []
     str << "#{scheme}://" if scheme
     str << "#{user}@" if user
     if port && port != self.class::DEFAULT_PORT
@@ -28,11 +31,14 @@ module Triplets
     else
       str << [host, path].join("/").squeeze("/")
     end
+    str.join
   end
   private :rfc_uri
+  # rubocop:enable Metrics/AbcSize
 
   def to_s
     return triplet if triplet?
+
     rfc_uri
   end
 
@@ -40,7 +46,7 @@ module Triplets
   # if this is a valid triplet.
   def triplet?
     # False if self matches a normal URI scheme
-    !(rfc_uri =~ URI.parser.const_get(:SCHEME)) &&
+    rfc_uri !~ URI.parser.const_get(:SCHEME) &&
       # False unless self matches a Triplet scheme
       !!(triplet =~ URI.parser.const_get(:TRIPLET))
   end
@@ -54,13 +60,14 @@ end
 # they're passed.
 module TripletInterruptus
   # Determine if a string can be teased apart into URI-like components
-  TRIPLET = %r{\A(?:(?<userinfo>.+)[@]+)?(?<host>[\w.]+):(?<path>.*)\z}
+  TRIPLET = %r{\A(?:(?<userinfo>.+)@+)?(?<host>[\w.-]+):(?<path>.*)\z}.freeze
 
   # Determine if a string is prefixed with a URI scheme like http:// or ssh://
-  SCHEME = %r{\A(?:(?<scheme>[a-z]+)://)}
+  SCHEME = %r{\A(?:(?<scheme>[a-z]+)://)}.freeze
 
   def parse(uri)
     return build_triplet(uri) if triplet?(uri)
+
     super(uri)
   end
 
@@ -79,6 +86,7 @@ module TripletInterruptus
   def build_triplet(address)
     values = parse_triplet(address)
     return nil unless values
+
     URI.scheme_list[URI.default_triplet_type].build(values)
   end
   private :build_triplet
@@ -86,13 +94,14 @@ module TripletInterruptus
   def parse_triplet(address)
     parts = address.match(TRIPLET)
     return nil unless parts
-    Hash[parts.names.map(&:to_sym).zip(parts.captures)]
+
+    parts.names.map(&:to_sym).zip(parts.captures).to_h
   end
   private :parse_triplet
 end
 
 module TripletHandling
-  TRIPLET_CLASSES = %w(Git SCP SSH).freeze
+  TRIPLET_CLASSES = %w[Git SCP SSH].freeze
 
   def self.included(base)
     base.extend(TripletHandling)
@@ -103,15 +112,15 @@ module TripletHandling
   end
 
   def default_triplet_type=(value)
-    unless TRIPLET_CLASSES.include?(value)
-      raise ArgumentError, "'#{value}' is not one of: #{TRIPLET_CLASSES.join(', ')}"
-    end
+    raise ArgumentError, "'#{value}' is not one of: #{TRIPLET_CLASSES.join(', ')}" unless TRIPLET_CLASSES.include?(value)
+
     @default_triplet_type = value
   end
 
   def parser
     return URI::RFC3986_Parser if
       Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("2.2.0")
+
     URI::Parser
   end
 end
@@ -129,10 +138,11 @@ module URI
   # fall through to the original URI::Parser.parse method.
   #
   if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("2.2.0")
-    # rubocop:disable Style/ClassAndModuleCamelCase
+    # rubocop:disable Naming/ClassAndModuleCamelCase
     class RFC3986_Parser
       prepend TripletInterruptus
     end
+    # rubocop:enable Naming/ClassAndModuleCamelCase
   else
     class Parser
       prepend TripletInterruptus

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: fustigit
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.3.0
 platform: ruby
 authors:
 - Ryan McKern
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-07-12 00:00:00.000000000 Z
+date: 2022-06-12 00:00:00.000000000 Z
 dependencies: []
 description: '"Parse" SCP-like address triplets with the Standard Ruby URI Library.'
-email: ryan@orangefort.com
+email: ryan@mckern.sh
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -19,7 +19,6 @@ files:
 - CHANGELOG.md
 - LICENSE
 - README.md
-- Rakefile
 - lib/fustigit.rb
 - lib/fustigit/version.rb
 - lib/uri/git.rb
@@ -27,13 +26,12 @@ files:
 - lib/uri/scp.rb
 - lib/uri/ssh.rb
 - lib/uri/triplets.rb
-- spec/spec_helper.rb
-- spec/uri/fustigit_spec.rb
 homepage: http://github.com/mckern/fustigit
 licenses:
 - Apache-2.0
-metadata: {}
-post_install_message: 
+metadata:
+  rubygems_mfa_required: 'true'
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -41,20 +39,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.1.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.6
-signing_key: 
+rubygems_version: 3.3.11
+signing_key:
 specification_version: 3
 summary: Use URI to "parse" SCP-like triplets
-test_files:
-- Rakefile
-- spec/spec_helper.rb
-- spec/uri/fustigit_spec.rb
-has_rdoc: 
+test_files: []

data/Rakefile

@@ -1,30 +0,0 @@
-require "bundler/setup"
-require "bundler/gem_tasks"
-require "rake/testtask"
-require "rubocop/rake_task"
-
-desc "Test fustigit"
-namespace :test do
-  Rake::TestTask.new(:spec) do |test|
-    test.libs << "spec"
-    test.pattern = "spec/**/*_spec.rb"
-    test.verbose = false
-    test.warning = false
-  end
-
-  desc "Test fustigit and calculate test coverage"
-  task :coverage do
-    ENV["COVERAGE"] = "true"
-    Rake::Task["test:spec"].invoke
-  end
-end
-
-desc "Run RuboCop"
-RuboCop::RakeTask.new(:rubocop) do |task|
-  task.patterns = ["lib/**/*.rb"]
-end
-
-desc "Run all spec tests and linters"
-task check: %w(test:spec rubocop)
-
-task default: :check

data/spec/spec_helper.rb

@@ -1,22 +0,0 @@
-require "bundler/setup"
-require "minitest/spec"
-require "minitest/autorun"
-require "minitest/reporters"
-require "simplecov"
-require "json"
-
-Minitest::Reporters.use! Minitest::Reporters::DefaultReporter.new
-
-if ENV["COVERAGE"]
-  SimpleCov.start do
-    # exclude common Bundler locations
-    %w(.bundle vendor).each { |dir| add_filter dir }
-    # exclude test code
-    add_filter "spec"
-  end
-end
-
-def fixture(path)
-  path = File.join(File.dirname(__FILE__), "fixtures", path)
-  File.read(path)
-end

data/spec/uri/fustigit_spec.rb

@@ -1,35 +0,0 @@
-require "spec_helper"
-require "fustigit"
-
-describe URI do
-  @git_repos = JSON.load(fixture("formats.json"))
-  @git_repos["URIs"].each do |protocol, repos|
-    repos.each do |repo|
-      describe %(#parse takes given URI "#{repo}") do
-        it "returns URI::#{protocol}" do
-          URI.parse(repo).is_a?(URI.const_get(protocol)).must_equal true
-        end
-      end
-    end
-  end
-
-  @git_repos["paths"].each do |repo|
-    describe %(#parse takes path "#{repo}") do
-      it "returns URI::Generic" do
-        URI.parse(repo).is_a?(URI::Generic).must_equal true
-      end
-    end
-  end
-
-  @git_repos["triplets"].each do |repo|
-    describe %(#parse takes triplet "#{repo}") do
-      it "returns URI::#{URI.default_triplet_type}" do
-        URI.parse(repo).is_a?(URI.const_get(URI.default_triplet_type)).must_equal true
-      end
-
-      it "recognizes URI::#{URI.default_triplet_type} as a triplet" do
-        URI.parse(repo).triplet?.must_equal true
-      end
-    end
-  end
-end