ebm 0.0.31 → 0.0.32

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
-SHA512: 
-  data.tar.gz: 0927051ba0c2822880b2647d82f2114b1be434f67d675e7dcd764a3732d3b9c238b78ce9e157dce7d2b5a7fbb37d0d49ebf7e2d67c09dfb4327d0c2a0d423177
-  metadata.gz: e4699f07b8cb4364a580e804f88beb925d5955ddde2bfd8daae1eeb28e1eedd70b5d5d0f153aba6c54adfac097609601db6ea783748e3e12c9b398b94e48fe03
 SHA1: 
-  data.tar.gz: b7adab478d1434f25025c99ed8c3c99b2afdaa38
-  metadata.gz: 6ec993882cfb9e3d7af2deee2d30ac7e1bac9cf8
+  data.tar.gz: c73999654884f1cc03767f59c73611a2e7426d89
+  metadata.gz: c0ced619f5588c020f01e9567e83996a90f19848
+SHA512: 
+  data.tar.gz: ddfc18f5627cc351680ec04c7ec50dc254f7050b2299ebfe9d058547e2df73a0b8f8714cade75fde4e08d7bf187c52dbee489ed61f4ee4ac47186edf75c8b3d0
+  metadata.gz: c1324a1f7987367a73e7678fd30b4b31f2af2c51b47be6e74a4b7b33030166c966009c35312207f815571351534f7622e9b98f9e57e6686a6fc029497c42f36f

data/lib/commands/commit.rb

@@ -78,15 +78,9 @@ module Commands
           end
 
           cmd = "git commit #{dry_run} -am \"#{comment}\""
-          msg = EbmSharedLib::CL.do_cmd_output(cmd, repo_path)
-          puts msg
-          exit_code = $?.exitstatus
-          if exit_code != 0
-            line = msg.split("\n").last   # last line
-            # ugly hack to not show as error when nothing to commit
-            if !line.include?("nothing to commit")
+          exit_code = EbmSharedLib::CL.do_cmd_ignore_str(cmd, "nothing to commit", repo_path)
+          if exit_code != 0 && exit_code != 999
               raise "Git commit failed for #{repo_name}."
-            end
           end
         end
       end

data/lib/commands/pull.rb

@@ -70,6 +70,7 @@ module Commands
       # Back up to version parent dir.  This directory contains the top level repos.
       top_dir = Dir.pwd
 
+      merge_failed = false
       repos = info[:repos]
       repos.each do |repo|
         if repo[:create_dev_branch]
@@ -105,9 +106,14 @@ module Commands
               # pull from the remote branch of the current branch
               cmd = "git pull #{dry_run} --no-edit --recurse-submodules=yes"
             end
-            if EbmSharedLib::CL.do_cmd_result(cmd, repo_path) != 0
+
+            exit_code = EbmSharedLib::CL.do_cmd_ignore_str(cmd, "Automatic merge failed", repo_path)
+            if exit_code != 0 && exit_code != 999
               raise "Git pull failed for #{repo_name}."
             end
+            if exit_code == 999
+              merge_failed = true
+            end
           end
           cmd = "git submodule sync"
           if EbmSharedLib::CL.do_cmd_result(cmd, repo_path) != 0
@@ -121,7 +127,13 @@ module Commands
           if EbmSharedLib::CL.do_cmd_result(cmd, repo_path) != 0
             raise "Updating submodules for #{repo_name} failed."
           end
+
         end
+
+      end
+
+      if merge_failed
+        raise "Automatic merge failed, you must hand merge the conflicts"
       end
 
     end

data/lib/ebmsharedlib/utilities.rb

@@ -66,6 +66,22 @@ module EbmSharedLib
       result
     end
 
+    # run a command and don't consider it an error
+    # if output contains string
+    def self.do_cmd_ignore_str(cmd, ok_match, dir=nil)
+      msg = EbmSharedLib::CL.do_cmd_output(cmd, dir)
+      puts msg
+      exit_code = $?.exitstatus
+      if exit_code != 0
+        line = msg.split("\n").last   # last line
+        # ugly hack to not show as error when nothing to commit
+        if line.include?(ok_match)
+          exit_code = 999
+        end
+      end
+      exit_code
+    end
+
   end
 
   def self.get_config_repo_url(config_repo)

data/lib/info.rb

@@ -7,6 +7,6 @@
 #
 class Info
   def self.version
-    "0.0.31"
+    "0.0.32"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ebm
 version: !ruby/object:Gem::Version 
-  version: 0.0.31
+  version: 0.0.32
 platform: ruby
 authors: 
 - Greg Seitz
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-08-09 00:00:00 Z
+date: 2013-08-13 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: subcommand