ext 1.0.4 → 1.0.5

data/CHANGELOG

@@ -1,3 +1,7 @@
+October 19, 2011 Version 1.0.5 released
+- Fixed a small bug preventing subprojects managed under git to update if they
+  have a branch set in .externals.
+
 October 9, 2011 Version 1.0.4 released
 - Dependency on programs such as rm, rmdir, cp, etc, removed.  Now only
   dependent on the actual SCM executables (and gzip to run the tests.)

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.0.4'
+  VERSION = '1.0.5'
   PROJECT_TYPES_DIRECTORY = File.join(File.dirname(__FILE__), '..', 'externals','project_types')
 
   # Full commands operate on the main project as well as the externals

data/lib/externals/extensions/file_utils.rb

@@ -24,16 +24,31 @@ FileUtils.class_eval do
   alias rm_rf_old rm_rf
   #going to try to give a delay after calling rm if necessary...
   def rm_rf *args
-    rm_rf_old *args
     tries = 0
-    while File.exists?(args[0]) && tries < 10
-      sleep 1
-      tries += 1
+
+    rm = proc do
+      rm_rf_old *args
+
+      while File.exists?(args[0]) && tries < 10
+        sleep 1
+        tries += 1
+      end
+    end
+
+    rm.call
+    if tries >= 10
+      puts "WARNING: deleted #{args[0]} didn't work, trying again"
+      tries = 0
+      rm.call
+
+      if tries >= 10
+        raise "Could not delete #{args[0]}"
+      end
     end
   end
 
   def dir_empty? path
-    File.directory?(path) && 
+    File.directory?(path) &&
       File.exists?(path) &&
       !Dir.entries(path).detect{|entry| !["..","."].include?(entry)}
   end

data/lib/externals/scms/git_project.rb

@@ -7,7 +7,7 @@ module Externals
     end
 
     private
-    def co_or_up command
+    def do_clone command, extra_opts = ""
       opts = resolve_opts(command)
 
       puts "path is #{path} repository is #{repository}"
@@ -19,18 +19,16 @@ module Externals
       dest = '' if dest == '.'
       dest = "\"#{dest}\"" if dest && !dest.empty?
 
-      puts(gitclonecmd = "git #{opts} clone \"#{repository}\" #{dest}")
+      puts(gitclonecmd = "git #{opts} clone #{extra_opts} \"#{repository}\" #{dest}")
       puts `#{gitclonecmd}`
       unless $? == 0
         raise "git clone of #{repository} failed."
       end
-
-      change_to_branch_revision(command)
     end
 
     public
     def co *args
-      co_or_up "co"
+      do_up "co"
     end
 
     private
@@ -40,27 +38,37 @@ module Externals
       `git #{opts} branch -a` =~ /^\s*#{branch_name}\s*$/
     end
 
+    # make sure you have already entered Dir.chdir(path) in your calling code!
+
     public
+    # this method fetches/pulls/changes branches/changes revisions/changes the oil in your geo metro/brings world peace
     def change_to_branch_revision command = ""
       opts = resolve_opts(command)
 
+      pulled = false
+
+      project_path = if path == "."
+        name || "."
+      else
+        path
+      end
+
+      Dir.chdir project_path do
+        do_fetch command
+      end
+
+
       if branch
         cb = current_branch
 
         # This allows the main project to be checked out to a directory
         # that doesn't match it's name.
-        project_path = if path == "."
-          name
-        else
-          path
-        end
-
         Dir.chdir project_path do
           if cb != branch
             # let's see if the branch exists in the remote repository
             # and if not, fetch it.
             if !branch_exists("origin/#{branch}")
-              puts `git #{opts} fetch`
+              do_fetch command
             end
 
             # if the local branch doens't exist, add --track -b
@@ -74,17 +82,29 @@ module Externals
             end
           end
         end
+
+        # on the right branch, let's pull
+        Dir.chdir project_path do
+          `git #{opts} pull`
+          raise unless $? == 0
+          pulled = true
+        end
       end
 
       if revision
-        Dir.chdir path do
-          puts `git #{opts} fetch`
-          puts `git #{opts} pull`
+        Dir.chdir project_path do
           puts `git #{opts} checkout #{revision}`
           unless $? == 0
             raise "Could not checkout #{revision}"
           end
         end
+      else
+        unless pulled
+          Dir.chdir project_path do
+            `git #{opts} pull`
+            raise unless $? == 0
+          end
+        end
       end
     end
 
@@ -116,38 +136,43 @@ module Externals
     end
 
     def ex *args
-      if path != '.'
-        rmdir_ie path
-      end
-
-      dest = path
-
-      dest = '' if dest == '.'
-
-      dest = "\"#{dest}\"" if dest && !dest.empty?
-
-      puts(gitclonecmd = "git #{scm_opts_ex} clone --depth 1 \"#{repository}\" #{dest}")
-
-      puts `#{gitclonecmd}`
+      do_clone "ex", "--depth 1"
 
       change_to_branch_revision "ex"
     end
 
     def up *args
