ecb 0.0.1

data/lib/commands/prepare.rb

@@ -0,0 +1,191 @@
+#
+#   Greg Seitz
+#
+#   Copyright 2013, eBay Inc.
+#   All rights reserved.
+#   http://www.ebay.com
+#
+module Commands
+  class Prepare
+
+    # 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: prepare [options]"
+      opts.description = "Prepare your build environment"
+
+      opts.on('-r', "--config-repo name", EbmSharedLib::REPO_COMMAND_DETAILS) do |v|
+        options[:config_repo] = v
+      end
+      
+      opts.on('-c', "--config name", "Required - Name of the config we are preparing from.") do |v|
+        options[:config] = v
+      end
+
+      opts.on('-i', "--initials name", "Initials prepended to your branch For example --initials gws will result in something like gws_iphone_3.0.") do |v|
+        options[:initials] = v
+      end
+
+      opts.on("--no-branch", "Don't create developer branch.") do |v|
+        options[:nobranch] = true # just indicate that the option was set (parms used --no to mean false but we don't want that)
+      end
+
+      opts.on("--with-local-version", "Also include a local version branch, only applies with the -i option.") do |v|
+        options[:with_local_version] = true
+      end
+      opts.on('-n', "--shallow", "Checkout only level one to only have first level of history") do |v|
+        options[:shallow] = true
+      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 prepare_repo(repo, top_dir, initials, nobranch, with_local_version, shallow)
+      git_path = repo[:git_path]
+      branch = repo[:branch]
+      create_dev_branch = (repo[:create_dev_branch] == true) && (!nobranch)
+      tag = repo[:tag]
+      parent_path = repo[:parent_path]
+
+      if tag && branch
+        raise "We only support branching relative to HEAD, you cannot specify a branch:#{branch} and a tag:#{tag}."
+      end
+
+      if tag && create_dev_branch
+        raise "We do not support creating dev branches when using a tag"
+      end
+
+      # build the parent path if we have one and make it the new top dir
+      if parent_path
+        Dir.chdir(top_dir){
+          FileUtils.mkpath(parent_path)
+        }
+        top_dir = "#{top_dir}/#{parent_path}"
+      end
+
+      # first clone the repo
+      cmd = "git clone #{git_path} -b #{branch} #{shallow}"
+      if EbmSharedLib::CL.do_cmd_result(cmd, top_dir) != 0
+        raise "Cloning repo at #{git_path} failed."
+      end
+
+      # extract the directory name that this repo ended up in
+      repo_name = EbmSharedLib.get_repo_name(git_path)
+      repo_path = "#{top_dir}/#{repo_name}"
+
+      # now set up the remote tracking base branch if we have one
+      if branch
+        cmd = "git checkout -B #{branch} --track origin/#{branch}"
+        if EbmSharedLib::CL.do_cmd_result(cmd, repo_path) != 0
+          raise "Checking out branch #{branch} for #{repo_name} failed."
+        end
+
+        # now create the developer branch off of the base branch
+        if create_dev_branch
+          dev_branch_name = "#{initials}_#{branch}"
+          # first assume dev branch already exists and try to switch to it
+          cmd = "git checkout --track origin/#{dev_branch_name}"
+          if EbmSharedLib::CL.do_cmd_result(cmd, repo_path) != 0
+            # no remote branch, so create local and push as remote
+            cmd = "git checkout -B #{dev_branch_name}"
+            if EbmSharedLib::CL.do_cmd_result(cmd, repo_path) != 0
+              raise "Unable to create local and tracking developer branch #{dev_branch_name} for #{repo_name}."
+            end
+            cmd = "git push -u origin #{dev_branch_name}"
+            if EbmSharedLib::CL.do_cmd_result(cmd, repo_path) != 0
+              raise "Unable to create local and tracking developer branch #{dev_branch_name} for #{repo_name}."
+            end
+          end
+          if with_local_version == false
+            # they don't want the local version branch so drop it
+            cmd = "git branch -D #{branch}"
+            if EbmSharedLib::CL.do_cmd_result(cmd, repo_path) != 0
+              raise "Unable to delete local version branch #{branch} for #{repo_name}."
+            end
+          end
+        end
+      elsif tag
+        # they are using a tag so don't create dev branches
+        cmd = "git checkout #{tag}"
+        if EbmSharedLib::CL.do_cmd_result(cmd, repo_path) != 0
+          raise "Unable to checkout tag:#{tag} for #{repo_name}."
+        end
+      end
+
+      # pull any submodules
+      cmd = "git submodule init"
+      if EbmSharedLib::CL.do_cmd_result(cmd, repo_path) != 0
+        raise "Cloning submodules in repo at #{git_path} failed."
+      end
+      cmd = "git submodule update"
+      if EbmSharedLib::CL.do_cmd_result(cmd, repo_path) != 0
+        raise "Cloning submodules in repo at #{git_path} failed."
+      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]
+      initials = options[:initials]
+      nobranch = !!options[:nobranch]
+      with_local_version = !!options[:with_local_version]
+      shallow = !!options[:shallow] ? "--depth=1" : ""
+
+      if (nobranch && initials)
+        raise "You must specify either the --initials or --no-branch, not both."
+      end
+
+      if (initials.nil? && nobranch == false)
+        raise "You must specify either --initials or --no-branch"
+      end
+
+      if (with_local_version && initials.nil?)
+        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
+      config_repo = options[:config_repo]
+      config_repo_url = EbmSharedLib.prepare_config_repo(config_repo)
+      info = EbmSharedLib.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.
+
+      top_dir = "#{Dir.pwd}/#{config_name}"
+      raise "Cannot prepare since top level directory already exists: #{top_dir}" if File.directory?(top_dir)
+
+      Dir::mkdir(top_dir)
+
+      repos = info[:repos]
+      repos.each do |repo|
+        prepare_repo(repo, top_dir, initials, nobranch, with_local_version, shallow)
+      end
+
+      # finish up by writing settings
+      settings = {
+          :config_repo_url => config_repo_url,
+          :config_name => config_name,
+      }
+      EbmSharedLib.write_settings(settings, top_dir, err_msg = nil)
+
+    end
+
+  end
+end

