ext 1.1.2 → 1.1.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: b99aa9d7a8d8bbc0d7bf8f46bfa26eca19156b15de602e5b3eeb0a47ce821f6d
+  data.tar.gz: 62d788f0fb5cb8c09cac2ccc422524325b7c50d945bc616ca940d13184869692
+SHA512:
+  metadata.gz: f1053255a27570040872fae424909a59b9b1164be59a1e8261ae1e01c5cbbf77f524fb3a9680d787775a4e4142288e70ea81e160b25a2372312e56bfb3fb7a3a
+  data.tar.gz: b580423a99dd943a25eb17cf1b6b90a71162adad8531c3ebbd8a73123963e85e4903a232e150637045f3340c0215fa8800281fb9825e4201f3facf7d88be00b1

data/CHANGELOG

@@ -1,3 +1,7 @@
+February 10, 2019 Version 1.1.3 released
+- Includes a --type bug fix
+- Removes several deprecation warnings
+
 January 13, 2012 Version 1.1.2 released
 - Fixes export problem with newer versions of git.
 - Fixes build on Windows, along with a bug that can prevent svn branches from

data/Rakefile

@@ -65,6 +65,8 @@ the main project.}
   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'
@@ -72,4 +74,4 @@ end
 
 Gem::PackageTask.new(gem_specification) do |package|
   package.need_zip = package.need_tar = false
-end
+end

data/lib/externals/configuration/configuration.rb

@@ -19,8 +19,8 @@ module Externals
       end
 
 
