ecb 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f42dfa6b6a572b6b964e0cb7eb14211c062e898a
-  data.tar.gz: 1b850e302822a3a92dd209d20585080f2b7a54f1
+  metadata.gz: e1eb1dd0fb7b6ffe99523933ec0c13577f9460af
+  data.tar.gz: 3c6de04a3e02783c8b4162ac1b05137455967817
 SHA512:
-  metadata.gz: 0e7d850184b3500cb7929f81e45a4d8cb2e964b5829284e9d8c349a9155b0dcf4756d758c54f18f3d1a9eb816b1ff79f5b55e36b8625860e73f985ba3b2e68c3
-  data.tar.gz: c7eaae920437caa761da826333f87952b30867edae96a3353fb7b72ea1cc858dd42acb1932b557ed584a7965240238bcd9ba417f22c5c6fee13b3cfed940c717
+  metadata.gz: 7e15c4f45993fab11a5372ff8b8975760d4fe62360cc2d981ddb96e12358478494f54fce11726df47f2e09ecce7052a7254cf0a94752ab538a4d13d76aa3d7e7
+  data.tar.gz: 1c9e6ce3c6019e57848b41f939220de8935de69978e8e3893face05afe2a5dc7daa991c854fd41eeef32b2b57dc607f6a772a4190bb3714a7b71345d9a6f994f

data/lib/commands/xcode_build.rb

@@ -0,0 +1,128 @@
+#
+#   Greg Seitz
+#
+#   Copyright 2013, eBay Inc.
+#   All rights reserved.
+#   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,
+        :branch
+      ]
+    end
+
+    def register(opts, global_options)
+      opts.banner = "Usage: xcode_archive [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('-b', "--branch name", "Required - Name git branch that we are building from.") do |v|
+        options[:branch] = v
+      end
+
+      opts.on('-r', "--config-repo name", EcbSharedLib::REPO_COMMAND_DETAILS) do |v|
+        options[:config_repo] = v
+      end
+      
+      opts.on('-a', "--archive archivePath", "Path to build the archive") do |v|
+        options[:archive] = 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 do_build(build, archivePath, branch)
+      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]
+      
+      branchCmd = "git push --delete origin #{branch}"
+      
+      if !archivePath.empty? then
+        archive = 'archive'
+      else
+        archive = ''
+      end
+
+      cmd = "xcodebuild #{archive} -workspace #{workspace} -scheme #{scheme} -xcconfig '#{xcconfig}' -configuration #{configuration} -derivedDataPath build -archivePath '#{archivePath}/#{archiveName}' #{extra_configs}"
+      if EcbSharedLib::CL.do_cmd_result(cmd, '.') != 0
+        EcbSharedLib::CL.do_cmd(branchCmd, '.')
+        raise "Xcode Build failed."
+      end
+      
+      if !archivePath.empty? then
+        cmd = "xcodebuild -exportArchive -exportFormat IPA -archivePath '#{archivePath}/#{archiveName}' -exportPath '#{archivePath}/#{exportName}'  -exportProvisioningProfile '#{provisioning_file}'"
+        if EcbSharedLib::CL.do_cmd_result(cmd, '.') != 0
+          EcbSharedLib::CL.do_cmd(branchCmd, '.')
+          raise "Xcode Export Arcive failed."
+        end
+      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]
+      archivePath = options[:archive]
+      branch = options[:branch]
+
+      config_repo = options[:config_repo]
+      config_repo_url = EcbSharedLib.prepare_config_repo(config_repo)
+      info = EcbSharedLib.read_repo_config(config_repo_url, config_name)
+
+      # 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 = "rm -Rf build"
+      EcbSharedLib::CL.do_cmd(cmd, '.')
+      
+      if !archivePath.empty? then
+        cmd = "rm -Rf #{archivePath}"
+        EcbSharedLib::CL.do_cmd(cmd, '.')
+      end
+      
+      builds = info[:builds]
+      builds.each do |build|
+        do_build(build, archivePath, branch)
+        cmd = "git checkout ."
+        EcbSharedLib::CL.do_cmd(cmd, '.')
+      end
+
+      # finish up by writing settings
+      settings = {
+          :config_repo_url => config_repo_url,
+          :config_name => config_name,
+      }
+      
+      # saves the settings to .ecb-settings.json file.
+      # currently inside a git repo, which is probably not the desired behavior.
+      # don't think this is needed for ecb. 
+      
+      #top_dir = "#{Dir.pwd}/#{config_name}"
+      #EcbSharedLib.write_settings(settings, top_dir, err_msg = nil)
+    end
+
+  end
+end

