ext 0.1.5 → 0.1.6

data/CHANGELOG

@@ -0,0 +1,7 @@
+1/3/2010 Version 1.6 released
+- Fixes a problem that can occur if ext is symlinked (thanks to Olmo Maldonado)
+- Added --version command line option
+
+12/20/2009
+- Fix for a bug when a subproject frozen to a revision is missing during
+  an update (thanks to Lane Roathe)

data/Rakefile

@@ -6,6 +6,8 @@ require 'find'
 
 root_dir = File.dirname(__FILE__)
 
+require File.join(root_dir, 'lib', 'externals', 'ext')
+
 desc "Creates the starting repositories needed to run the tests.
 If you plan on running the tests, you only need
  to run this once."
@@ -87,7 +89,7 @@ end
 
 gem_specification = Gem::Specification.new do |specification|
   specification.name = 'ext'
-  specification.version = '0.1.5'
+  specification.version = Externals::VERSION
   specification.platform = Gem::Platform::RUBY
   specification.rubyforge_project = 'ext'
 
@@ -134,7 +136,7 @@ the main project.}
   specification.executables = ['ext']
   specification.default_executable = "ext"
 
-  specification.files = ['Rakefile', 'README', 'MIT_LICENSE.txt'] +
+  specification.files = ['Rakefile', 'README', 'MIT_LICENSE.txt', 'CHANGELOG'] +
     FileList['lib/**/*.rb']
   #specification.require_path = 'lib'
 end

data/bin/ext

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
-$:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+THIS_FILE = File.symlink?(__FILE__) ? File.readlink(__FILE__) : __FILE__
+$:.unshift(File.join(File.dirname(THIS_FILE), '..', 'lib'))
 require 'externals/ext'
 
 Externals::Ext.run(*ARGV)

data/lib/externals/configuration/configuration.rb

@@ -90,24 +90,6 @@ module Externals
         set_setting(key, value)
       end
 
-
-      #      def projects
-      #        return @projects if @projects
-      #
-      #        @projects = []
-      #
-      #        if main?
-      #          @projects = [Ext.project_class(self['scm']).new(".", :is_main)]
-      #        else
-      #          rows.each do |row|
-      #            if Project.project_line?(row)
-      #              @projects << Ext.project_class(title).new(row)
-      #            end
-      #          end
-      #          @projects
-      #        end
-      #      end
-
       def add_row(row)
         rows << row
 
@@ -115,10 +97,6 @@ module Externals
         #clear_caches
       end
 
-      #      def clear_caches
-      #        @projects = nil
-      #      end
-
       def to_s
         "[#{title}]\n#{rows.join("\n")}"
       end

data/lib/externals/ext.rb

@@ -10,7 +10,7 @@ module Externals
   #exit status
   OBSOLETE_EXTERNALS_FILE = 15
 
-
+  VERSION = '0.1.6'
   PROJECT_TYPES_DIRECTORY = File.join(File.dirname(__FILE__), '..', 'externals','project_types')
 
   # Full commands operate on the main project as well as the externals
@@ -72,7 +72,7 @@ module Externals
       maintaining .externals"],
     [:upgrade_externals_file, "Converts the old format that stored
       as [main][svn][git] to [<path1>][<path2>]..."],
-
+    [:version, "Displays the version number of externals and exits."],
   ]
 
 
