gitrb 0.0.8 → 0.0.9

data/gitrb.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'gitrb'
-  s.version = '0.0.8'
+  s.version = '0.0.9'
   s.summary = 'Pure ruby git implementation'
   s.author = 'Daniel Mendler'
   s.email = 'mail@daniel-mendler.de'
@@ -21,8 +21,9 @@ lib/gitrb.rb
 lib/gitrb/blob.rb
 lib/gitrb/commit.rb
 lib/gitrb/diff.rb
-lib/gitrb/object.rb
+lib/gitrb/gitobject.rb
 lib/gitrb/pack.rb
+lib/gitrb/reference.rb
 lib/gitrb/repository.rb
 lib/gitrb/tag.rb
 lib/gitrb/tree.rb

data/lib/gitrb/blob.rb

@@ -1,7 +1,7 @@
 module Gitrb
 
   # This class stores the raw string data of a blob
-  class Blob < Gitrb::Object
+  class Blob < GitObject
 
     attr_accessor :data, :mode
 
@@ -9,15 +9,15 @@ module Gitrb
     def initialize(options = {})
       super(options)
       @data = options[:data]
-      @mode = options[:mode] || "100644"
+      @mode = options[:mode] || '100644'
     end
 
     def type
-      'blob'
+      :blob
     end
 
     def ==(other)
-      Blob === other and id == other.id
+      Blob === other && id == other.id
     end
 
     def dump

data/lib/gitrb/commit.rb

@@ -1,11 +1,11 @@
 module Gitrb
 
-  class Commit < Gitrb::Object
-    attr_accessor :tree, :parent, :author, :committer, :message
+  class Commit < GitObject
+    attr_accessor :tree, :parents, :author, :committer, :message
 
     def initialize(options = {})
       super(options)
-      @parent = [options[:parent]].flatten.compact
+      @parents = [options[:parents]].flatten.compact
       @tree = options[:tree]
       @author = options[:author]
       @committer = options[:committer]
@@ -14,7 +14,7 @@ module Gitrb
     end
 
     def type
-      'commit'
+      :commit
     end
 
     def date
@@ -22,7 +22,7 @@ module Gitrb
     end
 
     def ==(other)
-      Commit === other and id == other.id
+      Commit === other && id == other.id
     end
 
     def save
