brigit 0.9.1 → 0.9.2

data/Manifest

@@ -2,12 +2,14 @@ bin/brigit
 help/grab.rdoc
 help/hop.rdoc
 help/map.rdoc
+help/status.rdoc
 help/update.rdoc
 lib/brigit/cli.rb
 lib/brigit/commands/command.rb
 lib/brigit/commands/grab_command.rb
 lib/brigit/commands/hop_command.rb
 lib/brigit/commands/map_command.rb
+lib/brigit/commands/status_command.rb
 lib/brigit/commands/update_command.rb
 lib/brigit/config_parser.rb
 lib/brigit/fallible.rb

data/README.rdoc

@@ -2,6 +2,11 @@
 
 A random collection of utilities for developers working with Git repositories.
 
+== Dependencies
+
+* git (>= 1.0.5) by Scott Chacon (sudo gem install git)
+* highline (>= 1.4.0) by James Edward Gray II (sudo gem install highline)
+
 == Contributing
 
 Feel free to fork, send patches, etc.  Development is done at http://github.com/fiveruns/brigit

data/Rakefile

@@ -12,4 +12,6 @@ Echoe.new 'brigit' do |p|
   p.url = "http://github.com/fiveruns/brigit"
   p.include_rakefile = true
   p.rcov_options << '--sort coverage --exclude gems --text-summary'
+  p.runtime_dependencies << ['git', '>= 1.0.5']
+  p.runtime_dependencies << ['highline', '>= 1.4.0']  
 end

data/brigit.gemspec

@@ -1,20 +1,40 @@
 
-# Gem::Specification for Brigit-0.9.1
+# Gem::Specification for Brigit-0.9.2
 # Originally generated by Echoe
 
 --- !ruby/object:Gem::Specification 
 name: brigit
 version: !ruby/object:Gem::Version 
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors: 
 - FiveRuns Development Team
 autorequire: 
 bindir: bin
 
-date: 2008-07-12 00:00:00 -05:00
+date: 2008-07-28 00:00:00 -05:00
 default_executable: 
 dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: git
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.0.5
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: highline
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.4.0
+    version: 
 - !ruby/object:Gem::Dependency 
   name: echoe
   type: :development
@@ -38,6 +58,7 @@ extra_rdoc_files:
 - lib/brigit/commands/grab_command.rb
 - lib/brigit/commands/hop_command.rb
 - lib/brigit/commands/map_command.rb
+- lib/brigit/commands/status_command.rb
 - lib/brigit/commands/update_command.rb
 - lib/brigit/config_parser.rb
 - lib/brigit/fallible.rb
@@ -54,12 +75,14 @@ files:
 - help/grab.rdoc
 - help/hop.rdoc
 - help/map.rdoc
+- help/status.rdoc
 - help/update.rdoc
 - lib/brigit/cli.rb
 - lib/brigit/commands/command.rb
 - lib/brigit/commands/grab_command.rb
 - lib/brigit/commands/hop_command.rb
 - lib/brigit/commands/map_command.rb
+- lib/brigit/commands/status_command.rb
 - lib/brigit/commands/update_command.rb
 - lib/brigit/config_parser.rb
 - lib/brigit/fallible.rb

data/help/status.rdoc

@@ -0,0 +1,9 @@
+Show status of the current repo and all submodules, recursively
+
+== Syntax
+
+  brigit status
+
+== Notes
+
+You must be in the Git repository when this command is executed.

data/lib/brigit/commands/command.rb

@@ -37,7 +37,7 @@ module Brigit
     
     def say(message)
       message = pretending? ? "{PRETENDING} #{message}" : message
-      $stderr.puts message
+      HighLine.say message
     end
     
     def sh(command)
@@ -65,6 +65,16 @@ module Brigit
       File.directory?(File.join(Dir.pwd, '.git'))
     end
     