@@ -150,10 +150,13 @@ module Externals
       }
       opts.on("--help", "does the same as 'ext help'  If you use this with a command
         it will ignore the command and run help instead.") {main_options[:help] = true}
+      opts.on("--version", "Displays the version number of externals and then exits.
+        Same as 'ext version'") {
+        main_options[:version] = true
+      }
     end
 
     def self.run *arguments
-
       main_options = {}
       sub_options = {}
 
@@ -169,6 +172,7 @@ module Externals
       command &&= command.to_sym
 
       command = :help if main_options[:help]
+      command = :version if main_options[:version]
 
       if !command || command.to_s == ''
         puts "hey... you didn't tell me what you want to do."
@@ -186,7 +190,7 @@ module Externals
       Dir.chdir(main_options[:workdir] || ".") do
         if command == :upgrade_externals_file
           main_options[:upgrade_externals_file] = true
-        elsif command != :help
+        elsif command != :help && command != :version
           if externals_file_obsolete?
             puts "your .externals file Appears to be in an obsolete format"
             puts "Please run 'ext upgrade_externals_file' to migrate it to the new format"
@@ -715,6 +719,10 @@ Please use the --type option to tell ext which to use."
       config.write('.externals')
     end
 
+    def version(args, options)
+      puts Externals::VERSION
+    end
+
     def self.project_type_detector name
       Externals.module_eval("#{name.classify}Detector", __FILE__, __LINE__)
     end

data/lib/externals/project_types/rails.rb

@@ -4,7 +4,7 @@ module Externals
       #obj.send(:extend, Externals::RailsProjectType::Project)
       Externals::OldProject.send(:include, Externals::RailsProjectType::Project)
     end
-    
+
     class DefaultPathCalculator
       def default_path name
         if name
@@ -14,7 +14,7 @@ module Externals
         end
       end
     end
-    
+
     module Project
       def default_path
         if name
@@ -25,8 +25,8 @@ module Externals
       end
     end
   end
-  
-  
+
+
   class RailsDetector
     def self.detected?
       boot_path = File.join('config','boot.rb')

data/lib/externals/scms/git_project.rb

@@ -59,17 +59,17 @@ module Externals
     end
 
     def up *args
-      if revision
-        change_to_branch_revision
-      else
-        if File.exists? path
+      if File.exists? path
+        if revision
+          change_to_branch_revision
+        else
           puts "updating #{path}:"
           Dir.chdir path do
             puts `git pull`
           end
-        else
-          co(*args)
         end
+      else
+        co(*args)
       end
     end
 

data/lib/externals/scms/svn_project.rb

@@ -40,17 +40,17 @@ module Externals
     end
 
     def up *args
-      if revision
-        change_to_revision
-      else
-        if File.exists? path
+      if File.exists? path
+        if revision
+          change_to_revision
+        else
           puts "updating #{path}:"
           Dir.chdir path do
             puts `svn up .`
           end
-        else
-          co(*args)
         end
+      else
+        co(*args)
       end
     end
 

data/test/test_checkout_with_subprojects_svn.rb

@@ -180,6 +180,72 @@ module Externals
       end
     end
 
+    def test_update_with_missing_subproject_by_revision_git
+      subproject = "ssl_requirement"
+      revision = "aa2dded823f8a9b378c22ba0159971508918928a"
+
+      Dir.chdir File.join(root_dir, 'test') do
+        Dir.chdir 'workdir' do
+          `mkdir update`
+          Dir.chdir 'update' do
+            source = repository_dir('svn')
+
+            if windows?
+              source = source.gsub(/\\/, "/")
+            end
+            source = "file:///#{source}"
+
+
+            puts "About to checkout #{source}"
+            Ext.run "checkout", "--svn", source, 'rails_app'
+
+            Dir.chdir 'rails_app' do
+              pretests = proc do
+                assert File.exists?('.svn')
+                assert !File.exists?(File.join('vendor', 'plugins', subproject, 'lib'))
+                assert File.read(".externals") =~ /rails/
+                assert File.read(".externals") !~ /#{subproject}/
+              end
+
+              pretests.call
+
+              #add a project
+              Dir.chdir File.join(root_dir, 'test') do
+                Dir.chdir File.join('workdir', "rails_app") do
+                  #install a new project
+                  Ext.run "install", File.join(root_dir, 'test', 'cleanreps', "#{subproject}.git")
+                  Dir.chdir File.join("vendor",'plugins', subproject) do
+                    assert `git show HEAD` !~ /^\s*commit\s*#{revision}\s*$/i
+                  end
+                  #freeze it to a revision
+                  Ext.run "freeze", subproject,  revision
+                  Dir.chdir File.join("vendor",'plugins', subproject) do
+                    assert `git show HEAD` =~ /^\s*commit\s*#{revision}\s*$/i
+                  end
+
+                  SvnProject.add_all
+
+                  puts `svn commit -m "added another subproject (#{subproject}) frozen to #{revision}"`
+                end
+              end
+
+              pretests.call
+
+              #update the project and make sure ssl_requirement was added and checked out at the right revision
+              Ext.run "update"
+              assert File.read(".externals") =~ /ssl_requirement/
+
+              assert File.exists?(File.join('vendor', 'plugins', subproject, 'lib'))
+
+              Dir.chdir File.join("vendor",'plugins', subproject) do
+                assert `git show HEAD` =~ /^\s*commit\s*#{revision}\s*$/i
+              end
+            end
+          end
+        end
+      end
+    end
+
     def test_update_with_missing_subproject_svn
       Dir.chdir File.join(root_dir, 'test') do
         Dir.chdir 'workdir' do

data/test/test_version.rb

@@ -0,0 +1,31 @@
+$:.unshift File.join(File.dirname(__FILE__), '..', 'lib') if $0 == __FILE__
+require 'externals/test_case'
+require 'externals/ext'
+require 'stringio'
+
+module Externals
+  class TestVersion < TestCase
+    include ExtTestCase
+
+    def test_version
+      version_regex = /(?:[^\.\d]|^)(\d+\.\d+\.\d+)(?:[^\.\d]|$)/
+
+      assert Externals::VERSION =~ version_regex
+
+      ["version", "--version"].each do |options|
+        out = StringIO.new
+        old_stdout = $stdout
+
+        begin
+          $stdout = out
+          Ext.run options
+        ensure
+          $stdout = old_stdout
+        end
+
+        assert(out.string =~ version_regex)
+        assert_equal $1, Externals::VERSION.strip
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ext
 version: !ruby/object:Gem::Version 
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors: 
 - Miles Georgi
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-29 00:00:00 -07:00
+date: 2010-01-03 00:00:00 -08:00
 default_executable: ext
 dependencies: []
 
@@ -52,20 +52,21 @@ files:
 - Rakefile
 - README
 - MIT_LICENSE.txt
+- CHANGELOG
 - lib/extensions/string.rb
 - lib/extensions/symbol.rb
-- lib/externals/command.rb
-- lib/externals/configuration/configuration.rb
-- lib/externals/configuration/old_configuration.rb
-- lib/externals/ext.rb
+- lib/externals/project_types/rails.rb
 - lib/externals/old_project.rb
+- lib/externals/command.rb
 - lib/externals/old_scms/old_git_project.rb
 - lib/externals/old_scms/old_svn_project.rb
 - lib/externals/project.rb
-- lib/externals/project_types/rails.rb
+- lib/externals/configuration/configuration.rb
+- lib/externals/configuration/old_configuration.rb
+- lib/externals/test_case.rb
 - lib/externals/scms/git_project.rb
 - lib/externals/scms/svn_project.rb
-- lib/externals/test_case.rb
+- lib/externals/ext.rb
 has_rdoc: true
 homepage: http://nopugs.com/ext-tutorial
 licenses: []
@@ -90,17 +91,18 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: ext
-rubygems_version: 1.3.4
+rubygems_version: 1.3.5
 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_rails_detection.rb
+- test/test_string_extensions.rb
+- test/test_version.rb
+- test/test_init_git.rb
+- test/test_upgrade_externals_file.rb
 - test/test_checkout_git.rb
-- test/test_checkout_with_subprojects_git.rb
 - test/test_checkout_with_subprojects_svn.rb
 - test/test_freeze_to_revision.rb
-- test/test_init_git.rb
-- test/test_rails_detection.rb
-- test/test_string_extensions.rb
+- test/test_checkout_with_subprojects_git.rb
 - test/test_touch_emptydirs.rb
-- test/test_upgrade_externals_file.rb