data/lib/commands.rb

@@ -18,5 +18,6 @@ require "ebmsharedlib/utilities"
 
 
 require 'commands/version'
+require 'commands/xcode_build'
 require 'commands/randombranch'
 require 'commands/update_plist'

data/lib/ebmsharedlib/options.rb

@@ -5,7 +5,7 @@
 #   All rights reserved.
 #   http://www.ebay.com
 #
-module EbmSharedLib
+module EcbSharedLib
   # tracks the global and per command options but lets you
   # fetch values without regard to which one.  The command
   # is checked before the global

data/lib/ebmsharedlib/utilities.rb

@@ -5,17 +5,16 @@
 #   All rights reserved.
 #   http://www.ebay.com
 #
-module EbmSharedLib
-  ROOT_PATH = File.expand_path("~/.ebm")
-  CONFIG_DIR = "build_configs"
+module EcbSharedLib
+  ROOT_PATH = File.expand_path("~/.ecb")
+  CONFIG_DIR = "buildsys_configs"
   CONFIG_SUFFIX = ".config"
-  SETTINGS_FILE = ".ebm-settings.json"
+  SETTINGS_FILE = ".ecb-settings.json"
   REPO_COMMAND_DETAILS = "Remote git repository for initial configs file download [mobi,corp,stash,<git url>]"
 
   # the key is the shortcut used for the config repos
   CONFIG_REPOS = {
-      "stash" => "https://mobiebay.com/git/scm/ebmconfigs/build_configs.git",
-      "mobi" => "git@github.mobiebay.com:eBayMobile/build_configs.git",
+      "mobi" => "git@github.mobiebay.com:eBayMobile/buildsys_config.git",
   }
   CONFIG_REPOS["default"] = CONFIG_REPOS["mobi"]
 
@@ -69,7 +68,7 @@ module EbmSharedLib
     # run a command and don't consider it an error
     # if output contains string
     def self.do_cmd_ignore_str(cmd, ok_match, dir=nil)
-      msg = EbmSharedLib::CL.do_cmd_output(cmd, dir)
+      msg = EcbSharedLib::CL.do_cmd_output(cmd, dir)
       puts msg
       exit_code = $?.exitstatus
       if exit_code != 0
@@ -118,7 +117,7 @@ module EbmSharedLib
   # returns the full repo_url
   def self.prepare_config_repo(config_repo_url)
     # get the full url
-    repo_url = EbmSharedLib.get_config_repo_url(config_repo_url)
+    repo_url = EcbSharedLib.get_config_repo_url(config_repo_url)
 
     # get the local config dir
     base_config_path = base_config_path(repo_url)
@@ -131,14 +130,13 @@ module EbmSharedLib
 
     # try to pull, if it fails could be due to repo not cloned
     cmd = "git pull"
-    if EbmSharedLib::CL.do_cmd_result(cmd, config_path) != 0
+    if EcbSharedLib::CL.do_cmd_result(cmd, config_path) != 0
       # pull failed, try to clone
       cmd = "git clone #{repo_url} #{CONFIG_DIR}"
-      if EbmSharedLib::CL.do_cmd_result(cmd, base_config_path) != 0
+      if EcbSharedLib::CL.do_cmd_result(cmd, base_config_path) != 0
         raise "Unable to clone #{CONFIG_DIR} repo into #{base_config_path}"
       end
     end
-
     repo_url
   end
 
@@ -169,15 +167,14 @@ module EbmSharedLib
 
   # write the prepared settings, expects us to pass
   # dir to write into
-  def self.write_settings(map, dir, err_msg = nil)
+  def self.write_settings(map,dir,err_msg = nil)
     settings_path = "#{dir}/#{SETTINGS_FILE}"