data/lib/commands/prune.rb

@@ -0,0 +1,53 @@
+#
+#   Rick Hoiberg
+#
+#   Copyright 2013, eBay Inc.
+#   All rights reserved.
+#   http://www.ebay.com
+#
+module Commands
+  class Prune
+
+    # 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: prune"
+      opts.description = "Removes branches in the local repository that no longer exist on origin."
+    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
+
+      # determine config_name by extracting parent of our directory
+      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}"
+      		cmd = "git remote prune origin"
+          if EbmSharedLib::CL.do_cmd_result(cmd, repo_path) != 0
+            raise "Git push origin failed for #{repo_name}.  Make sure you run the command from within a top level repo directory."
+          end
+        end
+      end
+    end
+  end
+end

data/lib/commands/pull.rb

@@ -0,0 +1,140 @@
+#
+#   Greg Seitz
+#
+#   Copyright 2013, eBay Inc.
+#   All rights reserved.
+#   http://www.ebay.com
+#
+module Commands
+  class Pull
+
+    # 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: pull [options]"
+      opts.description = "Pull code from remote repo."
+
+      opts.on('-t', "--tag name", "Name of the remote tag that you want to checkout. Warning this will overwrite any local changes.") do |v|
+        options[:tag] = v
+      end
+
+      opts.on("--remote-version", "Pull from remote version branch into your current branch.") do |v|
+        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
+    end
+
+    # @param [Object] global_options
+    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
+      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 || 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
+
+      # 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} pull:\n");
+
+        cmd = "git fetch #{dry_run} --all"
+        if EbmSharedLib::CL.do_cmd_result(cmd, repo_path) != 0
+          raise "Git fetch failed for #{repo_name}."
+        end
+
+        if tag
+          # use git checkout to force changes from either tag or branch
+          cmd = "git checkout -f refs/tags/#{tag}"
+          if EbmSharedLib::CL.do_cmd_result(cmd, repo_path) != 0
+            raise "Git checkout failed for #{repo_name}."
+          end
+        elsif repo[:create_dev_branch]
+          if remote_version
+            # pulling from remote version branch
+            cmd = "git pull #{dry_run} --no-ff --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-ff --no-edit --recurse-submodules=yes origin #{base_branch}"
+          else
+            # pull from the remote branch of the current branch
+            cmd = "git pull #{dry_run} --no-ff --no-edit --recurse-submodules=yes"
+          end
+
+          exit_code = EbmSharedLib::CL.do_cmd_ignore_str(cmd, "Automatic merge failed", repo_path)
+          if exit_code != 0 && exit_code != 999
+            raise "Git pull failed for #{repo_name}."
+          end
+          if exit_code == 999
+            merge_failed = true
+          end
+        end
+
+        cmd = "git submodule sync"
+        if EbmSharedLib::CL.do_cmd_result(cmd, repo_path) != 0
+          raise "Submodule sync for #{repo_name} failed."
+        end
+        if dry_run.empty?
+          cmd = "git submodule update"
+        else
+          cmd = "git submodule update --no-fetch"
+        end
+        if EbmSharedLib::CL.do_cmd_result(cmd, repo_path) != 0
+          raise "Updating submodules for #{repo_name} failed."
+        end
+
+      end
+
+      if merge_failed
+        raise "Automatic merge failed, you must hand merge the conflicts"
+      end
+
+    end
+
+  end
+end

data/lib/commands/push.rb

@@ -0,0 +1,83 @@
+#
+#   Greg Seitz
+#
+#   Copyright 2013, eBay Inc.
+#   All rights reserved.
+#   http://www.ebay.com
+#
+module Commands
+  class Push
+
+    # 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: push [options]"
+      opts.description = "Push code to the remote repo."
+
+      opts.on("--remote-version", "Push from your local dev branch to the remote version branch - use with caution!") do |v|
+        options[:remote_version] = true
+      end
+
+      opts.on('-n', "--dry-run", "Perform a dry run.") do |v|
+        options[:dry_run] = true
+      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
+      remote_version = !!options[:remote_version]
+      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}"
+          local_branch = EbmSharedLib.get_current_branch(repo, repo_path)
+
+          puts("\n#{repo_name} push:\n");
+
+          if remote_version
+            # pulling from remote version branch
+            remote_branch = repo[:branch]
+            cmd = "git push #{dry_run} origin #{local_branch}:#{remote_branch}"
+          else
+            # pull from the remote branch of the current branch
+            # they want to commit whatever has changed and push to current remote
+            # first grab the current branch name
+            cmd = "git push #{dry_run} origin #{local_branch}"
+          end
+          if EbmSharedLib::CL.do_cmd_result(cmd, repo_path) != 0
+            raise "Git push failed for #{repo_name}."
+          end
+        end
+      end
+
+    end
+
+  end
+end