ext 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e9cd6a860cece148b6e0b047fce4ed9f0a1a70f8b16e6e289afe80bf3461591c
-  data.tar.gz: 13e74b2de7d427916a178cae3c9e880bfdfb981663e2b4de1800e4df7ca5913d
+  metadata.gz: fb5c68ba3375b12dbea5800bece08005da5e1e97efc68be98dae113339e5212a
+  data.tar.gz: 6f6e20a275ab463c44f3c6fdefecb5f11914fb509cbb1782782fd6e72b2a3336
 SHA512:
-  metadata.gz: 31218d8a5d66b49fc527b832add38c177496218bb806e769ac4895e0f5797f911e9c6224d7397097dbb7480c1b31c37b4fca8fe5bcf66e5795dea16dc5047200
-  data.tar.gz: da37b87e4d571d9547f3083d16fee1075587ebff7a0f0564ec38c56e85f051156c1f57364fbbd7ca45434d5fb5ce22f2ec298d13bdb43f22fae5defea1a23abf
+  metadata.gz: b58e47efac69e26e71385bbdd5e556e34fd2dcbf1ba10e5ec53577321b8bf1083c2aabba98768e594af9157e05fe416a9916d5d6041c83dea3b3d589005a6fdb
+  data.tar.gz: bd145d8c8d02183164422236ef748b29d67a035139051924d32bb723e7e18489b3870737f9f6e0c0e384d14723e9caea1407a14d40f873c7311c2549107b3af8

data/CHANGELOG

@@ -1,3 +1,7 @@
+## [2.1.0] - 2026-07-23
+
+- Support Rubies 3.3 through 4.0 (the currently supported Ruby versions)
+
 ## [2.0.0] - 2026-07-23
 
 Some overdue love!

data/lib/externals/configuration/configuration.rb

@@ -53,15 +53,16 @@ module Externals
 
         if found
           if rows[found] !~ SET_SETTING_REGEX
-            # :nocov:
+            # simplecov:disable
             raise "thought I found the row, but didn't"
-            # :nocov:
+            # simplecov:enable
           end
 
           rows[found] = "#{$1}#{value}#{$2}"
         else
           rows << "#{key} = #{value}"
         end
+
         value
       end
 
@@ -81,9 +82,9 @@ module Externals
         if found
           value = self[key]
           if rows[found] !~ SET_SETTING_REGEX
-            # :nocov:
+            # simplecov:disable
             raise "thought I found the row, but didn't"
-            # :nocov:
+            # simplecov:enable
           end
 
           rows.delete rows[found]
@@ -162,9 +163,9 @@ module Externals
 
         if !titles.empty? && !bodies.empty?
           if titles.size + 1 != bodies.size
-            # :nocov:
+            # simplecov:disable
             raise "bodies and sections do not match up"
-            # :nocov:
+            # simplecov:enable
           end
 
           bodies = bodies[1..]

data/lib/externals/ext.rb

@@ -163,19 +163,19 @@ module Externals
       command = :version if main_options[:version]
 
       if !command || command.to_s == ''
-        # :nocov:
+        # simplecov:disable
         puts "hey... you didn't tell me what you want to do."
         puts "Try 'ext help' for a list of commands"
         exit 1
-        # :nocov:
+        # simplecov:enable
       end
 
       unless COMMANDS.index command
-        # :nocov:
+        # simplecov:disable
         puts "unknown command: #{command}"
         puts "for a list of commands try 'ext help'"
         exit 1
-        # :nocov:
+        # simplecov:enable
       end
 
       Dir.chdir(main_options[:workdir] || ".") do
@@ -246,9 +246,9 @@ module Externals
       end
       project || subprojects.detect do |p|
         # TODO: test (or delete) this code path!
-        # :nocov:
+        # simplecov:disable
         p.name == name
-        # :nocov:
+        # simplecov:enable
       end
     end
     alias subproject subproject_by_name_or_path
@@ -317,9 +317,9 @@ module Externals
             p.name == project_name_or_path || p.path == project_name_or_path
           end
 
-          # :nocov:
+          # simplecov:disable
           raise "no such project" unless project
-          # :nocov:
+          # simplecov:enable
 
           project.send command_name, args, options
         else
@@ -343,9 +343,9 @@ module Externals
           section[:branch] = branch
         else
           # TODO: test (or delete) this code path!
