ebm 0.0.16 → 0.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
 SHA1: 
-  data.tar.gz: 367cd483688c378a1979e31d5a54c5ace5b147c4
-  metadata.gz: 49faf13adbf47da860c7f57af3f7fc34d7525422
+  data.tar.gz: 72a6a8df2a47c113752bae24f81204061cc199af
+  metadata.gz: 5da175684eb49bf3cf36acf77fa0862f3e6d634e
 SHA512: 
-  data.tar.gz: 7ec095e60931d255776b90fca492af8f6910a3401e4fc9b17b2ea338d40433ff81724010ae4a73e7b3619b8734bae5ff78f1bbfdfe7decd3dbc155cf2a148a4d
-  metadata.gz: 40d95b1f00c62395c9bbd6af7224c9e158afca688e9073875bf89b86b9799b3e0c15000874bee290f5fdceb756f5b8737233abfb59722442de8d9d1320fb2813
+  data.tar.gz: 34809f027513421967f3cd4c3f15b64ce40450bdba487b1a46e5112e7149db14e1489973b04721fa2c14077e0788e6ff96aafec39a754d26acd37a828c0423f5
+  metadata.gz: 0f0d2605a34c2218fe6a5f8173d9751b64e9aa30a463dc2654071bf2b2ce16cc82e3236115761fec287ef373c5b1cde67bbf16cdb330375300d0d45067f38f0a

data/lib/commands/prepare.rb

@@ -38,13 +38,17 @@ module Commands
         options[:nobranch] = v
       end
 
+      opts.on("--with_local_version", "Also include a local version branch, only applies with the -i option.") do |v|
+        options[:with_local_version] = v
+      end
+
     end
 
     # prepare a single repo and create a local and tracking branch if it should have one
     # if the repo specifies a branch then we will do the initial fetch from that branch
     # if the create_dev_branch flag is set, we will create a local and tracking branch with
     # the developer initials prepended
-    def prepare_repo(repo, top_dir, initials, nobranch)
+    def prepare_repo(repo, top_dir, initials, nobranch, with_local_version)
       git_path = repo[:git_path]
       branch = repo[:branch]
       create_dev_branch = (repo[:create_dev_branch] == true) && (!nobranch)
@@ -96,6 +100,13 @@ module Commands
               raise "Unable to create local and tracking developer branch #{dev_branch_name} for #{repo_name}."
             end
           end
+          if with_local_version == false
+            # they don't want the local version branch so drop it
+            cmd = "git branch -D #{branch}"
+            if EbmSharedLib::CL.do_cmd_result(cmd, repo_path) != 0
+              raise "Unable to delete local version branch #{branch} for #{repo_name}."
+            end
+          end
         end
       elsif tag
         # they are using a tag so don't create dev branches
@@ -120,6 +131,7 @@ module Commands
       config_name = options[:config]
       initials = options[:initials]
       nobranch = !!options[:nobranch]
+      with_local_version = !!options[:with_local_version]
 
       if (nobranch && initials)
         raise "You must specify either the --initials or --nobranch, not both."
@@ -129,6 +141,10 @@ module Commands
         raise "You must specify either --initials or --nobranch"
       end
 
+      if (with_local_version && initials.nil?)
+        raise "Using --with_local_version is only applicable if you are also creating a developer branch -i."
+      end
+
       # try to make sure the repo is available
       EbmSharedLib.prepare_config_repo
       info = EbmSharedLib.read_repo_config(config_name)
@@ -143,7 +159,7 @@ module Commands
 
       repos = info[:repos]
       repos.each do |repo|
-        prepare_repo(repo, top_dir, initials, nobranch)
+        prepare_repo(repo, top_dir, initials, nobranch, with_local_version)
       end
 
     end

data/lib/info.rb

@@ -7,6 +7,6 @@
 #
 class Info
   def self.version
-    "0.0.16"
+    "0.0.17"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ebm
 version: !ruby/object:Gem::Version 
-  version: 0.0.16
+  version: 0.0.17
 platform: ruby
 authors: 
 - Greg Seitz
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-06-27 00:00:00 Z
+date: 2013-07-01 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: subcommand