grit 1.1.1 → 2.0.0

data/lib/grit/repo.rb

@@ -1,16 +1,16 @@
 module Grit
-  
+
   class Repo
     DAEMON_EXPORT_FILE = 'git-daemon-export-ok'
-    
+
     # The path of the git repo as a String
     attr_accessor :path
     attr_accessor :working_dir
     attr_reader :bare
-    
+
     # The git command line interface object
     attr_accessor :git
-    
+
     # Create a new Repo instance
     #   +path+ is the path to either the root git directory or the bare git repo
     #   +options+ :is_bare force to load a bare repo
@@ -22,7 +22,7 @@ module Grit
     # Returns Grit::Repo
     def initialize(path, options = {})
       epath = File.expand_path(path)
-      
+
       if File.exist?(File.join(epath, '.git'))
         self.working_dir = epath
         self.path = File.join(epath, '.git')
@@ -35,10 +35,10 @@ module Grit
       else
         raise NoSuchPathError.new(epath)
       end
-      
+
       self.git = Git.new(self.path)
     end
-   
+
     # Does nothing yet...
     def self.init(path)
       # !! TODO !!
@@ -46,19 +46,19 @@ module Grit
       # generate initial git directory
       # create new Grit::Repo on that dir, return it
     end
-    
+
     # The project's description. Taken verbatim from GIT_REPO/description
     #
     # Returns String
     def description
-      File.open(File.join(self.path, 'description')).read.chomp
+      self.git.fs_read('description').chomp
     end
 
     def blame(file, commit = nil)
       Blame.new(self, file, commit)
     end
 
-    
+
     # An array of Head objects representing the branch heads in
     # this repo
     #
@@ -66,17 +66,17 @@ module Grit
     def heads
       Head.find_all(self)
     end
-    
+
     alias_method :branches, :heads
 
     def get_head(head_name)
       heads.find { |h| h.name == head_name }
     end
-    
+
     def is_head?(head_name)
       get_head(head_name)
     end
-    
+
     # Object reprsenting the current repo head.
     #
     # Returns Grit::Head (baked)
@@ -108,18 +108,18 @@ module Grit
     def remove(*files)
       self.git.rm({}, *files.flatten)
     end
-    
+
 
     def blame_tree(commit, path = nil)
       commit_array = self.git.blame_tree(commit, path)
-      
+
       final_array = {}
       commit_array.each do |file, sha|
         final_array[file] = commit(sha)
       end
       final_array
     end
-    
+
     def status
       Status.new(self)
     end
@@ -131,7 +131,7 @@ module Grit
     def tags
       Tag.find_all(self)
     end
-    
+
     # An array of Remote objects representing the remote branches in
     # this repo
     #
@@ -140,6 +140,34 @@ module Grit
       Remote.find_all(self)
     end
 
+    def remote_list
+      self.git.list_remotes
+    end
+
+    def remote_add(name, url)
+      self.git.remote({}, 'add', name, url)
+    end
+
+    def remote_fetch(name)
+      self.git.fetch({}, name)
+    end
+
+    # takes an array of remote names and last pushed dates
+    # fetches from all of the remotes where the local fetch
+    # date is earlier than the passed date, then records the
+    # last fetched date
+    #
+    # { 'origin' => date,
+    #   'peter => date,
+    # }
+    def remotes_fetch_needed(remotes)
+      remotes.each do |remote, date|
+        # TODO: check against date
+        self.remote_fetch(remote)
+      end
+    end
+
+
     # An array of Ref objects representing the refs in
     # this repo
     #
@@ -151,10 +179,10 @@ module Grit
     def commit_stats(start = 'master', max_count = 10, skip = 0)
       options = {:max_count => max_count,
                  :skip => skip}
-      
+
       CommitStats.find_all(self, start, options)
     end
-    
+
     # An array of Commit objects representing the history of a given ref/commit
     #   +start+ is the branch/commit name (default 'master')
     #   +max_count+ is the maximum number of commits to return (default 10, use +false+ for all)
@@ -164,10 +192,10 @@ module Grit
     def commits(start = 'master', max_count = 10, skip = 0)
       options = {:max_count => max_count,
                  :skip => skip}
