ecb 0.0.26 → 0.0.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 15b890f2091a15f90d16603f447e5a39f80e956e
-  data.tar.gz: 3b0228c5b11428c6aa92e66bbc3f6665ee0c5457
+  metadata.gz: d77ae2e396638399c3353b73e6895870d5700d80
+  data.tar.gz: d8705b10e49c6b706d1ace9b1a093b898202d24c
 SHA512:
-  metadata.gz: f1c37182fdd72b23a248e2fccbc9f88db8b3b3e9247d5682966262985bb1a3116bea7e629ee7bba90798c57f3e00dc13ac607f29a4ace775cc836f9fe1b5b3ba
-  data.tar.gz: 39d6ca512348f52970ced43e16acaac8393fc1694dc3f61de9a151e9c1065f48559334d17196d2999ec19daa4ee4a4d862910e3d64e8e17c4bc0fabff71367b9
+  metadata.gz: 4c539085227247bfcaa31e3acc1ffd794ca8ab0de741b5f6a7065f2f825ebef821a8abb385aa5f1613bc3e965b6543c3b3a5279a7aca001424449b175eff14a7
+  data.tar.gz: a3af658e11075128c494105707977e18000cabb2f6b6bba333ddfaa92e78a78ba25838e7f1f6dc2196d8f02b2fd5d9fc700066097bf7e94ae29ff1da5f1971c8

data/bin/ecb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 #
-#   Greg Seitz
+#   Rick Hoiberg
 #
 #   Copyright 2013, eBay Inc.
 #   All rights reserved.

data/lib/commands.rb

@@ -1,5 +1,5 @@
 #
-#   Greg Seitz
+#   Rick Hoiberg
 #
 #   Copyright 2013, eBay Inc.
 #   All rights reserved.

data/lib/commands/promote.rb

@@ -1,5 +1,5 @@
 #
-#   Greg Seitz
+#   Rick Hoiberg
 #
 #   Copyright 2013, eBay Inc.
 #   All rights reserved.

data/lib/commands/randombranch.rb

@@ -1,6 +1,6 @@
 
 #
-#   Greg Seitz
+#   Rick Hoiberg
 #
 #   Copyright 2013, eBay Inc.
 #   All rights reserved.

data/lib/commands/shell.rb

@@ -1,5 +1,5 @@
 #
-#   Greg Seitz
+#   Rick Hoiberg
 #
 #   Copyright 2013, eBay Inc.
 #   All rights reserved.

data/lib/commands/update_plist.rb

@@ -1,5 +1,5 @@
 #
-#   Greg Seitz
+#   Rick Hoiberg
 #
 #   Copyright 2013, eBay Inc.
 #   All rights reserved.

data/lib/commands/verify_provision.rb

@@ -1,5 +1,5 @@
 #
-#   Greg Seitz
+#   Rick Hoiberg
 #
 #   Copyright 2013, eBay Inc.
 #   All rights reserved.

data/lib/commands/version.rb

@@ -1,5 +1,5 @@
 #
-#   Greg Seitz
+#   Rick Hoiberg
 #
 #   Copyright 2013, eBay Inc.
 #   All rights reserved.

data/lib/commands/xcode_build.rb

@@ -1,5 +1,5 @@
 #
-#   Greg Seitz
+#   Rick Hoiberg
 #
 #   Copyright 2013, eBay Inc.
 #   All rights reserved.
@@ -19,6 +19,7 @@ module Commands
     def required_options
       @required_options ||= Set.new [
         :config,
+        :deliverables,
       ]
     end
 
@@ -30,17 +31,47 @@ module Commands
         options[:config] = v
       end
 
-      opts.on('-a', "--archive archivePath", "Path to build the archive") do |v|
-        options[:archive] = v
+      opts.on('-d', "--deliverables deliverablesPath", "Path to build the deliverables") do |v|
+        options[:deliverables] = v
+      end
+      
+      opts.on('-a', "--archive-build", "Do archive build") do |v|
+        options[:archive_build] = true
+      end
+      
+      opts.on('-a', "--branch config branch name", "Use build config branch") do |v|
+        options[:branch] = v
       end
       
     end
 
