git-ds 0.9.8.1 → 0.9.8.3

data/ChangeLog

@@ -1,3 +1,11 @@
+2011-08-03 :	mkfs <mkfs@thoughtgang.org>
+	*	Repo#path_to_object now searches Index if appropriate
+	*	Index now has include? and path_to_object methods
+
+2011-08-01 :	mkfs <mkfs@thoughtgang.org>
+	*	Added Index#force_sync method
+	*	StageMemIndex#sync is now a no-op
+
 2011-07-30 :	mkfs <mkfs@thoughtgang.org>
 	*	Model#batch is now a wrapper for Database#batch
 	*	Transaction#perform now executes in batch mode

data/lib/git-ds/database.rb

@@ -374,7 +374,7 @@ NOTE: branch-and-merge will fail if in batch mode (TODO: FIX).
       end
 
       # write in-mem staging index to git-staging-index
-      self.staging.sync
+      self.staging.force_sync
 
       # read git-staging-index if appropriate
       unstage

data/lib/git-ds/index.rb

@@ -91,6 +91,30 @@ filesystem.
       }
     end
 
+=begin rdoc
+Return true if index includes path.
+=end
+    def include?(path)
+      path_to_object(path) ? true : false
+    end
+
+=begin rdoc
+Return the data for the object at 'path'. This is required in order for
+in-memory indexes to work properly.
+=end
+    def path_to_object(path)
+      # Note: this algorithm is re-implemented from Grit::Index#add
+      arr = path.split('/')
+      fname = arr.pop
+      curr = self.tree
+      arr.each do |dir|
+        curr = curr[dir] if curr
+      end
+
+      #TODO: it would be nice to return a Grit::Blob or Grit::Tree here.
+      (curr && fname && curr[fname]) ? curr[fname] : nil
+    end
+
     private
 
 =begin rdoc
@@ -191,6 +215,8 @@ the index contents.
       @repo.exec_in_git_dir { `git read-tree #{@sha}` }
     end
 
+    alias :force_sync :sync
+
 =begin rdoc
 Read staging index from disk and create a StagingIndex object for it.
 
@@ -224,9 +250,15 @@ in-memory index with the on-disk index.
     end
 
 =begin rdoc
-Override StageIndex#sync to not rely on StageIndex#build.
+Replace standard sync with a no-op.
 =end
     def sync
+    end
+
+=begin rdoc
+Force a sync-to-disk. This is used by batch mode to ensure a sync.
+=end
+    def force_sync
       self.read_tree(self.write)
       @repo.exec_in_git_dir { `git read-tree #{@sha}` }
     end

data/lib/git-ds/repo.rb

@@ -339,10 +339,12 @@ Remove an object from the database. This can be a path to a Tree or a Blob.
 =begin rdoc
 Fetch the contents of a DB or FS object from the object database. This uses
 the staging index.
+Note: This returns nil if path is a Tree instead of a blob
 =end
     def object_data(path)
       blob = path_to_object(path)
-      (blob && blob.kind_of?(Grit::Blob)) ? blob.data : nil
+      return nil if (not blob) || (blob.kind_of? Grit::Tree)
+      blob.kind_of?(Grit::Blob) ? blob.data : blob
     end
 
 # ----------------------------------------------------------------------
@@ -455,14 +457,17 @@ Fetch an object from the repo based on its path.
 If a staging index exists, its tree will be used; otherwise, the tree
 Repo#current_branch will be used.
 
-The object returned will be a Grit::Blob, a Grit::Tree, or nil.
+The object returned will be a Grit::Blob, a Grit::Tree, or the raw data from
+the staging index.
 =end
     def path_to_object(path)
       treeish = (@staging_index ? staging.sha : @current_branch)
       tree = self.tree(treeish, [path])
       return tree.blobs.first if tree && (not tree.blobs.empty?)
       return tree.trees.first if tree && (not tree.trees.empty?)
-      nil
+
+      # check staging index in case object has not been written to object DB
+      staging? ? staging.path_to_object(path) : nil
     end
 
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: git-ds
 version: !ruby/object:Gem::Version 
-  hash: 37
+  hash: 33
   prerelease: 
   segments: 
   - 0
   - 9
   - 8
-  - 1
-  version: 0.9.8.1
+  - 3
+  version: 0.9.8.3
 platform: ruby
 authors: 
 - TG Community
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-31 00:00:00 -04:00
+date: 2011-08-03 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -72,7 +72,6 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - lib/git-ds.rb
-- lib/git-ds/t.rb
 - lib/git-ds/repo.rb
 - lib/git-ds/config.rb
 - lib/git-ds/transaction.rb

data/lib/git-ds/t.rb

@@ -1,44 +0,0 @@
-=begin rdoc
-Subcribers that are notified when the model is changed. This is a Hash of
-an ident (e.g. a classname, UUID, or symbol) to a 2-element array:
-a callback method  and an (optional) object to pass with that method.
-=end
-    attr_reader :subscribers
-
-      @subscribers = {}
-=begin rdoc
-Subscribe to change notifications from the model. The provided callback will
-be invoked whenever the model is modified (specifically, when an outer
-Transaction or ExecCmd is completed).
-
-A subscriber can use either block or argument syntax:
-
-  def func_cb(arg)
-    ...
-  end
-  model.subscribe( self.ident, arg, func_cb )
-
-  # block callback
-  model.subscribe( self.ident ) { ... }
-
-  # block callback where arg is specified in advance
-  model.subscribe( self.ident, arg ) { |arg| ... }
-=end
-    def subscribe(ident, obj=nil, func=nil, &block)
-      cb = (block_given?) ? block : func
-      @subscribers[ident] = [cb, obj]
-    end
-
-=begin rdoc
-Notify all subscribers that a change has occurred.
-=end
-    def notify
-      @subscribers.each { |ident, (block,obj)} block.call(obj) }
-    end
-
-=begin rdoc
-Unsubscribe from change notification.
-=end
-    def unsubscribe(ident)
-      @subscribers.delete(ident)
-    end