-      
+
       Commit.find_all(self, start, options)
     end
-    
+
     # The Commits objects that are reachable via +to+ but not via +from+
     # Commits are returned in chronological order.
     #   +from+ is the branch/commit name of the younger item
@@ -177,7 +205,7 @@ module Grit
     def commits_between(from, to)
       Commit.find_all(self, "#{from}..#{to}").reverse
     end
-    
+
     # The Commits objects that are newer than the specified date.
     # Commits are returned in chronological order.
     #   +start+ is the branch/commit name (default 'master')
@@ -187,10 +215,10 @@ module Grit
     # Returns Grit::Commit[] (baked)
     def commits_since(start = 'master', since = '1970-01-01', extra_options = {})
       options = {:since => since}.merge(extra_options)
-      
+
       Commit.find_all(self, start, options)
     end
-    
+
     # The number of commits reachable by the given branch/commit
     #   +start+ is the branch/commit name (default 'master')
     #
@@ -198,17 +226,17 @@ module Grit
     def commit_count(start = 'master')
       Commit.count(self, start)
     end
-    
+
     # The Commit object for the specified id
     #   +id+ is the SHA1 identifier of the commit
     #
     # Returns Grit::Commit (baked)
     def commit(id)
       options = {:max_count => 1}
-      
+
       Commit.find_all(self, id, options).first
     end
-    
+
     # Returns a list of commits that is in +other_repo+ but not in self
     #
     # Returns Grit::Commit[]
@@ -217,12 +245,12 @@ module Grit
       # rev-list'ing the whole thing
       repo_refs       = self.git.rev_list({}, ref).strip.split("\n")
       other_repo_refs = other_repo.git.rev_list({}, other_ref).strip.split("\n")
-      
+
       (other_repo_refs - repo_refs).map do |ref|
         Commit.find_all(other_repo, ref, {:max_count => 1}).first
       end
     end
-    
+
     # The Tree object for the given treeish reference
     #   +treeish+ is the reference (default 'master')
     #   +paths+ is an optional Array of directory paths to restrict the tree (deafult [])
@@ -234,7 +262,7 @@ module Grit
     def tree(treeish = 'master', paths = [])
       Tree.construct(self, treeish, paths)
     end
-    
+
     # The Blob object for the given id
     #   +id+ is the SHA1 id of the blob
     #
@@ -253,7 +281,7 @@ module Grit
       commits = self.git.log(actual_options, *arg)
       Commit.list_from_string(self, commits)
     end
-    
+
     # The diff from commit +a+ to commit +b+, optionally restricted to the given file(s)
     #   +a+ is the base commit
     #   +b+ is the other commit
@@ -261,7 +289,7 @@ module Grit
     def diff(a, b, *paths)
       self.git.diff({}, a, b, '--', *paths)
     end
-    
+
     # The commit diff for the given commit
     #   +commit+ is the commit name/id
     #
@@ -269,7 +297,7 @@ module Grit
     def commit_diff(commit)
       Commit.diff(self, commit)
     end
-    
+
     # Initialize a bare git repository at the given path
     #   +path+ is the full path to the repo (traditionally ends with /<name>.git)
     #   +options+ is any additional options to the git init command
@@ -279,11 +307,13 @@ module Grit
     #
     # Returns Grit::Repo (the newly created repo)
     def self.init_bare(path, git_options = {}, repo_options = {})
+      git_options = {:bare => true}.merge(git_options)
       git = Git.new(path)
+      git.fs_mkdir('..')
       git.init(git_options)
       self.new(path, repo_options)
     end
-    
+
     # Fork a bare git repository from this repo
     #   +path+ is the full path of the new repo (traditionally ends with /<name>.git)
     #   +options+ is any additional options to the git clone command (:bare and :shared are true by default)
@@ -292,10 +322,24 @@ module Grit
     def fork_bare(path, options = {})
       default_options = {:bare => true, :shared => true}
       real_options = default_options.merge(options)
+      Git.new(path).fs_mkdir('..')
       self.git.clone(real_options, self.path, path)
       Repo.new(path)
     end
