multi_git 0.0.1.alpha1 → 0.0.1.alpha2

data/lib/multi_git/directory.rb

@@ -23,6 +23,29 @@ module MultiGit
         e.with_parent(self) if e
       end
 
+      # @visibility private
+      def walk_pre(&block)
+        descend = block.call(self)
+        return if descend == false
+        each do |child|
+          child.walk(:pre, &block)
+        end
+      end
+
+      # @visibility private
+      def walk_post(&block)
+        each do |child|
+          child.walk(:post, &block)
+        end
+        block.call(self)
+      end
+
+      # @visibility private
+      def walk_leaves(&block)
+        each do |child|
+          child.walk(:leaves,&block)
+        end
+      end
     end
 
     class Builder < TreeEntry::Builder

data/lib/multi_git/error.rb

@@ -36,6 +36,10 @@ module MultiGit
     class BadRevisionSyntax < InvalidReference
     end
 
+    class InvalidReferenceName < ArgumentError
+      include Error
+    end
+
     class WrongTypeForMode < Exception
       include Error
 

data/lib/multi_git/git_backend/repository.rb

@@ -121,10 +121,46 @@ module MultiGit::GitBackend
       end
     end
 
+    # {include:MultiGit::Repository#ref}
+    # @param (see MultiGit::Repository#ref)
+    # @raise (see MultiGit::Repository#ref)
+    # @return (see MultiGit::Repository#ref)
     def ref(name)
+      validate_ref_name(name)
       MultiGit::GitBackend::Ref.new(self, name)
     end
 
+  private
+    TRUE_LAMBDA = proc{ true }
+  public 
+
+    def each_branch(filter = :all)
+      return to_enum(:each_branch, filter) unless block_given?
+      which = case filter
+              when :all, Regexp then [:a]
+              when :local       then []
+              when :remote      then [:r]
+              end
+      post_filter = TRUE_LAMBDA
+      if filter.kind_of? Regexp
+        post_filter = filter
+      end
+      @git['branch', *which].each_line do |line|
+        name = line[2..-2]
+        next unless post_filter === name
+        yield branch(name)
+      end
+      return self
+    end
+
+    def each_tag
+      return to_enum(:each_tag) unless block_given?
+      @git['tag'].each_line do |line|
+        yield tag(line.chomp)
+      end
+      return self
+    end
+
     # @visibility private
     MKTREE_FORMAT = "%06o %s %s\t%s\n"
 

data/lib/multi_git/jgit_backend/ref.rb

@@ -83,9 +83,16 @@ module MultiGit
         end
       end
 
+      # @visibility private
       def initialize(repository, name)
+        if name.kind_of? Java::OrgEclipseJgitLib::Ref
+          ref = name
+          name = ref.name
+        else
+          ref = repository.__backend__.getRef(name)
+        end
         super(repository, name)
-        @java_ref = repository.__backend__.getRef(name)
+        @java_ref = ref
       end
 
       def target

data/lib/multi_git/jgit_backend/repository.rb

@@ -26,6 +26,7 @@ module MultiGit::JGitBackend
     }
 
     REVERSE_OBJECT_TYPE_IDS = Hash[ OBJECT_TYPE_IDS.map{|k,v| [v,k]} ]
+
   public
 
     delegate "bare?" => "@git"
@@ -109,9 +110,46 @@ module MultiGit::JGitBackend
     # @raise (see MultiGit::Repository#ref)
     # @return (see MultiGit::Repository#ref)
     def ref(name)
+      validate_ref_name(name)
       Ref.new(self, name)
     end
 
+  private
+    ALL_FILTER = %r{\Arefs/(?:heads|remotes)}
+    LOCAL_FILTER = %r{\Arefs/heads}
+    REMOTE_FILTER = %r{\Arefs/remotes}
+  public
+
+    def each_branch(filter = :all)
+      return to_enum(:each_branch, filter) unless block_given?
+      prefix = case filter
+           when :all, Regexp then 'refs/'
+           when :local       then Java::OrgEclipseJgitLib::Constants::R_HEADS
+           when :remote      then Java::OrgEclipseJgitLib::Constants::R_REMOTES
+           end
+      refs = @git.ref_database.get_refs(prefix)
+      if filter.kind_of? Regexp
+        refs.each do |name, ref|
+          next unless filter === name[(name.index('/')+1)..-1]
+          yield Ref.new(self, ref)
+        end
+      else
+        refs.each do |name, ref|
+          yield Ref.new(self, ref)
+        end
+      end
+      return self
+    end
+
+    def each_tag
+      return to_enum(:each_branch, filter) unless block_given?
+      refs = @git.ref_database.get_refs('refs/tags')
+      refs.each do |name, ref|
+        yield Ref.new(self, ref)
+      end
+      return self
+    end
+
     # @visibility private
     # @api private
     def make_tree(entries)

