ext 1.1.1 → 1.1.2

data/CHANGELOG

@@ -1,3 +1,8 @@
+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
+  working.
+
 January 1, 2012 Version 1.1.1 released
 - Fixes a bug preventing proper rails 3 project detection
 

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.1'
+  VERSION = '1.1.2'
   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/scms/git_project.rb

@@ -136,10 +136,17 @@ module Externals
     end
 
     def ex *args
-      do_clone "ex", "--depth 1"
-
-      puts "Exporting #{path}..."
-      change_to_branch_revision "ex"
+      if revision
+        # No clean reliable way to clone something that's not a branch or tag.
+        # just call up instead.
+        up *args
+      else
+        clone_opts = "--depth 1"
+        if branch
+          clone_opts << " -b #{branch}"
+        end
+        do_clone "ex", clone_opts
+      end
     end
 
     def up *args

data/lib/externals/scms/svn_project.rb

@@ -8,10 +8,14 @@ module Externals
 
     public
     def co *args
-      # delete path if not empty
-      rmdir_ie path
+      # delete path if empty
+      rmdir_ie path unless path == "."
 
-      if File.exists? path
+      dest = path
+      dest = '' if dest == '.'
+      dest = "\"#{dest}\"" if dest && !dest.empty?
+
+      if File.exists? dest
         up
       else
         opts = resolve_opts "co"
@@ -23,7 +27,7 @@ module Externals
           url = [url, branch].join("/")
         end
 
-        puts(svncocmd = "svn #{opts} co #{url} #{path}")
+        puts(svncocmd = "svn #{opts} co #{url} #{dest}")
         puts `#{svncocmd}`
         unless $? == 0
           raise
@@ -45,8 +49,12 @@ module Externals
     end
 
     def ex *args
-      # delete path if not empty
-      rmdir_ie path
+      # delete path if  empty
+      rmdir_ie path unless path == "."
+
+      dest = path
+      dest = '' if dest == '.'
+      dest = "\"#{dest}\"" if dest && !dest.empty?
 
       url = repository
 
@@ -59,7 +67,7 @@ module Externals
         url += "@#{revision}"
       end
 
-      puts(svncocmd = "svn #{scm_opts_ex} export #{url} #{path}")
+      puts(svncocmd = "svn #{scm_opts_ex} export #{url} #{dest}")
       puts `#{svncocmd}`
     end
 
@@ -152,7 +160,7 @@ module Externals
     def current_branch
       require_repository
 
-      branch = info_url.gsub(/\/+/, "/").gsub(repository.gsub(/\/+/, "/"), "")
+      branch = info_url.downcase.gsub(/\/+/, "/").gsub(repository.downcase.gsub(/\/+/, "/"), "")
       if branch == repository
         raise "Could not determine branch from URL #{info_url}.
     Does not appear have a substring of #{repository}"

data/test/test_checkout_with_subprojects_svn.rb

@@ -1,4 +1,5 @@
 $:.unshift File.join(File.dirname(__FILE__), '..', 'lib') if $0 == __FILE__
+$:.unshift File.join(File.dirname(__FILE__), 'support') if $0 == __FILE__
 
 require 'ext_test_case'
 require 'externals/ext'
@@ -292,51 +293,87 @@ module Externals
             end
 
             assert File.exists?(File.join('vendor', 'rails', 'activerecord', 'lib'))
+
+            # Check that engines subproject has content expected for edge branch
+            ext = Ext.new
+
+            assert_equal(ext.configuration["vendor/plugins/some_subproject_with_edge"]["branch"], "edge")
+            assert_equal(ext.configuration["vendor/plugins/some_subproject_with_edge"]["revision"], nil)
+
+            Dir.chdir File.join("vendor", "plugins", "some_subproject_with_edge") do
+              assert(File.read(File.join("lib", "somelib.rb")) =~ /living on the edge/)
+            end
           end
         end
       end
 
-      def test_uninstall
-        return
-        Dir.chdir File.join(root_dir, 'test') do
-          Dir.chdir 'workdir' do
-            `mkdir checkout`
-            Dir.chdir 'checkout' do
-              #source = File.join(root_dir, 'test', 'workdir', 'rails_app')
-              source = repository_dir('svn')
-
-              if windows?
-                source = source.gsub(/\\/, "/")
-                #source.gsub!(/^[A-Z]:[\/\\]/, "")
-              end
-              source = "file:///#{source}"
+      def test_export_with_subproject_by_revision
+        # figure out the revision to set it to.
+        sub_project_revision = nil
+        sub_repository = SomeSubprojectWithEdge.new
+        sub_repository.prepare
 
-              puts "About to checkout #{source}"
-              Ext.run "checkout", "--svn", source, "rails_app"
+        workdir = File.join(root_dir, 'test', "tmp", "workdir", "export")
+        rm_rf_ie workdir
+        mkdir_p workdir
 
