Supporting git init with --bare

robertodecurnex · robertodecurnex · commit 77707c2a74eb · 2013-08-16T16:47:42.000-03:00
Closes ruby-git#45
diff --git a/lib/git/base.rb b/lib/git/base.rb
@@ -16,19 +16,23 @@ def self.open(working_dir, opts={})
     # initializes a git repository
     #
     # options:
+    #  :bare
+    #  :index
     #  :repository
-    #  :index_file
     #
     def self.init(working_dir, opts = {})
-      opts = {
-        :working_directory => working_dir,
-        :repository => File.join(working_dir, '.git')
-      }.merge(opts)
+      opts[:working_directory] = working_dir if !opts[:working_directory] 
+      opts[:repository] = File.join(opts[:working_directory], '.git') if !opts[:repository]
       
       FileUtils.mkdir_p(opts[:working_directory]) if opts[:working_directory] && !File.directory?(opts[:working_directory])
       
-      # run git_init there
-      Git::Lib.new(opts).init
+      init_opts = {
+        bare: opts[:bare]
+      }
+
+      opts.delete(:working_directory) if opts[:bare]
+
+      Git::Lib.new(opts).init(init_opts)
        
       self.new(opts)
     end
diff --git a/lib/git/lib.rb b/lib/git/lib.rb
@@ -24,9 +24,18 @@ def initialize(base = nil, logger = nil)
       end
       @logger = logger
     end
-    
-    def init
-      command('init')
+
+    # creates or reinitializes the repository
+    #
+    # options:
+    #   :bare
+    #   :working_directory
+    #
+    def init(opts={})
+      arr_opts = []
+      arr_opts << '--bare' if opts[:bare]
+
+      command('init', arr_opts, false)
     end
     
     # tries to clone the given repo
@@ -659,11 +668,13 @@ def command_lines(cmd, opts = [], chdir = true, redirect = '')
     
     def command(cmd, opts = [], chdir = true, redirect = '', &block)
       ENV['GIT_DIR'] = @git_dir
-      ENV['GIT_INDEX_FILE'] = @git_index_file
       ENV['GIT_WORK_TREE'] = @git_work_dir
+      ENV['GIT_INDEX_FILE'] = @git_index_file
+
       path = @git_work_dir || @git_dir || @path
 
       opts = [opts].flatten.map {|s| escape(s) }.join(' ')
+
       git_cmd = "git #{cmd} #{opts} #{redirect} 2>&1"
 
       out = nil
diff --git a/tests/units/test_init.rb b/tests/units/test_init.rb
@@ -32,9 +32,19 @@ def test_git_bare
   #		  :index_file => '/tmp/index'} )
   def test_git_init
     in_temp_dir do |path|
-      Git.init
+      repo = Git.init(path)
       assert(File.directory?(File.join(path, '.git')))
       assert(File.exists?(File.join(path, '.git', 'config')))
+      assert_equal('false', repo.config('core.bare'))
+    end
+  end
+
+  def test_git_init_bare
+    in_temp_dir do |path|
+      repo = Git.init(path, bare: true)
+      assert(File.directory?(File.join(path, '.git')))
+      assert(File.exists?(File.join(path, '.git', 'config')))
+      assert_equal('true', repo.config('core.bare'))
     end
   end
   
