ecb 0.0.42 → 0.0.43

data/lib/commands/xcode_build.rb

@@ -6,151 +6,167 @@
 #   http://www.ebay.com
 #
 module Commands
-  class XcodeBuild
-
-    # holds the options that were passed
-    # you can set any initial defaults here
-    def options
-      @options ||= {
-      }
-    end
-
-    # required options
-    def required_options
-      @required_options ||= Set.new [
-        :config,
-        :deliverables,
-      ]
-    end
-
-    def register(opts, global_options)
-      opts.banner = "Usage: xcode_build [options]"
-      opts.description = "Build an Xcode deliverable from the specified config."
-
-      opts.on('-c', "--config name", "Required - Name of the config we are building from.") do |v|
-        options[:config] = v
-      end
-
-      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('-b', "--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}")
+    class XcodeBuild
+        
+        # holds the options that were passed
+        # you can set any initial defaults here
+        def options
+            @options ||= {
+            }
         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, deliverablesPath, archive_build)
-      workspace = build[:workspace]
-      scheme = build[:scheme]
-      xcconfig = build[:xcconfig]
-      archiveName = build[:archiveName]
-      exportName = build[:exportName]
-      configuration = build[:configuration]
-      extra_configs = build[:extra_configs]
-      provisioning_file = build[:provisioning_file]
-      build_dir = build[:build_dir]
-      itunes_artwork = build[:itunes_artwork]
-      target_file = build[:target_file]
-      
-      archive = archive_build ? 'archive' : ''
-      
-      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 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."
+        
+        # required options
+        def required_options
+            @required_options ||= Set.new [
+            :config,
+            :deliverables,
+            ]
         end
-        cmd = "ditto -c -k --norsrc #{archiveName} #{archiveName}.zip"
-        EcbSharedLib::CL.do_cmd(cmd, "#{deliverablesPath}")
-        export_name = exportName.split(".").first
-        sym_file = "#{export_name}_dSYM.zip"
-        cmd =  "ditto -c -k --norsrc --keepParent '#{build_dir}/#{target_file}.dSYM' '#{deliverablesPath}/#{sym_file}'";
-        EcbSharedLib::CL.do_cmd(cmd, '.')
-      else
-        builddistribtion(target_file, build_dir, itunes_artwork, exportName, deliverablesPath)
-      end
-     end
-
-    def run(global_options)
-      # 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]
-      config_branch = options[:branch]
-      config_branch = 'master' if config_branch.nil? || config_branch.empty?
-      deliverablesPath = options[:deliverables]
-      archive_build = options[:archive_build]
-      
-      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)
-
-      # 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.
-      
-      cmd = "security unlock-keychain -p #{build_config[:login_password]} ~/Library/Keychains/login.keychain"
-      EcbSharedLib::CL.do_cmd(cmd, '.')
- 
-      cmd = "rm -Rf #{deliverablesPath}"
-      EcbSharedLib::CL.do_cmd(cmd, '.')
+        
+        def register(opts, global_options)
+            opts.banner = "Usage: xcode_build [options]"
+            opts.description = "Build an Xcode deliverable from the specified config."
+            
+            opts.on('-c', "--config name", "Required - Name of the config we are building from.") do |v|
+                options[:config] = v
+            end
+            
+            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('-b', "--branch config branch name", "Use build config branch") do |v|
+                options[:branch] = v
+            end
+            opts.on('-i', "--copy-appicon", "copy icons for iTunesArtWork") do |v|
+                options[:copy_appicon] = true
+            end
             
-      xcode_version = info[:xcode_version].nil? ? "" : info[:xcode_version]
-      unless File.exists?("/Applications/Xcode#{xcode_version}.app")
-        cmd = "sudo xcode-select --switch /Applications/Xcode.app/Contents/Developer"
-      else
-        cmd = "sudo xcode-select --switch /Applications/Xcode#{xcode_version}.app/Contents/Developer"
-      end
-      EcbSharedLib::CL.do_cmd(cmd, '.')
-
-      builds = info[:builds]
-      builds.each do |build|
-        info_plist = info[:info_plist]
-        enterprise_info_plist = info[:enterprise_info_plist]
-        if build[:build_type] == "enterprise" && 
-          !info_plist.nil? && !enterprise_info_plist.nil? then
-          cmd = "rm #{info_plist}"
-          EcbSharedLib::CL.do_cmd(cmd, '.')
-          cmd = "cp #{enterprise_info_plist} #{info_plist}"
-          EcbSharedLib::CL.do_cmd(cmd, '.')
         end