-          # :nocov:
+          # simplecov:disable
           section.rm_setting :branch
-          # :nocov:
+          # simplecov:enable
         end
       end
       section[:revision] = revision
@@ -363,10 +363,10 @@ module Externals
       section = configuration[project.path]
 
       unless section[:revision]
-        # :nocov:
+        # simplecov:disable
         puts "Uhh... #{project.name} wasn't frozen, so I can't unfreeze it."
         exit 1
-        # :nocov:
+        # simplecov:enable
       end
 
       section.rm_setting :revision
@@ -378,10 +378,10 @@ module Externals
 
     def install args, options
       if !File.exist?('.externals')
-        # :nocov:
+        # simplecov:disable
         warn "This project does not appear to be managed by externals.  Try 'ext init' first"
         exit NO_EXTERNALS_FILE
-        # :nocov:
+        # simplecov:enable
       end
       repository = args[0]
       path = args[1]
@@ -393,13 +393,13 @@ module Externals
       scm ||= infer_scm(repository)
 
       unless scm
-        # :nocov:
+        # simplecov:disable
         warn "Unable to determine SCM from the repository name.
 You need to either specify the scm used to manage the subproject
 that you are installing. Use an option to specify it
 (such as --git or --svn)"
         exit COULD_NOT_DETERMINE_SCM