-    write_json_file(map, settings_path, err_msg)
+    write_json_file(map,settings_path, err_msg)
   end
 
   # read and return the config info for this repo
   def self.read_repo_config(repo_url, config_name, err_msg = nil)
-    config_file_path = "#{full_config_path(repo_url)}/configs/#{config_name}#{EbmSharedLib::CONFIG_SUFFIX}"
-
+    config_file_path = "#{full_config_path(repo_url)}/configs/#{config_name}#{EcbSharedLib::CONFIG_SUFFIX}"
     read_json_file(config_file_path, err_msg)
   end
 
@@ -205,10 +202,10 @@ module EbmSharedLib
 
   # get the current banch
   def self.get_current_branch(repo, repo_path)
-    repo_name = EbmSharedLib.get_repo_name(repo[:git_path])
+    repo_name = EcbSharedLib.get_repo_name(repo[:git_path])
 
     cmd = "git symbolic-ref HEAD"
-    result = EbmSharedLib::CL.do_cmd_output(cmd, repo_path)
+    result = EcbSharedLib::CL.do_cmd_output(cmd, repo_path)
     if $?.exitstatus != 0
       raise "Unable to get the current branch for #{repo_name}, you may be on a detached HEAD."
     end
@@ -221,7 +218,7 @@ module EbmSharedLib
     begin
       # for now we still operate without settings by using defaults
       # this should be removed once everyone is on the new tool
-      settings = read_settings(".ebm-settings not found, make sure you are in the top level directory.")
+      settings = read_settings(".ecb-settings not found, make sure you are in the top level directory.")
       repo_url = settings[:config_repo_url]
       config_name = settings[:config_name]
     rescue

data/lib/ecb.rb

@@ -8,7 +8,7 @@
 
 require "fileutils"
 require "pathname"
-require 'plist'
+#require 'plist'
 
 $:.unshift(File.dirname(__FILE__))
 models = File.expand_path('../../models', __FILE__)
@@ -38,7 +38,7 @@ class Ecb
   end
 
   def printer
-    EbmSharedLib.printer
+    EcbSharedLib.printer
   end
 
   # define sub commands here
@@ -46,6 +46,7 @@ class Ecb
     sub_commands[:version] = Commands::Version.new
     sub_commands[:randombranch] = Commands::RandomBranch.new
     sub_commands[:update_plist] = Commands::UpdatePlist.new
+    sub_commands[:xcode_build] = Commands::XcodeBuild.new
   end
 
   def setup
@@ -119,8 +120,8 @@ class Ecb
     validate(cmd, sub_cmd)
 
     # track both types of options
-    EbmSharedLib::Options.global_options = options
-    EbmSharedLib::Options.cmd_options = sub_cmd.options
+    EcbSharedLib::Options.global_options = options
+    EcbSharedLib::Options.cmd_options = sub_cmd.options
 
     sub_cmd.send("run", options)
   end

data/lib/info.rb

@@ -7,6 +7,6 @@
 #
 class Info
   def self.version
-    "0.0.1"
+    "0.0.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ecb
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Rick Hoiberg
@@ -66,6 +66,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.6.12
+- !ruby/object:Gem::Dependency
+  name: plist
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 3.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 3.1.0
 description: Various utility commands for building eBay mobile Core
 email: 
 executables:
@@ -73,20 +87,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/commands/commit.rb
-- lib/commands/configs.rb
-- lib/commands/format_helper.rb
-- lib/commands/make_sample.rb
-- lib/commands/periodic.rb
-- lib/commands/prepare.rb
-- lib/commands/prune.rb
-- lib/commands/pull.rb
-- lib/commands/push.rb
 - lib/commands/randombranch.rb
-- lib/commands/remove_merged_branches.rb
-- lib/commands/tag.rb
 - lib/commands/update_plist.rb
 - lib/commands/version.rb
+- lib/commands/xcode_build.rb
 - lib/commands.rb
 - lib/ebmsharedlib/monkey_patches.rb
 - lib/ebmsharedlib/options.rb

data/lib/commands/commit.rb