data/lib/multi_git/ref.rb

@@ -77,6 +77,10 @@ module MultiGit
 
     protected
 
+      def ensure_dir!
+        FileUtils.mkdir_p(::File.dirname(file_path))
+      end
+
       def open_file(exists)
         mode = ::File::WRONLY | ::File::TRUNC
         if !exists
@@ -126,6 +130,7 @@ module MultiGit
 
       def initialize(*_)
         super
+        ensure_dir!
         @lock = acquire_lock
         # safe now
         @ref = @ref.reload
@@ -159,6 +164,7 @@ module MultiGit
     class OptimisticFileUpdater < FileUpdater
 
       def update(new)
+        ensure_dir!
         begin
           lock = acquire_lock
           if ::File.exists?(file_path)
@@ -188,7 +194,7 @@ module MultiGit
           end
           return nx
         ensure
-          release_lock( lock )
+          release_lock( lock ) if lock
         end
       end
 

data/lib/multi_git/repository.rb

@@ -84,12 +84,27 @@ public
   abstract :write
 
   # @!method ref(name)
-  #   Opens a reference.
+  #   Opens a reference. A reference is usually known as branch or tag.
+  #
+  #   @example
+  #     # setup:
+  #     dir = `mktemp -d`
+  #     # example:
+  #     repo = MultiGit.open(dir, init: true) #=> be_a MultiGit::Repository
+  #     master_branch = repo.ref('refs/heads/master')
+  #     head = repo.ref('HEAD')
+  #     # teardown:
+  #     `rm -rf #{dir}`
+  #
   #   @abstract
   #   @param [String] name
   #   @return [MultiGit::Ref] ref
   abstract :ref
 
+  # Opens a branch
+  #
+  # @param name [String] branch name
+  # @return [Ref]
   def branch(name)
     if name.include? '/'
       ref('refs/remotes/'+name)
@@ -98,10 +113,36 @@ public
     end
   end
 
+  # Opens a tag
+  #
+  # @param name [String] tag name
+  # @return [Ref]
   def tag(name)
     ref('refs/tags/'+name)
   end
 
+  # @method each_branch( filter = :all )
+  #   Yields either all, local or remote branches. If called 
+  #   with a regular expression it will be used to filter the 
+  #   branches by name.
+  #
+  #   @param filter [:all, :local, :remote, Regexp]
+  #   @yield branch
+  #   @yieldparam branch [Ref]
+  #   @return [Enumerable<Ref>] if called without block
+  #
+  abstract :each_branch
+
+
+  # @method each_tag
+  #   Yields all tags.
+  #
+  #   @yield tag
+  #   @yieldparam tag [Ref]
+  #   @return [Enumerable<Ref>] if called without block
+  #
+  abstract :each_tag
+
   # @!parse alias_method :[], :ref
   def [](name)
     ref(name)
@@ -183,6 +224,14 @@ protected
     end
   end
 
+  VALID_REF = %r{\Arefs/heads/\w+|refs/tags/\w+|refs/remotes/\w+/\w+|[A-Z0-9_]+}
+
+  def validate_ref_name(name)
+    unless VALID_REF =~ name
+      raise Error::InvalidReferenceName, name
+    end
+  end
+
   def validate_type(type)
     raise Error::InvalidObjectType, type.inspect unless VALID_TYPES.include?(type)
   end

data/lib/multi_git/rugged_backend/ref.rb

@@ -7,9 +7,16 @@ module MultiGit
 
       include MultiGit::Ref
 
+      # @api private
       def initialize(repository, name)
+        if name.kind_of? Rugged::Reference
+          ref = name
+          name = ref.name
+        else
+          ref = Rugged::Reference.lookup(repository.__backend__, name)
+        end
         super(repository, name)
-        @rugged_ref = Rugged::Reference.lookup(repository.__backend__, name)
+        @rugged_ref = ref
       end
 
       def target

data/lib/multi_git/rugged_backend/repository.rb

