gash 0.1.2 → 0.1.3

data/CHANGELOG

@@ -1,3 +1,5 @@
+v0.1.3. Removed nasty eval. Switching to open4.
+
 v0.1.2. Working correctly on empty branches.
 
 v0.1.1. Tree got more Hash-methods. Better documentation.

data/Rakefile

@@ -7,6 +7,7 @@ Echoe.new('gash') do |p|
   p.email = "judofyr@gmail.com"
   p.summary = "Git + Hash"
   p.url = "http://dojo.rubyforge.org/gash/"
+  p.runtime_dependencies = ["open4 >= 0.9.6"]
   p.rdoc_options += ["--main", "Gash", "--title", "Gash"]
 end
 

data/gash.gemspec

@@ -1,20 +1,33 @@
 
-# Gem::Specification for Gash-0.1.2
+# Gem::Specification for Gash-0.1.3
 # Originally generated by Echoe
 
 --- !ruby/object:Gem::Specification 
 name: gash
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - Magnus Holm
 autorequire: 
 bindir: bin
 
-date: 2008-09-28 00:00:00 +02:00
+date: 2008-10-02 00:00:00 +02:00
 default_executable: 
 dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: open4
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 0.9.6
+    version: 
 - !ruby/object:Gem::Dependency 
   name: echoe
   type: :development

data/lib/gash.rb

@@ -1,4 +1,5 @@
 require 'delegate'
+require 'open4'
 
 # == What is Gash?
 #
@@ -7,7 +8,7 @@ require 'delegate'
 # * Gash only cares about the data, not the commits.
 # * Gash only cares about the _latest_ data.
 # * Gash can commit.
-# * Gash will automatically create branches if they don't exists.
+# * Gash will automatically create branches if they don't exist.
 # * Gash only loads what it needs, so it handles large repos well.
 # * Gash got {pretty good documentation}[http://dojo.rubyforge.org/gash].
 # * Gash got {a bug tracker}[http://dojo.lighthouseapp.com/projects/17529-gash].
@@ -327,12 +328,10 @@ class Gash < SimpleDelegator
   attr_accessor :branch, :repository
   
   # Opens the +repo+ with the specified +branch+.
-  #
-  # <b>Please note:</b> The +repo+ must link to the actual repo,
-  # not the working directory!
-  def initialize(repo = ".git", branch = "master")
+  def initialize(repo = ".", branch = "master")
     @branch = branch
-    @repository = File.expand_path(repo)
+    @repository = repo
+    @repository = find_repo(repo)
     __setobj__(Tree.new(:parent => self))
     update!
   end
@@ -355,9 +354,6 @@ class Gash < SimpleDelegator
       type = line[7]
       sha1 = line[12, 40]
       name = line[53..-1]
