boof-grit 1.1.2

data/lib/grit/git.rb

@@ -0,0 +1,141 @@
+module Grit
+  
+  class Git
+    class GitTimeout < RuntimeError
+      attr_reader :command, :bytes_read
+
+      def initialize(command = nil, bytes_read = nil)
+        @command = command
+        @bytes_read = bytes_read
+      end
+    end
+
+    undef_method :clone
+    
+    include GitRuby
+    
+    class << self
+      attr_accessor :git_binary, :git_timeout, :git_max_size
+    end
+  
+    self.git_binary   = "/usr/bin/env git"
+    self.git_timeout  = 10
+    self.git_max_size = 5242880 # 5.megabytes
+    
+    def self.with_timeout(timeout = 10.seconds)
+      old_timeout = Grit::Git.git_timeout
+      Grit::Git.git_timeout = timeout
+      yield
+      Grit::Git.git_timeout = old_timeout
+    end
+    
+    attr_accessor :git_dir, :work_tree, :bytes_read
+    
+    def initialize(git_dir, work_tree = nil)
+      self.git_dir, self.work_tree = git_dir, work_tree
+      self.bytes_read = 0
+    end
+
+    def shell_escape(str)
+      str.to_s.gsub("'", "\\\\'").gsub(";", '\\;')
+    end
+    alias_method :e, :shell_escape
+    
+    # Run the given git command with the specified arguments and return
+    # the result as a String
+    #   +cmd+ is the command
+    #   +options+ is a hash of Ruby style options
+    #   +args+ is the list of arguments (to be joined by spaces)
+    #
+    # Examples
+    #   git.rev_list({:max_count => 10, :header => true}, "master")
+    #
+    # Returns String
+    def method_missing(cmd, options = {}, *args)
+      run('', cmd, '', options, args)
+    end
+
+    def run(prefix, cmd, postfix, options, args)
+      timeout  = options.delete(:timeout) rescue nil
+      timeout  = true if timeout.nil?
+
+      opt_args = transform_options(options)
+      ext_args = args.reject { |a| a.empty? }.map { |a| (a == '--' || a[0].chr == '|') ? a : "'#{e(a)}'" }
+
+      work_tree_option = " --work-tree='#{self.work_tree}'" if self.work_tree
+      call = "#{prefix}#{Git.git_binary}#{work_tree_option} --git-dir='#{self.git_dir}' #{cmd.to_s.gsub(/_/, '-')} #{(opt_args + ext_args).join(' ')}#{e(postfix)}"
+      Grit.log(call) if Grit.debug
+      response, err = timeout ? sh(call) : wild_sh(call)
+      Grit.log(response) if Grit.debug
+      Grit.log(err) if Grit.debug
+      response
+    end
+
+    def sh(command)
+      ret, err = '', ''
+      Open3.popen3(command) do |_, stdout, stderr|
+        Timeout.timeout(self.class.git_timeout) do
+          while tmp = stdout.read(1024)
+            ret += tmp
+            if (@bytes_read += tmp.size) > self.class.git_max_size
+              bytes = @bytes_read
+              @bytes_read = 0
+              raise GitTimeout.new(command, bytes)
+            end
+          end
+        end
+
+        while tmp = stderr.read(1024)
+          err += tmp
+        end
+      end
+      [ret, err]
+    rescue Timeout::Error, Grit::Git::GitTimeout
+      bytes = @bytes_read
+      @bytes_read = 0
+      raise GitTimeout.new(command, bytes)
+    end
+
+    def wild_sh(command)
+      ret, err = '', ''
+      Open3.popen3(command) do |_, stdout, stderr|
+        while tmp = stdout.read(1024)
+          ret += tmp
+        end
+
+        while tmp = stderr.read(1024)
+          err += tmp
+        end
+      end
+      [ret, err]
+    end
+
+    # Transform Ruby style options into git command line options
+    #   +options+ is a hash of Ruby style options
+    #
+    # Returns String[]
+    #   e.g. ["--max-count=10", "--header"]
+    def transform_options(options)
+      args = []
+      options.keys.each do |opt|
+        if opt.to_s.size == 1
+          if options[opt] == true
+            args << "-#{opt}"
+          else
+            val = options.delete(opt)
+            args << "-#{opt.to_s} '#{e(val)}'"
+          end
+        else
+          if options[opt] == true
+            args << "--#{opt.to_s.gsub(/_/, '-')}"
+          else
+            val = options.delete(opt)
+            args << "--#{opt.to_s.gsub(/_/, '-')}='#{e(val)}'"
+          end
+        end
+      end
+      args
+    end
+  end # Git
+  
+end # Grit

