ext 1.1.3 → 2.0.0

data/lib/externals/scms/svn_project.rb

@@ -2,20 +2,11 @@ require File.join(File.dirname(__FILE__), '..', 'project')
 
 module Externals
   class SvnProject < Project
-    def default_branch
-      raise "There is no default_branch for SvnProject"
-    end
-
-    public
-    def co *args
+    def co *_args
       # delete path if empty
-      rmdir_ie path unless path == "."
+      rmdir_if_empty_ie path unless path == "."
 
-      dest = path
-      dest = '' if dest == '.'
-      dest = "\"#{dest}\"" if dest && !dest.empty?
-
-      if File.exist?(dest)
+      if path != "." && File.exist?(path)
         up
       else
         opts = resolve_opts "co"
@@ -27,10 +18,16 @@ module Externals
           url = [url, branch].join("/")
         end
 
+        dest = path
+        dest = '' if dest == '.'
+        dest = "\"#{dest}\"" if dest && !dest.empty?
+
         puts(svncocmd = "svn #{opts} co #{url} #{dest}")
         puts `#{svncocmd}`
         unless $? == 0
-          raise
+          # :nocov:
+          raise "Failed to run #{svncocmd}"
+          # :nocov:
         end
 
         change_to_revision "co"
@@ -48,7 +45,7 @@ module Externals
       end
     end
 
-    def ex *args
+    def ex *_args
       # delete path if  empty
       rmdir_ie path unless path == "."
 
@@ -64,14 +61,17 @@ module Externals
       end
 
       if revision
+        # TODO: test (or delete) this code path!
+        # :nocov:
         url += "@#{revision}"
+        # :nocov:
       end
 
       puts(svncocmd = "svn #{scm_opts_ex} export #{url} #{dest}")
       puts `#{svncocmd}`
     end
 
-    def switch branch_name, options = {}
+    def switch branch_name, _options = {}
       require_repository
 
       if current_branch != branch_name
@@ -79,15 +79,17 @@ module Externals
           url = [repository, branch_name].join("/")
           `svn #{scm_opts} switch #{url}`
           unless $? == 0
+            # :nocov:
             raise "Could not switch to #{url}"
+            # :nocov:
           end
         end
       end
     end
 
-    def up *args
+    def up *_args
       # delete path if empty
-      rmdir_if_empty_ie path
+      rmdir_if_empty_ie path unless path == "."
 
       if File.exist?(path)
         puts "updating #{path}:"
@@ -108,35 +110,41 @@ module Externals
       end
     end
 
-    def st *args
+    def st *_args
+      # TODO: test (or delete) this code path!
+      # :nocov:
       puts "\nstatus for #{path}:"
       Dir.chdir path do
         puts `svn #{scm_opts_st} status`
       end
+      # :nocov:
     end
 
     def self.scm_path? path
+      # TODO: test (or delete) this code path!
+      # :nocov:
       return true if path =~ /^svn(\+ssh)?:/
 
       # Look for http(s)://svn.*/*
-      if path =~ /^https?:\/\/([\w+\-]+)\.(?:[\w+\-]+\.)*[\w\-]+(?:\/|$)/
+      if path =~ /^https?:\/\/([\w+-]+)\.(?:[\w+-]+\.)*[\w-]+(?:\/|$)/
         return true if $1.downcase == "svn"
       end
 
       # Look for http(s)://*/*svn*/
-      if path =~ /^https?:\/\/(?:[\w+\-]+\.?)+\/(\w+)/
+      if path =~ /^https?:\/\/(?:[\w+-]+\.?)+\/(\w+)/
         return true if $1.downcase.include? "svn"
       end
 
       false
+      # :nocov:
     end
 
     def self.fill_in_opts opts, main_options, sub_options, options = {}
       opts.on("--svn", "--subversion",
-        Integer,
-        *"same as '--scm svn'  Uses subversion to
+              Integer,
+              *"same as '--scm svn'  Uses subversion to
         checkout/export the main project".lines_by_width(options[:summary_width])
-        ) {sub_options[:scm] = main_options[:scm] = 'svn'}
+      ) {sub_options[:scm] = main_options[:scm] = 'svn'}
     end
 
     def self.detected?
@@ -144,13 +152,16 @@ module Externals
     end
 
     #this is a test helper method
+    # TODO: can we move it to the test suite, then?
     def self.add_all
+      # :nocov:
       status = `svn st`
 
       status.split("\n").grep(/^\?/).each do |to_add|