@@ -86,8 +86,13 @@ module MultiGit::RuggedBackend
       return OBJECT_CLASSES[object.type].new(self, oid, object)
     end
 
-    def ref(ref)
-      Ref.new(self, ref)
+    # {include:MultiGit::Repository#ref}
+    # @param (see MultiGit::Repository#ref)
+    # @raise (see MultiGit::Repository#ref)
+    # @return (see MultiGit::Repository#ref)
+    def ref(name)
+      validate_ref_name(name)
+      Ref.new(self, name)
     end
 
     # {include:MultiGit::Repository#parse}
@@ -110,6 +115,33 @@ module MultiGit::RuggedBackend
       @git.include?(oid)
     end
 
+    TRUE_LAMBDA = proc{ true }
+
+    def each_branch(filter = :all)
+      return to_enum(:each_branch, filter) unless block_given?
+      rugged_filter = nil
+      if filter == :local || filter == :remote
+        rugged_filter = filter
+      end
+      post_filter = TRUE_LAMBDA
+      if filter.kind_of? Regexp
+        post_filter = filter
+      end
+      Rugged::Branch.each(@git, rugged_filter) do |ref|
+        next unless post_filter === ref.name
+        yield Ref.new(self, ref)
+      end
+      return self
+    end
+
+    def each_tag
+      return to_enum(:each_branch, filter) unless block_given?
+      Rugged::Tag.each(@git) do |name|
+        yield tag(name)
+      end
+      return self
+    end
+
     # @api private
     # @visibility private
     def __backend__

data/lib/multi_git/tree/builder.rb

@@ -1,6 +1,9 @@
 require 'set'
 require 'multi_git/tree'
 require 'multi_git/builder'
+require 'multi_git/file'
+require 'multi_git/executeable'
+require 'multi_git/symlink'
 module MultiGit
   class Tree::Builder
 
@@ -75,6 +78,7 @@ module MultiGit
     module DSL
 
       def set(key, *args, &block)
+        options = {}
         case(args.size)
         when 0
           raise ArgumentError, "Expected a value or a block" unless block
@@ -98,7 +102,7 @@ module MultiGit
         if parts.any?{|p| p == ".." }
           raise MultiGit::Error::InvalidTraversal, "Traversal to parent directories is currently not supported while setting."
         end
-        return traverse_set( self, parts, value, true)
+        return traverse_set( self, parts, value, options.fetch(:create,true))
       end
 
       alias []= set
@@ -142,7 +146,11 @@ module MultiGit
           elsif create == :overwrite || ( entry.nil? && create )
             entry = MultiGit::Directory::Builder.new(current, part)
           else
-            raise MultiGit::Error::InvalidTraversal, "Can't traverse to #{path} from #{self.inspect}: #{current.inspect} doesn't contain an entry named #{part.inspect}" unless entry
+            if entry.nil?
+              raise MultiGit::Error::InvalidTraversal, "#{current.inspect} doesn't contain an entry named #{part.inspect}"
+            else
+              raise MultiGit::Error::InvalidTraversal, "#{current.inspect} does contain an entry named #{part.inspect} but it's not a directory. To overwrite files specify create: :overwrite."
+            end
           end
         end
         current.entry_set(part, traverse_set(entry, rest, value, create))

data/lib/multi_git/tree.rb

@@ -1,4 +1,5 @@
 require 'multi_git/object'
+require 'multi_git/walkable'
 require 'forwardable'
 module MultiGit
   module Tree
@@ -9,6 +10,7 @@ module MultiGit
     module Base
 
       include Enumerable
+      include Walkable
 
       def type
         :tree
@@ -92,6 +94,19 @@ module MultiGit
       alias / traverse
       alias [] traverse
 
+      def glob( pattern, flags = 0 )
+        return to_enum(:glob, pattern, flags) unless block_given?
+        l = path.size
+        flags |= ::File::FNM_PATHNAME
+        walk_pre do |object|
+          if ::File.fnmatch(pattern, object.path[l..-1], flags)
+            yield object
+            false
+          end
+        end
+        return self
+      end
+
       # @yield [MultiGit::TreeEntry]
       def each
         return to_enum unless block_given?
@@ -101,6 +116,27 @@ module MultiGit
         return self
       end
 
