libdolt 0.17.0 → 0.17.1

data/lib/libdolt/disk_repo_resolver.rb

@@ -29,10 +29,15 @@ module Dolt
 
     def all
       (Dir.entries(root).select do |e|
-         File.exists?(File.join(root, e, ".git"))
+          git_repo?(e)
        end).sort
     end
 
+    def git_repo?(dir)
+      return true if dir.split(".").last == "git"
+      File.exists? File.join(root, dir, ".git")
+    end
+
     private
     def root; @root; end
   end

data/lib/libdolt/repo_actions.rb

@@ -15,7 +15,6 @@
 #   You should have received a copy of the GNU Affero General Public License
 #   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #++
-require "eventmachine"
 
 # Need consistent Time formatting in JSON
 require "time"
@@ -66,9 +65,7 @@ module Dolt
 
     def archive(repo, ref, format)
       repository = resolve_repository(repo)
-      d = @archiver.archive(repository, ref, format)
-      d.callback { |filename| block.call(nil, filename) }
-      d.errback { |err| block.call(err, nil) }
+      @archiver.archive(repository, ref, format)
     end
 
     def repositories

data/lib/libdolt/version.rb

@@ -17,5 +17,5 @@
 #++
 
 module Dolt
-  VERSION = "0.17.0"
+  VERSION = "0.17.1"
 end

data/test/libdolt/disk_repo_resolver_test.rb

@@ -0,0 +1,42 @@
+# encoding: utf-8
+#--
+#   Copyright (C) 2013 Gitorious AS
+#
+#   This program is free software: you can redistribute it and/or modify
+#   it under the terms of the GNU Affero General Public License as published by
+#   the Free Software Foundation, either version 3 of the License, or
+#   (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU Affero General Public License for more details.
+#
+#   You should have received a copy of the GNU Affero General Public License
+#   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#++
+require "test_helper"
+require "fileutils"
+describe Dolt::DiskRepoResolver do
+  before do
+    @root = FileUtils.mkdir_p("/tmp/libdolt-tests/")
+    FileUtils.mkdir_p(File.join(@root, "single/.git"))
+    @resolver = Dolt::DiskRepoResolver.new(@root)
+  end
+
+  after do
+    FileUtils.rm_f("/tmp/libdolt-tests")
+  end
+
+  it "resolves non-bare repositories" do
+    assert @resolver.git_repo?("single")
+  end
+
+  it "resolves bare repositories" do
+    assert @resolver.git_repo?("multi.git")
+  end
+
+  it "fails too" do
+    refute @resolver.git_repo?("nope")
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: libdolt
 version: !ruby/object:Gem::Version
-  version: 0.17.0
+  version: 0.17.1
   prerelease: 
 platform: ruby
 authors:
@@ -229,6 +229,7 @@ files:
 - lib/libdolt/view/tree.rb
 - lib/libdolt/view/urls.rb
 - libdolt.gemspec
+- test/libdolt/disk_repo_resolver_test.rb
 - test/libdolt/git/archiver_test.rb
 - test/libdolt/git/blame_test.rb
 - test/libdolt/git/commit_test.rb