-      if name[0] == ?" && name[-1] == ?"
-        name = eval(name)
-      end
       name = name[/[^\/]+$/]
       parent = if $`.empty?
         self
@@ -386,18 +382,24 @@ class Gash < SimpleDelegator
   
   # Checks if the current branch exists
   def branch_exists?
-    git('rev-parse', @branch, '2>&1')
-    true
-  rescue Errors::Git
-    false
+    git_status('rev-parse', @branch) == 0
   end
   
   def inspect #:nodoc:
     __getobj__.inspect
   end
+  undef_method :dup
   
   private
   
+  def find_repo(dir)
+    Dir.chdir(dir) do
+      File.expand_path(git('rev-parse', '--git-dir', :git_dir => false))
+    end
+  rescue Errno::ENOENT, Gash::Errors::Git
+    raise Errors::NoGitRepo.new("No Git repository at: " + @repository)
+  end
+  
   def cat_file(blob)
     git('cat-file', 'blob', blob)
   end
@@ -405,18 +407,17 @@ class Gash < SimpleDelegator
   def to_tree!(from = self)
     input = []
     from.each do |key, value|
-      key = key.inspect
       if value.tree?
         value.sha1 ||= to_tree!(value)
         value.mode ||= "040000"
-        input << "#{value.mode} tree #{value.sha1}\t#{key}\n"
+        input << "#{value.mode} tree #{value.sha1}\t#{key}\0"
       else
         value.sha1 ||= git('hash-object', '-w', '--stdin', :input => value.to_s)
         value.mode ||= "100644" 
-        input << "#{value.mode} blob #{value.sha1}\t#{key}\n"
+        input << "#{value.mode} blob #{value.sha1}\t#{key}\0"
       end
     end
-    git('mktree', :input => input)
+    git('mktree', '-z', :input => input)
   end
   
   def update_head(new_head)
@@ -435,13 +436,13 @@ class Gash < SimpleDelegator
   end
   
   def git_tree(&blk)
-    git('ls-tree', '-r', '-t', @branch, '2>&1').each_line(&blk)
+    git('ls-tree', '-r', '-t', '-z', @branch).split("\0").each(&blk)
   rescue Errors::Git
     ""
   end
   
   def git_tree_sha1(from = @branch)
-    git('rev-parse', @branch + '^{tree}', '2>&1')
+    git('rev-parse', @branch + '^{tree}')
   rescue Errors::Git
   end
   
@@ -469,14 +470,10 @@ class Gash < SimpleDelegator
   # ==== Returns
   # String:: if you didn't supply a block, the things git said on STDOUT, otherwise noting
   def git(cmd, *rest, &block)
-    result, status = run_git(cmd, *rest, &block)
+    result, reserr, status = run_git(cmd, *rest, &block)
 
     if status != 0
-      if result =~ /Not a git repository/
-        raise Errors::NoGitRepo.new("No Git repository at: " + @repository)
-      else
-        raise Errors::Git.new("Error: #{cmd} returned #{status}. Result: #{result}")
-      end
+      raise Errors::Git.new("Error: #{cmd} returned #{status}. STDERR: #{reserr}")
     end
     result
   end
@@ -492,7 +489,7 @@ class Gash < SimpleDelegator
   # ==== Returns
   # Integer:: the return status of git
   def git_status(cmd, *rest, &block)
-    run_git(cmd, *rest, &block)[1]
+    run_git(cmd, *rest, &block)[2]
   end
 
   # passes the command over to git (you should not call this directly)
@@ -504,44 +501,53 @@ class Gash < SimpleDelegator
   #
   # ==== Options
   # :strip<Boolean>:: true to strip the output String#strip, false not to to it
+  # :git_dir<Boolean>:: true to automatically use @repository as git-dir, false to not use anything.
   #
   # ==== Raises
   # Errors::Git:: if git returns non-null, an Exception is raised
   #
   # ==== Returns
-  # Array[String, Integer]:: the first item is the STDOUT of git, the second is the return-status
+  # Array[String, String, Integer]:: the first item is the STDOUT of git, the second is the STDERR, the third is the return-status
   def run_git(cmd, *args, &block)
     options = if args.last.kind_of?(Hash)
       args.pop
     else
       {}
     end
-
     options[:strip] = true unless options.key?(:strip)
+    
+    git_cmd = ["git"]
+    
+    unless options[:git_dir] == false
+      git_cmd.push("--git-dir", @repository)
+    end
 
-    ENV["GIT_DIR"] = @repository
-    cmd = "git #{cmd} #{args.join(' ')}"
-
+    git_cmd.push(cmd, *args)
+    
     result = ""
-    IO.popen(cmd, "w+") do |f|
+    reserr = ""
+    status = Open4.popen4(*git_cmd) do |pid, stdin, stdout, stderr|
       if input = options.delete(:input)
-        f.write(input)
-        f.close_write
+        stdin.write(input)
       elsif block_given?
-        yield f
-        f.close_write
+        yield stdin
       end
+      stdin.close_write
 
       result = ""
+      reserr = ""
 
-      while !f.eof
-        result << f.read
+      while !stdout.eof
+        result << stdout.read
+      end
+      
+      while !stderr.eof
+        reserr << stderr.read
       end
     end
-    status = $?
 
     result.strip! if options[:strip] == true
-
-    [result, status]
+    
+    [result, reserr, status]
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: gash
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - Magnus Holm
@@ -9,9 +9,22 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-28 00:00:00 +02:00
+date: 2008-10-02 00:00:00 +02:00
 default_executable: 
 dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: open4
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 0.9.6
+    version: 
 - !ruby/object:Gem::Dependency 
   name: echoe
   type: :development