ext 1.0.1 → 1.0.2

data/CHANGELOG

@@ -1,3 +1,9 @@
+September 8, 2011 Version 1.0.2 released
+- For git, fixed bug preventing "ext up" from changing the branches of subprojects as expected.
+- For git, fixed bug preventing "ext checkout -b <branch_name>" from functioning as expected.
+- Updating with revisions/branches should now do a fetch when using git to make sure
+  that new tags and branches are added.
+
 July 19, 2011 Version 1.0.1 released
 - Fixed a small bug preventing subprojects with a revision associated with them
   from having their name displayed when updating.

data/Rakefile

@@ -1,7 +1,7 @@
 require 'rake'
 require 'rake/testtask'
-require 'rake/rdoctask'
-require 'rake/gempackagetask'
+require 'rdoc/task'
+require 'rubygems/package_task'
 require 'find'
 
 root_dir = File.dirname(__FILE__)
@@ -143,6 +143,6 @@ the main project.}
   #specification.require_path = 'lib'
 end
 
-Rake::GemPackageTask.new(gem_specification) do |package|
+Gem::PackageTask.new(gem_specification) do |package|
   package.need_zip = package.need_tar = false
 end

data/lib/externals/configuration/configuration.rb

@@ -161,7 +161,7 @@ module Externals
         end
       end
 
-      def write path  # = ".externals"
+      def write path = ".externals"
         raise "no path given" unless path
         open(path, 'w') do |f|
           f.write to_s

data/lib/externals/ext.rb

@@ -5,10 +5,7 @@ require 'externals/command'
 require 'externals/extensions/symbol'
 
 module Externals
-  #exit status
-  OBSOLETE_EXTERNALS_FILE = 15
-
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
   PROJECT_TYPES_DIRECTORY = File.join(File.dirname(__FILE__), '..', 'externals','project_types')
 
   # Full commands operate on the main project as well as the externals
@@ -246,6 +243,7 @@ module Externals
         p.name == name
       end
     end
+    alias :subproject :subproject_by_name_or_path
 
     def subprojects
       s = []
@@ -681,8 +679,11 @@ Please use the --type option to tell ext which to use."
           (such as --git or --svn)"
         end
 
-        main_project = self.class.project_class(scm).new(:repository => repository,
-          :path => path)
+        main_project = self.class.project_class(scm).new(
+          :repository => repository,
+          :path => path,
+          :branch => options[:branch]
+        )
 
         main_project.send(sym)
         main_project

data/lib/externals/scms/git_project.rb

@@ -1,6 +1,5 @@
 require File.join(File.dirname(__FILE__), '..', 'project')
 
-
 module Externals
   class GitProject < Project
     def default_branch
@@ -32,18 +31,57 @@ module Externals
       co_or_up "co"
     end
 
+    private
+    # make sure you have already entered Dir.chdir(path) in your calling code!
+    def branch_exists branch_name
+      opts = resolve_opts
+      `git #{opts} branch -a` =~ /^\s*#{branch_name}\s*$/
+    end
+
+    public
     def change_to_branch_revision command = ""
       opts = resolve_opts(command)
 
       if branch
-        Dir.chdir path do
-          puts `git #{opts} checkout --track -b #{branch} origin/#{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`
+            end
+
+            # if the local branch doens't exist, add --track -b
+            if branch_exists(branch)
+              puts `git #{opts} checkout #{branch}`
+            else
+              puts `git #{opts} checkout --track -b #{branch} origin/#{branch}`
+            end
+            unless $? == 0
+              raise "Could not checkout origin/#{branch}"
+            end
+          end
         end
       end
 
       if revision
         Dir.chdir path do
+          puts `git #{opts} fetch`
+          puts `git #{opts} pull`
           puts `git #{opts} checkout #{revision}`
+          unless $? == 0
+            raise "Could not checkout #{revision}"
+          end
         end
       end
     end
@@ -70,7 +108,7 @@ module Externals
     def up *args
       if File.exists? path
         puts "updating #{path}:"
-        if revision
+        if revision || branch
           change_to_branch_revision "up"
         else
           Dir.chdir path do

data/test/test_checkout_with_subprojects_git.rb

@@ -6,7 +6,6 @@ module Externals
   class TestCheckoutWithSubprojectsGit < TestCase
     include ExtTestCase
 
