ext 0.1.7 → 0.1.8

data/CHANGELOG

@@ -1,3 +1,8 @@
+February 17, 2011 Version 1.8 released
+- Fixes a compatibility issue with jruby (thanks to Patrik Sundberg)
+- Fixes some issues with recognizing rails 3 projects and testing with
+  rails 3 installed
+
 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

data/Rakefile

@@ -6,6 +6,8 @@ require 'find'
 
 root_dir = File.dirname(__FILE__)
 
+$LOAD_PATH << File.join(root_dir, 'lib')
+
 require File.join(root_dir, 'lib', 'externals', 'ext')
 
 desc "Creates the starting repositories needed to run the tests.

data/lib/externals/ext.rb

@@ -4,13 +4,13 @@ require 'externals/configuration/configuration'
 require 'externals/configuration/old_configuration'
 require 'optparse'
 require 'externals/command'
-require 'extensions/symbol'
+require 'externals/extensions/symbol'
 
 module Externals
   #exit status
   OBSOLETE_EXTERNALS_FILE = 15
 
-  VERSION = '0.1.7'
+  VERSION = '0.1.8'
   PROJECT_TYPES_DIRECTORY = File.join(File.dirname(__FILE__), '..', 'externals','project_types')
 
   # Full commands operate on the main project as well as the externals
@@ -84,8 +84,8 @@ module Externals
 
 
   class Ext
-    Dir.entries(File.join(File.dirname(__FILE__), '..', 'extensions')).each do |extension|
-      require "extensions/#{extension}" if extension =~ /.rb$/
+    Dir.entries(File.join(File.dirname(__FILE__), 'extensions')).each do |extension|
+      require "externals/extensions/#{extension}" if extension =~ /.rb$/
     end
 
     Dir.entries(File.join(File.dirname(__FILE__), '..', 'externals','scms')).each do |project|
@@ -198,7 +198,7 @@ module Externals
           end
         end
 
-        new(main_options).send(command, args, sub_options)
+        self.new(main_options).send(command, args, sub_options)
       end
     end
 

data/lib/externals/project.rb