-              Dir.chdir 'rails_app' do
-                mp = Ext.new.main_project
+        Dir.chdir workdir do
+          `git clone #{sub_repository.clean_dir}`
+          raise unless $? == 0
+
+          Dir.chdir sub_repository.name do
+            git_show = `git show origin/master`
+            raise unless $? == 0
+
+            sub_project_revision = /^commit:?\s*([a-f\d]+)$/.match(git_show)[1]
+            assert(sub_project_revision =~ /^[a-f\d]+$/)
+          end
+        end
+
+        # Change the project to use a revision instead of a branch
+        repository = RailsAppSvnRepository.new
+        repository.prepare
+        repository.mark_dirty
 
-                projs = %w(foreign_key_migrations redhillonrails_core acts_as_list)
-                projs_i = projs.dup
-                projs_ni = []
+        rm_rf_ie workdir
+        mkdir_p workdir
 
-                #let's uninstall acts_as_list
-                Ext.run "uninstall", "acts_as_list"
+        Dir.chdir workdir do
+          Ext.run "checkout", "--svn", repository.clean_url
+
+          Dir.chdir repository.name do
+            assert(sub_project_revision)
+            Ext.run "freeze", "some_subproject_with_edge", sub_project_revision
+            ext = Ext.new
+            ext.configuration["vendor/plugins/some_subproject_with_edge"].rm_setting("branch")
+            ext.configuration.write
+
+            SvnProject.add_all
+            `svn commit -m "changed some_subproject_with_edge to use a revision instead"`
+            raise unless $? == 0
+          end
+        end
 
-                projs_ni << projs_i.delete('acts_as_list')
+        rm_rf_ie workdir
+        mkdir_p workdir
+        Dir.chdir workdir do
+          source = repository.clean_url
 
-                mp.assert_e_dne_i_ni proc{|a|assert(a)}, projs, [], projs_i, projs_ni
+          puts "About to export #{source}"
+          Ext.run "export", "--svn", source, 'rails_app'
 
-                Ext.run "uninstall", "-f", "foreign_key_migrations"
+          Dir.chdir 'rails_app' do
+            assert !File.exists?('.svn')
 
-                projs_ni << projs_i.delete('foreign_key_migrations')
+            # Check that engines subproject has content expected for sub_project_revision
+            ext = Ext.new
 
-                projs_dne = []
-                projs_dne << projs.delete('foreign_key_migrations')
+            assert_equal(ext.configuration["vendor/plugins/some_subproject_with_edge"]["branch"], nil)
+            assert_equal(ext.configuration["vendor/plugins/some_subproject_with_edge"]["revision"], sub_project_revision)
 
-                mp.assert_e_dne_i_ni proc{|a|assert(a)}, projs, projs_dne, projs_i, projs_ni
-              end
+            Dir.chdir File.join("vendor", "plugins", "some_subproject_with_edge") do
+              assert(File.read(File.join("lib", "somelib.rb")) !~ /living on the edge/)
+              assert(File.read(File.join("lib", "somelib.rb")) =~ /'double lulz!'/)
             end
           end
         end

data/test/test_freeze_to_revision.rb

@@ -112,7 +112,7 @@ module Externals
 
             repository.mark_dirty
 
-            `git commit -m 'froze modules to revision 3'`
+            `git commit -m "froze modules to revision 3"`
             raise unless $? == 0
             `git push`
             raise unless $? == 0
@@ -144,7 +144,7 @@ module Externals
             # Check it in to make sure it sticks
             `git add .externals`
             raise unless $? == 0
-            `git commit -m 'unfreezing modules'`
+            `git commit -m "unfreezing modules"`
             raise unless $? == 0
             `git push`
             raise unless $? == 0

data/test/test_svn_branches.rb

@@ -1,4 +1,5 @@
 $:.unshift File.join(File.dirname(__FILE__), '..', 'lib') if $0 == __FILE__
+$:.unshift File.join(File.dirname(__FILE__), 'support') if $0 == __FILE__
 require 'ext_test_case'
 require 'externals/ext'
 require 'rails_app_svn_branches'
@@ -257,6 +258,7 @@ module Externals
         assert File.exists?(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"))
@@ -276,7 +278,7 @@ module Externals
             assert !File.exists?('.svn')
 
             %w(redhillonrails_core).each do |proj|
-              assert !File.exists?(File.join('vendor', 'plugins',proj, '.svn'))
+              assert !File.exists?(File.join('vendor', 'plugins', proj, '.svn'))
             end
 
             %w(redhillonrails_core acts_as_list engines).each do |proj|

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ext
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: 
   segments: 
   - 1
   - 1
-  - 1
-  version: 1.1.1
+  - 2
+  version: 1.1.2
 platform: ruby
 authors: 
 - Miles Georgi
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-12-30 00:00:00 Z
+date: 2013-01-13 00:00:00 Z
 dependencies: []
 
 description: |-