-
     def setup
       destroy_rails_application
       create_rails_application
@@ -31,9 +30,13 @@ module Externals
 
           #install a couple svn managed subprojects
           %w(foreign_key_migrations redhillonrails_core).each do |proj|
-            Ext.run "install", "--svn", 'file:///' + File.join(root_dir, 'test', 'cleanreps', proj)
+            Ext.run "install", "--svn", 'file:///' +
+              File.join(root_dir, 'test', 'cleanreps', proj)
           end
 
+          #install project with a branch
+          Ext.run "install", File.join(root_dir, 'test', 'cleanreps', 'engines.git'), "-b", "edge"
+
           GitProject.add_all
           `git commit -m "created empty rails app with some subprojects"`
         end
@@ -70,9 +73,90 @@ module Externals
               assert File.exists?('.git')
 
               assert File.exists?('.gitignore')
-              mp = Ext.new.main_project
 
-              mp.assert_e_dne_i_ni proc{|a|assert(a)},%w(foreign_key_migrations redhillonrails_core acts_as_list)
+              ext = Ext.new
+              main_project = ext.main_project
+              engines = ext.subproject("engines")
+
+              main_project.assert_e_dne_i_ni proc{|a|assert(a)},%w(foreign_key_migrations redhillonrails_core acts_as_list)
+
+              # let's test switching branches via altering .externals and running "ext up"
+              assert_equal "master", main_project.current_branch
+              assert_equal "edge", engines.current_branch
+              assert_equal "edge", ext.configuration["vendor/plugins/engines"]["branch"]
+
+              #let's create a branch for the main project called 'new_branch' and a
+              #branch for the engines subproject called 'new_branch' and make sure
+              #that checking one out and doing "ext up" correctly changes the branch
+              #of the subproject
+
+              `git push origin master:new_branch`
+              raise unless $? == 0
+
+              `git fetch origin`
+              raise unless $? == 0
+
+              `git checkout --track -b new_branch origin/new_branch`
+              raise unless $? == 0
+
+              assert_equal "new_branch", main_project.current_branch
+              assert_equal "edge", engines.current_branch
+
+              Dir.chdir File.join(%w(vendor plugins engines)) do
+                `git push origin master:new_branch`
+                raise unless $? == 0
+              end
+              assert_equal "new_branch", main_project.current_branch
+
+              #update .externals
+              ext.configuration["vendor/plugins/engines"]["branch"] = "new_branch"
+              ext.configuration.write
+
+              ext = Ext.new
+              assert_equal "new_branch", ext.configuration["vendor/plugins/engines"]["branch"]
+
+              `git add .externals`
+              raise unless $? == 0
+              `git commit -m "changed branch on engines subproject"`
+              raise unless $? == 0
+              `git push`
+              raise unless $? == 0
+
+              `git checkout master`
+              raise unless $? == 0
+
+              assert_equal "master", main_project.current_branch
+              assert_equal "edge", engines.current_branch
+
+              Ext.run "up"
+              assert_equal "master", main_project.current_branch
+              assert_equal "edge", engines.current_branch
+
+              `git checkout new_branch`
+              assert_equal "new_branch", main_project.current_branch
+              assert_equal "edge", engines.current_branch
+
+              Ext.run "up"
+              assert_equal "new_branch", main_project.current_branch
+              assert_equal "new_branch", engines.current_branch
+
+              `git checkout master`
+              assert_equal "master", main_project.current_branch
+            end
+
+            #now let's check it out again to test "ext checkout -b new_branch"
+            `rm -rf rails_app`
+            raise unless $? == 0
+
+            Ext.run "checkout", "--git", "-b", "new_branch", source
+
+            Dir.chdir 'rails_app' do
+              ext = Ext.new
+              main_project = ext.main_project
+              engines = ext.subproject("engines")
+
+              assert_equal "new_branch", main_project.current_branch
+              assert_equal "new_branch", engines.current_branch
             end
           end
         end
@@ -115,5 +199,6 @@ module Externals
         end
       end
     end
+
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ext
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 1
   - 0
-  - 1
-  version: 1.0.1
+  - 2
+  version: 1.0.2
 platform: ruby
 authors: 
 - Miles Georgi
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-19 00:00:00 -07:00
+date: 2011-09-08 00:00:00 -07:00
 default_executable: ext
 dependencies: []