@@ -1,91 +0,0 @@
-#
-#   Greg Seitz
-#
-#   Copyright 2013, eBay Inc.
-#   All rights reserved.
-#   http://www.ebay.com
-#
-module Commands
-  class Commit
-
-    # 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 [
-          :comment
-      ]
-    end
-
-    def register(opts, global_options)
-      opts.banner = "Usage: commit [options]"
-      opts.description = "Commit changes to local repos."
-
-      opts.on('-c', "--comment comment", "Required - The comment you want to use for the commit - alternate use -m.") do |v|
-        options[:comment] = v
-      end
-
-      opts.on('-m', "--comment comment", "Required - The comment you want to use for the commit - alternate use -c.") do |v|
-        options[:comment] = v
-      end
-
-      opts.on('-a', "--add", "Also add all new files.") do |v|
-        options[:add] = true
-      end
-
-      opts.on('-n', "--dry-run", "Perform a dry run.") do |v|
-        options[:dry_run] = v
-      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
-      comment = options[:comment]
-      add = !!options[:add]
-      dry_run = !!options[:dry_run] ? "--dry-run" : ""
-
-      if ARGV.length > 0
-        raise "You must specify all arguments with their options."
-      end
-
-      # get config based on name of current dir
-      info = EbmSharedLib.get_config_from_top_dir
-
-      # Back up to version parent dir.  This directory contains the top level repos.
-      top_dir = Dir.pwd
-
-      repos = info[:repos]
-      repos.each do |repo|
-        if repo[:create_dev_branch]
-          repo_name = EbmSharedLib.get_repo_name(repo[:git_path])
-          repo_path = "#{top_dir}/#{repo_name}"
-          branch = repo[:branch]
-          puts("\n#{repo_name} commit:\n");
-
-          if (add)
-            # first add any new files
-            cmd = "git add #{dry_run} ."
-            if EbmSharedLib::CL.do_cmd_result(cmd, repo_path) != 0
-              raise "Git add all failed for #{repo_name}."
-            end
-          end
-
-          cmd = "git commit #{dry_run} -am \"#{comment}\""
-          exit_code = EbmSharedLib::CL.do_cmd_ignore_str(cmd, "nothing to commit", repo_path)
-          if exit_code != 0 && exit_code != 999
-              raise "Git commit failed for #{repo_name}."
-          end
-        end
-      end
-
-    end
-
-  end
-end

data/lib/commands/configs.rb

@@ -1,58 +0,0 @@
-#
-#   Greg Seitz
-#
-#   Copyright 2013, eBay Inc.
-#   All rights reserved.
-#   http://www.ebay.com
-#
-module Commands
-  class Configs
-
-    # 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 [
-      ]
-    end
-
-    def register(opts, global_options)
-      opts.banner = "Usage: configs"
-      opts.description = "List all configurations."
-        
-      opts.on('-r', "--config-repo name", EbmSharedLib::REPO_COMMAND_DETAILS) do |v|
-        options[:config_repo] = v
-      end
-    end
-
-
-    def run(global_options)
-      # show contents of configs directory for files with .config extension
-      # try to make sure the repo is available
-      config_repo = options[:config_repo]
-      repo_url = EbmSharedLib.prepare_config_repo(config_repo)
-
-      config_path = EbmSharedLib.full_config_path(repo_url)
-      config_names = Pathname.glob("#{config_path}/configs/*.config").map { |file_info|
-        if file_info.directory? == false
-          name = file_info.basename.to_s
-          name.slice!("#{EbmSharedLib::CONFIG_SUFFIX}")
-          name
-        else
-          nil
-        end
-      }
-      puts "\nCurrent configurations for #{repo_url}:"
-      config_names.each do |name|
-        puts name unless name.nil?
-      end
-
-    end
-
-  end
-end

data/lib/commands/format_helper.rb

