brigit 0.8.2 → 0.9.1

data/lib/brigit/commands/map_command.rb

@@ -5,10 +5,13 @@ module Brigit
   
   class MapCommand < Command
     
-    self.help = "Graphs of submodules in this repository"
-    
-    def execute!
-      super
+    def run
+      open = false
+      super do |parser|
+        parser.on('-o', '--open', "Open as PNG in Preview.app (OSX only, requires `dot')") do
+          open = true
+        end
+      end
       text =  %|digraph G {\n|
       # TODO: Allow customization
       text << %|ranksep=.75; size = "12,12";\n|
@@ -21,7 +24,7 @@ module Brigit
         end
       end
       text << %|}\n|
-      if options.open
+      if open
         IO.popen("dot -Tpng | open -f -a /Applications/Preview.app", 'w') do |file|
           file.write text
         end
@@ -36,18 +39,18 @@ module Brigit
     
     def origin_at(path)
       filename = File.join(path, '.git/config')
-      result = parser.parse(File.readlines(filename))
+      result = config_parser.parse(File.readlines(filename))
       result['remote "origin"']['url']
     end
     
     def submodules_at(path)
       filename = File.join(path, '.gitmodules')
-      result = parser.parse(File.readlines(filename))
+      result = config_parser.parse(File.readlines(filename))
       result.values
     end
 
-    def parser
-      @parser ||= ConfigParser.new
+    def config_parser
+      @config_parser ||= ConfigParser.new
     end
       
   end

data/lib/brigit/commands/update_command.rb

@@ -4,14 +4,12 @@ require 'find'
 module Brigit
   
   class UpdateCommand < Command
-    
-    self.help = "Update all submodules in the repo, recursively"
-    
-    def execute!
+        
+    def run
       super
       Brigit.at_dot_gitmodules do |path|
-        system "git submodule init"
-        system "git submodule update"
+        sh "git submodule init"
+        sh "git submodule update"
       end
     end
     

data/lib/brigit/fallible.rb

@@ -3,7 +3,7 @@ module Brigit
   module Fallible
     
     def fail(message)
-      abort "\n#{message}\n\n---\n#{CLI.usage}"
+      abort "#{CLI.banner}\n---\n#{message}\n(See `brigit #{self.class.name} --help' for more information)"
     end
   
   end

data/lib/brigit/inventories/gitosis_inventory.rb

@@ -49,7 +49,7 @@ module Brigit
     end
     
     def repo_path(component)
-      [base, component].join(':')
+      [base, component].join(':') << '.git'
     end
     
     def sections

data/lib/brigit/listable.rb

@@ -27,7 +27,7 @@ module Brigit
       end
 
       def name
-        to_s.sub(/^.+::(.+?)[A-Z][a-z]+$/, '\1').downcase
+        to_s.sub(/^(?:.+::)?(.+?)[A-Z][a-z]+$/, '\1').downcase
       end
       
     end

data/lib/brigit/pretending.rb

@@ -0,0 +1,25 @@
+module Brigit
+  
+  module Pretending
+    
+    def pretend!
+      @pretending = true
+    end
+    
+    #######
+    private
+    #######
+    
+    def add_pretend_to(parser)
+      parser.on('-p', '--pretend', "Just pretend to #{self.class.name}") do
+        pretend!
+      end
+    end
+    
+    def pretending?
+      @pretending
+    end
+    
+  end
+  
+end

data/lib/brigit/version.rb

@@ -73,8 +73,8 @@ module Brigit
     end
 
     MAJOR = 0
-    MINOR = 8
-    TINY  = 2
+    MINOR = 9
+    TINY  = 1
 
     # The current version as a Version instance
     CURRENT = new(MAJOR, MINOR, TINY)

data/lib/brigit.rb

@@ -2,8 +2,8 @@ require 'find'
 
 module Brigit
   
-  def self.at_dot_gitmodules
-    Find.find(Dir.pwd) do |path|
+  def self.at_dot_gitmodules(base = Dir.pwd)
+    Find.find(base) do |path|
       if File.basename(path) == '.git' && File.directory?(path)
         Find.prune
       elsif File.file?(File.join(path, '.gitmodules'))
@@ -13,6 +13,37 @@ module Brigit
       end
     end
   end
+  
+  # Note: Doesn't validate against .gitmodules or .git/config
+  def self.parent_of(path)
+    components = path.split(File::SEPARATOR)
+    components.pop
+    matched = []
+    components.inject(['']) do |list, component|
+      list << component
+      check_path = File.join(*list.clone.push('.git'))
+      matched << File.dirname(check_path) if File.exists?(check_path)
+      list
+    end
+    matched.pop
+  end
+  
+  def self.submodule?(path)
+    parent_of(path)
+  end
+  
+  def self.at_repos(submodules = false, base = Dir.pwd)
+    Find.find(base) do |path|
+      if File.basename(path) == '.git' && File.directory?(path)
+        Find.prune
+      elsif File.directory?(File.join(path, '.git'))
+        Dir.chdir path do
+          yield path
+        end
+        Find.prune unless submodules
+      end
+    end
+  end
     
 end
 

