ebm 0.0.32 → 0.0.33

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
 SHA1: 
-  data.tar.gz: c73999654884f1cc03767f59c73611a2e7426d89
-  metadata.gz: c0ced619f5588c020f01e9567e83996a90f19848
+  data.tar.gz: 992915ca9318b3a1771ac408a516e1aff08c4d3e
+  metadata.gz: 31e420ce369332e349abb147f778cdad71cbac14
 SHA512: 
-  data.tar.gz: ddfc18f5627cc351680ec04c7ec50dc254f7050b2299ebfe9d058547e2df73a0b8f8714cade75fde4e08d7bf187c52dbee489ed61f4ee4ac47186edf75c8b3d0
-  metadata.gz: c1324a1f7987367a73e7678fd30b4b31f2af2c51b47be6e74a4b7b33030166c966009c35312207f815571351534f7622e9b98f9e57e6686a6fc029497c42f36f
+  data.tar.gz: a8330e7c3981e410f9751f2a3ef24daaf410ec3c5d3c68490883899648a658ee1240f66562a22bc23ff6fb4d3fe78128c2b6dc90922e7904d2126b9dd84721fd
+  metadata.gz: 6c6d7bc01b509ae2c8e7e23c6058f18d55f108280f97346c798bbd23d3f0454209e3dd273f9d7761a9a4b85d414daf192c9a692174c408d948f015c2156c48cd

data/lib/commands/pull.rb

@@ -73,61 +73,59 @@ module Commands
       merge_failed = false
       repos = info[:repos]
       repos.each do |repo|
-        if repo[:create_dev_branch]
-          repo_name = EbmSharedLib.get_repo_name(repo[:git_path])
-          repo_path = "#{top_dir}/#{repo_name}"
-          branch = repo[:branch]
-          base_branch = repo[:base_branch]
+        repo_name = EbmSharedLib.get_repo_name(repo[:git_path])
+        repo_path = "#{top_dir}/#{repo_name}"
+        branch = repo[:branch]
+        base_branch = repo[:base_branch]
 
-          puts("\n#{repo_name} pull:\n");
+        puts("\n#{repo_name} pull:\n");
 
-          cmd = "git fetch #{dry_run} --all"
+        cmd = "git fetch #{dry_run} --all"
+        if EbmSharedLib::CL.do_cmd_result(cmd, repo_path) != 0
+          raise "Git fetch failed for #{repo_name}."
+        end
+
+        if tag
+          # use git checkout to force changes from either tag or branch
+          cmd = "git checkout -f refs/tags/#{tag}"
           if EbmSharedLib::CL.do_cmd_result(cmd, repo_path) != 0
-            raise "Git fetch failed for #{repo_name}."
+            raise "Git checkout failed for #{repo_name}."
           end
-
-          if tag
-            # use git checkout to force changes from either tag or branch
-            cmd = "git checkout -f refs/tags/#{tag}"
-            if EbmSharedLib::CL.do_cmd_result(cmd, repo_path) != 0
-              raise "Git checkout failed for #{repo_name}."
+        elsif repo[:create_dev_branch]
+          if remote_version
+            # pulling from remote version branch
+            cmd = "git pull #{dry_run} --no-edit --recurse-submodules=yes origin #{branch}"
+          elsif base_version
+            # pulling from base remote version branch
+            if base_branch.nil?
+              raise "You specified base-version but the config has no base_branch."
             end
+            cmd = "git pull #{dry_run} --no-edit --recurse-submodules=yes origin #{base_branch}"
           else
-            if remote_version
-              # pulling from remote version branch
-              cmd = "git pull #{dry_run} --no-edit --recurse-submodules=yes origin #{branch}"
-            elsif base_version
-              # pulling from base remote version branch
-              if base_branch.nil?
-                raise "You specified base-version but the config has no base_branch."
-              end
-              cmd = "git pull #{dry_run} --no-edit --recurse-submodules=yes origin #{base_branch}"
-            else
-              # pull from the remote branch of the current branch
-              cmd = "git pull #{dry_run} --no-edit --recurse-submodules=yes"
-            end
-
-            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
+            # pull from the remote branch of the current branch
+            cmd = "git pull #{dry_run} --no-edit --recurse-submodules=yes"
           end
-          cmd = "git submodule sync"
-          if EbmSharedLib::CL.do_cmd_result(cmd, repo_path) != 0
-            raise "Submodule sync for #{repo_name} failed."
-          end
-          if dry_run.empty?
-            cmd = "git submodule update"
-          else
-            cmd = "git submodule update --no-fetch"
+
+          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 EbmSharedLib::CL.do_cmd_result(cmd, repo_path) != 0
-            raise "Updating submodules for #{repo_name} failed."
+          if exit_code == 999
+            merge_failed = true
           end
+        end
 
+        cmd = "git submodule sync"
+        if EbmSharedLib::CL.do_cmd_result(cmd, repo_path) != 0
+          raise "Submodule sync for #{repo_name} failed."
+        end
+        if dry_run.empty?
+          cmd = "git submodule update"
+        else
+          cmd = "git submodule update --no-fetch"
+        end
+        if EbmSharedLib::CL.do_cmd_result(cmd, repo_path) != 0
+          raise "Updating submodules for #{repo_name} failed."
         end
 
       end

data/lib/commands/status.rb

@@ -41,14 +41,12 @@ module Commands
 
       repos = info[:repos]
       repos.each do |repo|
-        if repo[:create_dev_branch]
-          repo_name = EbmSharedLib.get_repo_name(repo[:git_path])
-          repo_path = "#{top_dir}/#{repo_name}"
-          puts("\n#{repo_name} status:\n");
-          cmd = "git status"
-          if EbmSharedLib::CL.do_cmd_result(cmd, repo_path) != 0
-            raise "Git status failed for #{repo_name}.  Make sure you run the command from within a top level repo directory."
-          end
+        repo_name = EbmSharedLib.get_repo_name(repo[:git_path])
+        repo_path = "#{top_dir}/#{repo_name}"
+        puts("\n#{repo_name} status:\n");
+        cmd = "git status"
+        if EbmSharedLib::CL.do_cmd_result(cmd, repo_path) != 0
+          raise "Git status failed for #{repo_name}.  Make sure you run the command from within a top level repo directory."
         end
       end
 

data/lib/info.rb

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

metadata

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