git-ds 0.9.4.1 → 0.9.4.2

data/ChangeLog

@@ -4,3 +4,4 @@
 	*	Added Changelog to gemspec.
 	*	Removed initialize() method from Model and ModelItem modules
 	*	Fixed bug in Repo.top_level class method
+	*	Added code to account for broken Grit init

data/lib/git-ds/repo.rb

@@ -42,6 +42,12 @@ Note: StagingIndex is cached, as it is from the command line.
     # TODO: something more intelligent, e.g. with git/repo options
     def self.create(path)
       Grit::Repo.init(path)
+
+      # handle broken Grit init
+      if not File.exist?(path + GIT_DIR)
+        `git init #{path}`
+      end
+
       self.new(path)          # discard Grit::Repo object and use a Repo object
     end
 
@@ -164,7 +170,7 @@ branch for all repo activity and sets HEAD.
 Merge specified branch into master.
 =end
     def merge_branch( tag=@current_branch, actor=nil )
-      raise "Invalid branch '#{tag}'" if not (is_head? tag)
+      raise "Invalid branch '#{tag}'" if not is_head?(tag)
 
       tag.gsub!(/['\\]/, '')
 

data/tests/ut_repo.rb

@@ -108,8 +108,8 @@ class TC_GitRepoTest < Test::Unit::TestCase
     assert( @repo.staging?(), 'Repo#staging returned FALSE' )
 
     path, data = 'class c/instance a/prop b', 'XXXXXXXXXX'
-    @repo.stage { |idx|
-      idx.add( path, data )
+    @repo.stage { |index|
+      index.add( path, data )
     }
 
     assert_equal(data, @repo.object_data(path), 'Stage did not write data')
@@ -118,8 +118,8 @@ class TC_GitRepoTest < Test::Unit::TestCase
     assert( (not @repo.staging?), 'Repo#staging returned TRUE' )
 
     msg = 'this is a test'
-    @repo.stage_and_commit(msg) { |idx|
-      idx.add( path, data )
+    @repo.stage_and_commit(msg) { |index|
+      index.add( path, data )
     }
 
     # ensure this doesn't screw up repo

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-ds
 version: !ruby/object:Gem::Version
-  version: 0.9.4.1
+  version: 0.9.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grit
-  requirement: &18089080 !ruby/object:Gem::Requirement
+  requirement: &19441760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,7 +22,7 @@ dependencies:
         version: 2.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *18089080
+  version_requirements: *19441760
 description: A hierarchical datastore based on Git.
 email: community@thoughtgang.org
 executables: []