+      # @visibility private
+      def walk_pre(&block)
+        each do |child|
+          child.walk(:pre, &block)
+        end
+      end
+
+      # @visibility private
+      def walk_post(&block)
+        each do |child|
+          child.walk(:post, &block)
+        end
+      end
+
+      # @visibility private
+      def walk_leaves(&block)
+        each do |child|
+          child.walk(:leaves,&block)
+        end
+      end
+
       # @return [Integer] number of entries
       def size
         entries.size
@@ -125,6 +161,10 @@ module MultiGit
       ['#<',self.class.name,' ',oid,' repository:', repository.inspect,'>'].join
     end
 
+    def path
+      ''
+    end
+
   protected
     # @return [Hash<String, MultiGit::TreeEntry>]
     def entries

data/lib/multi_git/tree_entry.rb

@@ -1,6 +1,7 @@
 require 'multi_git/utils'
 require 'multi_git/object'
 require 'multi_git/builder'
+require 'multi_git/walkable'
 module MultiGit
 
   base = Class.new
@@ -8,16 +9,18 @@ module MultiGit
   # @!parse
   #    class TreeEntry < TreeEntry::Base
   #    end
-  class TreeEntry < base
-    Base = superclass
-  end
+  TreeEntry = Class.new(base)
 
   # A tree entry is like a {MultiGit::Object} or a {MultiGit::Builder} but it 
   # also has knows it's parent tree.
   class TreeEntry
 
+    Base = superclass
+
     class Base
 
+      include Walkable
+
       # @return [String]
       attr :name
       # @return [MultiGit::Tree::Base]
@@ -43,6 +46,16 @@ module MultiGit
         self.class.new(parent, name, @object)
       end
 
+      def path
+        @path ||= begin
+                    if parent && parent.path != ''
+                      [parent.path,SLASH, name].join
+                    else
+                      name
+                    end
+                  end
+      end
+
     end
 
     class Builder < Base
@@ -81,6 +94,11 @@ module MultiGit
       self.class::Builder.new(parent, name, object)
     end
 
+    def inspect
+      ['#<', self.class.name,' ',path,' ', oid, '>'].join
+    end
+
+
   end
 
 end

data/lib/multi_git/version.rb

@@ -1,3 +1,3 @@
 module MultiGit
-  VERSION = '0.0.1.alpha1'
+  VERSION = '0.0.1.alpha2'
 end

data/lib/multi_git/walkable.rb

@@ -0,0 +1,38 @@
+module MultiGit
+
+  module Walkable
+
+    # @visibility private
+    # @api private
+    MODES = [:pre, :post, :leaves]
+
+    # works like each, but recursive
+    #
+    # @param mode [:pre, :post, :leaves] 
+    def walk( mode = :pre, &block )
+      raise ArgumentError, "Unknown walk mode #{mode.inspect}. Use either :pre, :post or :leaves" unless MODES.include? mode
+      return to_enum(:walk, mode) unless block
+      case(mode)
+      when :pre   then walk_pre(&block)
+      when :post  then walk_post(&block)
+      when :leaves then walk_leaves(&block)
+      end
+    end
+
+  protected
+
+    def walk_pre
+      yield self
+    end
+
+    def walk_post
+      yield self
+    end
+
+    def walk_leaves
+      yield self
+    end
+
+  end
+  
+end

data/lib/multi_git.rb

@@ -13,6 +13,8 @@ private
   BACKENDS[:rugged, priority: 1] = RuggedBackend
   BACKENDS[  :jgit, priority: 2] = JGitBackend
 
+  SLASH = '/'.freeze
+
 public
 
   extend SingleForwardable

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: multi_git
 version: !ruby/object:Gem::Version
-  version: 0.0.1.alpha1
+  version: 0.0.1.alpha2
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-24 00:00:00.000000000 Z
+date: 2013-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -59,7 +59,7 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description: multi_git is aimed to be the best git interface for ruby
 email: hannes.georg@googlemail.com
 executables: []
 extensions: []
@@ -107,9 +107,10 @@ files:
 - lib/multi_git/tree_entry.rb
 - lib/multi_git/builder.rb
 - lib/multi_git/directory.rb
+- lib/multi_git/walkable.rb
 - lib/multi_git/tree/builder.rb
 - lib/multi_git.rb
-homepage: https://github.com/hannesg/ridley-git
+homepage: https://github.com/hannesg/multi_git
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -133,6 +134,6 @@ rubyforge_project:
 rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
-summary: Use all the gits
+summary: Use all the git
 test_files: []
 has_rdoc: