ext 1.0.7 → 1.1.0

data/CHANGELOG

@@ -1,3 +1,6 @@
+July 20, 2012 Version 1.10 released
+- unfreeze feature added.
+
 July 17, 2012 Version 1.0.7 released
 - Fixes a bug that removes the branch from the .externals configuration
   file when freezing a subproject managed by subversion.

data/README

@@ -18,14 +18,15 @@ The externals executable is called ext.  Commands come in a long form and a
 short form.  The longer form applies the action to the main project.  The short
 forms apply the action to all sub projects.
 
-The commands and usage are as follows (from 'ext help'):
 There's a tutorial available at http://nopugs.com/ext-tutorial
 
+The commands and usage are as follows (from 'ext help'):
+
 ext [OPTIONS] <command> [repository] [-b <branch>] [path]
-  -g, --git                same as '--scm git' Uses git to checkout/export the
-                           main project
       --svn, --subversion  same as '--scm svn' Uses subversion to
                            checkout/export the main project
+  -g, --git                same as '--scm git' Uses git to checkout/export the
+                           main project
   -t, --type TYPE          The type of project the main project is. For example,
                            'rails'.
   -s, --scm SCM            The SCM used to manage the main project. For example,
@@ -50,16 +51,15 @@ ext [OPTIONS] <command> [repository] [-b <branch>] [path]
 
 
 Commands that apply to the main project or the .externals file:
-freeze, help, init, install, switch, touch_emptydirs, uninstall, update_ignore, version
-
-freeze          Usage: ext freeze project [REVISION]
+freeze, help, init, install, switch, touch_emptydirs, unfreeze, uninstall, update_ignore, version
 
+freeze          Usage: ext freeze <subproject> [REVISION]
                 Locks a subproject into a specific revision/branch.  If no
                 revision is supplied, the current revision/branch of the
-                project will be used.  You can specify the project by name
+                project will be used.  You can specify the subproject by name
                 or path.
 
-help            You probably just ran this command just now.
+help            It helps.  Hopefully.
 
 init            Creates a .externals file containing only [main]
                 It will try to determine the SCM used by the main project,
@@ -85,6 +85,10 @@ touch_emptydirs Recurses through all directories from the
                 comes across.  Useful for dealing with SCMs that refuse to
                 track empty directories (such as git, for example)
 
+unfreeze        Usage: ext unfreeze <subproject>
+                Unfreezes a previously frozen subproject.  You can specify
+                the subproject by name or path.
+
 uninstall       Usage: ext uninstall [-f|--force_removal] <project>
                 Removes a subproject from being tracked by ext.  If you
                 want the files associated with this subproject deleted as well
@@ -105,22 +109,18 @@ Commands that apply to the main project and all subprojects:
 checkout, export, status, update
 
 checkout        Usage: ext checkout <repository>
-
                 Checks out <repository>, and checks out any subprojects
                 registered in <repository>'s .externals file.
 
 export          Usage: ext export <repository>
-
                 Like checkout except this command fetches as little
                 history as possible.
 
 status          Usage: ext status
-
                 Prints out the status of the main project, followed by
                 the status of each subproject.
 
 update          Usage: ext update
-
                 Brings the main project, and all subprojects, up to the
                 latest version.
 

data/Rakefile

@@ -11,7 +11,7 @@ $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')]
+  task.libs = [File.expand_path('lib'),File.expand_path('test/support')]
   task.pattern = './test/test_*.rb'
   #task.warning = true
 end

data/lib/externals/ext.rb

@@ -9,24 +9,24 @@ Dir.entries(File.join(File.dirname(__FILE__), 'extensions')).each do |extension|
 end
 
 module Externals