@@ -1,4 +1,4 @@
-require 'extensions/symbol'
+require 'externals/extensions/symbol'
 
 module Externals
   VALID_ATTRIB = [:name, :path, :repository, :branch, :type, :scm, :revision

data/lib/externals/project_types/rails.rb

@@ -29,10 +29,17 @@ module Externals
 
   class RailsDetector
     def self.detected?
-      boot_path = File.join('config','boot.rb')
-      if File.exists? boot_path
-        open(boot_path) do |f|
-          f.read =~ /^\s*module\s+Rails/
+      application_path = File.join('config', 'application.rb')
+      if File.exists? application_path
+        open(application_path) do |f|
+          f.read =~ /^\s*module\s+RailsApp/
+        end
+      else
+        boot_path = File.join('config', 'boot.rb')
+        if File.exists? boot_path
+          open(boot_path) do |f|
+            f.read =~ /^\s*module\s+Rails/
+          end
         end
       end
     end

data/lib/externals/test_case.rb

@@ -99,14 +99,20 @@ module Externals
     def create_rails_application
       Dir.mkdir applications_dir unless File.exists?(applications_dir)
       Dir.chdir applications_dir do
-        if windows?
-          puts `ruby C:\\ruby\\bin\\rails rails_app`
-        else
+        if rails_version =~ /^3([^\d]|$)/
+          puts `rails new rails_app`
+        elsif rails_version =~ /^2([^\d]|$)/
           puts `rails rails_app`
+        else
+          raise "can't determine rails version"
         end
       end
     end
 
+    def rails_version
+      /[\d\.]+/.match(`rails --version`)[0]
+    end
+
     def windows?
       ENV['OS'] =~ /^Win/i
     end

data/test/test_freeze_to_revision.rb

@@ -33,6 +33,10 @@ module Externals
             Ext.run "install", "--svn", 'file:///' + File.join(root_dir, 'test', 'cleanreps', proj)
           end
 
+          Dir.chdir File.join('vendor', 'plugins', 'foreign_key_migrations') do
+            assert `svn info` !~ /^.*:\s*2\s*$/i
+          end
+
           Ext.run "freeze", "foreign_key_migrations", "2"
           Ext.run "freeze", "acts_as_list", "9baff190a52c05cc542bfcaa7f77a91ce669f2f8"
 
@@ -91,12 +95,12 @@ module Externals
                 end
 
                 Dir.chdir 'foreign_key_migrations' do
-                  assert `svn info` =~ /^Revision:\s*2\s*$/i
+                  assert `svn info` =~ /^.*:\s*2\s*$/i
                 end
               end
 
               %w(foreign_key_migrations redhillonrails_core acts_as_list).each do |proj|
-                assert File.exists?(File.join('vendor', 'plugins',proj, 'lib'))
+                assert File.exists?(File.join('vendor', 'plugins', proj, 'lib'))
               end
             end
           end

metadata

@@ -1,15 +1,20 @@
 --- !ruby/object:Gem::Specification 
 name: ext
 version: !ruby/object:Gem::Version 
-  version: 0.1.7
+  prerelease: false
+  segments: 
+    - 0
+    - 1
+    - 8
+  version: 0.1.8
 platform: ruby
 authors: 
-- Miles Georgi
+  - Miles Georgi
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-01-03 00:00:00 -08:00
+date: 2011-02-17 00:00:00 -08:00
 default_executable: ext
 dependencies: []
 
@@ -43,30 +48,42 @@ description: |-
   the main project.
 email: azimux@gmail.com
 executables: 
-- ext
+  - ext
 extensions: []
 
 extra_rdoc_files: []
 
 files: 
-- Rakefile
-- README
-- MIT_LICENSE.txt
-- CHANGELOG
-- lib/extensions/string.rb
-- lib/extensions/symbol.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/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/ext.rb
+  - Rakefile
+  - README
+  - MIT_LICENSE.txt
+  - CHANGELOG
+  - lib/externals/old_project.rb
+  - lib/externals/command.rb
+  - lib/externals/project.rb
+  - lib/externals/test_case.rb
+  - lib/externals/ext.rb
+  - lib/externals/project_types/rails.rb
+  - lib/externals/old_scms/old_git_project.rb
+  - lib/externals/old_scms/old_svn_project.rb
+  - lib/externals/extensions/string.rb
+  - lib/externals/extensions/symbol.rb
+  - lib/externals/configuration/configuration.rb
+  - lib/externals/configuration/old_configuration.rb
+  - lib/externals/scms/git_project.rb
+  - lib/externals/scms/svn_project.rb
+  - test/test_rails_detection.rb
+  - test/test_string_extensions.rb
+  - test/test_git_project_extract_name.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_svn.rb
+  - test/test_freeze_to_revision.rb
+  - test/test_checkout_with_subprojects_git.rb
+  - test/test_touch_emptydirs.rb
+  - bin/ext
 has_rdoc: true
 homepage: http://nopugs.com/ext-tutorial
 licenses: []
@@ -75,35 +92,39 @@ post_install_message:
 rdoc_options: []
 
 require_paths: 
-- lib
+  - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+          - 0
+        version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+          - 0
+        version: "0"
 requirements: []
 
 rubyforge_project: ext
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 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_git_project_extract_name.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_svn.rb
-- test/test_freeze_to_revision.rb
-- test/test_checkout_with_subprojects_git.rb
-- test/test_touch_emptydirs.rb
+  - test/test_rails_detection.rb
+  - test/test_string_extensions.rb
+  - test/test_git_project_extract_name.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_svn.rb
+  - test/test_freeze_to_revision.rb
+  - test/test_checkout_with_subprojects_git.rb
+  - test/test_touch_emptydirs.rb