-      if File.exists? path
-        puts "updating #{path}:"
-        if revision || branch
-          change_to_branch_revision "up"
-        else
-          Dir.chdir path do
-            puts `git #{scm_opts_up} pull`
-          end
-        end
+      do_up "up"
+    end
+
+    private
+    def do_fetch command
+      opts = resolve_opts(command)
+      `git #{opts} fetch`
+      raise unless $? == 0
+    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.
+        # When we are doing a checkout, the name is set manually in Ext.checkout.
+        # we are then in the parent directory.
+        # When we are doing an update, the main project has no name.
+        # we are then in the correct directory.
       else
-        co_or_up "up"
+        path
       end
+
+      if !File.exists? project_path
+        do_clone command
+      end
+      change_to_branch_revision command
     end
 
+    public
     def st *args
       puts "\nstatus for #{path}:"
       Dir.chdir path do

data/lib/externals/test/modules_svn_branches_repository.rb

@@ -17,7 +17,7 @@ module Externals
         Dir.chdir 'workdir' do
           rm_rf name
 
-          cmd = "svn checkout \'#{clean_url}\'"
+          cmd = "svn checkout \"#{clean_url}\""
           puts "about to run #{cmd}"
           puts `#{cmd}`
           unless $? == 0

data/lib/externals/test/simple_git_with_sub.rb

@@ -0,0 +1,62 @@
+require 'externals/test/repository'
+require 'externals/test/basic_git_repository'
+
+module Externals
+  module Test
+    class SimpleGitWithSub < Repository
+      def initialize
+        super "simple_wth_sub", File.join("git", "5")
+        dependents.merge!(
+          :basic => BasicGitRepository.new
+          )
+      end
+
+      def build_here
+        mkdir name
+
+        Dir.chdir("#{name}") do
+          `git init`
+          raise unless $? == 0
+
+          open 'simple_readme.txt', 'w' do |f|
+            f.write "simple_readme.txt Line 1
+            Line 2
+            Line 3
+            "
+          end
+
+          `git add .`
+          raise unless $? == 0
+          `git commit -m "added simple_readme.txt"`
+          raise unless $? == 0
+
+          open 'simple_readme.txt', 'a' do |f|
+            f.write "line 4"
+          end
+
+          `git add .`
+          raise unless $? == 0
+          `git commit -m "added a line to simple_readme.txt"`
+          raise unless $? == 0
+
+          # initialize externals
+          Ext.run "init"
+
+          mkdir "subs"
+
+          Ext.run "touch_emptydirs"
+
+          # adding a branch here exposes a bug
+          Ext.run "install", "-g", "-b", "master",
+            dependents[:basic].clean_dir, "subs/#{dependents[:basic].name}"
+
+          `git add .`
+          raise unless $? == 0
+          `git commit -m "added basic subproject under subs"`
+          raise unless $? == 0
+        end
+      end
+
+    end
+  end
+end

data/lib/externals/test/svn_repository_helper.rb

@@ -2,8 +2,8 @@ module Externals
   module Test
     module SvnRepositoryHelper
       def clean_url