data/lib/grit/index.rb

@@ -0,0 +1,122 @@
+module Grit
+  
+  class Index
+    attr_accessor :repo, :tree, :current_tree
+    
+    def initialize(repo)
+      self.repo = repo
+      self.tree = {}
+      self.current_tree = nil
+    end
+    
+    # Add a file to the index
+    #   +path+ is the path (including filename)
+    #   +data+ is the binary contents of the file
+    #
+    # Returns nothing
+    def add(file_path, data)
+      path = file_path.split('/')
+      filename = path.pop
+      
+      current = self.tree
+      
+      path.each do |dir|
+        current[dir] ||= {}
+        node = current[dir]
+        current = node
+      end
+      
+      current[filename] = data
+    end
+        
+    # Sets the current tree
+    #   +tree+ the branch/tag/sha... to use - a string
+    #
+    # Returns index (self)
+    def read_tree(tree)
+      self.current_tree = self.repo.tree(tree)
+    end
+    
+    # Commit the contents of the index
+    #   +message+ is the commit message [nil]
+    #   +parents+ is one or more commits to attach this commit to to form a new head [nil]
+    #   +actor+ is the details of the user making the commit [nil]
+    #   +last_tree+ is a tree to compare with - to avoid making empty commits [nil]
+    #   +head+ is the branch to write this head to [master]
+    #
+    # Returns a String of the SHA1 of the commit
+    def commit(message, parents = nil, actor = nil, last_tree = nil, head = 'master')
+      tree_sha1 = write_tree(self.tree, self.current_tree)
+      return false if tree_sha1 == last_tree # don't write identical commits
+      
+      contents = []
+      contents << ['tree', tree_sha1].join(' ')
+      parents.each do |p|
+        contents << ['parent', p].join(' ') if p        
+      end if parents
+
+      if actor
+        name = actor.name
+        email = actor.email
+      else
+        config = Config.new(self.repo)
+        name = config['user.name']
+        email = config['user.email']
+      end
+    
+      author_string = "#{name} <#{email}> #{Time.now.to_i} -0700" # !! TODO : gotta fix this
+      contents << ['author', author_string].join(' ')
+      contents << ['committer', author_string].join(' ')
+      contents << ''
+      contents << message
+      
+      commit_sha1 = self.repo.git.ruby_git.put_raw_object(contents.join("\n"), 'commit')      
+      
+      self.repo.update_ref(head, commit_sha1)
+    end
+    
+    # Recursively write a tree to the index
+    #   +tree+ is the tree
+    #
+    # Returns the SHA1 String of the tree
+    def write_tree(tree, now_tree = nil)
+      tree_contents = {}
+            
+      # fill in original tree
+      now_tree.contents.each do |obj|
+        sha = [obj.id].pack("H*")
+        k = obj.name
+        k += '/' if (obj.class == Grit::Tree)
+        tree_contents[k] = "%s %s\0%s" % [obj.mode.to_s, obj.name, sha]
+      end if now_tree
+      
+      # overwrite with new tree contents
+      tree.each do |k, v|
+        case v
+          when String
+            sha = write_blob(v)
+            sha = [sha].pack("H*")
+            str = "%s %s\0%s" % ['100644', k, sha]
+            tree_contents[k] = str
+          when Hash
+            ctree = now_tree/k if now_tree
+            sha = write_tree(v, ctree)
+            sha = [sha].pack("H*")
+            str = "%s %s\0%s" % ['040000', k, sha]
+            tree_contents[k + '/'] = str
+        end
+      end
+      tr = tree_contents.sort.map { |k, v| v }.join('')
+      self.repo.git.ruby_git.put_raw_object(tr, 'tree')
+    end
+    
+    # Write the blob to the index
+    #   +data+ is the data to write
+    #
+    # Returns the SHA1 String of the blob
+    def write_blob(data)
+      self.repo.git.ruby_git.put_raw_object(data, 'blob')
+    end
+  end # Index
+  
+end # Grit

