ebm 0.0.29 → 0.0.30

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
 SHA1: 
-  data.tar.gz: 23f00a9b95f4cc9e013b1cabd1dfad0d665aac8e
-  metadata.gz: 3f9ad29a4e1e1827156bc6875841679fd2e60489
+  data.tar.gz: c0e8930ea69c9089a9fba0cd873282f8928d4cfd
+  metadata.gz: e00edf0f5fa988baf2057b3e16c13dfc528f47f2
 SHA512: 
-  data.tar.gz: a67935429ca402a81c00da655aa768da91bd42476d2c55645ca37d27ddc4fcddc72310a03c0b1559dbc2084e0f2f18a74b978b36e65bbb319b54900075b0791e
-  metadata.gz: fa48e791b33f88046c56976c4453d58458698f57fee8d747c06630342d4934377a367b0d8993a4272c69c0e7bac349b78ccf1e67f70d8c46d55625d2789127f1
+  data.tar.gz: c31719d07140f74b34ca90b60bb39ca143147df3ff830aa5ea7769bdd9cb7214332f97421fdb02cfe2d52ad6297fe3aeb536ad7621f89dec42479e9b0e3c155b
+  metadata.gz: a80df46fdd191cde1701061a9dd024cb31c3cfb4d5bcd96a2604dd2c683095a0720d4bc250bb0f792bd5e0d1aa59d76477f5c0cc4cfea43584bfd4c777e0fb15

data/lib/commands/prepare.rb

@@ -43,7 +43,7 @@ module Commands
       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
+        options[:with_local_version] = true
       end
 
     end
@@ -154,7 +154,7 @@ module Commands
       end
 
       if (with_local_version && initials.nil?)
-        raise "Using --with_local_version is only applicable if you are also creating a developer branch -i."
+        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

data/lib/commands/pull.rb

@@ -33,6 +33,10 @@ module Commands
         options[:remote_version] = true
       end
 
+      opts.on("--base-version", "Pull from base remote version branch into your current branch.") do |v|
+        options[:base_version] = true
+      end
+
       opts.on('-n', "--dry-run", "Perform a dry run.") do |v|
         options[:dry_run] = true
       end
@@ -45,16 +49,21 @@ module Commands
       # the file is expected to be in JSON format
       tag = options[:tag]
       remote_version = !!options[:remote_version]
+      base_version = !!options[:base_version]
       dry_run = !!options[:dry_run] ? "--dry-run" : ""
 
       if ARGV.length > 0
         raise "You must specify all arguments with their options."
       end
 
-      if (!tag.nil? && remote_version)
+      if (!tag.nil? && (remote_version || base_version))
         raise "You can't specify both a pull from a tag and a pull from a remote version branch together."
       end
 
+      if (remote_version && base_version)
+        raise "You can only specify base-version or remote-version, not both."
+      end
+
       # get config based on name of current dir
       info = EbmSharedLib.get_config_from_top_dir
 
@@ -67,6 +76,8 @@ module Commands
           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");
 
           cmd = "git fetch #{dry_run} --all"
@@ -84,6 +95,12 @@ module Commands
             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"

data/lib/ebmsharedlib/utilities.rb

@@ -15,10 +15,9 @@ module EbmSharedLib
   # the key is the shortcut used for the config repos
   CONFIG_REPOS = {
       "stash" => "https://mobiebay.com/git/scm/ebmconfigs/build_configs.git",
-      "corp" => "git@github.scm.corp.ebay.com:eBayMobile/build_configs.git",
       "mobi" => "git@github.mobiebay.com:eBayMobile/build_configs.git",
   }
-  CONFIG_REPOS["default"] = CONFIG_REPOS["corp"]
+  CONFIG_REPOS["default"] = CONFIG_REPOS["mobi"]
 
   class CL
     # run a command line and echo to console
@@ -134,7 +133,7 @@ module EbmSharedLib
       info = JSON.parse(json)
       info.recursively_symbolize_keys!
     rescue
-      msg = err_msg.nil? ? "Error opening config file JSON: #{config_path}" : err_msg
+      msg = err_msg.nil? ? "Error opening config file JSON: #{file_path}" : err_msg
       raise msg
     end
   end

data/lib/info.rb

@@ -7,6 +7,6 @@
 #
 class Info
   def self.version
-    "0.0.29"
+    "0.0.30"
   end
 end

metadata

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