ecb 0.0.27 → 0.0.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d77ae2e396638399c3353b73e6895870d5700d80
-  data.tar.gz: d8705b10e49c6b706d1ace9b1a093b898202d24c
+  metadata.gz: d6c26fc156e61dbe196be16e0a698516c3733ce4
+  data.tar.gz: ccd1283c478933c9884d055534c08adb92ad6417
 SHA512:
-  metadata.gz: 4c539085227247bfcaa31e3acc1ffd794ca8ab0de741b5f6a7065f2f825ebef821a8abb385aa5f1613bc3e965b6543c3b3a5279a7aca001424449b175eff14a7
-  data.tar.gz: a3af658e11075128c494105707977e18000cabb2f6b6bba333ddfaa92e78a78ba25838e7f1f6dc2196d8f02b2fd5d9fc700066097bf7e94ae29ff1da5f1971c8
+  metadata.gz: 92f5971e39915d835f1b742f9832873c43ef92aa1fe3b050c7d6650f3344492a79423643c6df907084e49fb21b5d789bb92aed813276bdfa314c0f39c89ab777
+  data.tar.gz: 9d3daa7b0a115f4104931b0b3056406a9c1ebeb7809a40bfdbe3248ea2dcae838470a8940a429ef4c571077ce4c540d5af66dd9d094dfd2ed91595b2afefe613

data/lib/commands/promote.rb

@@ -40,11 +40,14 @@ module Commands
         options[:config] = v
       end
 =end
+      opts.on('-b', "--branch config branch name", "Use build config branch") do |v|
+        options[:branch] = v
+      end
       
       opts.on('-n', "--product-name name", "Required") do |v|
         options[:product_name] = v
       end
-      opts.on('-b', "--bundle-indentifer Bundle Identitifer", "Required") do |v|
+      opts.on('-i', "--bundle-indentifer Bundle Identitifer", "Required") do |v|
         options[:bundleid] = v
       end
       opts.on('-p', "--product-key key", "Required") do |v|
@@ -77,9 +80,11 @@ module Commands
     end
     
     def run(global_options)
+      config_branch = options[:branch]
+      config_repo_url = EcbSharedLib.prepare_config_repo(config_branch)
+      
 =begin
       config_name = options[:config]
-      config_repo_url = EcbSharedLib.prepare_config_repo(config_repo)
       info = EcbSharedLib.read_repo_config(config_repo_url, config_name)
       bundleid = info[:bundleid]
       product_key = info[:product_key]
@@ -87,6 +92,7 @@ module Commands
       device = info[:device]
       wiki_key = info[:wiki_key]
 =end 
+
       bundleid = options[:bundleid]
       product_key = options[:product_key]
       product_name = options[:product_name]
@@ -98,7 +104,6 @@ module Commands
       fix_versions = options[:fix_versions]
       usenew = !!options[:usenew] ? "--usenew" : ""
       usecli = !!options[:usecli] ? "--usecli" : ""
-      config_repo_url = EcbSharedLib.prepare_config_repo(nil)
       scriptsPath = EcbSharedLib.path_to_scripts(config_repo_url)
       cmd = "./masterpromote.sh   --bundleID #{bundleid} --projectKey #{product_key} \
                                   --productName #{product_name} --device #{device} --wikiKey #{wiki_key} \

data/lib/commands/shell.rb

@@ -24,10 +24,14 @@ module Commands
     def register(opts, global_options)
       opts.banner = "Usage: shell"
       opts.description = "Test running of a shell script."
+      opts.on('-b', "--branch config branch name", "Use build config branch") do |v|
+        options[:branch] = v
+      end
     end
 
     def run(global_options)
-      config_repo_url = EcbSharedLib.prepare_config_repo(nil)
+      config_branch = options[:branch]
+      config_repo_url = EcbSharedLib.prepare_config_repo(config_branch)
       base = EcbSharedLib.full_config_path(config_repo_url)
       newpath = File.expand_path(File.join(base, "scripts"))
       cmd = "./ecb_test.sh"

data/lib/commands/update_plist.rb