-      SETTING_REGEX = /^\s*([\.\w_-]+)\s*=\s*([^#\n]*)(?:#[^\n]*)?$/
-      SET_SETTING_REGEX = /^(\s*(?:[\.\w_-]+)\s*=\s*)(?:[^#\n]*)(#[^\n]*)?$/
+      SETTING_REGEX = /^\s*([\.\w-]+)\s*=\s*([^#\n]*)(?:#[^\n]*)?$/
+      SET_SETTING_REGEX = /^(\s*(?:[\.\w-]+)\s*=\s*)(?:[^#\n]*)(#[^\n]*)?$/
 
       def attributes
         retval = {}
@@ -181,4 +181,4 @@ module Externals
       end
     end
   end
-end
+end

data/lib/externals/ext.rb

@@ -9,7 +9,7 @@ Dir.entries(File.join(File.dirname(__FILE__), 'extensions')).each do |extension|
 end
 
 module Externals
-  VERSION = '1.1.2'
+  VERSION = '1.1.3'
   PROJECT_TYPES_DIRECTORY = File.join(File.dirname(__FILE__), '..', 'externals','project_types')
 
   # Full commands operate on the main project as well as the externals
@@ -140,7 +140,7 @@ module Externals
         String,
         *"The type of project the main project is.
           For example, 'rails'.".lines_by_width(summary_width)
-      ) {|type| sub_options[:scm] = main_options[:type] = type}
+      ) {|type| sub_options[:type] = main_options[:type] = type}
       opts.on("--scm SCM", "-s SCM",
         String,
         *"The SCM used to manage the main project.  For example, '--scm svn'.".lines_by_width(summary_width)
@@ -163,7 +163,7 @@ module Externals
       opts.on("--workdir DIR", "-w DIR", String, *"The working directory to execute commands from.  Use this if for some reason you
         cannot execute ext from the main project's directory (or if it's just inconvenient, such as in a script
         or in a Capistrano task)".lines_by_width(summary_width)) {|dir|
-        raise "No such directory: #{dir}" unless File.exists?(dir) && File.directory?(dir)
+        raise "No such directory: #{dir}" unless File.exist?(dir) && File.directory?(dir)
         main_options[:workdir] = dir
       }
       opts.on(
@@ -237,6 +237,7 @@ module Externals
       print_commands(SHORT_COMMANDS_HASH)
     end
 
+    @registered_scms = nil
     def self.registered_scms
       return @registered_scms if @registered_scms
       @registered_scms ||= []
@@ -293,7 +294,7 @@ module Externals
       return @configuration if @configuration
 
       file_string = ''
-      if File.exists? '.externals'
+      if File.exist?('.externals')
         open('.externals', 'r') do |f|
           file_string = f.read
         end
@@ -310,6 +311,9 @@ module Externals
     def initialize options = {}
       super()
 
+      @configuration = nil
+      @projects = nil
+
       scm = configuration['.']
       scm = scm['scm'] if scm
       scm ||= options[:scm]
@@ -360,8 +364,8 @@ Please use
         end
 
         if project_name_or_path
-          project = subprojects.detect do |project|
-            project.name == project_name_or_path || project.path == project_name_or_path
+          project = subprojects.detect do |p|
+            p.name == project_name_or_path || p.path == project_name_or_path
           end
 
           raise "no such project" unless project
@@ -417,7 +421,7 @@ Please use
     end
 
     def install args, options
-      if !File.exists? '.externals'
+      if !File.exist?('.externals')
         STDERR.puts "This project does not appear to be managed by externals.  Try 'ext init' first"
         exit NO_EXTERNALS_FILE
       end
@@ -461,7 +465,9 @@ that you are installing. Use an option to specify it
     end
 
     def uninstall args, options
-      raise "Hmm... there's no .externals file in this directory." if !File.exists? '.externals'
+      unless File.exist?('.externals')
+        raise "Hmm... there's no .externals file in this directory."
+      end
 
       project = subproject_by_name_or_path(args[0])
 
@@ -618,14 +624,14 @@ by creating the .externals file manually"
 
         removed_project_paths = old_config.removed_project_paths(
           configuration
-        ).select{|path| File.exists?(path)}
+        ).select{|path| File.exist?(path)}
 
         if !removed_project_paths.empty?
           puts "WARNING: The following subprojects are no longer being maintained in the
 .externals file.  You might want to remove them.  You can copy and paste the
 commands below if you actually wish to delete them."
           removed_project_paths.each do |path|
-            if File.exists? path
+            if File.exist?(path)
               puts "  rm -r #{path}"
             end
           end
@@ -689,7 +695,7 @@ commands below if you actually wish to delete them."
     end
 
     def init args, options = {}
-      raise ".externals already exists" if File.exists? '.externals'
+      raise ".externals already exists" if File.exist?('.externals')
 
       scm = options[:scm]
       type = options[:type]
@@ -726,7 +732,7 @@ Please use the --type option to tell ext which to use."
       end
 
       config = Configuration::Configuration.new_empty
-      raise ".externals already exists" if File.exists?('.externals')
+      raise ".externals already exists" if File.exist?('.externals')
 
       config.add_empty_section '.'
 
@@ -763,7 +769,7 @@ Please use the --type option to tell ext which to use."
 
     protected
     def do_checkout_or_export repository, path, options, sym
-      if File.exists?('.externals')
+      if File.exist?('.externals')
         raise "seems main project is already checked out here?"
       else
         #We appear to be attempting to checkout/export a main project

data/lib/externals/extensions/file_utils.rb

@@ -8,17 +8,17 @@ FileUtils.class_eval do
 
   # calls rm_rf if the file exists
   def rm_rf_ie file, options = {}
-    rm_rf file, options if File.exists? file
+    rm_rf file, options if File.exist?(file)
   end
 
   # calls rmdir if the file exists and is empty
   def rmdir_if_empty_ie path
-    rmdir path if File.exists?(path) && dir_empty?(path)
+    rmdir path if File.exist?(path) && dir_empty?(path)
   end
 
   # calls rmdir if the file exists
   def rmdir_ie path
-    rmdir path if File.exists?(path)
+    rmdir path if File.exist?(path)
   end
 
   alias rm_rf_old rm_rf
@@ -27,9 +27,9 @@ FileUtils.class_eval do
     tries = 0
 
     rm = proc do
-      rm_rf_old *args
+      rm_rf_old(*args)
 
-      while File.exists?(args[0]) && tries < 10
+      while File.exist?(args[0]) && tries < 10
         # :nocov:
         sleep 1
         tries += 1
@@ -53,7 +53,7 @@ FileUtils.class_eval do
 
   def dir_empty? path
     File.directory?(path) &&
-      File.exists?(path) &&
+      File.exist?(path) &&
       !Dir.entries(path).detect{|entry| !["..","."].include?(entry)}
   end
-end
+end

data/lib/externals/extensions/symbol.rb

@@ -1,7 +1,7 @@
-unless Symbol.respond_to? :to_proc
+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
+end

data/lib/externals/project.rb

@@ -16,12 +16,13 @@ module Externals
     def self.attr_attr_accessor *names
       names = [names].flatten
       names.each do |name|
-        define_method name do
-          attributes[name.to_sym]
-        end
         define_method "#{name}=" do |value|
           attributes[name.to_sym] = value
         end
+        next if name == "name" || name == "scm"
+        define_method name do
+          attributes[name.to_sym]
+        end
       end
     end
 
@@ -112,7 +113,7 @@ module Externals
     end
 
     def extract_name repository
-      if repository =~ /\/([\w_-]+)(?:\.git)?$/
+      if repository =~ /\/([\w-]+)(?:\.git)?$/
         $1
       end
     end
@@ -128,11 +129,11 @@ module Externals
       end
 
       exists.each do |proj|
-        assert.call File.exists?(File.join('vendor', 'plugins', proj, 'lib'))
+        assert.call File.exist?(File.join('vendor', 'plugins', proj, 'lib'))
       end
 
       doesnt.each do |proj|
-        assert.call !File.exists?(File.join('vendor', 'plugins', proj, 'lib'))
+        assert.call !File.exist?(File.join('vendor', 'plugins', proj, 'lib'))
       end
     end
 
@@ -153,7 +154,7 @@ module Externals
 
     # create the suffixed versions
     OPTS_SUFFIXES.map do |suffix|
-      name = "scm_opts_#{suffix}"
+      "scm_opts_#{suffix}"
     end.each do |name|
       define_method name do
         values = [
@@ -206,7 +207,7 @@ module Externals
 
         #now we create the suffixed version of the global settings.
         OPTS_SUFFIXES.map do |suffix|
-          name = "#{scm_name}_opts_#{suffix}"
+          "#{scm_name}_opts_#{suffix}"
         end.each do |name|
           #defer to the parent project for these global settings
           Project.__send__(:define_method, name) do
@@ -247,4 +248,4 @@ module Externals
       send("scm_opts#{command}")
     end
   end
-end
+end

data/lib/externals/project_types/rails.rb

@@ -18,13 +18,13 @@ module Externals
   class RailsDetector
     def self.detected?
       application_path = File.join('config', 'application.rb')
-      if File.exists? application_path
+      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.exists? boot_path
+        if File.exist?(boot_path)
           open(boot_path) do |f|
             f.read =~ /^\s*module\s+Rails/
           end
@@ -32,4 +32,4 @@ module Externals
       end
     end
   end
-end
+end

data/lib/externals/scms/git_project.rb

@@ -139,7 +139,7 @@ module Externals
       if revision
         # No clean reliable way to clone something that's not a branch or tag.
         # just call up instead.
-        up *args
+        up(*args)
       else
         clone_opts = "--depth 1"
         if branch
@@ -161,8 +161,6 @@ module Externals
     end
 
     def do_up command
-      opts = resolve_opts(command)
-
       project_path = if path == "."
         name || "." # if no name is specified then we are expected to already be in the right path.
         # this is a little confusing and should be cleaned up.
@@ -176,7 +174,7 @@ module Externals
 
       puts "Updating #{path}..."
 
-      if !File.exists? project_path
+      if !File.exist?(project_path)
         do_clone command
       end
       change_to_branch_revision command
@@ -203,7 +201,7 @@ module Externals
     end
 
     def self.detected?
-      File.exists? ".git"
+      File.exist?(".git")
     end
 
     #this is a test helper method
@@ -218,7 +216,7 @@ module Externals
     end
 
     def ignore_text(path = nil)
-      return '' unless File.exists? '.gitignore'
+      return '' unless File.exist?('.gitignore')
       retval = ''
       open('.gitignore') do |f|
         retval = f.read
@@ -288,4 +286,4 @@ module Externals
     end
 
   end
-end
+end

data/lib/externals/scms/svn_project.rb

@@ -15,7 +15,7 @@ module Externals
       dest = '' if dest == '.'
       dest = "\"#{dest}\"" if dest && !dest.empty?
 
-      if File.exists? dest
+      if File.exist?(dest)
         up
       else
         opts = resolve_opts "co"
@@ -89,7 +89,7 @@ module Externals
       # delete path if empty
       rmdir_if_empty_ie path
 
-      if File.exists? path
+      if File.exist?(path)
         puts "updating #{path}:"
 
         if branch
@@ -119,12 +119,12 @@ module Externals
       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
 
@@ -140,7 +140,7 @@ module Externals
     end
 
     def self.detected?
-      File.exists? ".svn"
+      File.exist?(".svn")
     end
 
     #this is a test helper method

data/test/test_checkout_git.rb

@@ -12,21 +12,21 @@ module Externals
         repository = BasicGitRepository.new
         repository.prepare
 
-        assert File.exists?(repository.clean_dir)
+        assert File.exist?(repository.clean_dir)
 
         workdir = File.join(root_dir, 'test', "tmp", "workdir")
         mkdir_p workdir
 
         Dir.chdir workdir do
-          if File.exists?(repository.name)
+          if File.exist?(repository.name)
             rm_r repository.name
           end
 
           Ext.run "checkout", "--git", repository.clean_dir
 
-          assert File.exists?(File.join(repository.name, "readme.txt"))
+          assert File.exist?(File.join(repository.name, "readme.txt"))
         end
       end
     end
   end
-end
+end

data/test/test_checkout_with_subprojects_git.rb

@@ -15,7 +15,7 @@ module Externals
         workdir = File.join(root_dir, 'test', "tmp", "workdir", "branches", "git")
         mkdir_p workdir
 
-        if File.exists?(File.join(workdir,"rails_app"))
+        if File.exist?(File.join(workdir,"rails_app"))
           rm_rf File.join(workdir, "rails_app")
         end
 
@@ -25,9 +25,9 @@ module Externals
           Ext.run "checkout", "--git", source
 
           Dir.chdir 'rails_app' do
-            assert File.exists?('.git')
+            assert File.exist?('.git')
 
-            assert File.exists?('.gitignore')
+            assert File.exist?('.gitignore')
 
             ext = Ext.new
             main_project = ext.main_project
@@ -40,7 +40,7 @@ module Externals
             assert_equal "edge", engines.current_branch
             assert_equal "edge", ext.configuration["vendor/plugins/engines"]["branch"]
 
-            assert File.exists?(File.join('vendor', 'rails', 'activerecord', 'lib'))
+            assert File.exist?(File.join('vendor', 'rails', 'activerecord', 'lib'))
 
             `git checkout --track -b new_branch origin/new_branch`
             raise unless $? == 0
@@ -57,7 +57,7 @@ module Externals
             assert !main_project.ignore_contains?("vendor/rails")
 
             rm_rf "vendor/rails"
-            raise if File.exists?(File.join("vendor", "rails"))
+            raise if File.exist?(File.join("vendor", "rails"))
 
             `git checkout master`
             raise unless $? == 0
@@ -68,7 +68,7 @@ module Externals
             Ext.run "up"
             assert_equal "master", main_project.current_branch
             assert_equal "edge", engines.current_branch
-            assert File.exists?(File.join('vendor', 'rails', 'activerecord', 'lib'))
+            assert File.exist?(File.join('vendor', 'rails', 'activerecord', 'lib'))
 
             `git checkout new_branch`
             assert_equal "new_branch", main_project.current_branch
@@ -91,21 +91,21 @@ module Externals
             assert_equal "branch1", engines.current_branch
 
             assert !main_project.ignore_contains?("vendor/rails")
-            assert File.exists?(File.join('vendor', 'rails', 'activerecord', 'lib'))
+            assert File.exist?(File.join('vendor', 'rails', 'activerecord', 'lib'))
             rm_rf "vendor/rails"
 
             Ext.run "switch", "master"
             assert_equal "master", main_project.current_branch
             assert_equal "edge", engines.current_branch
 
-            assert File.exists?(File.join('vendor', 'rails', 'activerecord', 'lib'))
+            assert File.exist?(File.join('vendor', 'rails', 'activerecord', 'lib'))
 
             assert main_project.ignore_contains?("vendor/rails")
           end
 
           #now let's check it out again to test "ext checkout -b new_branch"
           rm_rf "rails_app"
-          if File.exists?("rails_app")
+          if File.exist?("rails_app")
             raise
           end
 
@@ -129,7 +129,7 @@ module Externals
         workdir = File.join(root_dir, 'test', "tmp", "workdir", "branches", "uninstall", "git")
         mkdir_p workdir
 
-        if File.exists?(File.join(workdir,"rails_app"))
+        if File.exist?(File.join(workdir,"rails_app"))
           rm_rf File.join(workdir, "rails_app")
         end
 
@@ -166,4 +166,4 @@ module Externals
     end
 
   end
-end
+end

data/test/test_checkout_with_subprojects_svn.rb

@@ -24,7 +24,7 @@ module Externals
           Ext.run "checkout", "--svn", source, 'rails_app'
 
           Dir.chdir 'rails_app' do
-            assert File.exists?('.svn')
+            assert File.exist?('.svn')
 
             %w(redhillonrails_core acts_as_list).each do |proj|
               puts(ignore_text = `svn propget svn:ignore vendor/plugins`)
@@ -35,12 +35,12 @@ module Externals
             assert(ignore_text =~ /^rails$/)
 
             %w(redhillonrails_core acts_as_list some_subproject_with_edge).each do |proj|
-              assert File.exists?(File.join('vendor', 'plugins', proj, 'lib'))
+              assert File.exist?(File.join('vendor', 'plugins', proj, 'lib'))
             end
 
-            assert File.exists?(File.join('vendor', 'rails', 'activerecord', 'lib'))
+            assert File.exist?(File.join('vendor', 'rails', 'activerecord', 'lib'))
 
-            assert File.exists?(File.join('vendor', 'rails', '.git'))
+            assert File.exist?(File.join('vendor', 'rails', '.git'))
 
             Dir.chdir File.join('vendor', 'rails') do
               heads = File.readlines("heads").map(&:strip)
@@ -53,7 +53,7 @@ module Externals
                 /^\s*commit\s+#{heads[0]}\s*$/
             end
 
-            assert File.exists?(File.join('modules', 'modules.txt'))
+            assert File.exist?(File.join('modules', 'modules.txt'))
 
             assert File.read(File.join('modules', 'modules.txt')) =~ /line1 of/
 
@@ -80,8 +80,8 @@ module Externals
 
           Dir.chdir 'rails_app' do
             pretests = proc do
-              assert File.exists?('.svn')
-              assert !File.exists?(File.join('vendor', 'plugins', 'ssl_requirement', 'lib'))
+              assert File.exist?('.svn')
+              assert !File.exist?(File.join('vendor', 'plugins', 'ssl_requirement', 'lib'))
               assert File.read(".externals") =~ /rails/
               assert File.read(".externals") !~ /ssl_requirement/
             end
@@ -114,7 +114,7 @@ module Externals
             #update the project and make sure ssl_requirement was added and checked out
             Ext.run "update"
             assert File.read(".externals") =~ /ssl_requirement/
-            assert File.exists?(File.join('vendor', 'plugins', 'ssl_requirement', 'lib'))
+            assert File.exist?(File.join('vendor', 'plugins', 'ssl_requirement', 'lib'))
           end
         end
       end
@@ -139,8 +139,8 @@ module Externals
           Dir.chdir 'rails_app' do
 
             pretests = proc do
-              assert File.exists?('.svn')
-              assert !File.exists?(File.join('vendor', 'plugins', subproject_name, 'lib'))
+              assert File.exist?('.svn')
+              assert !File.exist?(File.join('vendor', 'plugins', subproject_name, 'lib'))
               assert File.read(".externals") =~ /rails/
               assert File.read(".externals") !~ /#{subproject}/
             end
@@ -189,7 +189,7 @@ module Externals
             Ext.run "update"
             assert File.read(".externals") =~ /ssl_requirement/
 
-            assert File.exists?(File.join('vendor', 'plugins', subproject_name, 'lib'))
+            assert File.exist?(File.join('vendor', 'plugins', subproject_name, 'lib'))
 
             Dir.chdir File.join("vendor",'plugins', subproject_name) do
               assert `git show HEAD` =~ /^\s*commit\s*#{revision}\s*$/i
@@ -215,8 +215,8 @@ module Externals
 
           Dir.chdir 'rails_app' do
             pretests = proc do
-              assert File.exists?('.svn')
-              assert !File.exists?(File.join('vendor', 'plugins', subproject.name, 'lib'))
+              assert File.exist?('.svn')
+              assert !File.exist?(File.join('vendor', 'plugins', subproject.name, 'lib'))
               assert File.read(".externals") =~ /rails/
               assert File.read(".externals") !~ /empty_plugin/
             end
@@ -248,7 +248,7 @@ module Externals
             #update the project and make sure ssl_requirement was added and checked out
             Ext.run "update"
             assert File.read(".externals") =~ /empty_plugin/
-            assert File.exists?(File.join('vendor', 'plugins', subproject.name, 'lib'))
+            assert File.exist?(File.join('vendor', 'plugins', subproject.name, 'lib'))
           end
         end
       end
@@ -267,7 +267,7 @@ module Externals
           Ext.run "export", "--svn", source, 'rails_app'
 
           Dir.chdir 'rails_app' do
-            assert !File.exists?('.svn')
+            assert !File.exist?('.svn')
 
             Dir.chdir File.join('vendor', 'rails') do
               heads = File.readlines("heads").map(&:strip)
@@ -281,18 +281,18 @@ module Externals
             end
 
             %w(redhillonrails_core acts_as_list).each do |proj|
-              puts "filethere? #{proj}: #{File.exists?(File.join('vendor', 'plugins', proj, 'lib'))}"
-              if !File.exists?(File.join('vendor', 'plugins', proj, 'lib'))
+              puts "filethere? #{proj}: #{File.exist?(File.join('vendor', 'plugins', proj, 'lib'))}"
+              if !File.exist?(File.join('vendor', 'plugins', proj, 'lib'))
                 puts "here"
               end
-              assert File.exists?(File.join('vendor', 'plugins', proj, 'lib'))
+              assert File.exist?(File.join('vendor', 'plugins', proj, 'lib'))
             end
 
             %w(redhillonrails_core).each do |proj|
-              assert !File.exists?(File.join('vendor', 'plugins',proj, '.svn'))
+              assert !File.exist?(File.join('vendor', 'plugins',proj, '.svn'))
             end
 
-            assert File.exists?(File.join('vendor', 'rails', 'activerecord', 'lib'))
+            assert File.exist?(File.join('vendor', 'rails', 'activerecord', 'lib'))
 
             # Check that engines subproject has content expected for edge branch
             ext = Ext.new
@@ -363,7 +363,7 @@ module Externals
           Ext.run "export", "--svn", source, 'rails_app'
 
           Dir.chdir 'rails_app' do
-            assert !File.exists?('.svn')
+            assert !File.exist?('.svn')
 
             # Check that engines subproject has content expected for sub_project_revision
             ext = Ext.new
@@ -381,4 +381,4 @@ module Externals
 
     end
   end
-end
+end

data/test/test_freeze_to_revision.rb

@@ -14,21 +14,21 @@ module Externals
         repository = RailsAppGitRepository.new
         repository.prepare
 
-        assert File.exists?(repository.clean_dir)
+        assert File.exist?(repository.clean_dir)
 
         workdir = File.join(root_dir, 'test', "tmp", "workdir", "checkout", "git")
         mkdir_p workdir
 
         Dir.chdir workdir do
-          rm_r repository.name if File.exists? repository.name
+          rm_r repository.name if File.exist?(repository.name)
           source = repository.clean_dir
           puts "About to checkout #{source}"
           Ext.run "checkout", "--git", source
 
           Dir.chdir repository.name do
-            assert File.exists?('.git')
+            assert File.exist?('.git')
 
-            assert File.exists?('.gitignore')
+            assert File.exist?('.gitignore')
 
             %w(foreign_key_migrations redhillonrails_core acts_as_list).each do |proj|
               assert(File.read('.gitignore') =~ /^vendor[\/\\]plugins[\/\\]#{proj}$/)
@@ -63,7 +63,7 @@ module Externals
             raise unless $? == 0
 
             %w(foreign_key_migrations redhillonrails_core acts_as_list).each do |proj|
-              assert File.exists?(File.join('vendor', 'plugins', proj, 'lib'))
+              assert File.exist?(File.join('vendor', 'plugins', proj, 'lib'))
             end
           end
         end
@@ -76,13 +76,13 @@ module Externals
         sub_repository = ModulesSvnBranchesRepository.new
         sub_repository.prepare
 
-        assert File.exists?(repository.clean_dir)
+        assert File.exist?(repository.clean_dir)
 
         workdir = File.join(root_dir, 'test', "tmp", "workdir", "checkout", "git")
         mkdir_p workdir
 
         Dir.chdir workdir do
-          rm_r repository.name if File.exists? repository.name
+          rm_r repository.name if File.exist?(repository.name)
           source = repository.clean_dir
 
           puts "About to checkout #{source}"
@@ -123,7 +123,7 @@ module Externals
         mkdir_p workdir
 
         Dir.chdir workdir do
-          rm_r repository.name if File.exists? repository.name
+          rm_r repository.name if File.exist?(repository.name)
           source = repository.clean_dir
 
           puts "About to checkout #{source}"
@@ -155,7 +155,7 @@ module Externals
         mkdir_p workdir
 
         Dir.chdir workdir do
-          rm_r repository.name if File.exists? repository.name
+          rm_r repository.name if File.exist?(repository.name)
           source = repository.clean_dir
 
           puts "About to checkout #{source}"
@@ -173,4 +173,4 @@ module Externals
 
     end
   end
-end
+end

data/test/test_init_git.rb

@@ -8,33 +8,55 @@ module Externals
     class TestInitGit < ::Test::Unit::TestCase
       include ExtTestCase
 
-      def test_init
+      def setup
         repository = BasicGitRepository.new
         repository.prepare
 
-        assert File.exists?(repository.clean_dir)
+        assert File.exist?(repository.clean_dir)
 
         workdir = File.join(root_dir, 'test', "tmp", "workdir")
         mkdir_p workdir
 
         Dir.chdir workdir do
           delete_if_dirty(repository.name)
-          if !File.exists?(repository.name)
+          if !File.exist?(repository.name)
             `git clone #{repository.clean_dir} #{repository.name}`
             raise unless $? == 0
           end
 
           mark_dirty(repository.name)
-          Dir.chdir repository.name do
-            assert !File.exists?('.externals')
+        end
+
+        @workdir = workdir
+        @repository = repository
+      end
+
+      def test_init
+        Dir.chdir @workdir do
+          Dir.chdir @repository.name do
+            assert !File.exist?('.externals')
+
+            rescue_exit { Ext.run "init" }
+
+            config = Externals::Configuration::Configuration.new(File.read('.externals'))
+            assert_equal(config['.']['scm'], 'git')
+          end
+        end
+      end
+
+      def test_init_rails_project
+        Dir.chdir @workdir do
+          Dir.chdir @repository.name do
+            assert !File.exist?('.externals')
 
-            Ext.run "init"
+            rescue_exit { Ext.run "init", "--type", "rails" }
 
-            assert File.exists?('.externals')
-            assert(File.read('.externals') =~ /^\s*scm\s*=\s*git\s*$/)
+            config = Externals::Configuration::Configuration.new(File.read('.externals'))
+            assert_equal(config['.']['scm'], 'git')
+            assert_equal(config['.']['type'], 'rails')
           end
         end
       end
     end
   end
-end
+end

data/test/test_out_of_date_git_subproject.rb

@@ -12,24 +12,24 @@ module Externals
         repository = SimpleGitWithSub.new
         repository.prepare
 
-        assert File.exists?(repository.clean_dir)
+        assert File.exist?(repository.clean_dir)
 
         workdir = File.join(root_dir, 'test', "tmp", "workdir")
         mkdir_p workdir
 
         Dir.chdir workdir do
-          if File.exists?(repository.name)
+          if File.exist?(repository.name)
             rm_rf repository.name
           end
 
           Ext.run "checkout", "--git", repository.clean_dir
 
-          assert !File.exists?(File.join(repository.name, "readme.txt"))
-          assert File.exists?(File.join(repository.name, "simple_readme.txt"))
-          assert !File.exists?(File.join(
+          assert !File.exist?(File.join(repository.name, "readme.txt"))
+          assert File.exist?(File.join(repository.name, "simple_readme.txt"))
+          assert !File.exist?(File.join(
               repository.name, "subs", repository.dependents[:basic].name, "simple_readme.txt")
           )
-          assert File.exists?(File.join(
+          assert File.exist?(File.join(
               repository.name, "subs", repository.dependents[:basic].name, "readme.txt")
           )
 
@@ -80,4 +80,4 @@ module Externals
       end
     end
   end
-end
+end

data/test/test_projects.rb

@@ -17,7 +17,7 @@ module Externals
 
       def test_svn_global_opts
         Dir.chdir File.join(root_dir, 'test') do
-          rm_rf "test_svn_global_opts" if File.exists? "test_svn_global_opts"
+          rm_rf "test_svn_global_opts" if File.exist?("test_svn_global_opts")
           mkdir "test_svn_global_opts"
 
           begin
@@ -138,11 +138,11 @@ repository = svn://rubyforge.org/var/svn/redhillonrails/trunk/vendor/plugins/for
 
             end
           ensure
-            rm_rf "test_svn_global_opts" if File.exists? "test_svn_global_opts"
+            rm_rf "test_svn_global_opts" if File.exist?("test_svn_global_opts")
           end
 
         end
       end
     end
   end
-end
+end

data/test/test_svn_branches.rb

@@ -14,12 +14,12 @@ module Externals
         repository = RailsAppSvnBranches.new
         repository.prepare
 
-        assert File.exists?(File.join(repository.clean_dir, "db"))
+        assert File.exist?(File.join(repository.clean_dir, "db"))
 
         workdir = File.join(root_dir, 'test', "tmp", "workdir", mode, "svn", "branches")
         mkdir_p workdir
 
-        if File.exists?(File.join(workdir, "rails_app"))
+        if File.exist?(File.join(workdir, "rails_app"))
           rm_r File.join(workdir, "rails_app")
         end
 
@@ -33,7 +33,7 @@ module Externals
           Ext.run mode, "--svn", source, "-b", "current", 'rails_app'
 
           Dir.chdir 'rails_app' do
-            assert File.exists?('.svn')
+            assert File.exist?('.svn')
 
             %w(redhillonrails_core acts_as_list).each do |proj|
               ignore_text = `svn propget svn:ignore vendor/plugins`
@@ -46,14 +46,14 @@ module Externals
             assert(ignore_text =~ /^rails$/)
 
             %w(redhillonrails_core acts_as_list engines).each do |proj|
-              assert File.exists?(File.join('vendor', 'plugins', proj, 'lib'))
+              assert File.exist?(File.join('vendor', 'plugins', proj, 'lib'))
             end
 
-            assert File.exists?(File.join('vendor', 'rails', 'activerecord', 'lib'))
+            assert File.exist?(File.join('vendor', 'rails', 'activerecord', 'lib'))
 
-            assert File.exists?(File.join('vendor', 'rails', '.git'))
+            assert File.exist?(File.join('vendor', 'rails', '.git'))
 
-            assert File.exists?(File.join('modules', 'modules.txt'))
+            assert File.exist?(File.join('modules', 'modules.txt'))
 
             assert File.read(File.join('modules', 'modules.txt')) =~ /line1 of/
 
@@ -70,8 +70,8 @@ module Externals
             assert_equal "current", modules.current_branch
             assert_equal "current", ext.configuration["modules"]["branch"]
 
-            assert !File.exists?(File.join(%w(vendor plugins ssl_requirement)))
-            assert !File.exists?(File.join(%w(vendor plugins empty_plugin)))
+            assert !File.exist?(File.join(%w(vendor plugins ssl_requirement)))
+            assert !File.exist?(File.join(%w(vendor plugins empty_plugin)))
 
             #let's run update.  This can expose certain errors.
             Ext.run "update"
@@ -81,8 +81,8 @@ module Externals
               raise
             end
 
-            assert !File.exists?(File.join(%w(vendor plugins ssl_requirement)))
-            assert !File.exists?(File.join(%w(vendor plugins empty_plugin)))
+            assert !File.exist?(File.join(%w(vendor plugins ssl_requirement)))
+            assert !File.exist?(File.join(%w(vendor plugins empty_plugin)))
 
             assert !main_project.ignore_contains?("vendor/rails")
 
@@ -101,8 +101,8 @@ module Externals
 
             Ext.run "up"
 
-            assert File.exists?(File.join(%w(vendor plugins ssl_requirement)))
-            assert File.exists?(File.join(%w(vendor plugins empty_plugin)))
+            assert File.exist?(File.join(%w(vendor plugins ssl_requirement)))
+            assert File.exist?(File.join(%w(vendor plugins empty_plugin)))
 
             Dir.chdir File.join("vendor",'plugins', "ssl_requirement") do
               assert `git show HEAD` =~ /^\s*commit\s*#{
@@ -146,9 +146,9 @@ module Externals
             engines = ext.subproject("engines")
             modules = ext.subproject("modules")
 
-            assert File.exists?(File.join('vendor', 'rails', 'activerecord', 'lib'))
+            assert File.exist?(File.join('vendor', 'rails', 'activerecord', 'lib'))
 
-            assert File.exists?(File.join('vendor', 'rails', '.git'))
+            assert File.exist?(File.join('vendor', 'rails', '.git'))
 
             assert_equal "current", main_project.current_branch
 
@@ -224,9 +224,9 @@ module Externals
 
             capture = capture.string
 
-            assert File.exists?(File.join('vendor', 'rails', 'activerecord', 'lib'))
+            assert File.exist?(File.join('vendor', 'rails', 'activerecord', 'lib'))
 
-            assert File.exists?(File.join('vendor', 'rails', '.git'))
+            assert File.exist?(File.join('vendor', 'rails', '.git'))
 
 
             assert_equal "current", main_project.current_branch
@@ -255,13 +255,13 @@ module Externals
         repository = RailsAppSvnBranches.new
         repository.prepare
 
-        assert File.exists?(File.join(repository.clean_dir, "db"))
+        assert File.exist?(File.join(repository.clean_dir, "db"))
 
         workdir = File.join(root_dir, 'test', "tmp", "workdir", mode, "svn", "branch_test")
         rm_rf workdir
         mkdir_p workdir
 
-        if File.exists?(File.join(workdir,"rails_app"))
+        if File.exist?(File.join(workdir,"rails_app"))
           rm_r File.join(workdir, "rails_app")
         end
 
@@ -275,21 +275,21 @@ module Externals
           Ext.run mode, "--svn", source, "-b", "current", 'rails_app'
 
           Dir.chdir 'rails_app' do
-            assert !File.exists?('.svn')
+            assert !File.exist?('.svn')
 
             %w(redhillonrails_core).each do |proj|
-              assert !File.exists?(File.join('vendor', 'plugins', proj, '.svn'))
+              assert !File.exist?(File.join('vendor', 'plugins', proj, '.svn'))
             end
 
             %w(redhillonrails_core acts_as_list engines).each do |proj|
-              assert File.exists?(File.join('vendor', 'plugins', proj, 'lib'))
+              assert File.exist?(File.join('vendor', 'plugins', proj, 'lib'))
             end
 
-            assert File.exists?(File.join('vendor', 'rails', 'activerecord', 'lib'))
+            assert File.exist?(File.join('vendor', 'rails', 'activerecord', 'lib'))
 
-            assert File.exists?(File.join('vendor', 'rails', '.git'))
+            assert File.exist?(File.join('vendor', 'rails', '.git'))
 
-            assert File.exists?(File.join('modules', 'modules.txt'))
+            assert File.exist?(File.join('modules', 'modules.txt'))
 
             assert File.read(File.join('modules', 'modules.txt')) =~ /line1 of/
 
@@ -297,8 +297,8 @@ module Externals
             assert_equal "edge", ext.configuration["vendor/plugins/engines"]["branch"]
             assert_equal "current", ext.configuration["modules"]["branch"]
 
-            assert !File.exists?(File.join(%w(vendor plugins ssl_requirement)))
-            assert !File.exists?(File.join(%w(vendor plugins empty_plugin)))
+            assert !File.exist?(File.join(%w(vendor plugins ssl_requirement)))
+            assert !File.exist?(File.join(%w(vendor plugins empty_plugin)))
           end
         end
       end
@@ -307,12 +307,12 @@ module Externals
         repository = RailsAppSvnBranches.new
         repository.prepare
 
-        assert File.exists?(File.join(repository.clean_dir, "db"))
+        assert File.exist?(File.join(repository.clean_dir, "db"))
 
         workdir = File.join(root_dir, 'test', "tmp", "workdir","uninstall","svn","branches")
         mkdir_p workdir
 
-        if File.exists?(File.join(workdir,"rails_app"))
+        if File.exist?(File.join(workdir,"rails_app"))
           rm_r File.join(workdir, "rails_app")
         end
 
@@ -350,4 +350,4 @@ module Externals
 
     end
   end
-end
+end

data/test/test_touch_emptydirs.rb

@@ -41,19 +41,19 @@ module Externals
 
       def test_touch_emptydirs
         Dir.chdir File.join(root_dir, 'test') do
-          assert !File.exists?(File.join('.emptydir'))
+          assert !File.exist?(File.join('.emptydir'))
           Dir.chdir 'workdir' do
             Ext.run "touch_emptydirs"
-            assert !File.exists?(File.join('.emptydir'))
-            assert !File.exists?(File.join('notempty1', '.emptydir'))
-            assert File.exists?(File.join('notempty1', 'empty1', '.emptydir'))
-            assert !File.exists?(File.join('notempty1', 'notempty2', '.emptydir'))
-            assert File.exists?(File.join('notempty1', 'notempty2', 'empty2', '.emptydir'))
-            assert !File.exists?(File.join('notempty1', 'notempty2', 'notempty3', '.emptydir'))
+            assert !File.exist?(File.join('.emptydir'))
+            assert !File.exist?(File.join('notempty1', '.emptydir'))
+            assert File.exist?(File.join('notempty1', 'empty1', '.emptydir'))
+            assert !File.exist?(File.join('notempty1', 'notempty2', '.emptydir'))
+            assert File.exist?(File.join('notempty1', 'notempty2', 'empty2', '.emptydir'))
+            assert !File.exist?(File.join('notempty1', 'notempty2', 'notempty3', '.emptydir'))
           end
         end
       end
 
     end
   end
-end
+end

metadata

@@ -1,63 +1,54 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: ext
-version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: 
-  segments: 
-  - 1
-  - 1
-  - 2
-  version: 1.1.2
+version: !ruby/object:Gem::Version
+  version: 1.1.3
 platform: ruby
-authors: 
+authors:
 - Miles Georgi
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-01-13 00:00:00 Z
+date: 2019-02-10 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.
 email: azimux@gmail.com
-executables: 
+executables:
 - ext
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- Rakefile
-- README
-- MIT_LICENSE.txt
+files:
 - CHANGELOG
+- MIT_LICENSE.txt
+- README
+- Rakefile
+- bin/ext
 - lib/externals/command.rb
 - lib/externals/configuration/configuration.rb
 - lib/externals/ext.rb
@@ -68,6 +59,9 @@ files:
 - 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
@@ -83,44 +77,33 @@ files:
 - 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
-- bin/ext
 homepage: http://nopugs.com/ext-tutorial
-licenses: []
-
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: ext
-rubygems_version: 1.8.24
+rubygems_version: 2.7.8
 signing_key: 
-specification_version: 3
-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: 
+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