data/lib/grit/lazy.rb

@@ -0,0 +1,33 @@
+##
+# Allows attributes to be declared as lazy, meaning that they won't be
+# computed until they are asked for. 
+#
+# Works by delegating each lazy_reader to a cached lazy_source method.
+#
+# class Person
+#   lazy_reader :eyes
+#
+#   def lazy_source
+#     OpenStruct.new(:eyes => 2)
+#   end
+# end
+#
+# >> Person.new.eyes
+# => 2
+#
+module Lazy
+  def lazy_reader(*args)
+    args.each do |arg|
+      ivar = "@#{arg}"
+      define_method(arg) do
+        if instance_variable_defined?(ivar)
+          val = instance_variable_get(ivar)
+          return val if val
+        end
+        instance_variable_set(ivar, (@lazy_source ||= lazy_source).send(arg))
+      end
+    end
+  end
+end
+
+Object.extend Lazy unless Object.ancestors.include? Lazy

data/lib/grit/merge.rb

@@ -0,0 +1,45 @@
+module Grit
+  
+  class Merge
+    
+    STATUS_BOTH = 'both'
+    STATUS_OURS = 'ours'
+    STATUS_THEIRS = 'theirs'
+    
+    attr_reader :conflicts, :text, :sections
+    
+    def initialize(str)
+      status = STATUS_BOTH
+      
+      section = 1
+      @conflicts = 0
+      @text = {}
+      
+      lines = str.split("\n")
+      lines.each do |line|
+        if /^<<<<<<< (.*?)/.match(line)
+          status = STATUS_OURS
+          @conflicts += 1
+          section += 1
+        elsif line == '======='
+          status = STATUS_THEIRS
+        elsif /^>>>>>>> (.*?)/.match(line)
+          status = STATUS_BOTH          
+          section += 1
+        else
+          @text[section] ||= {}
+          @text[section][status] ||= []
+          @text[section][status] << line
+        end
+      end
+      @text = @text.values
+      @sections = @text.size
+    end
+    
+    # Pretty object inspection
+    def inspect
+      %Q{#<Grit::Merge}
+    end
+  end # Merge
+  
+end # Grit

data/lib/grit/ref.rb

@@ -0,0 +1,177 @@
+module Grit
+
+  class Ref
+
+    class << self
+      # Creates a new Ref object with <tt>name</tt> in the repository if it
+      # does not exist already. This method can only be called on Tag, Head or
+      # Remote.
+      #
+      # The <tt>startpoint</tt> defaults to HEAD.
+      #
+      # Returns kind of Ref (baked).
+      def create(repo, ref_name, startpoint = nil, type = nil)
+        type = extract_type type
+        startpoint = startpoint_from_object repo, startpoint
+
+        path = File.join repo.path, %W[ refs #{ type }s #{ ref_name } ]
+        unless File.exists? path
+          dir = File.dirname path
+          FileUtils.mkdir_p dir unless File.exist? dir
+          open(path, 'w') { |f| f << startpoint }
+        end
+
+        new ref_name, Commit.create(repo, :id => startpoint)
+      end
+
+      # Find all Refs
+      #   +repo+ is the Repo
+      #   +options+ is a Hash of options
+      #
+      # Returns Grit::Ref[] (baked)
+      def find_all(repo, options = {})
+        refs = []
+        already = {}
+        Dir.chdir(repo.path) do
+          files = Dir.glob(prefix + '/**/*')
+          files.each do |ref|
+            next if !File.file?(ref)
+            id = File.read(ref).chomp
+            name = ref.sub("#{prefix}/", '')
+            commit = Commit.create(repo, :id => id)
+            if !already[name]
+              refs << self.new(name, commit)
+              already[name] = true
+            end
+          end
+
+          if File.file?('packed-refs')
+            File.readlines('packed-refs').each do |line|
+              if m = /^(\w{40}) (.*?)$/.match(line)
+                next if !Regexp.new('^' + prefix).match(m[2])
+                name = m[2].sub("#{prefix}/", '')
+                commit = Commit.create(repo, :id => m[1])
+                if !already[name]
+                  refs << self.new(name, commit)
+                  already[name] = true
+                end
+              end
+            end
+          end
+        end
+
+        refs
+      end
+
+      protected
+        def extract_type(type)
+          type ||= name.split('::').last.downcase
+
+          %w[ head remote tag ].include? type or
+          raise ArgumentError, "expected head, remote or tags but was #{type}"
+
+          type
+        end
+        def startpoint_from_object(repo, object)
+          case object
+          when String
+            ref = repo.refs.find {|r| r.name == object }
+            ref ? ref.commit.id : object
+          when Grit::Ref; object.commit.id
+          when Grit::Commit; object.id
+          else
+            repo.git.rev_parse nil, 'HEAD'
+          end
+        end
+        def prefix
+          "refs/#{name.to_s.gsub(/^.*::/, '').downcase}s"
+        end
+
+    end
+
+    attr_reader :name
+    attr_reader :commit
+
+    # Instantiate a new Head
+    #   +name+ is the name of the head
+    #   +commit+ is the Commit that the head points to
+    #
+    # Returns Grit::Head (baked)
+    def initialize(name, commit)
+      @name, @commit = name, commit
+      @repo = @commit.instance_variable_get :@repo
+      @git = @repo.git
+    end
+
+    # Checkout the current Ref unless the current repo is bare. In this case
+    # a RuntimeError is raised.
+    def checkout
+      # TODO: should this change the HEAD?
+      raise RuntimeError, 'bare repository' if @repo.bare
+      invoke :checkout, @name
+    end
+
+    # Pretty object inspection
+    def inspect
+      %Q{#<#{self.class.name} "#{@name}">}
+    end
+
+    def ==(other)
+      self.class === other and name == other.name
+    end
+
+    protected
+    def invoke(cmd, *args)
+      @git.send cmd, {}, *args
+    end
+  end # Ref
+
+  # A Head is a named reference to a Commit. Every Head instance contains a
+  # name and a Commit object.
+  #
+  #   r = Grit::Repo.new("/path/to/repo")
+  #   h = r.heads.first
+  #   h.name       # => "master"
+  #   h.commit     # => #<Grit::Commit "1c09...">
+  #   h.commit.id  # => "1c09f116cbc2cb4100fb6935bb162daa4723f455"
+  class Head < Ref
+
+    # Get the HEAD revision of the repo.
+    #   +repo+ is the Repo
+    #   +options+ is a Hash of options
+    #
+    # Returns Grit::Head (baked)
+    def self.current(repo, options = {})
+      head = File.read File.join(repo.path, 'HEAD')
+      head.chomp!
+
+      if match = /ref: refs\/heads\/(.*)/.match(head)
+        commit = Commit.create repo,
+            :id => repo.git.rev_parse(options, 'HEAD')
+
+        new match[1], commit
+      end
+    end
+
+    # Checkout the this branch, do stuff and ensure that the old branch gets
+    # checked out afterwards.
+    # If message is set the index is commited. In this case the commit (baked)
+    # is returned.
+    def in_branch(message = nil)
+      old_ref = @repo.head
+      checkout
+      yield @repo
+
+      if message
+        @repo.commit_index message
+        @repo.head.commit
+      end
+    ensure
+      old_ref.checkout
+    end
+
+  end # Head
+
+  class Remote < Ref; end
+
+end # Grit