@@ -32,7 +32,7 @@ module Gitrb
 
     def dump
       [ "tree #{tree.id}",
-        @parent.map { |p| "parent #{p.id}" },
+        @parents.map { |p| "parent #{p.id}" },
         "author #{author.dump}",
         "committer #{committer.dump}",
         '',
@@ -54,7 +54,7 @@ module Gitrb
 
         case key
         when 'parent'
-          @parent << Reference.new(:repository => repository, :id => repository.set_encoding(value))
+          @parents << Reference.new(:repository => repository, :id => repository.set_encoding(value))
         when 'author'
           @author = User.parse(repository.set_encoding(value))
         when 'committer'

data/lib/gitrb/diff.rb

@@ -1,21 +1,3 @@
 module Gitrb
-
-  class Diff
-    attr_reader :from, :to, :patch, :deletions, :insertions
-
-    def initialize(from, to, patch)
-      @from = from
-      @to = to
-      @patch = patch
-      @deletions = @insertions = 0
-      @patch.split("\n").each do |line|
-        if line[0..0] == '-'
-          @deletions += 1
-        elsif line[0..0] == '+'
-          @insertions += 1
-        end
-      end
-    end
-  end
-
+  Diff = Struct.new(:from, :to, :patch)
 end

data/lib/gitrb/gitobject.rb

@@ -0,0 +1,26 @@
+module Gitrb
+  class GitObject
+    attr_accessor :repository, :id
+
+    def initialize(options = {})
+      @repository = options[:repository]
+      @id = options[:id]
+    end
+
+    def object
+      self
+    end
+
+    @types = {}
+
+    def self.inherited(subclass)
+      @types[subclass.name[7..-1].downcase] = subclass
+    end
+
+    def self.factory(type, *args)
+      klass = @types[type]
+      raise NotImplementedError, "Object type not supported: #{type}" if !klass
+      klass.new(*args)
+    end
+  end
+end

data/lib/gitrb/pack.rb

@@ -9,8 +9,6 @@
 # provides native ruby access to git objects and pack files
 #
 
-require 'zlib'
-
 module Gitrb
   PACK_SIGNATURE = "PACK"
   PACK_IDX_SIGNATURE = "\377tOc"

data/lib/gitrb/{object.rb → reference.rb}

@@ -1,36 +1,7 @@
 module Gitrb
-  class Object
-    attr_accessor :repository, :id
-    alias sha id
-
-    def initialize(options = {})
-      @repository = options[:repository]
-      @id = options[:id] || options[:sha]
-    end
-
-    CLASS = {}
-
-    def object
-      self
-    end
-
-    def self.inherited(subclass)
-      CLASS[subclass.name[7..-1].downcase] = subclass
-    end
-
-    def self.factory(type, *args)
-      klass = CLASS[type] or raise NotImplementedError, "Object type not supported: #{type}"
-      klass.new(*args)
-    end
-  end
-
   class Reference
     undef_method :id, :type rescue nil
 
-    def sha
-      id
-    end
-
     def initialize(properties = {})
       @properties = properties
       @object = nil
@@ -42,7 +13,7 @@ module Gitrb
         @object.send(name, *args, &block)
       elsif name == :type && (mode = @properties['mode'] || @properties[:mode])
         mode = mode.to_i(8)
-        return (mode & 0x4000 == 0x4000) ? 'tree' : 'blob'
+        return (mode & 0x4000 == 0x4000) ? :tree : :blob
       elsif @properties.include?(name)
         return @properties[name]
       elsif @properties.include?(name.to_s)

data/lib/gitrb/repository.rb

@@ -1,33 +1,25 @@
-require 'zlib'
-require 'digest/sha1'
-require 'yaml'
-require 'fileutils'
-require 'logger'
-require 'enumerator'
-
-require 'gitrb/util'
-require 'gitrb/repository'
-require 'gitrb/object'
-require 'gitrb/blob'
-require 'gitrb/diff'
-require 'gitrb/tree'
-require 'gitrb/tag'
-require 'gitrb/user'
-require 'gitrb/pack'
-require 'gitrb/commit'
-require 'gitrb/trie'
-
 module Gitrb
   class NotFound < StandardError; end
 
-  class Repository
-    attr_reader :path, :index, :root, :branch, :lock_file, :head, :encoding
+  class CommandError < StandardError
+    attr_reader :command, :args, :output
+
+    def initialize(command, args, output)
+      super("#{command} failed")
+      @command = command
+      @args = args
+      @output = output
+    end
+  end
 
-    SHA_PATTERN = /[A-Fa-f0-9]{5,40}/
-    REVISION_PATTERN = /[\w\-\.]+([\^~](\d+)?)*/
+  class Repository
+    attr_reader :path, :root, :branch, :head, :encoding
 
-    # Encoding stuff
+    SHA_PATTERN = /^[A-Fa-f0-9]{5,40}$/
+    REVISION_PATTERN = /^[\w\-\.]+([\^~](\d+)?)*$/
     DEFAULT_ENCODING = 'utf-8'
+    MIN_GIT_VERSION = '1.6.0'
+    LOCK = 'Gitrb.Repository.lock'
 
     if RUBY_VERSION > '1.9'
       def set_encoding(s); s.force_encoding(@encoding); end
@@ -46,17 +38,8 @@ module Gitrb
       @path.chomp!('/')
       @path += '/.git' if !@bare
 
-      if options[:create] && !File.exists?("#{@path}/objects")
-        FileUtils.mkpath(@path) if !File.exists?(@path)
-        raise ArgumentError, "Not a valid Git repository: '#{@path}'" if !File.directory?(@path)
-        if @bare
-          Dir.chdir(@path) { git_init('--bare') }
-        else
-          Dir.chdir(@path[0..-6]) { git_init }
-        end
-      else
-        raise ArgumentError, "Not a valid Git repository: '#{@path}'" if !File.directory?("#{@path}/objects")
-      end
+      check_git_version if !options[:ignore_version]
+      open_repository(options[:create])
 
       load_packs
       load
@@ -75,7 +58,7 @@ module Gitrb
 
     # Has our repository been changed on disk?
     def changed?
-      head.nil? or head.id != read_head_id
+      head.nil? || head.id != read_head_id
     end
 
     # Load the repository, if it has been changed on disk.
@@ -85,17 +68,17 @@ module Gitrb
 
     # Is there any transaction going on?
     def in_transaction?
-      Thread.current['gitrb_repository_lock']
+      Thread.current[LOCK]
     end
 
     # Diff
     def diff(from, to, path = nil)
       if from && !(Commit === from)
-        raise ArgumentError if !(String === from)
+        raise ArgumentError, "Invalid sha: #{from}" if from !~ SHA_PATTERN
         from = Reference.new(:repository => self, :id => from)
       end
       if !(Commit === to)
-        raise ArgumentError if !(String === to)
+        raise ArgumentError, "Invalid sha: #{to}" if to !~ SHA_PATTERN
         to = Reference.new(:repository => self, :id => to)
       end
       Diff.new(from, to, git_diff_tree('--root', '-u', '--full-index', from && from.id, to.id, '--', path))
@@ -131,7 +114,7 @@ module Gitrb
 
       commit = Commit.new(:repository => self,
                           :tree => root,
-                          :parent => head,
+                          :parents => head,
                           :author => author,
                           :committer => committer,
                           :message => message)
@@ -145,17 +128,21 @@ module Gitrb
 
     # Returns a list of commits starting from head commit.
     def log(limit = 10, start = nil, path = nil)
-      ### FIX: tformat need --pretty option
-      args = ['--pretty=tformat:%H%n%P%n%T%n%an%n%ae%n%at%n%cn%n%ce%n%ct%n%x00%s%n%b%x00', "-#{limit}", ]
-      args << start if start
-      args << "--" << path if path && !path.empty?
+      limit = limit.to_s
+      start = start.to_s
+      raise ArgumentError, "Invalid limit: #{limit}" if limit !~ /^\d+$/
+      raise ArgumentError, "Invalid commit: #{start}" if start =~ /^\-/
+      args = ['--pretty=tformat:%H%n%P%n%T%n%an%n%ae%n%at%n%cn%n%ce%n%ct%n%x00%s%n%b%x00', "-#{limit}" ]
+      args << start if !start.empty?
+      args << '--' << path if path && !path.empty?
       log = git_log(*args).split(/\n*\x00\n*/)
       commits = []
       log.each_slice(2) do |data, message|
         data = data.split("\n")
+        parents = data[1].empty? ? nil : data[1].split(' ').map {|id| Reference.new(:repository => self, :id => id) }
         commits << Commit.new(:repository => self,
                               :id => data[0],
-                              :parent => data[1].empty? ? nil : Reference.new(:repository => self, :id => data[1]),
+                              :parents => parents,
                               :tree => Reference.new(:repository => self, :id => data[2]),
                               :author => User.new(data[3], data[4], Time.at(data[5].to_i)),
                               :committer => User.new(data[6], data[7], Time.at(data[8].to_i)),
@@ -171,15 +158,17 @@ module Gitrb
     #
     # Returns a tree, blob, commit or tag object.
     def get(id)
-      raise NotFound, "No id given" if id.nil?
+      raise ArgumentError, 'No id given' if !(String === id)
+
       if id =~ SHA_PATTERN
-        raise NotFound, "Sha too short" if id.length < 5
+        raise NotFound, "Sha too short: #{id}" if id.length < 5
         list = @objects.find(id).to_a
+        raise NotFound, "Sha is ambiguous: #{id}" if list.size > 1
         return list.first if list.size == 1
       elsif id =~ REVISION_PATTERN
         list = git_rev_parse(id).split("\n") rescue nil
-        raise NotFound, "Revision not found" if !list || list.empty?
-        raise NotFound, "Revision is ambiguous" if list.size > 1
+        raise NotFound, "Revision not found: #{id}" if !list || list.empty?
+        raise NotFound, "Revision is ambiguous: #{id}" if list.size > 1
         id = list.first
       end
 
@@ -188,7 +177,7 @@ module Gitrb
       path = object_path(id)
       if File.exists?(path) || (glob = Dir.glob(path + '*')).size >= 1
         if glob
-          raise NotFound, "Sha is ambiguous" if glob.size > 1
+          raise NotFound, "Sha is ambiguous: #{id}" if glob.size > 1
           path = glob.first
           id = path[-41..-40] + path[-38..-1]
         end
@@ -203,12 +192,12 @@ module Gitrb
         raise NotFound, "Bad object: #{id}" if content.length != size.to_i
       else
         trie = @packs.find(id)
-	raise NotFound, "Object not found" if !trie
+	raise NotFound, "Object not found: #{id}" if !trie
 
         id += trie.key[-(41 - id.length)...-1]
 
         list = trie.to_a
-	raise NotFound, "Sha is ambiguous" if list.size > 1
+	raise NotFound, "Sha is ambiguous: #{id}" if list.size > 1
 
         pack, offset = list.first
         content, type = pack.get_object(offset)
@@ -217,14 +206,14 @@ module Gitrb
       @logger.debug "gitrb: Loaded #{id}"
 
       set_encoding(id)
-      object = Gitrb::Object.factory(type, :repository => self, :id => id, :data => content)
+      object = GitObject.factory(type, :repository => self, :id => id, :data => content)
       @objects.insert(id, object)
       object
     end
 
-    def get_tree(id)   get_type(id, 'tree') end
-    def get_blob(id)   get_type(id, 'blob') end
-    def get_commit(id) get_type(id, 'commit') end
+    def get_tree(id)   get_type(id, :tree) end
+    def get_blob(id)   get_type(id, :blob) end
+    def get_commit(id) get_type(id, :commit) end
 
     # Write a raw object to the repository.
     #
@@ -258,22 +247,22 @@ module Gitrb
       cmd = name.to_s
       if cmd[0..3] == 'git_'
         ENV['GIT_DIR'] = path
-        args = args.flatten.compact.map {|s| "'" + s.to_s.gsub("'", "'\\\\''") + "'" }.join(' ')
         cmd = cmd[4..-1].tr('_', '-')
-        cmd = "git #{cmd} #{args} 2>&1"
+        args = args.flatten.compact.map {|s| "'" + s.to_s.gsub("'", "'\\\\''") + "'" }.join(' ')
+        cmdline = "git #{cmd} #{args} 2>&1"
 
-        @logger.debug "gitrb: #{cmd}"
+        @logger.debug "gitrb: #{cmdline}"
 
 	# Read in binary mode (ascii-8bit) and convert afterwards
         out = if block_given?
-		IO.popen(cmd, 'rb', &block)
+		IO.popen(cmdline, 'rb', &block)
 	      else
-                set_encoding IO.popen(cmd, 'rb') {|io| io.read }
+                set_encoding IO.popen(cmdline, 'rb') {|io| io.read }
               end
 
         if $?.exitstatus > 0
           return '' if $?.exitstatus == 1 && out == ''
-          raise RuntimeError, "#{cmd}: #{out}"
+          raise CommandError.new("git #{cmd}", args, out)
         end
 
         out
@@ -305,16 +294,42 @@ module Gitrb
       end
     end
 
-    protected
+    private
+
+    def check_git_version
+      version = git_version
+      raise "Invalid git version: #{version}" if version !~ /^git version ([\d\.]+)$/
+      a = $1.split('.').map {|s| s.to_i }
+      b = MIN_GIT_VERSION.split('.').map {|s| s.to_i }
+      while !a.empty? && !b.empty? && a.first == b.first
+        a.shift
+        b.shift
+      end
+      raise "Minimum required git version is #{MIN_GIT_VERSION}" if a.first.to_i < b.first.to_i
+    end
+
+    def open_repository(create)
+      if create && !File.exists?("#{@path}/objects")
+        FileUtils.mkpath(@path) if !File.exists?(@path)
+        raise ArgumentError, "Not a valid Git repository: '#{@path}'" if !File.directory?(@path)
+        if @bare
+          Dir.chdir(@path) { git_init '--bare' }
+        else
+          Dir.chdir(@path[0..-6]) { git_init }
+        end
+      else
+        raise ArgumentError, "Not a valid Git repository: '#{@path}'" if !File.directory?("#{@path}/objects")
+      end
+    end
 
     # Start a transaction.
     #
     # Tries to get lock on lock file, load the this repository if
     # has changed in the repository.
     def start_transaction
-      file = File.open("#{head_path}.lock", "w")
+      file = File.open("#{head_path}.lock", 'w')
       file.flock(File::LOCK_EX)
-      Thread.current['gitrb_repository_lock'] = file
+      Thread.current[LOCK] = file
       refresh
     end
 
@@ -331,8 +346,8 @@ module Gitrb
     #
     # Release the lock file.
     def finish_transaction
-      Thread.current['gitrb_repository_lock'].close rescue nil
-      Thread.current['gitrb_repository_lock'] = nil
+      Thread.current[LOCK].close rescue nil
+      Thread.current[LOCK] = nil
       File.unlink("#{head_path}.lock") rescue nil
     end
 
@@ -392,7 +407,7 @@ module Gitrb
       if File.exists?(head_path)
         File.read(head_path).strip
       elsif File.exists?("#{path}/packed-refs")
-        File.open("#{path}/packed-refs", "rb") do |io|
+        File.open("#{path}/packed-refs", 'rb') do |io|
           while line = io.gets
             line.strip!
             next if line[0..0] == '#'
@@ -404,7 +419,7 @@ module Gitrb
     end
 
     def write_head_id(id)
-      File.open(head_path, "wb") {|file| file.write(id) }
+      File.open(head_path, 'wb') {|file| file.write(id) }
     end
 
     def legacy_loose_object?(buf)

data/lib/gitrb/tag.rb

@@ -1,6 +1,6 @@
 module Gitrb
 
-  class Tag < Gitrb::Object
+  class Tag < GitObject
     attr_accessor :object, :tagtype, :tagger, :message
 
     def initialize(options = {})
@@ -9,7 +9,7 @@ module Gitrb
     end
 
     def ==(other)
-      Tag === other and id == other.id
+      Tag === other && id == other.id
     end
 
     def parse(data)

data/lib/gitrb/tree.rb

@@ -1,6 +1,6 @@
 module Gitrb
 
-  class Tree < Gitrb::Object
+  class Tree < GitObject
     include Enumerable
 
     attr_accessor :mode, :repository
@@ -15,7 +15,7 @@ module Gitrb
     end
 
     def type
-      'tree'
+      :tree
     end
 
     def ==(other)
@@ -30,7 +30,7 @@ module Gitrb
 
     # Has this tree been modified?
     def modified?
-      @modified || @children.values.any? { |entry| entry.type == 'tree' && entry.modified? }
+      @modified || @children.values.any? { |entry| entry.type == :tree && entry.modified? }
     end
 
     def dump
@@ -61,7 +61,7 @@ module Gitrb
       if path.size == 1
         entry
       elsif entry
-        raise RuntimeError, 'Not a tree' if entry.type != 'tree'
+        raise 'Not a tree' if entry.type != :tree
         entry[path[1..-1]]
       end
     end
@@ -70,9 +70,9 @@ module Gitrb
     def []=(path, entry)
       path = normalize_path(path)
       if path.empty?
-        raise RuntimeError, 'Empty path'
+        raise 'Empty path'
       elsif path.size == 1
-        raise RuntimeError, 'No blob or tree' if entry.type != 'tree' && entry.type != 'blob'
+        raise 'No blob or tree' if entry.type != :tree && entry.type != :blob
         entry.repository = repository
         @modified = true
         @children[path.first] = entry
@@ -82,7 +82,7 @@ module Gitrb
           tree = @children[path.first] = Tree.new(:repository => repository)
           @modified = true
         end
-        raise RuntimeError, 'Not a tree' if tree.type != 'tree'
+        raise 'Not a tree' if tree.type != :tree
         tree[path[1..-1]] = entry
       end
     end
@@ -91,13 +91,13 @@ module Gitrb
     def delete(path)
       path = normalize_path(path)
       if path.empty?
-        raise RuntimeError, 'Empty path'
+        raise 'Empty path'
       elsif path.size == 1
         @modified = true
         @children.delete(path.first)
       else
         tree = @children[path.first]
-        raise RuntimeError, 'Not a tree' if tree.type != 'tree'
+        raise 'Not a tree' if tree.type != :tree
         tree.delete(path[1..-1])
       end
     end

data/lib/gitrb/user.rb

@@ -1,14 +1,13 @@
 module Gitrb
 
-  class User
-    attr_accessor :name, :email, :date
-
+  class User < Struct.new(:name, :email, :date)
     def initialize(name, email, date = Time.now)
-      @name, @email, @date = name, email, date
+      super
     end
 
     def dump
-      "#{name} <#{email}> #{date.localtime.to_i} #{date.gmt_offset < 0 ? '-' : '+'}#{date.gmt_offset / 60}"
+      off = date.gmt_offset / 60
+      '%s <%s> %d %s%02d%02d' % [name, email, date.to_i, off < 0 ? '-' : '+', off / 60, off % 60]
     end
 
     def self.parse(user)

data/lib/gitrb.rb

@@ -1 +1,18 @@
+require 'zlib'
+require 'digest/sha1'
+require 'fileutils'
+require 'logger'
+require 'enumerator'
+
+require 'gitrb/util'
+require 'gitrb/gitobject'
+require 'gitrb/reference'
+require 'gitrb/blob'
+require 'gitrb/diff'
+require 'gitrb/tree'
+require 'gitrb/tag'
+require 'gitrb/user'
+require 'gitrb/pack'
+require 'gitrb/commit'
+require 'gitrb/trie'
 require 'gitrb/repository'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: gitrb
 version: !ruby/object:Gem::Version 
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors: 
 - Daniel Mendler
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-09 00:00:00 +01:00
+date: 2010-05-21 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -30,8 +30,9 @@ files:
 - lib/gitrb/blob.rb
 - lib/gitrb/commit.rb
 - lib/gitrb/diff.rb
-- lib/gitrb/object.rb
+- lib/gitrb/gitobject.rb
 - lib/gitrb/pack.rb
+- lib/gitrb/reference.rb
 - lib/gitrb/repository.rb
 - lib/gitrb/tag.rb
 - lib/gitrb/tree.rb