git-ds 0.9.5.2 → 0.9.6

data/ChangeLog

@@ -1,3 +1,9 @@
+2011-05-20 :	mkfs <mkfs@thoughtgang.org>
+	*	Fixed default-commmit bug in Database and Repo classes.
+
+2011-04-19 :	mkfs <mkfs@thoughtgang.org>
+	*	Added proxy_property alias for ModelItem.link_property
+
 2011-04-18 :	mkfs <mkfs@thoughtgang.org>
 	*	Bumped gem version to 0.9.5
 	*	Added ModelItem.exist? class member

data/lib/git-ds/database.rb

@@ -97,10 +97,10 @@ NOTE: This does not create a commit! Ony the staging index changes.
     def close(save=true)
       raise InvalidDbError if @stale
 
-      if save && self.staging?
+      if save && staging?
         self.staging.write
       end
-      self.staging = nil
+      unstage
       @stale = true
 
       # TODO: remove all locks etc
@@ -160,7 +160,7 @@ See ExecCmd.
         exec_in_staging(false, &block)
         self.staging.write
       ensure
-        self.staging = nil
+        self.unstage
       end
 
     end
@@ -179,7 +179,7 @@ See Transaction.
         self.staging
         transaction_in_staging(false, &block)
       ensure
-        self.staging = nil
+        self.unstage
       end
     end
 
@@ -234,7 +234,7 @@ Wrapper for Grit::Repo#tree that checks if Database has been closed.
 Generate a tag object for the most recent commit.
 =end
     def mark(msg)
-      tag_object(msg, commits.first.id)
+      tag_object(msg, commits.last.id)
     end
 
 =begin rdoc
@@ -247,21 +247,22 @@ See Database#transaction .
     def branch_and_merge(name=next_branch_tag(), actor=nil, &block)
       raise InvalidDbError if @stale
 
+      # Force a commit before the merge
+      # TODO: determine if this is really necessary
+      staging.sync
+      staging.commit('auto-commit before branch-and-merge', self.actor)
+
+      # ensure staging index is nil [in case branch name was re-used]
+      unstage
 
       # save old actor
       old_actor = self.actor
       self.actor = actor if actor
 
-      # save old staging
-      saved_stage = (self.staging?) ? self.staging : nil
-
-      sha = commits.first ? commits.first.id : nil
+      sha = commits.last ? commits.last.id : nil
       tag = create_branch(name, sha)
       set_branch(tag, self.actor)
 
-      # ensure staging index is nil [in case branch name was re-used]
-      unstage
-
       # execute block in a transaction
       rv = true
       begin

data/lib/git-ds/index.rb

@@ -155,6 +155,7 @@ Index object for the Git staging index.
         @parent_commit = @repo.commit(sha)
         # read tree back into index
         read_tree(@parent_commit.tree.id)
+        sync
       end
       sha
     end

data/lib/git-ds/model/item.rb

@@ -109,7 +109,7 @@ List all children of the ModelItem class inside parent_path.
     end
 
 =begin rdoc
-Generate an ident from a Hash of arguments.
+Generate an ident (String) from a Hash of arguments.
 
 To be overridden by a modelitem class.
 =end
@@ -270,6 +270,7 @@ ModelItems, use a ModelItem List of ProxyModelItemClass objects.
       add_property ProxyProperty.new(name, cls, false, &block)
     end
       
+    alias :proxy_property :link_property
 
 =begin rdoc
 Hash of properties associated with this MOdelItem class.
@@ -307,7 +308,7 @@ The GitDS::Model that contains the object.
     def initialize_item(model, path)
       @model = model
       @path = path
-      @ident = ::File.basename(path)
+      @ident = File.basename(path)
     end
 
 =begin rdoc

data/lib/git-ds/repo.rb

@@ -134,7 +134,7 @@ The canonical name of the tag is returned.
 =end
     def create_branch( tag=next_branch_tag(), sha=nil )
       if not sha
-        sha = commits.first.id
+        sha = commits.last.id
         #sha = branches.first.commit.id if not sha
       end
       name = clean_tag(tag)
@@ -147,20 +147,20 @@ Sets the current branch to the specified tag. This changes the default
 branch for all repo activity and sets HEAD.
 =end
     def set_branch( tag, actor=nil )
-      # allow creating of new branches
+      # allow creating of new branches via -b if they do not exist
       opt = (is_head? tag) ? '' : '-b'
 
       # Save staging index for current branch
-      @saved_stages[@current_branch] = self.staging if self.staging?
+      @saved_stages[@current_branch] = self.staging if staging?
 
       exec_git_cmd( "git checkout -q -m #{opt} '#{tag}'", actor )
 
       # Synchronize staging index (required before merge)
       unstage
-      self.staging.sync
 
       # Update current_branch info and restore staging for branch
       self.staging = @saved_stages[tag]
+      self.staging.sync if staging?
       @current_branch = tag
     end
 
@@ -210,7 +210,7 @@ Return the staging index for the repo.
 =end
     def staging
       # TODO: mutex
-      @staging_index ||= StageIndex.new(self)
+      @staging_index ||= StageIndex.read(self)
     end
 
 =begin rdoc
@@ -227,7 +227,7 @@ Close staging index.
 This discards all (non-committed) changes in the staging index.
 =end
     def unstage