data/test/brigit_test.rb

@@ -0,0 +1,70 @@
+require File.dirname(__FILE__) << "/test_helper"
+
+class BrigitTest < Test::Unit::TestCase
+
+  context "Brigit" do
+    
+    context "at_dot_gitmodules method" do
+
+      should "find directories with .gitmodules" do
+        paths = []
+        Brigit.at_dot_gitmodules(File.dirname(__FILE__) << "/fixtures/dotgitmodules") do |path|
+          paths << path
+        end
+        assert_equal 2, paths.size
+        assert_equal %w(dotgitmodules bar), paths.map { |path| File.basename(path) }
+      end
+    end
+    
+    context ".git path methods" do
+      
+      setup { locations.each { |loc| gitify!(loc) } }
+      teardown { locations.each { |loc| degitify!(loc) } }
+      
+      context "submodule? method" do
+        should "find submodule" do
+          assert Brigit.submodule?(locations.last)
+        end
+      end
+
+      context "parent_of method" do
+        should "description" do
+          parent, submodule = locations
+          assert_equal parent, Brigit.parent_of(submodule)
+        end
+      end
+      
+      context "at_repos method" do
+        setup { @paths = [] }
+        should "find only base repos if requested" do
+          find_repos(false)
+          assert_equal 1, @paths.size
+          assert_equal locations.first, @paths.first
+        end
+        should "find submodules also if requested" do
+          find_repos(true)
+          assert_equal locations, @paths
+        end
+      end
+            
+    end
+
+  end
+  
+  #######
+  private
+  #######
+  
+  def find_repos(submodules)
+    Brigit.at_repos(submodules, base) { |path| @paths << path }
+  end
+  
+  def base
+    File.expand_path(File.dirname(__FILE__) << "/fixtures/submodule_methods")
+  end
+
+  def locations
+    Dir[File.join(base, '**/*')].select { |path| File.directory?(path) }
+  end
+
+end

data/test/cli_test.rb

@@ -0,0 +1,47 @@
+require File.dirname(__FILE__) << "/test_helper"
+require 'stringio'
+
+class CLITest < Test::Unit::TestCase
+  
+  class AbortedException; end
+
+  context "Brigit::CLI" do
+    
+    setup do 
+      mock_stderr!
+    end
+    
+    teardown do
+      restore_stderr!
+    end
+
+    should "parse valid command" do
+      parsing %w(hop) do |command, args|
+        assert_kind_of Brigit::HopCommand, command
+        assert command.args.empty?
+      end
+    end
+    
+    should "not parse invalid command" do
+      assert_raises SystemExit do
+        parse %w(this-does-not-exist)
+      end
+      assert !stderr_output.empty?
+    end
+    
+    should "have banner with version number" do
+      assert Brigit::CLI.banner.include?(Brigit::Version::STRING)
+    end
+    
+  end
+  
+  #######
+  private
+  #######
+
+  def parsing(args)
+    yield(Brigit::CLI.new.parse(*args), args)
+  end
+  alias :parse :parsing
+
+end

data/test/command_test.rb

@@ -0,0 +1,47 @@
+require File.dirname(__FILE__) << "/test_helper"
+
+class CommandTest < Test::Unit::TestCase
+
+  context "Command" do
+    
+    setup do
+      @klass = Class.new(Brigit::Command) do
+        def self.to_s
+          'TestCommand'
+        end
+        def run
+          say 'foo'
+        end
+      end
+    end
+    
+    context "name class method" do
+      should "return downcased version of class name" do
+        assert_equal 'test', @klass.name
+      end
+    end
+    
+    context "say instance method" do
+      setup do
+        mock_stderr!
+      end
+      teardown do
+        restore_stderr!
+      end
+      should "output message" do
+        @klass.new.run
+        assert stderr_output.include?('foo')        
+        assert !stderr_output.include?('PRETEND')        
+      end
+      should "mention pretending if doing so" do
+        instance = @klass.new
+        instance.pretend!
+        instance.run
+        assert stderr_output.include?('foo')
+        assert stderr_output.include?('PRETEND')
+      end
+    end
+    
+  end
+
+end

data/test/fallible_test.rb

@@ -0,0 +1,33 @@
+require File.dirname(__FILE__) << "/test_helper"
+
+
+class FallibleTest < Test::Unit::TestCase
+
+  context "Fallible" do
+    
+    setup do 
+      @klass = Class.new
+      @klass.send(:include, Brigit::Fallible)
+      mock_stderr!
+    end
+    
+    teardown do
+      restore_stderr!
+    end
+    
+    context "fail method" do
+      setup do
+        @failed = "you totally failed"
+      end
+      should "output CLI banner and message" do
+        assert_raises SystemExit do
+          @klass.new.fail @failed
+          assert stderr_output.include?(Brigit::CLI.banner)
+          assert stderr_output.include?(@failed)
+        end
+      end
+    end
+
+  end
+
+end

