Changeset 8772

Timestamp:

02/02/08 02:55:14 (5 months ago)

Author:

bitsweat

Message:

Git support for script/generate. Closes #10690.

Files:

• trunk/railties/CHANGELOG (modified) (1 diff)
• trunk/railties/lib/rails_generator/commands.rb (modified) (5 diffs)
• trunk/railties/lib/rails_generator/options.rb (modified) (1 diff)

trunk/railties/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Git support for script/generate.  #10690 [ssoroka]
-
-* Update scaffold to use labels instead of bold tags.  Closes #10757 [zach-inglis-lt3]

trunk/railties/lib/rails_generator/commands.rb

@@ -256 +256 @@
-          end
-
-
+ or git
-          system("svn add #{destination}") if options[:svn]
+          system("git add -v #{relative_destination}") if options[:git]
-        end
-
@@ -304 +305 @@
-
-        # Create a directory including any missing parent directories.
-
+skips 
-        def directory(relative_path)
-          path = destination_path(relative_path)
@@ -313 +314 @@
-                  unless options[:pretend]
-                    FileUtils.mkdir_p(path)
+                    # git doesn't require adding the paths, adding the files later will
+                    # automatically do a path add.
-              
-                    # Subversion doesn't do path adds, so we need to add
@@ -429 +432 @@
-                # has no modifications so we can simply remove it
-                  system("svn rm #{destination}")
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-              else
-                FileUtils.rm(destination)
@@ -466 +482 @@
-                      system("svn rm #{path}")
-                    end
+                  # I don't think git needs to remove directories?..
+                  # or maybe they have special consideration...
-                  else
-                    FileUtils.rmdir(path)

trunk/railties/lib/rails_generator/options.rb

@@ -137 +137 @@
-            end
-          end
+          opt.on('-g', '--git', 'Modify files with git. (Note: git must be in path)') do
+            options[:git] = `git status`.inject({:new => {}, :modified => {}}) do |opt, e|
+              opt[:new][e.chomp[14..-1]] = true if e =~ /new file:/
+              opt[:modified][e.chomp[14..-1]] = true if e =~ /modified:/
+              opt
+            end
+          end
-        end
-