+    def submodules_at(path)
+      filename = File.join(path, '.gitmodules')
+      result = config_parser.parse(File.readlines(filename))
+      result.values
+    end
+
+    def config_parser
+      @config_parser ||= ConfigParser.new
+    end
+    
   end
   
 end

data/lib/brigit/commands/map_command.rb

@@ -42,16 +42,6 @@ module Brigit
       result = config_parser.parse(File.readlines(filename))
       result['remote "origin"']['url']
     end
-    
-    def submodules_at(path)
-      filename = File.join(path, '.gitmodules')
-      result = config_parser.parse(File.readlines(filename))
-      result.values
-    end
-
-    def config_parser
-      @config_parser ||= ConfigParser.new
-    end
       
   end
   

data/lib/brigit/commands/status_command.rb

@@ -0,0 +1,24 @@
+require 'brigit/commands/command'
+require 'find'
+
+module Brigit
+  
+  class StatusCommand < Command
+        
+    def run
+      super
+      say "<%= color '#{Dir.pwd}', :yellow, :bold %>"
+      sh "git status"
+      Brigit.at_dot_gitmodules do |path|
+        submodules_at(path).each do |sub|
+          say %<\n<%= color 'Submodule:', :yellow %> <%= color '#{sub['path']}', :yellow, :bold %> <%= color "(#{sub['url']})", :white %>>
+          Dir.chdir sub['path'] do
+            sh "git status"
+          end
+        end
+      end
+    end
+    
+  end
+  
+end

data/lib/brigit/commands/update_command.rb

@@ -6,8 +6,21 @@ module Brigit
   class UpdateCommand < Command
         
     def run
-      super
+      pull = false
+      super do
+        parser.on('-p', '--pull', "Pull master repo (if on branch `master')") do
+          pull = true
+        end
+      end
+      if pull
+        if Brigit.repo.branch.name == 'master'
+          sh "git pull origin master"
+        else
+          say "Not on `master' branch; skipping update of main repo..."
+        end
+      end
       Brigit.at_dot_gitmodules do |path|
+        say "---\nSubmodule: #{path}"
         sh "git submodule init"
         sh "git submodule update"
       end

data/lib/brigit/listable.rb

@@ -9,7 +9,13 @@ module Brigit
     module ClassMethods
       
       def [](name)
-        list.detect { |klass| klass.name == name }
+        matching = list.select { |klass| klass.name =~ /^#{Regexp.quote name}/io }
+        return false unless matching.any?
+        if matching.size > 1
+          HighLine.say %|<%= color "Too many matches for `#{name}'", :red %>|
+          return false
+        end
+        matching.first
       end
 
       def inherited(klass)

data/lib/brigit/version.rb

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

data/lib/brigit.rb

@@ -1,5 +1,12 @@
+require 'rubygems'
 require 'find'
 
+gem 'git', '>= 1.0.5'
+require 'git'
+
+gem 'highline', '>= 1.4.0'
+require 'highline/import'
+
 module Brigit
   
   def self.at_dot_gitmodules(base = Dir.pwd)
@@ -44,6 +51,10 @@ module Brigit
       end
     end
   end
+  
+  def self.repo
+    Git.open(Dir.pwd)
+  end
     
 end
 

data/test/cli_test.rb

@@ -8,11 +8,11 @@ class CLITest < Test::Unit::TestCase
   context "Brigit::CLI" do
     
     setup do 
-      mock_stderr!
+      mock_streams!
     end
     
     teardown do
-      restore_stderr!
+      restore_streams!
     end
 
     should "parse valid command" do
@@ -26,7 +26,7 @@ class CLITest < Test::Unit::TestCase
       assert_raises SystemExit do
         parse %w(this-does-not-exist)
       end
-      assert !stderr_output.empty?
+      assert !stream_output.empty?
     end
     
     should "have banner with version number" do

data/test/command_test.rb

@@ -23,22 +23,22 @@ class CommandTest < Test::Unit::TestCase
     
     context "say instance method" do
       setup do
-        mock_stderr!
+        mock_streams!
       end
       teardown do
-        restore_stderr!
+        restore_streams!
       end
       should "output message" do
         @klass.new.run
-        assert stderr_output.include?('foo')        
-        assert !stderr_output.include?('PRETEND')        
+        assert stream_output.include?('foo')        
+        assert !stream_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')
+        assert stream_output.include?('foo')
+        assert stream_output.include?('PRETEND')
       end
     end
     

data/test/fallible_test.rb

@@ -8,11 +8,11 @@ class FallibleTest < Test::Unit::TestCase
     setup do 
       @klass = Class.new
       @klass.send(:include, Brigit::Fallible)
-      mock_stderr!
+      mock_streams!
     end
     
     teardown do
-      restore_stderr!
+      restore_streams!
     end
     
     context "fail method" do
@@ -22,8 +22,8 @@ class FallibleTest < Test::Unit::TestCase
       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)
