graal 0.0.1 → 0.0.2

data/README.md

@@ -1,4 +1,4 @@
-Graal
+Graal [![Build Status](https://travis-ci.org/aumgn/graal.png)](https://travis-ci.org/aumgn/graal.png)
 =============
 
 Simple, read-only (for now), abstraction layer to access git repository

data/lib/graal.rb

@@ -4,7 +4,11 @@ require 'graal/repository'
 
 module Graal
 
-   def self.Repository(repository_path)
-      Repository.new repository_path
+   class << self
+
+      def Repository(repository_path)
+         Repository.new repository_path
+      end
+      alias Repo Repository
    end
 end

data/lib/graal/actor.rb

@@ -0,0 +1,16 @@
+module Graal
+
+   class Actor
+
+      attr_reader :name, :email
+
+      def initialize(name, email)
+         @name = name
+         @email = email
+      end
+
+      def header_line
+         "#@name <#@email>"
+      end
+   end
+end

data/lib/graal/blob.rb

@@ -5,7 +5,7 @@ module Graal
    class Blob < TreeBlob
 
       def contents
-         @backend.blob_contents(hash)
+         @backend.blob_contents(gitid)
       end
    end
 end

data/lib/graal/commit.rb

@@ -1,5 +1,6 @@
 require 'graal/tree'
 require 'graal/blob'
+require 'graal/actor'
 
 module Graal
 
@@ -8,5 +9,39 @@ module Graal
       def initialize(backend, revision)
          super(backend, revision, '')
       end
+
+      def parent
+         Commit.new(@backend, info[0])
+      end
+
+      def author
+         @author ||= Actor.new(info[1], info[2])
+      end
+
+      def author_date
+         @author_date ||= Time.at(info[3].to_i)
+      end
+
+      def committer
+         @committer ||= Actor.new(info[4], info[5])
+      end
+
+      def committer_date
+         @committer_date ||= Time.at(info[6].to_i)
+      end
+
+      def subject
+         @subject ||= info[7]
+      end
+
+      def body
+         @body ||= info.length > 8 ? info[8] : ''
+      end
+
+   private
+
+      def info
+         @info ||= @backend.commit_info(@revision)
+      end
    end
 end

data/lib/graal/exe/backend.rb

@@ -5,3 +5,4 @@ module Graal::Backend
 end
 
 require_relative 'git'
+require_relative 'git_ruby'

data/lib/graal/exe/git.rb

@@ -4,6 +4,13 @@ module Graal::Backend::Exe
 
    class Git
 
+      COMMIT_SHOW_FORMAT = '--pretty=format:' + [
+         '%P',
+         '%an', '%ae', '%at',
+         '%cn', '%ce', '%ct',
+         '%s', '%-b'
+      ] * '%n'
+
       class Result
 
          attr_reader :exit_code, :output, :error
@@ -31,7 +38,7 @@ module Graal::Backend::Exe
 
       def run_with_pathspec(cmd, *args, pathspec)
          command_line = ['git', cmd, *args]
-         unless pathspec.nil?
+         unless pathspec.nil? or pathspec.empty?
             command_line << '--'
             command_line << pathspec
          end
@@ -48,7 +55,7 @@ module Graal::Backend::Exe
          result.output.split("\n")
       end
 
-      def hash_for(revision, path)
+      def gitid_for(revision, path)
          if path.empty?
             result = run('rev-parse', revision).output.chomp
          else
@@ -57,27 +64,47 @@ module Graal::Backend::Exe
          end
       end
 
-      def child(hash, fullpath)
-         result = run('ls-tree', hash, fullpath)
+      def commit_info(revision)
+         result = run('show', '--quiet', COMMIT_SHOW_FORMAT, revision)
+         ary = result.output.split("\n")
+         ary[8] = ary[8..-1] * "\n" if ary.size > 9
+         ary
+      end
+
+      def log(revision, path, raw_opts = {})
+         opts = parse_opts(raw_opts)
+         result = run_with_pathspec('rev-list', *opts, revision, path)
+         result.output.split("\n")
+      end
+
+      def child(gitid, fullpath)
+         result = run('ls-tree', gitid, fullpath)
          return result.output.split(" ")[1..2]
       end
 
-      def children(hash, path)
-         gitpath = path
-         gitpath += '/' unless path.empty?
-         result = run('ls-tree', hash, gitpath)
-         return result.output.split("\n").map do |line|
+      def children(gitid, path, filter = nil)
+         result = run('ls-tree', gitid, path)
+         children = []
+         result.output.split("\n").each do |line|
             splitted = line.split(" ")
-            [splitted[1], splitted[3], splitted[2]]
+            next unless filter.nil? or splitted[1] == filter
+            children << [splitted[1], splitted[3], splitted[2]]
          end
+         children
       end
 
-      def blob_contents(hash)
-         run('cat-file', '-p', hash).output
+      def blob_contents(gitid)
+         run('cat-file', '-p', gitid).output
       end
 
    private
 
+      def parse_opts(opts)
+         opts.each_with_object([]) do |opt, array|
+            array << '--' + (opt[1] == true ? opt[0] : opt * '=')
+         end
+      end
+
       def do_run(command_line)
          process = ChildProcess.build(*command_line)
          process.cwd = @repository

data/lib/graal/exe/git_ruby.rb

@@ -0,0 +1,41 @@
+module Graal::Backend::Exe
+
+   class Git
+
+      def heads
+         refs('heads')
+      end
+
+      def tags
+         refs('tags')
+      end
+
+   private
+
+      def git_directory
+         live = File.join(@repository, '.git')
+         return live if File.exists? live
+         return @repository
+      end
+
+      def refs(type)
+         refs = []
+         git_dir = git_directory
+
+         refs_dir = File.join(git_dir, 'refs', type)
+         if File.exists? refs_dir
+            Dir.chdir refs_dir do
+               Dir['*'].each { |ref| refs << ref if File.file?(ref) }
+            end
+         end
+
+         packed = File.join(git_dir, 'packed-refs')
+         if File.exists? packed
+            pattern  = %r{ refs/#{type}/(.+)$}
+            File.read(packed).scan(pattern).each { |m| refs << m.first }
+         end
+
+         refs
+      end
+   end
+end

data/lib/graal/log.rb

@@ -0,0 +1,60 @@
+module Graal
+
+   class Log < Enumerator
+
+      def initialize(backend, revision, path, opts = {})
+         super() do |yielder|
+            commits_id = @backend.log(revision, path, opts)
+            commits_id.each { |cid| yielder << Commit.new(@backend, cid) }
+         end
+
+         @backend = backend
+         @revision = revision
+         @path = path
+         @opts = opts
+      end
+
+      def number(n)
+         push_opt('max-count', n)
+      end
+      alias n         number
+      alias max_count number
+
+      def skip(n)
+         push_opt('skip', n)
+      end
+
+      def since(time)
+         push_opt('since', time_pattern_for(time))
+      end
+      alias after since
+
+      def until(time)
+         push_opt('until', time_pattern_for(time))
+      end
+      alias before until
+
+      def author(actor)
+         push_opt('author', actor_pattern_for(actor))
+      end
+
+      def committer(actor)
+         push_opt('committer', actor_pattern_for(actor))
+      end
+
+   private
+
+      def push_opt(name, value = true)
+         Log.new(@backend, @revision, @path, @opts.merge(name => value))
+      end
+
+      def time_pattern_for(time_or_pattern)
+         return time_or_pattern.to_i if time_or_pattern.is_a? Time
+      end
+
+      def actor_pattern_for(actor_or_pattern)
+         return actor_or_pattern.header_line if actor_or_pattern.is_a? Actor
+         actor_or_pattern
+      end
+   end
+end

data/lib/graal/tree.rb

@@ -8,49 +8,44 @@ module Graal
          fullpath = File.join(@path, child_path)
          fullpath[ 0] = '' if fullpath[ 0] == ?/
          fullpath[-1] = '' if fullpath[-1] == ?/
-         type, child_hash = @backend.child(hash, fullpath)
-         child_for(type, fullpath, child_hash)
+         type, child_gitid = @backend.child(gitid, fullpath)
+         child_for(type, fullpath, child_gitid)
       end
       alias [] child
       alias /  child
 
-      def children
-         return Enumerator.new(self, :children) unless block_given?
-         @backend.children(hash, @path).each { |data| yield child_for(*data) }
-         nil
+      def children(&block)
+         enum_children(:children, &block)
       end
       alias each_child children
       alias list       children
       alias ls         children
 
-      def trees
-         return Enumerator.new(self, :trees) unless block_given?
-         children = @backend.children(hash, @path).each do |data|
-            yield child_for(*data) if data[0] == 'tree'
-         end
-         nil
+      def trees(&block)
+         enum_children(:trees, 'tree', &block)
       end
       alias each_tree  trees
       alias list_trees trees
 
-      def blobs
-         return Enumerator.new(self, :blobs) unless block_given?
-         @backend.children(hash, @path).each do |data|
-            yield child_for(*data) if data[0] == 'blob'
-         end
-         nil
+      def blobs(&block)
+         enum_children(:blobs, 'blob', &block)
       end
       alias each_blob  blobs
       alias list_blobs blobs
 
    private
 
-      def child_for(type, fullpath, hash)
-         if type == 'tree'
-            Tree.new(@backend, @revision, fullpath, hash)
-         else
-            Blob.new(@backend, @revision, fullpath, hash)
-         end
+      def enum_children(method, filter = nil)
+         dirpath = @path.empty? ? path : path + '/'
+         @backend.children(gitid, dirpath, filter).each do |data|
+            yield child_for(*data)
+         end if block_given?
+         Enumerator.new(self, method)
+      end
+
+      def child_for(type, fullpath, gitid)
+         return Blob.new(@backend, @revision, fullpath, gitid) if type == 'blob'
+         Tree.new(@backend, @revision, fullpath, gitid)
       end
    end
 end

data/lib/graal/tree_blob.rb

@@ -1,18 +1,25 @@
+require 'graal/log'
+
 module Graal
 
    class TreeBlob
 
       attr_reader :revision, :path
 
-      def initialize(backend, revision, path, hash = nil)
+      def initialize(backend, revision, path, gitid = nil)
          @backend = backend
          @revision = revision || 'master'
          @path = path || ''
-         @hash = hash
+         @gitid = gitid
+      end
+
+      def gitid
+         @gitid ||= @backend.gitid_for(@revision, @path)
       end
+      alias git_hash gitid
 
-      def hash
-         @hash ||= @backend.hash_for(@revision, @path)
+      def abbrev(n = 8)
+         gitid[0...n]
       end
 
       def tree?
@@ -22,5 +29,16 @@ module Graal
       def blob?
          is_a? Blob
       end
+
+      def log
+         Log.new(@backend, @revision, @path)
+      end
+
+      def history(n = nil, skip = nil)
+         history = log
+         history = log.number(n)  unless n.nil?
+         history = log.skip(skip) unless skip.nil?
+         history.to_a
+      end
    end
 end

data/lib/graal/version.rb

@@ -1,4 +1,4 @@
 module Graal
 
-   VERSION = '0.0.1'
+   VERSION = '0.0.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: graal
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-26 00:00:00.000000000 Z
+date: 2012-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: childprocess
@@ -27,38 +27,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.3.6
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 10.0.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 10.0.2
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.9.10
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.9.10
 description: ! "      Simple, read-only (for now), abstraction layer to access git
   repository\n      aiming to support different platforms/backends.\n"
 email: contact@aumgn.fr
@@ -68,11 +36,14 @@ extra_rdoc_files: []
 files:
 - README.md
 - LICENSE
+- lib/graal/actor.rb
 - lib/graal/backend.rb
 - lib/graal/blob.rb
 - lib/graal/commit.rb
 - lib/graal/exe/backend.rb
 - lib/graal/exe/git.rb
+- lib/graal/exe/git_ruby.rb
+- lib/graal/log.rb
 - lib/graal/repository.rb
 - lib/graal/tree.rb
 - lib/graal/tree_blob.rb