-        url = File.join 'file://', clean_dir
-        url.gsub(/^\s*file:(\/[^\/])/, "file://\\1")
+        url = File.join 'file:///', clean_dir
+        url.gsub(/^\s*file:(\/*)/, "file:///")
       end
     end
   end

data/test/test_checkout_with_subprojects_git.rb

@@ -107,7 +107,9 @@ module Externals
 
           #now let's check it out again to test "ext checkout -b new_branch"
           rm_rf "rails_app"
-          raise if File.exists?("rails_app")
+          if File.exists?("rails_app")
+            raise
+          end
 
           Ext.run "checkout", "--git", "-b", "new_branch", source
 

data/test/test_out_of_date_git_subproject.rb

@@ -0,0 +1,83 @@
+$:.unshift File.join(File.dirname(__FILE__), '..', 'lib') if $0 == __FILE__
+require 'externals/test_case'
+require 'externals/ext'
+require 'externals/test/simple_git_with_sub'
+
+module Externals
+  module Test
+    class TestOutOfDateGitSubproject < TestCase
+      include ExtTestCase
+
+      def test_out_of_date_sub
+        repository = SimpleGitWithSub.new
+        repository.prepare
+
+        assert File.exists?(File.join(repository.clean_dir, ".git"))
+
+        workdir = File.join(root_dir, 'test', "tmp", "workdir")
+        mkdir_p workdir
+
+        Dir.chdir workdir do
+          if File.exists?(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.exists?(File.join(repository.name, "simple_readme.txt"))
+          assert !File.exists?(File.join(
+              repository.name, "subs", repository.dependents[:basic].name, "simple_readme.txt")
+          )
+          assert File.exists?(File.join(
+              repository.name, "subs", repository.dependents[:basic].name, "readme.txt")
+          )
+
+          readme = File.read(File.join(
+              repository.name, "subs", repository.dependents[:basic].name, "readme.txt"))
+
+          assert readme =~ /Line 4/i
+          assert readme !~ /Line 5/i
+
+          # let's update the subproject and make sure that ext update works.
+
+          tmp = "tmp_update_sub"
+          rm_rf tmp
+          mkdir tmp
+          Dir.chdir tmp do
+            `git clone #{repository.dependents[:basic].clean_dir}`
+            raise unless $? == 0
+
+            repository.dependents[:basic].mark_dirty
+
+            Dir.chdir repository.dependents[:basic].name do
+              open 'readme.txt', 'a' do |f|
+                f.write "line 5"
+              end
+
+              `git add .`
+              raise unless $? == 0
+              `git commit -m "added line 5 to readme.txt"`
+              raise unless $? == 0
+              `git push`
+              raise unless $? == 0
+            end
+          end
+
+          rm_rf tmp
+
+          Dir.chdir repository.name do
+            Ext.run "update"
+
+            readme = File.read(File.join(
+                "subs", repository.dependents[:basic].name, "readme.txt"))
+
+            assert readme =~ /Line 4/i
+            assert readme =~ /Line 5/i
+            assert readme !~ /Line 6/i
+          end
+        end
+      end
+    end
+  end
+end

data/test/test_svn_branches.rb

@@ -68,7 +68,7 @@ module Externals
 
             assert_equal "current", modules.current_branch
             assert_equal "current", ext.configuration["modules"]["branch"]
-gi
+
             assert !File.exists?(File.join(%w(vendor plugins ssl_requirement)))
             assert !File.exists?(File.join(%w(vendor plugins empty_plugin)))
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ext
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 1
   - 0
-  - 4
-  version: 1.0.4
+  - 5
+  version: 1.0.5
 platform: ruby
 authors: 
 - Miles Georgi
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-10 00:00:00 -07:00
+date: 2011-10-19 00:00:00 -07:00
 default_executable: ext
 dependencies: []
 
@@ -59,47 +59,49 @@ files:
 - README
 - MIT_LICENSE.txt
 - CHANGELOG
-- lib/externals/ext.rb
+- lib/externals/command.rb
 - lib/externals/configuration/configuration.rb
-- lib/externals/test_case.rb
-- lib/externals/test/rails_app_svn_branches.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
 - lib/externals/test/basic_git_repository.rb
-- lib/externals/test/modules_svn_repository.rb
 - lib/externals/test/engines.rb
-- lib/externals/test/rails_app_svn_repository.rb
 - lib/externals/test/engines_with_branch1.rb
-- lib/externals/test/rails_app_unmanaged.rb
-- lib/externals/test/repository.rb
-- lib/externals/test/rails_app_git_branches.rb
-- lib/externals/test/modules_svn_branches_repository.rb
 - lib/externals/test/fake_rails_repository.rb
-- lib/externals/test/svn_repository_helper.rb
-- lib/externals/test/svn_repository_from_dump.rb
 - lib/externals/test/git_repository_from_internet.rb
+- lib/externals/test/modules_svn_branches_repository.rb
+- lib/externals/test/modules_svn_repository.rb
+- lib/externals/test/rails_app_git_branches.rb
 - lib/externals/test/rails_app_git_repository.rb
-- lib/externals/project_types/rails.rb
-- lib/externals/extensions/file_utils.rb
-- lib/externals/extensions/string.rb
-- lib/externals/extensions/symbol.rb
-- lib/externals/project.rb
-- lib/externals/scms/svn_project.rb
-- lib/externals/scms/git_project.rb
-- lib/externals/command.rb
-- test/test_svn_branches.rb
+- lib/externals/test/rails_app_svn_branches.rb
+- lib/externals/test/rails_app_svn_repository.rb
+- lib/externals/test/rails_app_unmanaged.rb
+- lib/externals/test/repository.rb
+- lib/externals/test/simple_git_with_sub.rb
+- lib/externals/test/svn_repository_from_dump.rb
+- lib/externals/test/svn_repository_helper.rb
+- lib/externals/test_case.rb
+- test/test_checkout_git.rb
 - test/test_checkout_with_subprojects_git.rb
-- test/test_touch_emptydirs.rb
-- test/test_version.rb
-- test/test_git_project_extract_name.rb
-- test/test_freeze_to_revision.rb
 - test/test_checkout_with_subprojects_svn.rb
-- test/test_checkout_git.rb
-- test/test_rails_detection.rb
-- test/test_init_git.rb
 - test/test_file_utils_extensions.rb
+- test/test_freeze_to_revision.rb
+- test/test_git_project_extract_name.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/setup/foreign_key_migrations.svn.gz
+- 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
 has_rdoc: true
@@ -137,19 +139,20 @@ 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: 
-- test/test_svn_branches.rb
+- test/test_checkout_git.rb
 - test/test_checkout_with_subprojects_git.rb
-- test/test_touch_emptydirs.rb
-- test/test_version.rb
-- test/test_git_project_extract_name.rb
-- test/test_freeze_to_revision.rb
 - test/test_checkout_with_subprojects_svn.rb
-- test/test_checkout_git.rb
-- test/test_rails_detection.rb
-- test/test_init_git.rb
 - test/test_file_utils_extensions.rb
+- test/test_freeze_to_revision.rb
+- test/test_git_project_extract_name.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/setup/foreign_key_migrations.svn.gz
+- 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