-        puts `svn add #{to_add.gsub(/^\?\s*/,"")}`
+        puts `svn add #{to_add.gsub(/^\?\s*/, "")}`
         raise unless $? == 0
       end
+      # :nocov:
     end
 
     def ignore_contains? path
@@ -162,12 +173,16 @@ module Externals
 
       branch = info_url.downcase.gsub(/\/+/, "/").gsub(repository.downcase.gsub(/\/+/, "/"), "")
       if branch == repository
+        # :nocov:
         raise "Could not determine branch from URL #{info_url}.
     Does not appear have a substring of #{repository}"
+        # :nocov:
       end
       if branch !~ /^\//
+        # :nocov:
         raise "Was expecting the branch and repository to be separated by '/'
       Please file an issue about this at http://github.com/azimux/externals"
+        # :nocov:
       end
       branch.gsub(/^\//, "")
     end
@@ -175,18 +190,24 @@ module Externals
     def self.extract_repository url, branch
       repository = url.gsub(branch, "")
       if url == repository
+        # :nocov:
         raise "Could not determine repository from URL #{info_url}.
     Does not appear to have the branch #{branch} as a substring"
+        # :nocov:
       end
       if repository !~ /\/$/
+        # :nocov:
         raise "Was expecting the branch and repository to be separated by '/'
       Please file an issue about this at http://github.com/azimux/externals"
+        # :nocov:
       end
+
       repository.gsub(/\/$/, "")
     end
 
     def require_repository
       if repository.nil? || repository.empty?
+        # :nocov:
         url = info_url
         info_url = "svn+ssh://server/path/repository" unless url
         puts "to use any branching features with a subversion project, the
@@ -202,7 +223,9 @@ You might need to change your .externals file to contain something like this:
 scm = svn
 repository = #{info_url}
         "
+
         raise "Cannot use subversion branching features without a repository in .externals file"
+        # :nocov:
       end
     end
 
@@ -227,14 +250,18 @@ repository = #{info_url}
       child = File.basename(path).strip
 
       ir = ignore_rows(path)
-      rows = ir.select {|row| row.strip != child}
+      rows = ir.reject {|row| row.strip == child}
 
       if rows.size == ir.size
+        # :nocov:
         raise "row not found matching #{path} in svn propget svn:ignore"
+        # :nocov:
       end
 
       if ir.size - rows.size != 1
+        # :nocov:
         raise "More than one row found matching #{path} in svn propget svn:ignore"
+        # :nocov:
       end
 
       Dir.chdir(parent) do
@@ -243,7 +270,7 @@ repository = #{info_url}
     end
 
     def ignore_rows(path)
-      rows = ignore_text(path).split(/\n/)
+      rows = ignore_text(path).split("\n")
 
       rows.delete_if {|row| row =~ /^\s*$/}
 
@@ -270,7 +297,9 @@ repository = #{info_url}
       if `svn #{scm_opts} info` =~ /^\s*URL:\s*([^\s]+)\s*$/
         $1
       else
+        # :nocov:
         raise "Could not get URL from svn info"
+        # :nocov:
       end
     end
 
@@ -279,6 +308,5 @@ repository = #{info_url}
         self.class.info_url scm_opts
       end
     end
-
   end
 end

data/version.rb

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

metadata

@@ -1,43 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: ext
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 2.0.0
 platform: ruby
 authors:
 - Miles Georgi
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-02-10 00:00:00.000000000 Z
+date: 2026-07-23 00:00:00.000000000 Z
 dependencies: []
-description: |-
-  Provides an SCM agnostic way to manage subprojects with a workflow similar
-  to the scm:externals feature of subversion.  It's particularly useful for rails
-  projects that have some plugins managed by svn and some managed by git.
-
-  For example, "ext install git://github.com/rails/rails.git" from within a rails
-  application directory will realize that this belongs in the vendor/rails folder.
-  It will also realize that this URL is a git repository and clone it into that
-  folder.
-
-  It will also add the vendor/rails folder to the ignore feature for the SCM of
-  the main project.  Let's say that the main project is being managed by
-  subversion.  In that case it adds "rails" to the svn:ignore property of the
-  vendor folder.  It also adds the URL to the .externals file so that when this
-  project is checked out via "ext checkout" it knows where to fetch the
-  subprojects.
-
-  There are several other useful commands, such as init, touch_emptydirs, add_all,
-  export, status.  There's a tutorial at http://nopugs.com/ext-tutorial
-
-  The reason I made this project is that I was frustrated by two things:
-
-  1.  In my opinion, the workflow for svn:externals is far superior to
-  git-submodule.
-
-  2.  Even if git-submodule was as useful as svn:externals, I would still like a
-  uniform way to fetch all of the subprojects regardless of the SCM used to manage
-  the main project.
+description:
 email: azimux@gmail.com
 executables:
 - ext
@@ -45,43 +18,28 @@ extensions: []
 extra_rdoc_files: []
 files:
 - CHANGELOG
-- MIT_LICENSE.txt
+- LICENSE-MPL-2.0.txt
+- LICENSE.txt
 - README
-- Rakefile
 - bin/ext
 - lib/externals/command.rb
 - lib/externals/configuration/configuration.rb
 - lib/externals/ext.rb
 - lib/externals/extensions/file_utils.rb
 - lib/externals/extensions/string.rb
-- lib/externals/extensions/symbol.rb
 - lib/externals/project.rb
-- lib/externals/project_types/rails.rb
 - lib/externals/scms/git_project.rb
 - lib/externals/scms/svn_project.rb
-- test/setup/empty_plugin.svn.gz
-- test/setup/foreign_key_migrations.svn.gz
-- test/setup/redhillonrails_core.svn.gz
-- test/test_checkout_git.rb
-- test/test_checkout_with_subprojects_git.rb
-- test/test_checkout_with_subprojects_svn.rb
-- test/test_file_utils_extensions.rb
-- test/test_freeze_to_revision.rb
-- test/test_git_project_extract_name.rb
-- test/test_help.rb
-- test/test_init_git.rb
-- test/test_out_of_date_git_subproject.rb
-- test/test_projects.rb
-- test/test_rails_detection.rb
-- test/test_string_extensions.rb
-- test/test_svn_branches.rb
-- test/test_touch_emptydirs.rb
-- test/test_version.rb
-homepage: http://nopugs.com/ext-tutorial
+- version.rb
+homepage: https://github.com/azimux/externals
 licenses:
-- MIT
-metadata: {}
-post_install_message: 
+- MPL-2.0
+metadata:
+  homepage_uri: https://github.com/azimux/externals
+  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
@@ -89,36 +47,19 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.7.0
+  - - "<"
+    - !ruby/object:Gem::Version
+      version: '3.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: ext
-rubygems_version: 2.7.8
-signing_key: 
+rubygems_version: 3.5.22
+signing_key:
 specification_version: 4
 summary: Provides an SCM agnostic way to manage subprojects with a workflow similar
-  to the svn:externals feature of subversion.  It's particularly useful for rails
-  projects that have some plugins managed by svn and some managed by git.
-test_files:
-- test/test_checkout_git.rb
-- test/test_checkout_with_subprojects_git.rb
-- test/test_checkout_with_subprojects_svn.rb
-- test/test_file_utils_extensions.rb
-- test/test_freeze_to_revision.rb
-- test/test_git_project_extract_name.rb
-- test/test_help.rb
-- test/test_init_git.rb
-- test/test_out_of_date_git_subproject.rb
-- test/test_projects.rb
-- test/test_rails_detection.rb
-- test/test_string_extensions.rb
-- test/test_svn_branches.rb
-- test/test_touch_emptydirs.rb
-- test/test_version.rb
-- test/setup/empty_plugin.svn.gz
-- test/setup/foreign_key_migrations.svn.gz
-- test/setup/redhillonrails_core.svn.gz
+  to the svn:externals feature of subversion instead of that of git submodules.
+test_files: []

data/MIT_LICENSE.txt

@@ -1,22 +0,0 @@
-Copyright (c) 2008-2009 Miles Georgi, Azimux.com, nopugs.com Consulting
-
-Permission is hereby granted, free of charge, to any person
-obtaining a copy of this software and associated documentation
-files (the "Software"), to deal in the Software without
-restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.

data/Rakefile

@@ -1,77 +0,0 @@
-require 'rake'
-require 'rake/testtask'
-require 'rdoc/task'
-require 'rubygems/package_task'
-require 'find'
-
-root_dir = File.dirname(__FILE__)
-
-$LOAD_PATH << File.join(root_dir, 'lib')
-
-require File.join(root_dir, 'lib', 'externals', 'ext')
-
-Rake::TestTask.new('test') do |task|
-  task.libs = [File.expand_path('lib'),File.expand_path('test/support')]
-  task.pattern = './test/test_*.rb'
-  #task.warning = true
-end
-
-gem_specification = Gem::Specification.new do |specification|
-  specification.name = 'ext'
-  specification.version = Externals::VERSION
-  specification.platform = Gem::Platform::RUBY
-  specification.rubyforge_project = 'ext'
-
-  specification.summary =
-    %{Provides an SCM agnostic way to manage subprojects with a workflow similar
-to the svn:externals feature of subversion.  It's particularly useful for rails
-projects that have some plugins managed by svn and some managed by git.}
-  specification.description =
-    %{Provides an SCM agnostic way to manage subprojects with a workflow similar
-to the scm:externals feature of subversion.  It's particularly useful for rails
-projects that have some plugins managed by svn and some managed by git.
-
-For example, "ext install git://github.com/rails/rails.git" from within a rails
-application directory will realize that this belongs in the vendor/rails folder.
-It will also realize that this URL is a git repository and clone it into that
-folder.
-
-It will also add the vendor/rails folder to the ignore feature for the SCM of
-the main project.  Let's say that the main project is being managed by
-subversion.  In that case it adds "rails" to the svn:ignore property of the
-vendor folder.  It also adds the URL to the .externals file so that when this
-project is checked out via "ext checkout" it knows where to fetch the
-subprojects.
-
-There are several other useful commands, such as init, touch_emptydirs, add_all,
-export, status.  There's a tutorial at http://nopugs.com/ext-tutorial
-
-The reason I made this project is that I was frustrated by two things:
-
-1.  In my opinion, the workflow for svn:externals is far superior to
-git-submodule.
-
-2.  Even if git-submodule was as useful as svn:externals, I would still like a
-uniform way to fetch all of the subprojects regardless of the SCM used to manage
-the main project.}
-
-  specification.author = "Miles Georgi"
-  specification.email = "azimux@gmail.com"
-  specification.homepage = "http://nopugs.com/ext-tutorial"
-
-  specification.test_files = FileList['test/test_*.rb', 'test/setup/*.gz']
-
-  specification.bindir = "bin"
-  specification.executables = ['ext']
-  specification.default_executable = "ext"
-
-  specification.licenses = ['MIT']
-
-  specification.files = ['Rakefile', 'README', 'MIT_LICENSE.txt', 'CHANGELOG'] +
-    FileList['lib/**/*.rb']
-  #specification.require_path = 'lib'
-end
-
-Gem::PackageTask.new(gem_specification) do |package|
-  package.need_zip = package.need_tar = false
-end

data/lib/externals/extensions/symbol.rb

@@ -1,7 +0,0 @@
-unless Symbol.instance_methods.include?(:to_proc)
-  class Symbol
-    def to_proc
-      proc { |*args| args[0].send(self, *args[1...args.size]) }
-    end
-  end
-end

data/lib/externals/project_types/rails.rb

@@ -1,35 +0,0 @@
-module Externals
-  module RailsProjectType
-    class DefaultPathCalculator
-      def default_path name
-        if name
-          if name == 'rails'
-            File.join("vendor","rails")
-          else
-            File.join("vendor","plugins", name)
-          end
-        else
-          raise "couldn't figure out project name..."
-        end
-      end
-    end
-  end
-
-  class RailsDetector
-    def self.detected?
-      application_path = File.join('config', 'application.rb')
-      if File.exist?(application_path)
-        open(application_path) do |f|
-          f.read =~ /<\s*Rails::Application/
-        end
-      else
-        boot_path = File.join('config', 'boot.rb')
-        if File.exist?(boot_path)
-          open(boot_path) do |f|
-            f.read =~ /^\s*module\s+Rails/
-          end
-        end
-      end
-    end
-  end
-end

data/test/test_checkout_git.rb

@@ -1,32 +0,0 @@
-$:.unshift File.join(File.dirname(__FILE__), '..', 'lib') if $0 == __FILE__
-require 'ext_test_case'
-require 'externals/ext'
-require 'basic_git_repository'
-
-module Externals
-  module Test
-    class TestCheckoutGit < ::Test::Unit::TestCase
-      include ExtTestCase
-
-      def test_checkout
-        repository = BasicGitRepository.new
-        repository.prepare
-
-        assert File.exist?(repository.clean_dir)
-
-        workdir = File.join(root_dir, 'test', "tmp", "workdir")
-        mkdir_p workdir
-
-        Dir.chdir workdir do
-          if File.exist?(repository.name)
-            rm_r repository.name
-          end
-
-          Ext.run "checkout", "--git", repository.clean_dir
-
-          assert File.exist?(File.join(repository.name, "readme.txt"))
-        end
-      end
-    end
-  end
-end