+    def builddistribtion(target_file, build_dir, artwork, exportName, deliverablesPath)
+      cmd = "mkdir -p tmp/PayLoad"
+      EcbSharedLib::CL.do_cmd(cmd, "#{build_dir}")
+      cmd =  "cp -Rp '#{target_file}' tmp/PayLoad"
+      EcbSharedLib::CL.do_cmd(cmd, "#{build_dir}")
+      export_name = exportName.split(".").first
+      sym_file = "#{export_name}_dSYM.zip"
+      unless "#{artwork}".nil?
+        if (File.exist?("#{artwork}"))
+          cmd =  "cp '#{artwork}' #{build_dir}/tmp/PayLoad"
+          EcbSharedLib::CL.do_cmd(cmd, '.')
+          paths = artwork.split("/") 
+          cmd =  "mv 'tmp/PayLoad/#{paths.last}' tmp/PayLoad/iTunesArtwork"
+          EcbSharedLib::CL.do_cmd(cmd, "#{build_dir}")
+        end
+      end
+      cmd =  "ditto -c -k --norsrc #{build_dir}/tmp/PayLoad \"#{deliverablesPath}/#{exportName}\""
+      EcbSharedLib::CL.do_cmd(cmd, '.')
+      cmd =  "ditto -c -k --norsrc --keepParent '#{build_dir}/#{target_file}.dSYM' '#{deliverablesPath}/#{sym_file}'";
+      EcbSharedLib::CL.do_cmd(cmd, '.')
+    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 do_build(build, archivePath)
+    def do_build(build, deliverablesPath, archive_build)
       workspace = build[:workspace]
       scheme = build[:scheme]
       xcconfig = build[:xcconfig]
@@ -49,25 +80,29 @@ module Commands
       configuration = build[:configuration]
       extra_configs = build[:extra_configs]
       provisioning_file = build[:provisioning_file]
-
-      if !archivePath.empty? then
+      build_dir = build[:build_dir]
+      itunes_artwork = build[:itunes_artwork]
+      target_file = build[:target_file]
+      
+      if archive_build then
         archive = 'archive'
       else
         archive = ''
       end
-
-      cmd = "xcodebuild #{archive} -workspace #{workspace} -scheme #{scheme} -xcconfig '#{xcconfig}' -configuration #{configuration} -derivedDataPath build -archivePath '#{archivePath}/#{archiveName}' #{extra_configs}"
+      
+      cmd = "xcodebuild #{archive} -workspace #{workspace} -scheme #{scheme} -xcconfig '#{xcconfig}' -configuration #{configuration} -archivePath '#{deliverablesPath}/#{archiveName}' #{extra_configs}"
       if EcbSharedLib::CL.do_cmd_result(cmd, '.') != 0
         raise "Xcode Build failed."
       end
-      
-      if !archivePath.empty? then
-        cmd = "xcodebuild -exportArchive -exportFormat IPA -archivePath '#{archivePath}/#{archiveName}' -exportPath '#{archivePath}/#{exportName}'  -exportProvisioningProfile '#{provisioning_file}'"
+      if archive_build then
+        cmd = "xcodebuild -exportArchive -exportFormat IPA -archivePath '#{deliverablesPath}/#{archiveName}' -exportPath '#{deliverablesPath}/#{exportName}'  -exportProvisioningProfile '#{provisioning_file}'"
         if EcbSharedLib::CL.do_cmd_result(cmd, '.') != 0
           raise "Xcode Export Archive failed."
         end
         cmd = "ditto -c -k --norsrc #{archiveName} #{archiveName}.zip"
-        EcbSharedLib::CL.do_cmd(cmd, "#{archivePath}")
+        EcbSharedLib::CL.do_cmd(cmd, "#{deliverablesPath}")
+      else
+        builddistribtion(target_file, build_dir, itunes_artwork, exportName, deliverablesPath)
       end
      end
 
