Merge pull request #734 from repotag/no_grit

No grit

bin/gollum

@@ -146,7 +146,7 @@ if options['irb']
   begin
     require 'gollum-lib'
     wiki = Gollum::Wiki.new(gollum_path, wiki_options)
-    if !wiki.exist? then raise Grit::InvalidGitRepositoryError end
+    if !wiki.exist? then raise Gollum::InvalidGitRepositoryError end
     puts "Loaded Gollum wiki at #{File.expand_path(gollum_path).inspect}."
     puts
     puts %(    page = wiki.page('page-name'))
@@ -160,7 +160,7 @@ if options['irb']
     puts
     puts "Check out the Gollum README for more."
     IRB.start_session(binding)
-  rescue Grit::InvalidGitRepositoryError, Grit::NoSuchPathError
+  rescue Gollum::InvalidGitRepositoryError, Gollum::NoSuchPathError
     puts "Invalid Gollum wiki at #{File.expand_path(gollum_path).inspect}"
     exit 0
   end

lib/gollum.rb

@@ -5,7 +5,6 @@ require 'digest/sha1'
 require 'ostruct'
 
 # external
-require 'grit'
 require 'github/markup'
 require 'sanitize'
 

lib/gollum/app.rb

@@ -14,8 +14,8 @@ require 'gollum/views/has_page'
 require File.expand_path '../helpers', __FILE__
 
 #required to upload bigger binary files
-Grit::Git.git_timeout = 120 # timeout in secs
+Gollum::set_git_timeout(120)
-Grit::Git.git_max_size = 190 * 10**6 # size in bytes (10^6=1 MB)
+Gollum::set_git_max_filesize(190 * 10**6)
 
 # Fix to_url
 class String

templates/helper_wiki.rb

@@ -1,7 +1,8 @@
 class WikiFactory
   def self.create p
-    path = testpath "examples/test.git"
+    examples = testpath "examples"
-    Grit::Repo.init_bare(@path)
+    path = File.join(examples, "test.git")
+    FileUtils.cp_r File.join(examples, "empty.git"), path, :remove_destination => true
     Gollum::Wiki.default_options = {:universal_toc => false}
     cleanup = Proc.new { FileUtils.rm_r File.join(File.dirname(__FILE__), *%w[examples test.git]) }
     Gollum::Wiki.new(@path), @path, cleanup

test/test_page_view.rb

@@ -4,9 +4,9 @@ require File.expand_path '../../lib/gollum/views/page', __FILE__
 
 context "Precious::Views::Page" do
   setup do
-    @path = testpath("examples/test.git")
+    examples = testpath "examples"
-    FileUtils.rm_rf(@path)
+    @path = File.join(examples, "test.git")
-    @repo = Grit::Repo.init_bare(@path)
+    FileUtils.cp_r File.join(examples, "empty.git"), @path, :remove_destination => true
     @wiki = Gollum::Wiki.new(@path)
   end