Moving some Git::Base methods into the Factories module

robertodecurnex · robertodecurnex · commit 456f1b6db09d · 2015-01-06T11:18:11.000-03:00
diff --git a/lib/git/base.rb b/lib/git/base.rb
@@ -149,8 +149,6 @@ def set_working(work_dir, check = true)
       @lib = nil
       @working_directory = Git::WorkingDirectory.new(work_dir.to_s, check)
     end
-
-
     
     # returns +true+ if the branch exists locally
     def is_local_branch?(branch)
@@ -170,11 +168,6 @@ def is_branch?(branch)
       branch_names.include?(branch)
     end
 
-    # returns a Git::Remote object
-    def remote(remote_name = 'origin')
-      Git::Remote.new(self, remote_name)
-    end
-
     # this is a convenience method for accessing the class that wraps all the 
     # actual 'git' forked system calls.  At some point I hope to replace the Git::Lib
     # class with one that uses native methods or libgit C bindings
@@ -205,11 +198,6 @@ def grep(string, path_limiter = nil, opts = {})
       self.object('HEAD').grep(string, path_limiter, opts)
     end
     
-    # returns a Git::Diff object
-    def diff(objectish = 'HEAD', obj2 = nil)
-      Git::Diff.new(self, objectish, obj2)
-    end
-    
     # updates the repository index using the workig dorectory content
     #
     #    @git.add('path/to/file')
@@ -386,11 +374,6 @@ def remove_remote(name)
     def tags
       self.lib.tags.map { |r| tag(r) }
     end
-    
-    # returns a Git::Tag object
-    def tag(tag_name)
-      Git::Object.new(self, tag_name, 'tag', true)
-    end
 
     # Creates a new git tag (Git::Tag)
     # Usage:
@@ -476,10 +459,6 @@ def write_tree
       self.lib.write_tree
     end
     
-    def commit_tree(tree = nil, opts = {})
-      Git::Object::Commit.new(self, self.lib.commit_tree(tree, opts))
-    end
-    
     def write_and_commit_tree(opts = {})
       tree = write_tree
       commit_tree(tree, opts)
@@ -537,7 +516,6 @@ def cat_file(objectish)
     def current_branch
       self.lib.branch_current
     end
-
     
   end
   
diff --git a/lib/git/base/factories.rb b/lib/git/base/factories.rb
@@ -3,49 +3,69 @@ module Git
   class Base
 
     module Factories
+      
+      # returns a Git::Branch object for branch_name
+      def branch(branch_name = 'master')
+        Git::Branch.new(self, branch_name)
+      end
 
-      # returns a Git::Object of the appropriate type
-      # you can also call @git.gtree('tree'), but that's 
-      # just for readability.  If you call @git.gtree('HEAD') it will
-      # still return a Git::Object::Commit object.  
-      #
-      # @git.object calls a factory method that will run a rev-parse 
-      # on the objectish and determine the type of the object and return 
-      # an appropriate object for that type 
-      def object(objectish)
-        Git::Object.new(self, objectish)
+      # returns a Git::Branches object of all the Git::Branch 
+      # objects for this repo
+      def branches
+        Git::Branches.new(self)
       end
       
-      def gtree(objectish)
-        Git::Object.new(self, objectish, 'tree')
+      def commit_tree(tree = nil, opts = {})
+        Git::Object::Commit.new(self, self.lib.commit_tree(tree, opts))
       end
-      
-      def gcommit(objectish)
-        Git::Object.new(self, objectish, 'commit')
+
+      # returns a Git::Diff object
+      def diff(objectish = 'HEAD', obj2 = nil)
+        Git::Diff.new(self, objectish, obj2)
       end
       
       def gblob(objectish)
         Git::Object.new(self, objectish, 'blob')
       end
       
+      def gcommit(objectish)
+        Git::Object.new(self, objectish, 'commit')
+      end
+
+      def gtree(objectish)
+        Git::Object.new(self, objectish, 'tree')
+      end
+      
       # returns a Git::Log object with count commits
       def log(count = 30)
         Git::Log.new(self, count)
       end
+      
+      # returns a Git::Object of the appropriate type
+      # you can also call @git.gtree('tree'), but that's 
+      # just for readability.  If you call @git.gtree('HEAD') it will
+      # still return a Git::Object::Commit object.  
+      #
+      # @git.object calls a factory method that will run a rev-parse 
+      # on the objectish and determine the type of the object and return 
+      # an appropriate object for that type 
+      def object(objectish)
+        Git::Object.new(self, objectish)
+      end
   
+      # returns a Git::Remote object
+      def remote(remote_name = 'origin')
+        Git::Remote.new(self, remote_name)
+      end
+
       # returns a Git::Status object
       def status
         Git::Status.new(self)
       end
-          
-      # returns a Git::Branches object of all the Git::Branch objects for this repo
-      def branches
-        Git::Branches.new(self)
-      end
-      
-      # returns a Git::Branch object for branch_name
-      def branch(branch_name = 'master')
-        Git::Branch.new(self, branch_name)
+    
+      # returns a Git::Tag object
+      def tag(tag_name)
+        Git::Object.new(self, tag_name, 'tag', true)
       end
 
     end