-        do_build(build, deliverablesPath, archive_build)
-        cmd = "git checkout ."
-        EcbSharedLib::CL.do_cmd(cmd, '.')
-      end
-   end
-  end
+        
+        def builddistribution(target_file, build_dir, artwork, exportName, deliverablesPath, appicon)
+            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"
+            if (!artwork.nil?) then
+                if (appicon == true and File.exist?("#{artwork}")) then
+                    cmd =  "cp '#{artwork}' #{build_dir}/tmp/"
+                    EcbSharedLib::CL.do_cmd(cmd, '.')
+                    paths = artwork.split("/")
+                    cmd =  "mv 'tmp/#{paths.last}' tmp/iTunesArtwork"
+                    EcbSharedLib::CL.do_cmd(cmd, "#{build_dir}")
+                end
+            end
+            #cmd =  "ditto -c -k --norsrc #{build_dir}/tmp/Payload \"#{deliverablesPath}/#{exportName}\""
+            cmd =  "ditto -c -k --norsrc #{build_dir}/tmp \"#{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, deliverablesPath, archive_build, copy_appicon)
+            workspace = build[:workspace]
+            scheme = build[:scheme]
+            xcconfig = build[:xcconfig]
+            archiveName = build[:archiveName]
+            exportName = build[:exportName]
+            configuration = build[:configuration]
+            extra_configs = build[:extra_configs]
+            provisioning_file = build[:provisioning_file]
+            build_dir = build[:build_dir]
+            itunes_artwork = build[:itunes_artwork]
+            target_file = build[:target_file]
+            
+            archive = archive_build ? 'archive' : ''
+            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 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, "#{deliverablesPath}")
+                export_name = exportName.split(".").first
+                sym_file = "#{export_name}_dSYM.zip"
+                cmd =  "ditto -c -k --norsrc --keepParent '#{build_dir}/#{target_file}.dSYM' '#{deliverablesPath}/#{sym_file}'";
+                EcbSharedLib::CL.do_cmd(cmd, '.')
+                if (copy_appicon == true and File.exist?("#{itunes_artwork}")) then
+                    cmd = "mv #{deliverablesPath}/#{export_name}.ipa #{deliverablesPath}/#{export_name}.zip"
+                    EcbSharedLib::CL.do_cmd(cmd, ".")
+                    cmd = "unzip #{deliverablesPath}/#{export_name}.zip -d #{deliverablesPath}/#{export_name}"
+                    EcbSharedLib::CL.do_cmd(cmd, '.')
+                    cmd =  "cp '#{itunes_artwork}' #{deliverablesPath}/#{export_name}/iTunesArtwork"
+                    EcbSharedLib::CL.do_cmd(cmd, '.')
+                    cmd = " ditto -c -k --norsrc #{deliverablesPath}/#{export_name} #{deliverablesPath}/#{export_name}.ipa"
+                    EcbSharedLib::CL.do_cmd(cmd, '.')
+                end
+                
+                
+                else
+                builddistribution(target_file, build_dir, itunes_artwork, exportName, deliverablesPath, copy_appicon)
+            end
+        end
+        
+        def run(global_options)
+            # 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]
+            config_branch = options[:branch]
+            config_branch = 'master' if config_branch.nil? || config_branch.empty?
+            deliverablesPath = options[:deliverables]
+            archive_build = options[:archive_build]
+            copy_appicon = options[:copy_appicon]
+            
+            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)
+            
+            # 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.
+            
+            cmd = "security unlock-keychain -p #{build_config[:login_password]} ~/Library/Keychains/login.keychain"
+            EcbSharedLib::CL.do_cmd(cmd, '.')
+            
+            cmd = "rm -Rf #{deliverablesPath}"
+            EcbSharedLib::CL.do_cmd(cmd, '.')
+            
+            xcode_version = info[:xcode_version].nil? ? "" : info[:xcode_version]
+            unless File.exists?("/Applications/Xcode#{xcode_version}.app")
+                cmd = "sudo xcode-select --switch /Applications/Xcode.app/Contents/Developer"
+                else
+                cmd = "sudo xcode-select --switch /Applications/Xcode#{xcode_version}.app/Contents/Developer"
+            end
+            EcbSharedLib::CL.do_cmd(cmd, '.')
+            
+            builds = info[:builds]
+            builds.each do |build|
+                info_plist = info[:info_plist]
+                enterprise_info_plist = info[:enterprise_info_plist]
+                if build[:build_type] == "enterprise" && 
+                    !info_plist.nil? && !enterprise_info_plist.nil? then
+                    cmd = "rm #{info_plist}"
+                    EcbSharedLib::CL.do_cmd(cmd, '.')
+                    cmd = "cp #{enterprise_info_plist} #{info_plist}"
+                    EcbSharedLib::CL.do_cmd(cmd, '.')
+                end
+                do_build(build, deliverablesPath, archive_build, copy_appicon)
+                cmd = "git checkout ."
+                EcbSharedLib::CL.do_cmd(cmd, '.')
+            end
+        end
+    end
 end