data/test/fixtures/gitosis-admin/gitosis.conf

@@ -0,0 +1,16 @@
+[gitosis]
+
+[group developers]
+writable = foo/bar
+           # other
+           baz
+           
+members = a b c
+
+[group deploy]
+writable = foo/bar
+members = deploy
+
+[group support]
+writable = forums help
+members = d

data/test/fixtures/grab_command/existing_directory/stub

@@ -0,0 +1 @@
+# Just an empty file

data/test/fixtures/submodule_methods/parent/submodule/foo.rb

@@ -0,0 +1 @@
+# Nothing here but us comments

data/test/gitosis_test.rb

@@ -0,0 +1,40 @@
+require File.dirname(__FILE__) << "/test_helper"
+
+class GitosisTest < Test::Unit::TestCase
+
+  context "Gitosis" do
+
+    setup do
+      gitify!(location, url('gitosis-admin'))
+      @gitosis = Brigit::GitosisInventory.new(location)
+    end
+    
+    teardown do
+      degitify!(location)
+    end
+
+    should "find all repos" do
+      assert_equal 4, @gitosis.repositories.size
+    end
+    
+    should "find correct URLs for repos" do
+      @gitosis.repositories.each do |name, location|
+        assert_equal url(name), location
+      end
+    end
+
+  end
+  
+  #######
+  private
+  #######
+  
+  def url(name)
+    "foo@foo.com:#{name}.git"
+  end
+  
+  def location
+    File.dirname(__FILE__) << "/fixtures/gitosis-admin"
+  end
+
+end

data/test/grab_command_test.rb

@@ -0,0 +1,55 @@
+require File.dirname(__FILE__) << "/test_helper"
+
+class GrabCommandTest < Test::Unit::TestCase
+
+  context "GrabCommand" do
+
+    setup do
+      mock_stderr!
+      @command = Brigit::GrabCommand.new
+    end
+    
+    teardown { restore_stderr! }
+    
+    context "update instance method" do
+      setup do
+        @updated = []
+        flexmock(Brigit::UpdateCommand).new_instances do |mock|
+          mock.should_receive(:run).and_return { @updated << Dir.pwd }
+        end
+      end
+      should "update existing directory" do
+        directory = File.join(location, 'existing_directory')
+        Dir.chdir location do
+          assert_nothing_raised do
+            update File.basename(directory)
+          end
+          assert_equal 1, @updated.size
+          assert @updated.include?(directory)
+        end
+      end
+      should "gracefully ignore update on missing directory" do
+        Dir.chdir location do
+          assert_nothing_raised do
+            update 'missing_directory'
+          end
+          assert stderr_output.include?('skipping')
+        end
+      end
+    end
+
+  end
+  
+  #######
+  private
+  #######
+  
+  def update(name)
+    @command.__send__(:update, name)
+  end
+
+  def location
+    File.expand_path(File.dirname(__FILE__) << "/fixtures/grab_command")
+  end
+
+end

data/test/inventory_test.rb

@@ -0,0 +1,22 @@
+require File.dirname(__FILE__) << "/test_helper"
+
+class InventoryTest < Test::Unit::TestCase
+
+  context "Inventory" do
+    
+    setup do
+      @klass = Class.new(Brigit::Inventory)
+    end
+    
+    context "repository method" do
+      should "be abstract" do
+        instance = @klass.new 'a-fake-path'
+        assert_raises NotImplementedError do
+          instance.repositories
+        end
+      end
+    end
+
+  end
+
+end

data/test/option_parser_test.rb

@@ -0,0 +1,21 @@
+require File.dirname(__FILE__) << "/test_helper"
+
+class OptionParserExtensionTest < Test::Unit::TestCase
+
+  context "OptionParserExtension" do
+    
+    context "separator" do
+      setup do
+        @separator = "foo\nbar\nbaz"
+        @opts = OptionParser.new do |opts|
+          opts.separator @separator
+        end
+      end
+      should "have not double newlines on assignment" do
+        assert @opts.to_s.include?(@separator)
+      end
+    end
+
+  end
+
+end

data/test/test_helper.rb

@@ -3,4 +3,35 @@ require 'rubygems'
 require 'Shoulda'
 require 'flexmock/test_unit'
 
-require File.dirname(__FILE__) << "/../lib/brigit"
+require File.dirname(__FILE__) << "/../lib/brigit"
+
+class Test::Unit::TestCase
+  
+  def gitify!(location, origin = nil)
+    Dir.chdir location do
+      `git init; git add .; git commit -a -m 'For test'`
+      if origin
+        `git remote add origin '#{origin}'`
+      end
+    end
+  end
+  
+  def degitify!(location)
+    FileUtils.rm_rf File.join(location, '.git') rescue nil
+  end
+  
+  def mock_stderr!
+    @old_stderr = $stderr
+    $stderr = StringIO.new
+  end
+  
+  def restore_stderr!
+    $stderr = @old_stderr
+  end
+  
+  def stderr_output
+    $stderr.rewind
+    $stderr.read
+  end
+  
+end