git-ds 0.9.4.3 → 0.9.4.4

data/ChangeLog

@@ -1,3 +1,9 @@
+2011-04-15 :	mkfs <mkfs@thoughtgang.org>
+	*	Removed newline from Repo.top_level
+	*	Added exception handling to exec_in_git 
+	*	Added Database#valid? method
+	*	Forced an unstage() call in Repo#stage_and_commit
+
 2011-04-14 :	mkfs <mkfs@thoughtgang.org>
 	*	Fixed broken dependency on Grit.
 

data/lib/git-ds/database.rb

@@ -48,14 +48,16 @@ Return a connection to the Git DB.
 Creates the DB if it does not already exist.
 =end
     def initialize(path, username=nil, email=nil)
+      @stale = true         # DB is always stale until it is initialized
+
       init = false
       if not File.exist? path
         Repo.create(path)
         init = true
       end
 
-      @stale = false
       super(path)
+      @stale = false        # DB is connected!
 
       if init
         # initial commit is needed for branches to work smoothly
@@ -65,6 +67,7 @@ Creates the DB if it does not already exist.
       end
 
       @actor = Grit::Actor.new(username, email) if username
+
     end
 
 =begin rdoc
@@ -103,6 +106,15 @@ NOTE: This does not create a commit! Ony the staging index changes.
       # TODO: remove all locks etc
     end
 
+=begin rdoc
+Return true if the database is valid (i.e. open)
+=end
+    def valid?
+      @stale == false
+    end
+
+    alias :connected? :valid?
+
 =begin rdoc
 Delete Database (including entire repository) from disk.
 =end

data/lib/git-ds/index.rb

@@ -151,7 +151,9 @@ Index object for the Git staging index.
       #sha = super(msg, parents, author, last_tree, @repo.current_branch)
       sha = super(msg, parents, author, nil, @repo.current_branch)
       if sha
+        # set index parent_commit to the new commit
         @parent_commit = @repo.commit(sha)
+        # read tree back into index
         read_tree(@parent_commit.tree.id)
       end
       sha

data/lib/git-ds/repo.rb

@@ -64,7 +64,7 @@ Return the top-level directory of the repo containing the location 'path'.
         Dir.chdir dest
       end
 
-      dir = `git rev-parse --show-toplevel`
+      dir = `git rev-parse --show-toplevel`.chomp
       Dir.chdir old_dir if old_dir
 
       (dir == '.git') ? '.' : dir.chomp(GIT_DIR) 
@@ -262,6 +262,7 @@ Returns SHA of commit.
     def stage_and_commit(msg, actor=nil, &block)
       stage(&block)
       self.staging.commit(msg, actor)
+      unstage
     end
 
 # ----------------------------------------------------------------------
@@ -270,9 +271,15 @@ Change to the Repo#top_level dir, yield to block, then pop the dir stack.
 =end
     def exec_in_git_dir(&block)
       curr = Dir.getwd
-      Dir.chdir top_level
-      result = yield
-      Dir.chdir curr
+      result = nil
+      begin
+        Dir.chdir top_level
+        result = yield
+      rescue
+        raise
+      ensure
+        Dir.chdir curr
+      end
       result
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-ds
 version: !ruby/object:Gem::Version
-  version: 0.9.4.3
+  version: 0.9.4.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-04-14 00:00:00.000000000 -04:00
+date: 2011-04-15 00:00:00.000000000 -04:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grit
-  requirement: &9278380 !ruby/object:Gem::Requirement
+  requirement: &13294020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,7 +22,7 @@ dependencies:
         version: 2.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *9278380
+  version_requirements: *13294020
 description: A hierarchical datastore based on Git.
 email: community@thoughtgang.org
 executables: []