-  VERSION = '1.0.7'
+  VERSION = '1.1.0'
   PROJECT_TYPES_DIRECTORY = File.join(File.dirname(__FILE__), '..', 'externals','project_types')
 
   # Full commands operate on the main project as well as the externals
   # short commands only operate on the externals
   # Main commands only operate on the main project
   FULL_COMMANDS_HASH = [
-    [:checkout, "ext checkout <repository>", %{
-      Checks out <repository>, and checks out any subprojects
+    [:checkout, "ext checkout <repository>",
+      %{Checks out <repository>, and checks out any subprojects
       registered in <repository>'s .externals file.}],
-    [:export, "ext export <repository>", %{
-      Like checkout except this command fetches as little
+    [:export, "ext export <repository>",
+      %{Like checkout except this command fetches as little
       history as possible.}],
-    [:status, "ext status", %{
-      Prints out the status of the main project, followed by
+    [:status, "ext status",
+      %{Prints out the status of the main project, followed by
       the status of each subproject.}],
-    [:update, "ext update", %{
-      Brings the main project, and all subprojects, up to the
+    [:update, "ext update",
+      %{Brings the main project, and all subprojects, up to the
       latest version.}]
   ]
   SHORT_COMMANDS_HASH = [
@@ -37,10 +37,10 @@ module Externals
     [:up, "Like update, but skips the main project."]
   ]
   MAIN_COMMANDS_HASH = [
-    [:freeze, "ext freeze project [REVISION]", %{
-      Locks a subproject into a specific revision/branch.  If no
+    [:freeze, "ext freeze <subproject> [REVISION]",
+      %{Locks a subproject into a specific revision/branch.  If no
       revision is supplied, the current revision/branch of the
-      project will be used.  You can specify the project by name
+      project will be used.  You can specify the subproject by name
       or path.}],
     [:help, "You probably just ran this command just now."],
     [:init, "Creates a .externals file containing only [main]
@@ -63,6 +63,9 @@ module Externals
       top and adds a .emptydir file to any empty directories it
       comes across.  Useful for dealing with SCMs that refuse to
       track empty directories (such as git, for example)"],
+    [:unfreeze, "ext unfreeze <subproject>",
+      %{Unfreezes a previously frozen subproject.  You can specify
+      the subproject by name or path.}],
     [:uninstall, "ext uninstall [-f|--force_removal] <project>",
       "Removes a subproject from being tracked by ext.  If you
       want the files associated with this subproject deleted as well
@@ -110,8 +113,6 @@ module Externals
       end
     end
 
-    #puts "Project types available: #{project_types.join(' ')}"
-
     def self.project_type_files
       project_types.map do |project_type|
         "#{File.join(PROJECT_TYPES_DIRECTORY, project_type)}.rb"
@@ -312,7 +313,6 @@ module Externals
       scm = configuration['.']
       scm = scm['scm'] if scm
       scm ||= options[:scm]
-      #scm ||= infer_scm(repository)
 
       type = configuration['.']
       type = type['type'] if type
@@ -342,18 +342,6 @@ Please use
       Externals.module_eval("#{scm.to_s.cap_first}Project", __FILE__, __LINE__)
     end
 
-    def self.project_classes
-      retval = []
-      registered_scms.each do |scm|
-        retval << project_class(scm)
-      end
-
-      retval
-    end
-    def self.project_class(scm)
-      Externals.module_eval("#{scm.to_s.cap_first}Project", __FILE__, __LINE__)
-    end
-
     def self.project_classes
       retval = []
       registered_scms.each do |scm|
@@ -409,6 +397,25 @@ Please use
       subproject_by_name_or_path(args[0]).up
     end
 
+    def unfreeze args, options
+      project = subproject_by_name_or_path(args[0])
+
+      raise "No such project named #{args[0]}" unless project
+
+      section = configuration[project.path]
+
+      unless section[:revision]
+        puts "Uhh... #{project.name} wasn't frozen, so I can't unfreeze it."
+        exit
+      end
+
+      section.rm_setting :revision
+      configuration.write '.externals'
+      reload_configuration
+
+      subproject_by_name_or_path(args[0]).up
+    end
+
     def install args, options
       if !File.exists? '.externals'
         STDERR.puts "This project does not appear to be managed by externals.  Try 'ext init' first"
@@ -454,7 +461,6 @@ that you are installing. Use an option to specify it
     end
 
     def uninstall args, options
-      #init args, options unless File.exists? '.externals'
       raise "Hmm... there's no .externals file in this directory." if !File.exists? '.externals'
 
       project = subproject_by_name_or_path(args[0])
@@ -476,9 +482,6 @@ that you are installing. Use an option to specify it
     end
 
     def update_ignore args, options
-      #path = args[0]
-
-
       scm = configuration['.']
       scm = scm['scm'] if scm
 
@@ -494,9 +497,7 @@ that you are installing. Use an option to specify it
       raise "only makes sense for main project" unless project.main_project?
 
       subprojects.each do |subproject|
-        #puts "about to add #{subproject.path} to ignore"
         project.update_ignore subproject.path
-        #puts "finished adding #{subproject.path}"
       end
     end
 
@@ -533,11 +534,7 @@ that you are installing. Use an option to specify it
 
     def status args, options
       options ||= {}
-      #repository = "."
-      #path = "."
-      #main_project = nil
       scm = options[:scm]
-      #scm ||= infer_scm(repository)
 
       if !scm
         scm ||= configuration['.']
@@ -565,7 +562,6 @@ by creating the .externals file manually"
           (such as --git or --svn)"
       end
 
-      #main_project = self.class.project_class(scm).new("#{repository} #{path}", :is_main)
       project = main_project
       project.scm ||= scm
       project.st
@@ -639,9 +635,7 @@ commands below if you actually wish to delete them."
 
     def update args, options
       options ||= {}
-      #repository = args[0]
       scm = options[:scm]
-      #scm ||= infer_scm(repository)
 
       if !scm
         scm ||= configuration['.']
@@ -653,7 +647,6 @@ commands below if you actually wish to delete them."
           (such as --git or --svn)"
       end
 
-      #main_project = self.class.project_class(scm).new("#{repository} #{path}", :is_main)
       project = main_project
       project.scm ||= scm
       project.up
@@ -737,7 +730,7 @@ Please use the --type option to tell ext which to use."
 
       config.add_empty_section '.'
 
-      # If we are using subversion, we should warn about not setting a branch
+      # TODO: If we are using subversion, we should warn about not setting a branch
       if scm == "svn"
         if options[:branch]
           config['.'][:repository] = SvnProject.extract_repository(
@@ -746,7 +739,6 @@ Please use the --type option to tell ext which to use."
           )
         elsif args[0]
           config['.'][:repository] = args[0].strip
-        else
         end
       end
 

data/test/test_checkout_git.rb

@@ -1,11 +1,11 @@
 $:.unshift File.join(File.dirname(__FILE__), '..', 'lib') if $0 == __FILE__
-require 'externals/test_case'
+require 'ext_test_case'
 require 'externals/ext'
-require 'externals/test/basic_git_repository'
+require 'basic_git_repository'
 
 module Externals
   module Test
-    class TestCheckoutGit < TestCase
+    class TestCheckoutGit < ::Test::Unit::TestCase
       include ExtTestCase
 
       def test_checkout

data/test/test_checkout_with_subprojects_git.rb

@@ -1,11 +1,11 @@
 $:.unshift File.join(File.dirname(__FILE__), '..', 'lib') if $0 == __FILE__
-require 'externals/test_case'
+require 'ext_test_case'
 require 'externals/ext'
-require 'externals/test/rails_app_git_branches'
+require 'rails_app_git_branches'
 
 module Externals
   module Test
-    class TestCheckoutWithSubprojectsGit < TestCase
+    class TestCheckoutWithSubprojectsGit < ::Test::Unit::TestCase
       include ExtTestCase
 
       def test_checkout_with_subproject

data/test/test_checkout_with_subprojects_svn.rb

@@ -1,12 +1,12 @@
 $:.unshift File.join(File.dirname(__FILE__), '..', 'lib') if $0 == __FILE__
 
-require 'externals/test_case'
+require 'ext_test_case'
 require 'externals/ext'
-require 'externals/test/rails_app_svn_repository'
+require 'rails_app_svn_repository'
 
 module Externals
   module Test
-    class TestCheckoutWithSubprojectsSvn < TestCase
+    class TestCheckoutWithSubprojectsSvn < ::Test::Unit::TestCase
       include ExtTestCase
 
       def test_checkout_with_subproject

data/test/test_file_utils_extensions.rb

@@ -1,11 +1,11 @@
 $:.unshift File.join(File.dirname(__FILE__),'..','lib') if $0 == __FILE__
 
-require 'externals/test_case'
+require 'ext_test_case'
 require 'externals/ext'
 
 module Externals
   module Test
-    class TestFileUtilsExtensions < TestCase
+    class TestFileUtilsExtensions < ::Test::Unit::TestCase
       include ExtTestCase
 
       def test_dir_empty

data/test/test_freeze_to_revision.rb

@@ -1,13 +1,13 @@
 $:.unshift File.join(File.dirname(__FILE__), '..', 'lib') if $0 == __FILE__
-require 'externals/test_case'
+require 'ext_test_case'
 require 'externals/ext'
-require 'externals/test/rails_app_git_repository'
-require 'externals/test/basic_git_repository'
-require 'externals/test/modules_svn_branches_repository'
+require 'rails_app_git_repository'
+require 'basic_git_repository'
+require 'modules_svn_branches_repository'
 
 module Externals
   module Test
-    class TestFreezeToRevision < TestCase
+    class TestFreezeToRevision < ::Test::Unit::TestCase
       include ExtTestCase
 
       def test_freeze_to_revision
@@ -135,6 +135,38 @@ module Externals
 
             assert_equal subproject.current_branch, "branches/branch2"
             assert_equal subproject.current_revision, "3"
+
+            # now let's test unfreezing...
+            Ext.run "unfreeze", "modules"
+            assert_equal subproject.current_branch, "branches/branch2"
+            assert_equal subproject.current_revision, "4"
+
+            # Check it in to make sure it sticks
+            `git add .externals`
+            raise unless $? == 0
+            `git commit -m 'unfreezing modules'`
+            raise unless $? == 0
+            `git push`
+            raise unless $? == 0
+          end
+        end
+
+        rm_rf workdir
+        mkdir_p workdir
+
+        Dir.chdir workdir do
+          rm_r repository.name if File.exists? repository.name
+          source = repository.clean_dir
+
+          puts "About to checkout #{source}"
+          Ext.run "checkout", "--git", source
+
+          Dir.chdir repository.name do
+            ext = Ext.new
+            subproject = ext.subproject_by_name_or_path("modules")
+
+            assert_equal subproject.current_branch, "branches/branch2"
+            assert_equal subproject.current_revision, "4"
           end
         end
       end

data/test/test_git_project_extract_name.rb

@@ -1,11 +1,11 @@
 $:.unshift File.join(File.dirname(__FILE__), '..', 'lib') if $0 == __FILE__
-require 'externals/test_case'
+require 'ext_test_case'
 require 'externals/ext'
 require 'stringio'
 
 module Externals
   module Test
-    class TestGitProjectExtractName < TestCase
+    class TestGitProjectExtractName < ::Test::Unit::TestCase
       include ExtTestCase
 
       def test_extract_name

data/test/test_init_git.rb

@@ -1,11 +1,11 @@
 $:.unshift File.join(File.dirname(__FILE__), '..', 'lib') if $0 == __FILE__
-require 'externals/test_case'
+require 'ext_test_case'
 require 'externals/ext'
-require 'externals/test/basic_git_repository'
+require 'basic_git_repository'
 
 module Externals
   module Test
-    class TestInitGit < TestCase
+    class TestInitGit < ::Test::Unit::TestCase
       include ExtTestCase
 
       def test_init

data/test/test_out_of_date_git_subproject.rb

@@ -1,11 +1,11 @@
 $:.unshift File.join(File.dirname(__FILE__), '..', 'lib') if $0 == __FILE__
-require 'externals/test_case'
+require 'ext_test_case'
 require 'externals/ext'
-require 'externals/test/simple_git_with_sub'
+require 'simple_git_with_sub'
 
 module Externals
   module Test
-    class TestOutOfDateGitSubproject < TestCase
+    class TestOutOfDateGitSubproject < ::Test::Unit::TestCase
       include ExtTestCase
 
       def test_out_of_date_sub