0
@@ -1,6 +1,8 @@
0
 module RSpec
0
   class Git
0
     def update
0
+      check_for_clean_repos "Unable to update"
0
+      
0
       submodules.each do |s|
0
         puts "** Updating #{s[:name]}"
0
         unless system("cd #{s[:path]} && git pull --rebase")
0
@@ -37,21 +39,31 @@ module RSpec
0
     end
0
 
0
     def push_all
0
-      if repos.all? do |r|
0
-          output = `cd #{r[:path]} && git status`
0
-          ['On branch master', 'nothing to commit'].all? {|message| output.include?(message) }
0
-        end
0
-        repos.each do |r|
0
-          puts "** push #{r[:name]}"
0
-          system "cd #{r[:path]} && git push"
0
-        end
0
-        puts "Successfully pushed changes to github"
0
-      else
0
-        puts "Unable to push.  Run 'rake git:status' to view any uncommitted changes"
0
+      check_for_clean_repos "Unable to push"
0
+
0
+      repos.each do |r|
0
+        puts "** push #{r[:name]}"
0
+        system "cd #{r[:path]} && git push"
0
       end
0
+      puts "Successfully pushed changes to github"
0
     end
0
 
0
     private
0
+    def check_for_clean_repos(message)
0
+      unless all_repos_clean?
0
+        puts "*** #{message} ***"
0
+        status
0
+        exit 1
0
+      end
0
+    end
0
+    
0
+    def all_repos_clean?
0
+      repos.all? do |r|
0
+        output = `cd #{r[:path]} && git status`
0
+        ['On branch master', 'nothing to commit'].all? {|message| output.include?(message) }
0
+      end
0
+    end
0
+    
0
     def repos
0
       [submodules, superproject].flatten
0
     end