+          assert stream_output.include?(Brigit::CLI.banner)
+          assert stream_output.include?(@failed)
         end
       end
     end

data/test/grab_command_test.rb

@@ -5,11 +5,11 @@ class GrabCommandTest < Test::Unit::TestCase
   context "GrabCommand" do
 
     setup do
-      mock_stderr!
+      mock_streams!
       @command = Brigit::GrabCommand.new
     end
     
-    teardown { restore_stderr! }
+    teardown { restore_streams! }
     
     context "update instance method" do
       setup do
@@ -33,7 +33,7 @@ class GrabCommandTest < Test::Unit::TestCase
           assert_nothing_raised do
             update 'missing_directory'
           end
-          assert stderr_output.include?('skipping')
+          assert stream_output.include?('skipping')
         end
       end
     end

data/test/test_helper.rb

@@ -20,18 +20,23 @@ class Test::Unit::TestCase
     FileUtils.rm_rf File.join(location, '.git') rescue nil
   end
   
-  def mock_stderr!
+  def mock_streams!
+    @old_output = $terminal.instance_variable_get(:@output)
+    $terminal.instance_variable_set(:@output, StringIO.new)
     @old_stderr = $stderr
     $stderr = StringIO.new
   end
   
-  def restore_stderr!
+  def restore_streams!
+    $terminal.instance_variable_set(:@output, @old_output)
     $stderr = @old_stderr
   end
   
-  def stderr_output
+  def stream_output
+    output = $terminal.instance_variable_get(:@output)
+    output.rewind
     $stderr.rewind
-    $stderr.read
+    output.read << $stderr.read
   end
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: brigit
 version: !ruby/object:Gem::Version 
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors: 
 - FiveRuns Development Team
@@ -9,9 +9,29 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-07-12 00:00:00 -05:00
+date: 2008-07-28 00:00:00 -05:00
 default_executable: 
 dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: git
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.0.5
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: highline
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.4.0
+    version: 
 - !ruby/object:Gem::Dependency 
   name: echoe
   type: :development
@@ -35,6 +55,7 @@ extra_rdoc_files:
 - lib/brigit/commands/grab_command.rb
 - lib/brigit/commands/hop_command.rb
 - lib/brigit/commands/map_command.rb
+- lib/brigit/commands/status_command.rb
 - lib/brigit/commands/update_command.rb
 - lib/brigit/config_parser.rb
 - lib/brigit/fallible.rb
@@ -51,12 +72,14 @@ files:
 - help/grab.rdoc
 - help/hop.rdoc
 - help/map.rdoc
+- help/status.rdoc
 - help/update.rdoc
 - lib/brigit/cli.rb
 - lib/brigit/commands/command.rb
 - lib/brigit/commands/grab_command.rb
 - lib/brigit/commands/hop_command.rb
 - lib/brigit/commands/map_command.rb
+- lib/brigit/commands/status_command.rb
 - lib/brigit/commands/update_command.rb
 - lib/brigit/config_parser.rb
 - lib/brigit/fallible.rb