-      self.staging=(nil)
+      self.staging=(nil)    # yes, the self is required. not sure why.
     end
 
 =begin rdoc
@@ -261,7 +261,7 @@ Returns SHA of commit.
 =end
     def stage_and_commit(msg, actor=nil, &block)
       stage(&block)
-      sha = self.staging.commit(msg, actor)
+      sha = staging.commit(msg, actor)
       unstage
       sha
     end
@@ -401,7 +401,7 @@ Uses the staging index if it is active.
         return @staging_index.sha
       end
 
-      (self.commits.count > 0) ? self.commits.first.tree.id : nil
+      (self.commits.count > 0) ? self.commits.last.tree.id : nil
     end
 
 =begin rdoc

data/tests/ut_database.rb

@@ -279,6 +279,8 @@ class TC_GitDatabaseTest < Test::Unit::TestCase
     blob = index.current_tree./(name2)
     assert_not_nil(blob, "nested db.exec did not create '#{name2}' in staging")
     assert_equal(data2, blob.data, "BLOB data for '#{name2}' does not match")
+
+    @db.staging = nil
   end
 
   def test_branch

data/tests/ut_model.rb

@@ -342,8 +342,24 @@ class TC_GitModelTest < Test::Unit::TestCase
     }
   end
 
+  def model_save(tag, &block)
+      opts = { :name => tag, :msg => tag }
+
+      if block_given?
+        tag = @model.db.clean_tag(tag)
+        @model.branched_transaction(tag, &block)
+        # @model.branch = tag  # set current branch to tag
+        @model.db.merge_branch(tag)
+      end
+
+      sha = @model.db.staging.commit(opts[:msg])
+      @model.db.tag_object(opts[:name], sha)
+      @model.db.unstage
+  end
+
   def test_branch
     num = @model.db.heads.count
+    @model.db.staging = nil
     @model.branched_transaction {
       index.add('tmp/1', '1')
     }
@@ -358,6 +374,22 @@ class TC_GitModelTest < Test::Unit::TestCase
     assert_equal(1, 
           @model.db.heads.select{|h| h.name == @model.db.clean_tag(name)}.count,
           'Named BranchTransaction not present.')
+
+    # Model#save test
+    index = @model.db.staging
+    index.add('.stuff/canary', 'abcdef', false)
+    index.commit('done')
+    @model.db.unstage
+
+    model = @model
+    model_save('v1') do |opts|
+      model.db.stage.add('tmp/save_1', '1', true)
+    end
+
+    model_save('v2') do |opts|
+      model.db.stage.add('tmp/save_2', '2', true)
+    end
+
   end
 
 end

data/tests/ut_user_group_model.rb

@@ -307,7 +307,7 @@ class TC_GitUserGroupModelTest < Test::Unit::TestCase
     user_defs.each { |u| u[:obj].delete }
 
     g.delete
-    assert( (not @model.exist? path) )
+    assert( (not @model.exist? path), 'path not deleted!' )
     assert_equal(0, GroupModelItem.list(@model.root).count, '>0 Groups exist')
 
     assert_raises(GitDS::InvalidModelItemError, 'Deleted item still usable') {

metadata

@@ -1,33 +1,46 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: git-ds
-version: !ruby/object:Gem::Version
-  version: 0.9.5.2
+version: !ruby/object:Gem::Version 
+  hash: 55
   prerelease: 
+  segments: 
+  - 0
+  - 9
+  - 6
+  version: 0.9.6
 platform: ruby
-authors:
+authors: 
 - TG Community
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-04-18 00:00:00.000000000 -04:00
+
+date: 2011-05-20 00:00:00 -04:00
 default_executable: 
-dependencies:
-- !ruby/object:Gem::Dependency
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: grit
-  requirement: &20831860 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 2
+        - 2
+        - 0
         version: 2.2.0
   type: :runtime
-  prerelease: false
-  version_requirements: *20831860
+  version_requirements: *id001
 description: A hierarchical datastore based on Git.
 email: community@thoughtgang.org
 executables: []
+
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - doc/Examples.rdoc
 - doc/examples/key_value/kv_get.rb
 - doc/examples/key_value/kv_list.rb
@@ -56,7 +69,7 @@ extra_rdoc_files:
 - doc/examples/test_suite/ts_add_bug.rb
 - doc/examples/test_suite/ts_add_module_to_test.rb
 - README.rdoc
-files:
+files: 
 - lib/git-ds.rb
 - lib/git-ds/model.rb
 - lib/git-ds/exec_cmd.rb
@@ -112,31 +125,41 @@ files:
 - README.rdoc
 has_rdoc: true
 homepage: http://www.thoughtgang.org
-licenses:
+licenses: 
 - GPLv3
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 57
+      segments: 
+      - 1
+      - 8
+      - 7
       version: 1.8.7
-required_rubygems_version: !ruby/object:Gem::Requirement
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: git-db
-rubygems_version: 1.6.2
+rubygems_version: 1.4.1
 signing_key: 
 specification_version: 3
 summary: Git-DS
-test_files:
+test_files: 
 - tests/ut_git_grit_equiv.rb
 - tests/ut_user_group_model.rb
 - tests/ut_model.rb