fustigit 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 964ec3d04e73940b8671a777029aaf1f1cd3b8ee
-  data.tar.gz: 06e01972ce77d819da1a917d1a0bca7da6f3cca6
+SHA256:
+  metadata.gz: 2521507f0a39cbeab8a60b250612e02c0bf5e42fc38afa9be6a16f348bfd3078
+  data.tar.gz: f892592872e5592f192720c5175542d804dce14daf7a1d56084073e2f6225c1b
 SHA512:
-  metadata.gz: eedc38d0fc5685834c186c8c8917c0a934a11fa28be2e37ce6f3efe40cc3a9604ed71f9adb73e589c90e37b07ad2e97738a8562681d3b0c12631867f74918876
-  data.tar.gz: e8e4cc9409423169bdba3671b25c39d11ba623a251057121d9ac0692258a20a61a1e696d5c904633e82b51716b1b9f81f8b44c2a48d3fa06c3afdaf59d4ef35f
+  metadata.gz: 7c4a55288990b7c8eb454d1a01ee6be7fffae687a9d4ab2470e6e69972e662806075c37f726f5eea7fda49219b61a22d5535fee5093bb40d0fee4e20e5810680
+  data.tar.gz: 1cf5ef69b396d5b7d1203d468f6a29ba6b26910480ab15a9db26f088264098a0ba868798fe6da0e1f546f2e2e5fb5abd10b21a6311b9dba72c1dd25aa0b98aa7

data/CHANGELOG.md

@@ -3,6 +3,13 @@ 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

data/README.md

@@ -6,11 +6,11 @@
     <dd>To criticize harshly.</dd>
 </dl>
 
-[![Build Status](https://travis-ci.org/mckern/fustigit.svg?branch=master)](https://travis-ci.org/mckern/fustigit)
+![](https://github.com/mckern/fustigit/workflows/Ruby%20CI/badge.svg?branch=master)
 
 ### 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?
 

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "bundler/setup"
 require "bundler/gem_tasks"
 require "rake/testtask"
@@ -25,6 +27,6 @@ RuboCop::RakeTask.new(:rubocop) do |task|
 end
 
 desc "Run all spec tests and linters"
-task check: %w(test:spec rubocop)
+task check: %w[test:spec rubocop]
 
 task default: :check

data/lib/fustigit.rb

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

data/lib/fustigit/version.rb

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

data/lib/uri/git.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "uri/generic"
 
 module URI
@@ -7,10 +9,10 @@ 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

data/lib/uri/rsync.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "uri/generic"
 
 module URI

data/lib/uri/scp.rb

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

data/lib/uri/ssh.rb

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

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)]
   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

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "bundler/setup"
 require "minitest/spec"
 require "minitest/autorun"
@@ -10,7 +12,7 @@ if ENV["COVERAGE"]
   require "simplecov"
   SimpleCov.start do
     # exclude common Bundler locations
-    %w(.bundle vendor).each { |dir| add_filter dir }
+    %w[.bundle vendor].each { |dir| add_filter dir }
     # exclude test code
     add_filter "spec"
   end

data/spec/uri/fustigit_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 require "fustigit"
 
@@ -7,7 +9,7 @@ describe URI do # rubocop:disable Metrics/BlockLength
     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
+          _(URI.parse(repo).is_a?(URI.const_get(protocol))).must_equal true
         end
       end
     end
@@ -16,7 +18,7 @@ describe URI do # rubocop:disable Metrics/BlockLength
   @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
+        _(URI.parse(repo).is_a?(URI::Generic)).must_equal true
       end
     end
   end
@@ -24,11 +26,11 @@ describe URI do # rubocop:disable Metrics/BlockLength
   @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
+        _(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
+        _(URI.parse(repo).triplet?).must_equal true
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fustigit
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - Ryan McKern
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-06 00:00:00.000000000 Z
+date: 2019-10-24 00:00:00.000000000 Z
 dependencies: []
 description: '"Parse" SCP-like address triplets with the Standard Ruby URI Library.'
 email: ryan@orangefort.com
@@ -41,15 +41,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.1.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 3
 summary: Use URI to "parse" SCP-like triplets