data/lib/info.rb

@@ -8,6 +8,6 @@
 
 class Info
   def self.version
-    "0.0.42"
+    "0.0.43"
   end
 end

metadata

@@ -1,119 +1,125 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: ecb
-version: !ruby/object:Gem::Version
-  version: 0.0.42
+version: !ruby/object:Gem::Version 
+  prerelease: false
+  segments: 
+  - 0
+  - 0
+  - 43
+  version: 0.0.43
 platform: ruby
-authors:
+authors: 
 - Rick Hoiberg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-11 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2014-04-04 00:00:00 -07:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: subcommand
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
-    - - '>='
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 0
+        version: "1.0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 0
+        - 0
         version: 1.0.0
-- !ruby/object:Gem::Dependency
-  name: json_pure
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.5'
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 1.5.2
   type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: json_pure
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.5'
-    - - '>='
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 5
+        version: "1.5"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 5
+        - 2
         version: 1.5.2
-- !ruby/object:Gem::Dependency
-  name: ruby-hmac
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.4'
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 0.4.0
   type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: ruby-hmac
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.4'
-    - - '>='
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 4
+        version: "0.4"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 4
+        - 0
         version: 0.4.0
-- !ruby/object:Gem::Dependency
-  name: highline
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.6.12
   type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: highline
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 6
+        - 12
         version: 1.6.12
-- !ruby/object:Gem::Dependency
-  name: plist
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.1'
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 3.1.0
   type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: plist
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.1'
-    - - '>='
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 3
+        - 1
+        version: "3.1"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 3
+        - 1
+        - 0
         version: 3.1.0
+  type: :runtime
+  version_requirements: *id005
 description: Various utility commands for building eBay mobile Core
 email: 
-executables:
+executables: 
 - ecb
 extensions: []
+
 extra_rdoc_files: []
-files:
-- LICENSE
-- bin/ecb
-- lib/commands.rb
+
+files: 
 - lib/commands/promote.rb
 - lib/commands/randombranch.rb
 - lib/commands/shell.rb
@@ -121,35 +127,47 @@ files:
 - lib/commands/verify_provision.rb
 - lib/commands/version.rb
 - lib/commands/xcode_build.rb
+- lib/commands.rb
 - lib/ebmsharedlib/monkey_patches.rb
 - lib/ebmsharedlib/options.rb
 - lib/ebmsharedlib/utilities.rb
 - lib/ecb.rb
 - lib/info.rb
 - lib/printer.rb
+- bin/ecb
+- LICENSE
+has_rdoc: true
 homepage: 
 licenses: []
-metadata: {}
+
 post_install_message: 
-rdoc_options:
+rdoc_options: 
 - --charset=UTF-8
-require_paths:
+require_paths: 
 - lib
 - lib/commands
-required_ruby_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - '>='
-    - !ruby/object:Gem::Version
-      version: '1.8'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - '>='
-    - !ruby/object:Gem::Version
-      version: '1.3'
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 1
+      - 8
+      version: "1.8"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 1
+      - 3
+      version: "1.3"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 1.3.6
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Core Builder
 test_files: []
+

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: f07b006133d82d68d5f7ab13e16073c2a8146bc6
-  data.tar.gz: 28b771ba00a3da77257d16c3317f72cdd528b321
-SHA512:
-  metadata.gz: b8b2ba329b4b95baac5a0639e2e23389f51140fc05dd12979cdd21b801d7b6c03cd791a2b26d82f532dd54b928ccfe0aea0437f2b262b62e23426754d7587571
-  data.tar.gz: 5757107a182d03f065ff56c63035b8d0e86f3a4f3da9ec942bbf5a305fd6ba186a219456ddd6550a4e1237e50fa2ca49624e1bd3f8f88173582bc36a90f011b4