-        # :nocov:
+        # simplecov:enable
       end
 
       project = self.class.project_class(scm).new(:repository => repository,
@@ -426,9 +426,9 @@ that you are installing. Use an option to specify it
 
     def uninstall args, options
       unless File.exist?('.externals')
-        # :nocov:
+        # simplecov:disable
         raise "Hmm... there's no .externals file in this directory."
-        # :nocov:
+        # simplecov:enable
       end
 
       project = subproject_by_name_or_path(args[0])
@@ -455,11 +455,11 @@ that you are installing. Use an option to specify it
       scm ||= options[:scm]
 
       unless scm
-        # :nocov:
+        # simplecov:disable
         raise "You need to either specify the scm as the first line in .externals (for example, scm = git), " \
                 "or use an option to specify it
           (such as --git or --svn)"
-        # :nocov:
+        # simplecov:enable
       end
 
       project = self.class.project_class(scm).new(:path => ".")
@@ -516,7 +516,7 @@ that you are installing. Use an option to specify it
 
       if !scm
         # TODO: test (or delete) this code path!
-        # :nocov:
+        # simplecov:disable
         possible_project_classes = self.class.project_classes.select(&:detected?)
 
         raise "Could not determine this projects scm" if possible_project_classes.empty?
@@ -528,14 +528,14 @@ by creating the .externals file manually"
         end
 
         scm = possible_project_classes.first.scm
-        # :nocov:
+        # simplecov:enable
       end
 
       unless scm
-        # :nocov:
+        # simplecov:disable
         raise "You need to either specify the scm as the first line in .externals, or use an option to specify it
           (such as --git or --svn)"
-        # :nocov:
+        # simplecov:enable
       end
 
       project = main_project
@@ -558,7 +558,7 @@ by creating the .externals file manually"
 
       if !scm
         # TODO: test (or delete) this code path!
-        # :nocov:
+        # simplecov:disable
         possible_project_classes = self.class.project_classes.select(&:detected?)
 
         raise "Could not determine this projects scm" if possible_project_classes.empty?
@@ -570,14 +570,14 @@ by creating the .externals file manually"
         end
 
         scm = possible_project_classes.first.scm
-        # :nocov:
+        # simplecov:enable
       end
 
       unless scm
-        # :nocov:
+        # simplecov:disable
         raise "You need to either specify the scm as the first line in .externals, or use an option to specify it
           (such as --git or --svn)"
-        # :nocov:
+        # simplecov:enable
       end
 
       old_config = configuration
@@ -622,10 +622,10 @@ commands below if you actually wish to delete them."
       end
 
       unless scm
-        # :nocov:
+        # simplecov:disable
         raise "You need to either specify the scm as the first line in .externals, or use an option to specify it
           (such as --git or --svn)"
-        # :nocov:
+        # simplecov:enable
       end
 
       project = main_project
@@ -662,9 +662,9 @@ commands below if you actually wish to delete them."
 
       if path == "."
         # TODO: test (or delete) this code path!
-        # :nocov:
+        # simplecov:disable
         path = main_project.name
-        # :nocov:
+        # simplecov:enable
       end
 
       Dir.chdir path do
@@ -673,9 +673,9 @@ commands below if you actually wish to delete them."
     end
 
     def init args, options = {}
-      # :nocov:
+      # simplecov:disable
       raise ".externals already exists" if File.exist?('.externals')
-      # :nocov:
+      # simplecov:enable
 
       scm = options[:scm]
 
@@ -684,11 +684,11 @@ commands below if you actually wish to delete them."
 
         raise "Could not determine this project's scm" if possible_project_classes.empty?
         if possible_project_classes.size > 1
-          # :nocov:
+          # simplecov:disable
           raise "This project appears to be managed by multiple SCMs: #{
           possible_project_classes.join(',')}
 Please explicitly declare the SCM (using --git or --svn, or, by creating .externals manually"
-          # :nocov:
+          # simplecov:enable
         end
 
         scm = possible_project_classes.first.scm
@@ -708,9 +708,9 @@ Please explicitly declare the SCM (using --git or --svn, or, by creating .extern
           )
         elsif args[0]
           # TODO: test (or delete) this code path!
-          # :nocov:
+          # simplecov:disable
           config['.'][:repository] = args[0].strip
-          # :nocov:
+          # simplecov:enable
         end
       end
 
@@ -728,9 +728,9 @@ Please explicitly declare the SCM (using --git or --svn, or, by creating .extern
 
     def do_checkout_or_export repository, path, options, sym
       if File.exist?('.externals')
-        # :nocov:
+        # simplecov:disable
         raise "seems main project is already checked out here?"
-        # :nocov:
+        # simplecov:enable
       else
         #We appear to be attempting to checkout/export a main project
         scm = options[:scm]
@@ -739,17 +739,17 @@ Please explicitly declare the SCM (using --git or --svn, or, by creating .extern
 
         if !scm
           # TODO: test (or delete) this code path!
-          # :nocov:
+          # simplecov:disable
           scm ||= configuration['main']
           scm &&= scm['scm']
-          # :nocov:
+          # simplecov:enable
         end
 
         unless scm
-          # :nocov:
+          # simplecov:disable
           raise "You need to either specify the scm as the first line in .externals, or use an option to specify it
           (such as --git or --svn)"
-          # :nocov:
+          # simplecov:enable
         end
 
         main_project = self.class.project_class(scm).new(

data/lib/externals/extensions/file_utils.rb

@@ -30,16 +30,16 @@ FileUtils.class_eval do
       rm_rf_old(filename, *args, **opts)
 
       while File.exist?(filename) && tries < 10
-        # :nocov:
+        # simplecov:disable
         sleep 1
         tries += 1
-        # :nocov:
+        # simplecov:enable
       end
     end
 
     rm.call
     if tries >= 10
-      # :nocov:
+      # simplecov:disable
       puts "WARNING: deleted #{filename} didn't work, trying again"
       tries = 0
       rm.call
@@ -47,7 +47,7 @@ FileUtils.class_eval do
       if tries >= 10
         raise "Could not delete #{filename}"
       end
-      # :nocov:
+      # simplecov:enable
     end
   end
 

data/lib/externals/project.rb

@@ -52,9 +52,9 @@ module Externals
     end
 
     def switch _branch_name, _options = {}
-      # :nocov:
+      # simplecov:disable
       raise "subclass responsibility"
-      # :nocov:
+      # simplecov:enable
     end
 
     def initialize hash
@@ -72,9 +72,9 @@ module Externals
           attribute =~ /^\w+_opts(_(#{OPTS_SUFFIXES.join("|")}))?/
         end
         if !invalid_attrib.empty?
-          # :nocov:
+          # simplecov:disable
           raise "invalid attribute(s): #{invalid_attrib.join(', ')}"
-          # :nocov:
+          # simplecov:enable
         end
       end
 
@@ -89,9 +89,9 @@ module Externals
 
     [:co, :ex].each do |method_name|
       define_method method_name do
-        # :nocov:
+        # simplecov:disable
         raise "subclass responsibility"
-        # :nocov:
+        # simplecov:enable
       end
     end
 

data/lib/externals/scms/git_project.rb

@@ -19,9 +19,9 @@ module Externals
       puts(gitclonecmd = "git #{opts} clone #{extra_opts} \"#{repository}\" #{dest}")
       puts `#{gitclonecmd}`
       unless $? == 0
-        # :nocov:
+        # simplecov:disable
         raise "git clone of #{repository} failed."
-        # :nocov:
+        # simplecov:enable
       end
     end
 
@@ -79,9 +79,9 @@ module Externals
               puts `git #{opts} checkout --track -b #{branch} origin/#{branch}`
             end
             unless $? == 0
-              # :nocov:
+              # simplecov:disable
               raise "Could not checkout origin/#{branch}"
-              # :nocov:
+              # simplecov:enable
             end
           end
         end
@@ -99,9 +99,9 @@ module Externals
         Dir.chdir project_path do
           puts `git #{opts} checkout #{revision}`
           unless $? == 0
-            # :nocov:
+            # simplecov:disable
             raise "Could not checkout #{revision}"
-            # :nocov:
+            # simplecov:enable
           end
         end
       else
@@ -130,9 +130,9 @@ module Externals
           puts `git #{resolve_opts("co")} checkout --track -b #{branch_name}`
         end
         unless $? == 0
-          # :nocov:
+          # simplecov:disable
           raise "Could not checkout origin/#{branch_name}"
-          # :nocov:
+          # simplecov:enable
         end
       end
     end
@@ -144,9 +144,11 @@ module Externals
         up(*args)
       else
         clone_opts = "--depth 1"
+
         if branch
-          clone_opts << " -b #{branch}"
+          clone_opts = "#{clone_opts} -b #{branch}"
         end
+
         do_clone "ex", clone_opts
       end
     end
@@ -211,10 +213,10 @@ module Externals
     #this is a test helper method
     # TODO: can we move it to the test suite, then?
     def self.add_all
-      # :nocov:
+      # simplecov:disable
       puts `git add .`
       raise unless $? == 0
-      # :nocov:
+      # simplecov:enable
     end
 
     def ignore_contains? path
@@ -259,15 +261,15 @@ module Externals
       rows = ir.reject {|row| row.strip == path.strip}
 
       if rows.size == ir.size
-        # :nocov:
+        # simplecov:disable
         raise "row not found matching #{path} in .gitignore"
-        # :nocov:
+        # simplecov:enable
       end
 
       if ir.size - rows.size != 1
-        # :nocov:
+        # simplecov:disable
         raise "More than one row found matching #{path} in .gitignore"
-        # :nocov:
+        # simplecov:enable
       end
 
       open('.gitignore', 'w') do |f|

data/lib/externals/scms/svn_project.rb

@@ -25,9 +25,9 @@ module Externals
         puts(svncocmd = "svn #{opts} co #{url} #{dest}")
         puts `#{svncocmd}`
         unless $? == 0
-          # :nocov:
+          # simplecov:disable
           raise "Failed to run #{svncocmd}"
-          # :nocov:
+          # simplecov:enable
         end
 
         change_to_revision "co"
@@ -62,9 +62,9 @@ module Externals
 
       if revision
         # TODO: test (or delete) this code path!
-        # :nocov:
+        # simplecov:disable
         url += "@#{revision}"
-        # :nocov:
+        # simplecov:enable
       end
 
       puts(svncocmd = "svn #{scm_opts_ex} export #{url} #{dest}")
@@ -79,9 +79,9 @@ module Externals
           url = [repository, branch_name].join("/")
           `svn #{scm_opts} switch #{url}`
           unless $? == 0
-            # :nocov:
+            # simplecov:disable
             raise "Could not switch to #{url}"
-            # :nocov:
+            # simplecov:enable
           end
         end
       end
@@ -112,17 +112,17 @@ module Externals
 
     def st *_args
       # TODO: test (or delete) this code path!
-      # :nocov:
+      # simplecov:disable
       puts "\nstatus for #{path}:"
       Dir.chdir path do
         puts `svn #{scm_opts_st} status`
       end
-      # :nocov:
+      # simplecov:enable
     end
 
     def self.scm_path? path
       # TODO: test (or delete) this code path!
-      # :nocov:
+      # simplecov:disable
       return true if path =~ /^svn(\+ssh)?:/
 
       # Look for http(s)://svn.*/*
@@ -136,7 +136,7 @@ module Externals
       end
 
       false
-      # :nocov:
+      # simplecov:enable
     end
 
     def self.fill_in_opts opts, main_options, sub_options, options = {}
@@ -154,14 +154,14 @@ module Externals
     #this is a test helper method
     # TODO: can we move it to the test suite, then?
     def self.add_all
-      # :nocov:
+      # simplecov:disable
       status = `svn st`
 
       status.split("\n").grep(/^\?/).each do |to_add|
         puts `svn add #{to_add.gsub(/^\?\s*/, "")}`
         raise unless $? == 0
       end
-      # :nocov:
+      # simplecov:enable
     end
 
     def ignore_contains? path
@@ -173,16 +173,16 @@ module Externals
 
       branch = info_url.downcase.gsub(/\/+/, "/").gsub(repository.downcase.gsub(/\/+/, "/"), "")
       if branch == repository
-        # :nocov:
+        # simplecov:disable
         raise "Could not determine branch from URL #{info_url}.
     Does not appear have a substring of #{repository}"
-        # :nocov:
+        # simplecov:enable
       end
       if branch !~ /^\//
-        # :nocov:
+        # simplecov:disable
         raise "Was expecting the branch and repository to be separated by '/'
       Please file an issue about this at http://github.com/azimux/externals"
-        # :nocov:
+        # simplecov:enable
       end
       branch.gsub(/^\//, "")
     end
@@ -190,16 +190,16 @@ module Externals
     def self.extract_repository url, branch
       repository = url.gsub(branch, "")
       if url == repository
-        # :nocov:
+        # simplecov:disable
         raise "Could not determine repository from URL #{info_url}.
     Does not appear to have the branch #{branch} as a substring"
-        # :nocov:
+        # simplecov:enable
       end
       if repository !~ /\/$/
-        # :nocov:
+        # simplecov:disable
         raise "Was expecting the branch and repository to be separated by '/'
       Please file an issue about this at http://github.com/azimux/externals"
-        # :nocov:
+        # simplecov:enable
       end
 
       repository.gsub(/\/$/, "")
@@ -207,7 +207,7 @@ module Externals
 
     def require_repository
       if repository.nil? || repository.empty?
-        # :nocov:
+        # simplecov:disable
         url = info_url
         info_url = "svn+ssh://server/path/repository" unless url
         puts "to use any branching features with a subversion project, the
@@ -225,7 +225,7 @@ repository = #{info_url}
         "
 
         raise "Cannot use subversion branching features without a repository in .externals file"
-        # :nocov:
+        # simplecov:enable
       end
     end
 
@@ -253,15 +253,15 @@ repository = #{info_url}
       rows = ir.reject {|row| row.strip == child}
 
       if rows.size == ir.size
-        # :nocov:
+        # simplecov:disable
         raise "row not found matching #{path} in svn propget svn:ignore"
-        # :nocov:
+        # simplecov:enable
       end
 
       if ir.size - rows.size != 1
-        # :nocov:
+        # simplecov:disable
         raise "More than one row found matching #{path} in svn propget svn:ignore"
-        # :nocov:
+        # simplecov:enable
       end
 
       Dir.chdir(parent) do
@@ -297,9 +297,9 @@ repository = #{info_url}
       if `svn #{scm_opts} info` =~ /^\s*URL:\s*([^\s]+)\s*$/
         $1
       else
-        # :nocov:
+        # simplecov:disable
         raise "Could not get URL from svn info"
-        # :nocov:
+        # simplecov:enable
       end
     end
 

data/version.rb

@@ -1,4 +1,4 @@
 module Externals
-  VERSION = "2.0.0".freeze
-  MINIMUM_RUBY_VERSION = [">= 2.7.0", "< 3.4"].freeze
+  VERSION = "2.1.0".freeze
+  MINIMUM_RUBY_VERSION = [">= 3.3", "< 4.1"].freeze
 end

metadata

@@ -1,16 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ext
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Miles Georgi
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-07-23 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies: []
-description:
 email: azimux@gmail.com
 executables:
 - ext
@@ -39,7 +37,6 @@ metadata:
   source_code_uri: https://github.com/azimux/externals
   changelog_uri: https://github.com/azimux/externals/blob/main/CHANGELOG.md
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -47,18 +44,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: '3.3'
   - - "<"
     - !ruby/object:Gem::Version
-      version: '3.4'
+      version: '4.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
-signing_key:
+rubygems_version: 4.0.16
 specification_version: 4
 summary: Provides an SCM agnostic way to manage subprojects with a workflow similar
   to the svn:externals feature of subversion instead of that of git submodules.