@@ -30,12 +30,17 @@ module Commands
       opts.on('-c', "--config name", "Required - Name of the config we are building from.") do |v|
         options[:config] = v
       end
-      opts.on('-b', "--build number", "Required - build number used to update plist") do |v|
+      opts.on('-n', "--build number", "Required - build number used to update plist") do |v|
         options[:build] = v
       end
+      
       opts.on('-v', "--verbose", "Display passed data") do |v|
         options[:verbose] = true
       end
+      
+      opts.on('-b', "--branch config branch name", "Use build config branch") do |v|
+        options[:branch] = v
+      end
     end
 
 #
@@ -47,8 +52,9 @@ module Commands
 
     def run(global_options)
       config_name = options[:config]
+      config_branch = options[:branch]
       build = options[:build]
-      config_repo_url = EcbSharedLib.prepare_config_repo(nil)
+      config_repo_url = EcbSharedLib.prepare_config_repo(config_branch)
       info = EcbSharedLib.read_repo_config(config_repo_url, config_name)
       info_plist = info[:info_plist]
       enterprise_info_plist = info[:enterprise_info_plist]

data/lib/commands/verify_provision.rb

@@ -28,6 +28,10 @@ module Commands
       opts.on('-c', "--config name", "Required - Name of the config we are building from.") do |v|
         options[:config] = v
       end
+      
+      opts.on('-b', "--branch config branch name", "Use build config branch") do |v|
+        options[:branch] = v
+      end
 
       opts.on('-v', "--verbose", "Display passed data") do |v|
         options[:verbose] = true
@@ -44,12 +48,11 @@ module Commands
       
       config_name = options[:config]
       verbose = options[:verbose]
+      config_branch = options[:branch]
       
-      config_repo_url = EcbSharedLib.prepare_config_repo(nil)
+      config_repo_url = EcbSharedLib.prepare_config_repo(config_branch)
       path_to_provisions = EcbSharedLib.path_to_provision_files(config_repo_url, config_name)
       Dir.glob('*.mobileprovision').each do |f| 
-        
-        #byebug
         cmd = "security cms -D -i #{f}"
         provision_data = EcbSharedLib::CL.do_cmd_output(cmd, path_to_provisions)
         plist_data = Plist::parse_xml(provision_data)

data/lib/commands/xcode_build.rb

@@ -39,7 +39,7 @@ module Commands
         options[:archive_build] = true
       end
       
-      opts.on('-a', "--branch config branch name", "Use build config branch") do |v|
+      opts.on('-b', "--branch config branch name", "Use build config branch") do |v|
         options[:branch] = v
       end
       
@@ -114,10 +114,10 @@ module Commands
       deliverablesPath = options[:deliverables]
       archive_build = options[:archive_build]
       
-      config_repo_url = EcbSharedLib.prepare_config_repo(nil, config_branch)
+      config_repo_url = EcbSharedLib.prepare_config_repo(config_branch)
       info = EcbSharedLib.read_repo_config(config_repo_url, config_name)
       build_config = EcbSharedLib.read_build_config(config_repo_url)
-
+      byebug
       # Now that we have the json, prepare the world by creating a directory with the config name and placing
       # the various repos beneath that.  The directory is created relative to the current directory.
       

data/lib/ebmsharedlib/utilities.rb

@@ -126,9 +126,9 @@ module EcbSharedLib
   # takes the repo name (shortcut or full url)
   # and fetches config into appropriate location
   # returns the full repo_url
-  def self.prepare_config_repo(config_repo_url, config_branch)
+  def self.prepare_config_repo(config_branch)
     # get the full url
-    repo_url = EcbSharedLib.get_config_repo_url(config_repo_url)
+    repo_url = EcbSharedLib.get_config_repo_url(nil)
 
     # get the local config dir
     base_config_path = base_config_path(repo_url)

data/lib/info.rb

@@ -7,6 +7,6 @@
 #
 class Info
   def self.version
-    "0.0.27"
+    "0.0.28"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ecb
 version: !ruby/object:Gem::Version
-  version: 0.0.27
+  version: 0.0.28
 platform: ruby
 authors:
 - Rick Hoiberg