ebm 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
 SHA1: 
-  metadata.gz: f826ef3471ca3e21b6aa76d34956d6d99c03d954
-  data.tar.gz: 1608441747b3ae19fecbda951ae840143ea7081e
+  metadata.gz: 8ad007e4af3a408677cb93bc4df24416f14238a4
+  data.tar.gz: 2a7a8ed1badc38a107658cac981bb3a62e14d165
 SHA512: 
-  metadata.gz: cb7d0026a76b2f748b9781552c6818047128e3a97a1e6d88e17b52fbbc336d6d8df5b88437b45e53ecf4336ffe9773c2a19398298be9f5b25e41b00f2b60e96a
-  data.tar.gz: 6443c98eada1920947cb6834d76fa28e736c05bc311d816f7ba86e683f7af02285f1ebb58ae216e24ef9fd8e24876a8ffdbc52afac61dcd0f15af79f20b33357
+  metadata.gz: f171c575262087494253ed30c057dec0affd6d2d9195a9592017dc6da2286ed33dd008d038446f0c69834e23eaa4c2e1b34fee4410a995dca24e174f3085a58c
+  data.tar.gz: 794b5095d08a3f7d847273c8cd290e25f419b1bcd75a8b2785b52fc24dea257752ba98a9f8644b0f668eee791a2c9a924cbed20f3157451f1add3cbc76f35206

data/lib/commands/prepare.rb

@@ -88,9 +88,14 @@ module Commands
         # now create the developer branch off of the base branch
         if create_dev_branch
           dev_branch_name = "#{initials}_#{branch}"
-          cmd = "git checkout -B #{dev_branch_name} && git push -u origin #{dev_branch_name}"
+          # first assume dev branch already exists and try to switch to it
+          cmd = "git checkout --track origin/#{dev_branch_name}"
           if EbmSharedLib::CL.do_cmd_result(cmd, repo_path) != 0
-            raise "Unable to create local and tracking developer branch #{dev_branch_name} for #{repo_name}."
+            # no remote branch, so create local and push as remote
+            cmd = "git checkout -B #{dev_branch_name} && git push -u origin #{dev_branch_name}"
+            if EbmSharedLib::CL.do_cmd_result(cmd, repo_path) != 0
+              raise "Unable to create local and tracking developer branch #{dev_branch_name} for #{repo_name}."
+            end
           end
         end
       elsif tag

data/lib/info.rb

@@ -7,6 +7,6 @@
 #
 class Info
   def self.version
-    "0.0.11"
+    "0.0.12"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ebm
 version: !ruby/object:Gem::Version 
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors: 
 - Greg Seitz