@@ -1,106 +0,0 @@
-#
-#   Greg Seitz
-#
-#   Copyright 2013, eBay Inc.
-#   All rights reserved.
-#   http://www.ebay.com
-#
-module Commands
-  class FormatHelper
-
-    # 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 [
-      ]
-    end
-
-    def register(opts, global_options)
-      opts.banner = "Usage: format_helper [options]"
-      opts.description = "Create checkouts and removes after format merge - only for android code reformat."
-      opts.on('-n', "--dry-run", "Perform a dry run.") do |v|
-        options[:dry_run] = true
-      end
-    end
-
-    # @param [Object] global_options
-    def run(global_options)
-
-      if ARGV.length > 0
-        raise "You must specify all arguments with their options."
-      end
-      dry_run = !!options[:dry_run]
-
-      # get config based on name of current dir
-      info = EbmSharedLib.get_config_from_top_dir
-
-      # Back up to version parent dir.  This directory contains the top level repos.
-      top_dir = Dir.pwd
-
-      merge_failed = false
-      repos = info[:repos]
-      repos.each do |repo|
-        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} format_helper:\n");
-
-        cmd = "git status --short"
-        result = EbmSharedLib::CL.do_cmd_output(cmd, repo_path)
-        if $?.exitstatus != 0
-          raise "Git status failed for #{repo_name}."
-        end
-
-        pairs = result.split
-
-        len = pairs.length
-        cur = 0
-        matches = 0
-        while true
-          if cur == len
-            break
-          end
-          code = pairs[cur]
-          cur += 1
-          path = pairs[cur]
-          cur += 1
-          if code == "UU"
-            matches +=1
-            #puts "#{code} - #{path}"
-            cmd = "git checkout --ours -- #{path}"
-            if dry_run
-              puts cmd
-            else
-              if EbmSharedLib::CL.do_cmd_result(cmd, repo_path) != 0
-                raise "Git checkout failed for #{path}."
-              end
-              cmd = "git add #{path}"
-              if EbmSharedLib::CL.do_cmd_result(cmd, repo_path) != 0
-                raise "Git add failed for #{path}."
-              end
-            end
-          elsif code == "DU"
-            matches += 1
-            cmd = "git rm #{path}"
-            if dry_run
-              puts cmd
-            else
-              if EbmSharedLib::CL.do_cmd_result(cmd, repo_path) != 0
-                raise "Git rm failed for #{path}."
-              end
-            end
-          end
-        end
-      end
-    end
-
-  end
-end

data/lib/commands/make_sample.rb

@@ -1,85 +0,0 @@
-#
-#   Greg Seitz
-#
-#   Copyright 2013, eBay Inc.
-#   All rights reserved.
-#   http://www.ebay.com
-#
-module Commands
-  class MakeSample
-
-    # 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,
-      ]
-    end
-
-    def register(opts, global_options)
-      opts.banner = "Usage: make_sample [options]"
-      opts.description = "Make a sample config file"
-
-      opts.on('-c', "--config name", "Required - Name of the config we are making.") do |v|
-        options[:config] = v
-      end
-
-    end
-
-
-    def run(global_options)
-
-      # create a sample config file in the current directory - we append the .config suffix
-      # the file will be in JSON format
-      config_name = options[:config]
-
-      config_path = "#{config_name}#{EbmSharedLib::CONFIG_SUFFIX}"
-
-      begin
-        sample = {
-            :repos => [
-                {
-                  :branch => "iphone_3.1",
-                  :create_dev_branch => true,
-                  :git_path => "git@github.scm.corp.ebay.com:eBayMobile/ios_iphone_core.git",
-                  :taggable => true,
-                },
-                {
-                  :branch => "nautilus_3.1",
-                  :create_dev_branch => true,
-                  :git_path => "git@github.scm.corp.ebay.com:eBayMobile/ios_nautilus.git",
-                  :taggable => true,
-                },
-                {
-                  :tag => "2.2.9",
-                  :git_path => "git@github.scm.corp.ebay.com:ios-mobile-framework/CoreFramework.git",
-                  :parent_path => "Framework",
-                },
-                {
-                  :tag => "2.0.10",
-                  :git_path => "git@github.scm.corp.ebay.com:ios-mobile-framework/ImagePickerModule.git",
-                  :parent_path => "Framework/Modules",
-                },
-                {
-                  :tag => "11fb35782f647a13552ccbd620ca4e88b75a8977",
-                  :git_path => "git@github.scm.corp.ebay.com:cfry/RegistrationModule.git",
-                  :parent_path => "Framework/Modules",
-                },
-            ],
-        }
-
-        json = JSON.pretty_generate(sample)
-
-        File.open(config_path, 'w') { |file| file.write(json) }
-      rescue
-        raise "Error creating config file JSON: #{config_path}"
-      end
-    end
-  end
-end