-    
+
+    # Fork a bare git repository from another repo
+    #   +path+ is the full path of the new repo (traditionally ends with /<name>.git)
+    #   +options+ is any additional options to the git clone command (:bare and :shared are true by default)
+    #
+    # Returns Grit::Repo (the newly forked repo)
+    def fork_bare_from(path, options = {})
+      default_options = {:bare => true, :shared => true}
+      real_options = default_options.merge(options)
+      Git.new(self.path).fs_mkdir('..')
+      self.git.clone(real_options, path, self.path)
+      Repo.new(self.path)
+    end
+
     # Archive the given treeish
     #   +treeish+ is the treeish name/id (default 'master')
     #   +prefix+ is the optional prefix
@@ -316,7 +360,7 @@ module Grit
       options[:prefix] = prefix if prefix
       self.git.archive(options, treeish)
     end
-    
+
     # Archive and gzip the given treeish
     #   +treeish+ is the treeish name/id (default 'master')
     #   +prefix+ is the optional prefix
@@ -335,7 +379,7 @@ module Grit
     def archive_tar_gz(treeish = 'master', prefix = nil)
       options = {}
       options[:prefix] = prefix if prefix
-      self.git.archive(options, treeish, "| gzip")
+      self.git.archive(options, treeish, "| gzip -n")
     end
 
     # Write an archive directly to a file
@@ -358,34 +402,33 @@ module Grit
     #
     # Returns nothing
     def enable_daemon_serve
-      FileUtils.touch(File.join(self.path, DAEMON_EXPORT_FILE))
+      self.git.fs_write(DAEMON_EXPORT_FILE, '')
     end
-    
+
     # Disable git-daemon serving of this repository by ensuring there is no
     # git-daemon-export-ok file in its git directory
     #
     # Returns nothing
     def disable_daemon_serve
-      FileUtils.rm_f(File.join(self.path, DAEMON_EXPORT_FILE))
+      self.git.fs_delete(DAEMON_EXPORT_FILE)
     end
-    
+
     def gc_auto
       self.git.gc({:auto => true})
     end
-    
+
     # The list of alternates for this repo
     #
     # Returns Array[String] (pathnames of alternates)
     def alternates
-      alternates_path = File.join(self.path, *%w{objects info alternates})
-      
-      if File.exist?(alternates_path)
-        File.read(alternates_path).strip.split("\n")
+      alternates_path = "objects/info/alternates"
+      if self.git.fs_exist?(alternates_path)
+        self.git.fs_read(alternates_path).strip.split("\n")
       else
         []
       end
     end
-    
+
     # Sets the alternates
     #   +alts+ is the Array of String paths representing the alternates
     #
@@ -396,42 +439,44 @@ module Grit
           raise "Could not set alternates. Alternate path #{alt} must exist"
         end
       end
-      
+
       if alts.empty?
-        File.open(File.join(self.path, *%w{objects info alternates}), 'w') do |f|
-          f.write ''
-        end
+        self.git.fs_write('objects/info/alternates', '')
       else
-        File.open(File.join(self.path, *%w{objects info alternates}), 'w') do |f|
-          f.write alts.join("\n")
-        end
+        self.git.fs_write('objects/info/alternates', alts.join("\n"))
       end
     end
-    
+
     def config
       @config ||= Config.new(self)
     end
-    
+
     def index
       Index.new(self)
     end
-    
+
     def update_ref(head, commit_sha)
       return nil if !commit_sha || (commit_sha.size != 40)
-   
-      ref_heads = File.join(self.path, 'refs', 'heads')
-      FileUtils.mkdir_p(ref_heads)
-      File.open(File.join(ref_heads, head), 'w') do |f|
-        f.write(commit_sha)
-      end
+      self.git.fs_write("refs/heads/#{head}", commit_sha)
       commit_sha
+    end
 
+    # Rename the current repository directory.
+    #   +name+ is the new name
+    #
+    # Returns nothing
+    def rename(name)
+      if @bare
+        self.git.fs_move('/', "../#{name}")
+      else
+        self.git.fs_move('/', "../../#{name}")
+      end
     end
