ext 1.1.0 → 1.1.1

data/CHANGELOG

@@ -1,4 +1,7 @@
-July 20, 2012 Version 1.10 released
+January 1, 2012 Version 1.1.1 released
+- Fixes a bug preventing proper rails 3 project detection
+
+July 20, 2012 Version 1.1.0 released
 - unfreeze feature added.
 
 July 17, 2012 Version 1.0.7 released

data/README

@@ -205,10 +205,20 @@ it's important that there is a repository field under [.] in the .externals file
 This can be accomplished by using -b with commands like 'ext checkout' and 'ext init'
 or by manually editing the .externals file.
 
+RUNNING TESTS
+-------------
+
+Tests are ran with:
+
+rake test
+
+You will need git and svn installed.
+If you are using Ruby 1.9 to run the tests, you will need to have the simplecov gem installed.
+
 
 Copyright Information
 ---------------------
-The externals project is copyright 2008 by Miles Georgi, nopugs.com, azimux.com
+The externals project is copyright 2008 by Miles Georgi
 and is released under the MIT license.
 
 The license is available in the same directory as this README

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.0'
+  VERSION = '1.1.1'
   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

@@ -30,13 +30,16 @@ FileUtils.class_eval do
       rm_rf_old *args
 
       while File.exists?(args[0]) && tries < 10
+        # :nocov:
         sleep 1
         tries += 1
+        # :nocov:
       end
     end
 
     rm.call
     if tries >= 10
+      # :nocov:
       puts "WARNING: deleted #{args[0]} didn't work, trying again"
       tries = 0
       rm.call
@@ -44,6 +47,7 @@ FileUtils.class_eval do
       if tries >= 10
         raise "Could not delete #{args[0]}"
       end
+      # :nocov:
     end
   end
 

data/lib/externals/project.rb

@@ -117,17 +117,6 @@ module Externals
       end
     end
 
-    def parent_path
-      File.dirname path
-    end
-
-    def self.project_line? line
-      #Make sure it's not a comment
-      return false if line =~ /^\s*#/
-
-      line =~ PROJECT_LINE_REGEX
-    end
-
     #test helper method
     def assert_e_dne_i_ni assert, exists, doesnt = [], ignored = exists, notignored = []
       ignored.each do |proj|

data/lib/externals/project_types/rails.rb

@@ -20,7 +20,7 @@ module Externals
       application_path = File.join('config', 'application.rb')
       if File.exists? application_path
         open(application_path) do |f|
-          f.read =~ /^\s*module\s+RailsApp/
+          f.read =~ /<\s*Rails::Application/
         end
       else
         boot_path = File.join('config', 'boot.rb')

data/test/test_checkout_with_subprojects_svn.rb

@@ -33,7 +33,7 @@ module Externals
             puts(ignore_text = `svn propget svn:ignore vendor`)
             assert(ignore_text =~ /^rails$/)
 
-            %w(redhillonrails_core acts_as_list engines).each do |proj|
+            %w(redhillonrails_core acts_as_list some_subproject_with_edge).each do |proj|
               assert File.exists?(File.join('vendor', 'plugins', proj, 'lib'))
             end
 
@@ -56,7 +56,7 @@ module Externals
 
             assert File.read(File.join('modules', 'modules.txt')) =~ /line1 of/
 
-            Dir.chdir File.join('vendor', 'plugins', 'engines') do
+            Dir.chdir File.join('vendor', 'plugins', 'some_subproject_with_edge') do
               assert(`git branch -a` =~ /^\*\s*edge\s*$/)
               assert(`git branch -a` !~ /^\*\s*master\s*$/)
             end
@@ -98,7 +98,7 @@ module Externals
 
               Dir.chdir "rails_app" do
                 #install a new project
-                subproject = GitRepositoryFromInternet.new("ssl_requirement")
+                subproject = GitRepositoryFromBundle.new("ssl_requirement")
                 Ext.run "install", subproject.clean_dir
 
                 SvnProject.add_all
@@ -121,7 +121,7 @@ module Externals
       def test_update_with_missing_subproject_by_revision_git
         repository = RailsAppSvnRepository.new
         repository.prepare
-        subproject = GitRepositoryFromInternet.new("ssl_requirement")
+        subproject = GitRepositoryFromBundle.new("ssl_requirement")
         subproject.prepare
         revision = "aa2dded823f8a9b378c22ba0159971508918928a"
         subproject_name = subproject.name.gsub(".git", "")

