Ticket #11294: git_support_for_railties_plugin_install.diff

railties/lib/commands/plugin.rb

@@ -162 +162 @@
-    @uri =~ /svn(?:\+ssh)?:\/\/*/
-  end
-  
+  def git_url?
+    @uri =~ /^git:\/\// || @url =~ /\.git$/
+  end
+  
-  def installed?
-    File.directory?("#{rails_env.root}/vendor/plugins/#{name}") \
-      or rails_env.externals.detect{ |name, repo| self.uri == repo }
@@ -169 +173 @@
-  
-  def install(method=nil, options = {})
-    method ||= rails_env.best_install_method?
-
+
+
+
+
-
-    uninstall if installed? and options[:force]
-
@@ -247 +254 @@
-        fetcher.fetch
-      end
-    end
+    
+    def install_using_clone(options = {})
+      git_command :clone, options
+    end
-
-    def svn_command(cmd, options = {})
-      root = rails_env.root
@@ -257 +268 @@
-      puts base_cmd if $verbose
-      system(base_cmd)
-    end
+    
+    def git_command(cmd, options = {})
+      root = rails_env.root
+      mkdir_p "#{root}/vendor/plugins"
+      base_cmd = "git #{cmd} --depth 1 #{uri} \"#{root}/vendor/plugins/#{name}\""
+      puts base_cmd if $verbose
+      puts "removing: #{root}/vendor/plugins/#{name}/.git"
+      system(base_cmd)
+      rm_rf "#{root}/vendor/plugins/#{name}/.git"
+    end
-
-    def guess_name(url)
-      @name = File.basename(url)
-      if @name == 'trunk' || @name.empty?
-        @name = File.basename(File.dirname(url))
-      end
+      @name.gsub!(/\.git$/, '') if @name =~ /\.git$/
-    end
-    
-    def rails_env