@@ -75,9 +110,11 @@ module Commands
       # see if we can open the config file - we append the .config suffix
       # the file is expected to be in JSON format
       config_name = options[:config]
-      archivePath = options[:archive]
-
-      config_repo_url = EcbSharedLib.prepare_config_repo(nil)
+      config_branch = options[:branch]
+      deliverablesPath = options[:deliverables]
+      archive_build = options[:archive_build]
+      
+      config_repo_url = EcbSharedLib.prepare_config_repo(nil, config_branch)
       info = EcbSharedLib.read_repo_config(config_repo_url, config_name)
       build_config = EcbSharedLib.read_build_config(config_repo_url)
 
@@ -87,20 +124,14 @@ module Commands
       cmd = "security unlock-keychain -p #{build_config[:login_password]} ~/Library/Keychains/login.keychain"
       EcbSharedLib::CL.do_cmd(cmd, '.')
  
-      #/Applications/Xcode.app/Contents/Developer
-      cmd = "rm -Rf build"
+      cmd = "rm -Rf #{deliverablesPath}"
       EcbSharedLib::CL.do_cmd(cmd, '.')
-      
-      if !archivePath.empty? then
-        cmd = "rm -Rf #{archivePath}"
-        EcbSharedLib::CL.do_cmd(cmd, '.')
-      end
-      
+            
       xcode_version = info[:xcode_version]
-      if xcode_version.nil? then
-        cmd = "xcode-select --switch /Applications/Xcode.app/Contents/Developer"
+      if xcode_version.nil? or xcode_version == 'latest-released' then
+        cmd = "sudo xcode-select --switch /Applications/Xcode.app/Contents/Developer"
       else
-        cmd = "xcode-select --switch /Applications/Xcode#{xcode_version}.app/Contents/Developer"
+        cmd = "sudo xcode-select --switch /Applications/Xcode#{xcode_version}.app/Contents/Developer"
       end
       EcbSharedLib::CL.do_cmd(cmd, '.')
 
@@ -115,7 +146,7 @@ module Commands
           cmd = "cp #{enterprise_info_plist} #{info_plist}"
           EcbSharedLib::CL.do_cmd(cmd, '.')
         end
-        do_build(build, archivePath)
+        do_build(build, deliverablesPath, archive_build)
         cmd = "git checkout ."
         EcbSharedLib::CL.do_cmd(cmd, '.')
       end

data/lib/ebmsharedlib/utilities.rb

@@ -126,7 +126,7 @@ 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)
+  def self.prepare_config_repo(config_repo_url, config_branch)
     # get the full url
     repo_url = EcbSharedLib.get_config_repo_url(config_repo_url)
 
@@ -148,6 +148,10 @@ module EcbSharedLib
         raise "Unable to clone #{CONFIG_DIR} repo into #{base_config_path}"
       end
     end
+    unless config_branch.nil?
+      cmd = "git checkout #{config_branch}"
+      EcbSharedLib::CL.do_cmd(cmd, config_path)
+    end
     repo_url
   end
 

data/lib/ecb.rb

@@ -1,5 +1,5 @@
 #
-#   Greg Seitz
+#   Rick Hoiberg
 #
 #   Copyright 2013, eBay Inc.
 #   All rights reserved.

data/lib/info.rb

@@ -1,5 +1,5 @@
 #
-#   Greg Seitz
+#   Rick Hoiberg
 #
 #   Copyright 2013, eBay Inc.
 #   All rights reserved.
@@ -7,6 +7,6 @@
 #
 class Info
   def self.version
-    "0.0.26"
+    "0.0.27"
   end
 end

data/lib/printer.rb

@@ -1,5 +1,5 @@
 #
-#   Greg Seitz
+#   Rick Hoiberg
 #
 #   Copyright 2013, eBay Inc.
 #   All rights reserved.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecb
 version: !ruby/object:Gem::Version
-  version: 0.0.26
+  version: 0.0.27
 platform: ruby
 authors:
 - Rick Hoiberg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-16 00:00:00.000000000 Z
+date: 2014-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: subcommand
@@ -148,7 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '1.3'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: Core Builder