data/test/test_help.rb

@@ -0,0 +1,27 @@
+$:.unshift File.join(File.dirname(__FILE__), '..', 'lib') if $0 == __FILE__
+require 'ext_test_case'
+require 'externals/ext'
+require 'basic_git_repository'
+
+module Externals
+  module Test
+    class TestHelp < ::Test::Unit::TestCase
+      include ExtTestCase
+
+      def test_help
+        capture = StringIO.new
+        begin
+          $stdout = capture
+
+          Ext.run "help"
+        ensure
+          $stdout = STDOUT
+        end
+        capture = capture.string
+
+
+        assert capture =~ /ext \[OPTIONS\] <command>/
+      end
+    end
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ext
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 1
   - 1
-  - 0
-  version: 1.1.0
+  - 1
+  version: 1.1.1
 platform: ruby
 authors: 
 - Miles Georgi
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-21 00:00:00 Z
+date: 2012-12-30 00:00:00 Z
 dependencies: []
 
 description: |-
@@ -58,33 +58,34 @@ files:
 - README
 - MIT_LICENSE.txt
 - CHANGELOG
-- lib/externals/project_types/rails.rb
-- lib/externals/extensions/symbol.rb
+- lib/externals/command.rb
+- lib/externals/configuration/configuration.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/configuration/configuration.rb
-- lib/externals/ext.rb
-- lib/externals/scms/svn_project.rb
+- lib/externals/project_types/rails.rb
 - lib/externals/scms/git_project.rb
-- lib/externals/command.rb
-- test/test_string_extensions.rb
-- test/test_rails_detection.rb
+- lib/externals/scms/svn_project.rb
+- test/test_checkout_git.rb
+- test/test_checkout_with_subprojects_git.rb
+- test/test_checkout_with_subprojects_svn.rb
+- test/test_file_utils_extensions.rb
+- test/test_freeze_to_revision.rb
+- test/test_git_project_extract_name.rb
+- test/test_help.rb
 - test/test_init_git.rb
+- test/test_out_of_date_git_subproject.rb
 - test/test_projects.rb
-- test/test_checkout_git.rb
+- test/test_rails_detection.rb
+- test/test_string_extensions.rb
 - test/test_svn_branches.rb
-- test/test_git_project_extract_name.rb
 - test/test_touch_emptydirs.rb
-- test/test_out_of_date_git_subproject.rb
 - test/test_version.rb
-- test/test_checkout_with_subprojects_git.rb
-- test/test_checkout_with_subprojects_svn.rb
-- test/test_freeze_to_revision.rb
-- test/test_file_utils_extensions.rb
 - test/setup/empty_plugin.svn.gz
-- test/setup/redhillonrails_core.svn.gz
 - test/setup/foreign_key_migrations.svn.gz
+- test/setup/redhillonrails_core.svn.gz
 - bin/ext
 homepage: http://nopugs.com/ext-tutorial
 licenses: []
@@ -120,20 +121,21 @@ 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_string_extensions.rb
-- test/test_rails_detection.rb
+- test/test_checkout_git.rb
+- test/test_checkout_with_subprojects_git.rb
+- test/test_checkout_with_subprojects_svn.rb
+- test/test_file_utils_extensions.rb
+- test/test_freeze_to_revision.rb
+- test/test_git_project_extract_name.rb
+- test/test_help.rb
 - test/test_init_git.rb
+- test/test_out_of_date_git_subproject.rb
 - test/test_projects.rb
-- test/test_checkout_git.rb
+- test/test_rails_detection.rb
+- test/test_string_extensions.rb
 - test/test_svn_branches.rb
-- test/test_git_project_extract_name.rb
 - test/test_touch_emptydirs.rb
-- test/test_out_of_date_git_subproject.rb
 - test/test_version.rb
-- test/test_checkout_with_subprojects_git.rb
-- test/test_checkout_with_subprojects_svn.rb
-- test/test_freeze_to_revision.rb
-- test/test_file_utils_extensions.rb
 - test/setup/empty_plugin.svn.gz
-- test/setup/redhillonrails_core.svn.gz
 - test/setup/foreign_key_migrations.svn.gz
+- test/setup/redhillonrails_core.svn.gz