-    
+
     # Pretty object inspection
     def inspect
       %Q{#<Grit::Repo "#{@path}">}
     end
   end # Repo
-  
+
 end # Grit

data/lib/grit/ruby1.9.rb

@@ -1,4 +1,4 @@
-class String 
+class String
   if ((defined? RUBY_VERSION) && (RUBY_VERSION[0..2] == "1.9"))
     def getord(offset); self[offset].ord; end
   else

data/lib/grit/status.rb

@@ -1,20 +1,20 @@
 module Grit
-  
+
   class Status
     include Enumerable
-    
+
     @base = nil
     @files = nil
-    
+
     def initialize(base)
       @base = base
       construct_status
     end
-    
+
     def changed
       @files.select { |k, f| f.type == 'M' }
     end
-    
+
     def added
       @files.select { |k, f| f.type == 'A' }
     end
@@ -22,11 +22,11 @@ module Grit
     def deleted
       @files.select { |k, f| f.type == 'D' }
     end
-    
+
     def untracked
       @files.select { |k, f| f.untracked }
     end
-    
+
     def pretty
       out = ''
       self.each do |file|
@@ -41,26 +41,26 @@ module Grit
       out << "\n"
       out
     end
-    
+
     # enumerable method
-    
+
     def [](file)
       @files[file]
     end
-    
+
     def each
       @files.each do |k, file|
         yield file
       end
     end
-    
+
     class StatusFile
       attr_accessor :path, :type, :stage, :untracked
       attr_accessor :mode_index, :mode_repo
       attr_accessor :sha_index, :sha_repo
-      
+
       @base = nil
-      
+
       def initialize(base, hash)
         @base = base
         @path = hash[:path]
@@ -72,7 +72,7 @@ module Grit
         @sha_repo = hash[:sha_repo]
         @untracked = hash[:untracked]
       end
-      
+
       def blob(type = :index)
         if type == :repo
           @base.object(@sha_repo)
@@ -80,15 +80,15 @@ module Grit
           @base.object(@sha_index) rescue @base.object(@sha_repo)
         end
       end
-      
+
     end
-    
+
     private
-    
+
       def construct_status
         @files = ls_files
-        
-        Dir.chdir(@base.working_dir) do 
+
+        Dir.chdir(@base.working_dir) do
           # find untracked in working dir
           Dir.glob('**/*') do |file|
             if !@files[file]
@@ -100,12 +100,12 @@ module Grit
          diff_files.each do |path, data|
             @files[path] ? @files[path].merge!(data) : @files[path] = data
           end
-        
+
           # find added but not committed - new files
           diff_index('HEAD').each do |path, data|
             @files[path] ? @files[path].merge!(data) : @files[path] = data
           end
-        
+
           @files.each do |k, file_hash|
             @files[k] = StatusFile.new(@base, file_hash)
           end
@@ -118,7 +118,7 @@ module Grit
         @base.git.diff_files.split("\n").each do |line|
           (info, file) = line.split("\t")
           (mode_src, mode_dest, sha_src, sha_dest, type) = info.split
-          hsh[file] = {:path => file, :mode_file => mode_src.to_s[1, 7], :mode_index => mode_dest, 
+          hsh[file] = {:path => file, :mode_file => mode_src.to_s[1, 7], :mode_index => mode_dest,
                         :sha_file => sha_src, :sha_index => sha_dest, :type => type}
         end
         hsh
@@ -130,7 +130,7 @@ module Grit
         @base.git.diff_index({}, treeish).split("\n").each do |line|
           (info, file) = line.split("\t")
           (mode_src, mode_dest, sha_src, sha_dest, type) = info.split
-          hsh[file] = {:path => file, :mode_repo => mode_src.to_s[1, 7], :mode_index => mode_dest, 
+          hsh[file] = {:path => file, :mode_repo => mode_src.to_s[1, 7], :mode_index => mode_dest,
                         :sha_repo => sha_src, :sha_index => sha_dest, :type => type}
         end
         hsh
@@ -147,5 +147,5 @@ module Grit
         hsh
       end
   end
-  
+
 end