ebm 0.0.25 → 0.0.26

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
-SHA512: 
-  metadata.gz: 786ec8b4b779ca4b493caf7b33be605b8f7153d5aa8c1734f3ff014b586a64757d4695fd1d1bd033f9c539b44a7994ad6cabc535f8156872cc5ff3978db921c2
-  data.tar.gz: 5fc4701500b320c735e5fe127dc227281ebb938dafd5588a8e31ffa13daeec0ea41fbf0e52fc75f5f629534609b17296ad2c6da5fd51e36da8d83806551c3050
 SHA1: 
-  metadata.gz: 733ad60292f1607af13abf36606ba345915af87f
-  data.tar.gz: f27005a74f5dd048a82f6328f7ee54ae2b99e24c
+  data.tar.gz: 9d440012f03a9075aa9f82058fee617d8635e90b
+  metadata.gz: 76bf9f7a8da9a5feaf71b31315aa3fc288252bd4
+SHA512: 
+  data.tar.gz: 3c0f5409c5bc890ead4d55696427ba88bea60683beb10590803cccf84cf9b522e00c17800ab1c65140718ed6a2df327635ba94beaa3a3e901547811580bec0dd
+  metadata.gz: 0951e0740b50371084f6d00f028a9dbb04acad054394ecc77de3955bad64e22ec8d5e25ef8ac87b80acc0b069a1d1e3e37b77991a103d06d9a8459ecf80a3d43

data/lib/commands/commit.rb

@@ -34,9 +34,13 @@ module Commands
         options[:comment] = v
       end
 
-      opts.on("--add", "Also add all new files.") do |v|
+      opts.on('-a', "--add", "Also add all new files.") do |v|
         options[:add] = v
       end
+
+      opts.on('-n', "--dry-run", "Perform a dry run.") do |v|
+        options[:dry_run] = v
+      end
     end
 
     def run(global_options)
@@ -45,13 +49,14 @@ module Commands
       # 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(false)
+      info = EbmSharedLib.get_config_from_top_dir
 
       # Back up to version parent dir.  This directory contains the top level repos.
       top_dir = Dir.pwd
@@ -66,13 +71,13 @@ module Commands
 
           if (add)
             # first add any new files
-            cmd = "git add ."
+            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 -am \"#{comment}\""
+          cmd = "git commit #{dry_run} -am \"#{comment}\""
           msg = EbmSharedLib::CL.do_cmd_output(cmd, repo_path)
           puts msg
           exit_code = $?.exitstatus

data/lib/commands/configs.rb

@@ -24,16 +24,21 @@ module Commands
     def register(opts, global_options)
       opts.banner = "Usage: configs"
       opts.description = "List all configurations."
+        
+      opts.on('-r', "--config-repo name", "Remote git repository for initial configs file download [corp,stash,<git url>]") 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
-      EbmSharedLib.prepare_config_repo
+      config_repo = options[:config_repo]
+      repo_url = EbmSharedLib.prepare_config_repo(config_repo)
 
-      config_path = "#{EbmSharedLib::CONFIG_PATH}/configs"
-      config_names = Pathname.glob("#{config_path}/*.config").map { |file_info|
+      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}")
@@ -42,7 +47,7 @@ module Commands
           nil
         end
       }
-      puts "\nCurrent configurations:"
+      puts "\nCurrent configurations for #{repo_url}:"
       config_names.each do |name|
         puts name unless name.nil?
       end

data/lib/commands/prepare.rb

@@ -26,6 +26,10 @@ module Commands
       opts.banner = "Usage: prepare [options]"
       opts.description = "Prepare your build environment"
 
+      opts.on('-r', "--config-repo name", "Remote git repository for initial configs file download [corp,stash,<git url>]") 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
@@ -34,11 +38,11 @@ module Commands
         options[:initials] = v
       end
 
-      opts.on("--nobranch", "Don't create developer branch.") do |v|
+      opts.on("--no-branch", "Don't create developer branch.") do |v|
         options[:nobranch] = v
       end
 
-      opts.on("--with_local_version", "Also include a local version branch, only applies with the -i option.") do |v|
+      opts.on("--with-local-version", "Also include a local version branch, only applies with the -i option.") do |v|
         options[:with_local_version] = v
       end
 
@@ -154,8 +158,9 @@ module Commands
       end
 
       # try to make sure the repo is available
-      EbmSharedLib.prepare_config_repo
-      info = EbmSharedLib.read_repo_config(config_name)
+      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.
@@ -170,6 +175,13 @@ module Commands
         prepare_repo(repo, top_dir, initials, nobranch, with_local_version)
       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

data/lib/commands/pull.rb

@@ -29,18 +29,23 @@ module Commands
         options[:tag] = v
       end
 
-      opts.on("--remote_version", "Pull from remote version branch into your current branch.") do |v|
+      opts.on("--remote-version", "Pull from remote version branch into your current branch.") do |v|
         options[:remote_version] = v
       end
 
+      opts.on('-n', "--dry-run", "Perform a dry run.") do |v|
+        options[:dry_run] = v
+      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]
+      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."
@@ -51,7 +56,7 @@ module Commands
       end
 
       # get config based on name of current dir
-      info = EbmSharedLib.get_config_from_top_dir(false)
+      info = EbmSharedLib.get_config_from_top_dir
 
       # Back up to version parent dir.  This directory contains the top level repos.
       top_dir = Dir.pwd
@@ -64,7 +69,7 @@ module Commands
           branch = repo[:branch]
           puts("\n#{repo_name} pull:\n");
 
-          cmd = "git fetch --all"
+          cmd = "git fetch #{dry_run} --all"
           if EbmSharedLib::CL.do_cmd_result(cmd, repo_path) != 0
             raise "Git fetch failed for #{repo_name}."
           end
@@ -78,16 +83,20 @@ module Commands
           else
             if remote_version
               # pulling from remote version branch
-              cmd = "git pull --no-edit --recurse-submodules=yes origin #{branch}"
+              cmd = "git pull #{dry_run} --no-edit --recurse-submodules=yes origin #{branch}"
             else
               # pull from the remote branch of the current branch
-              cmd = "git pull --no-edit --recurse-submodules=yes"
+              cmd = "git pull #{dry_run} --no-edit --recurse-submodules=yes"
             end
             if EbmSharedLib::CL.do_cmd_result(cmd, repo_path) != 0
               raise "Git pull failed for #{repo_name}."
             end
           end
-          cmd = "git submodule update"
+          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

data/lib/commands/push.rb

@@ -25,24 +25,29 @@ module Commands
       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|
+      opts.on("--remote-version", "Push from your local dev branch to the remote version branch - use with caution!") do |v|
         options[:remote_version] = v
       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
-      remote_version = options[:remote_version]
+      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(false)
+      info = EbmSharedLib.get_config_from_top_dir
 
       # Back up to version parent dir.  This directory contains the top level repos.
       top_dir = Dir.pwd
@@ -59,12 +64,12 @@ module Commands
           if remote_version
             # pulling from remote version branch
             remote_branch = repo[:branch]
-            cmd = "git push origin #{local_branch}:#{remote_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 origin #{local_branch}"
+            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}."

data/lib/commands/status.rb

@@ -33,7 +33,7 @@ module Commands
       # 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(false)
+      info = EbmSharedLib.get_config_from_top_dir
 
       # Back up to version parent dir.  This directory contains the top level repos.
 #      top_dir = File.expand_path("#{Dir.pwd}/..")

data/lib/commands/tag.rb

@@ -34,7 +34,7 @@ module Commands
         options[:delete] = v
       end
 
-      opts.on("--commit_and_push", "Commit any local changes and then push the remote - should only be used by the build system.") do |v|
+      opts.on("--commit-and-push", "Commit any local changes and then push the remote - should only be used by the build system.") do |v|
         options[:commit_and_push] = v
       end
 
@@ -52,7 +52,7 @@ module Commands
         raise "You cannot use --commit_and_push with --delete."
       end
 
-      info = EbmSharedLib.get_config_from_top_dir(false)
+      info = EbmSharedLib.get_config_from_top_dir
 
       # other than prepare, any commands that work across the repos expect you to start
       # in the containing directory (i.e. if your config is named iphone_3.1, you are expected

data/lib/commands/version.rb

@@ -0,0 +1,34 @@
+#
+#   Greg Seitz
+#
+#   Copyright 2013, eBay Inc.
+#   All rights reserved.
+#   http://www.ebay.com
+#
+module Commands
+  class Version
+
+    # 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: version"
+      opts.description = "Returns the version only."
+    end
+
+    def run(global_options)
+      puts "#{Info.version}"
+    end
+
+  end
+end

data/lib/commands.rb

@@ -8,6 +8,7 @@
 #require "FileUtils"
 require "set"
 require "fileutils"
+require "hmac-sha1"
 
 require 'ebmsharedlib/monkey_patches'
 require "printer"
@@ -24,3 +25,4 @@ require 'commands/periodic'
 require 'commands/pull'
 require 'commands/push'
 require 'commands/commit'
+require 'commands/version'

data/lib/ebm.rb

@@ -52,6 +52,7 @@ class Ebm
     sub_commands[:pull] = Commands::Pull.new
     sub_commands[:push] = Commands::Push.new
     sub_commands[:commit] = Commands::Commit.new
+    sub_commands[:version] = Commands::Version.new
   end
 
   def setup

data/lib/ebmsharedlib/utilities.rb

@@ -8,8 +8,16 @@
 module EbmSharedLib
   ROOT_PATH = File.expand_path("~/.ebm")
   CONFIG_DIR = "build_configs"
-  CONFIG_PATH = "#{ROOT_PATH}/#{CONFIG_DIR}"
   CONFIG_SUFFIX = ".config"
+  SETTINGS_FILE = ".ebm-settings.json"
+
+  # the key is the shortcut used for the config repos
+  CONFIG_REPOS = {
+      "stash" => "https://mobiebay.com/git/scm/ebmconfigs/build_configs.git",
+      "corp" => "git@github.scm.corp.ebay.com:eBayMobile/build_configs.git",
+      "mobi" => "git@github.mobiebay.com:eBayMobile/build_configs.git",
+  }
+  CONFIG_REPOS["default"] = CONFIG_REPOS["corp"]
 
   class CL
     # run a command line and echo to console
@@ -60,29 +68,68 @@ module EbmSharedLib
 
   end
 
-  def self.prepare_config_repo
-      # make the root if missing
-      FileUtils.mkpath(ROOT_PATH)
-      #`mkdir -p #{ROOT_PATH}`
+  def self.get_config_repo_url(config_repo)
+    # convert to lowercase for comparison below if non nil
+    repo_alias = config_repo.nil? ? "default" : config_repo.downcase
 
-      # 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
-        # pull failed, try to clone
-        cmd = "git clone git@github.scm.corp.ebay.com:eBayMobile/build_configs.git"
-        if EbmSharedLib::CL.do_cmd_result(cmd, ROOT_PATH) != 0
-          raise "Unable to clone build_configs repo into #{ROOT_PATH}"
-        end
-      end
+    # loop up matching repo
+    found_repo = CONFIG_REPOS[repo_alias]
+    # if no match use the passed in repo
+    config_repo = found_repo.nil? ? config_repo : found_repo
+  end
 
+  # compute a unique hash for this repo so
+  # we can store it in a subdir of configs
+  def self.repo_url_hash(repo_url)
+    Digest::SHA1.hexdigest(repo_url)
   end
 
-  # read and return the config info for this repo
-  def self.read_repo_config(config_name, err_msg = nil)
-    config_path = "#{EbmSharedLib::CONFIG_PATH}/configs/#{config_name}#{EbmSharedLib::CONFIG_SUFFIX}"
+  # return the base config path minus the git dir
+  # for the given url
+  def self.base_config_path(repo_url)
+    config_hash = repo_url_hash(repo_url)
+
+    "#{ROOT_PATH}/repo_configs/#{config_hash}"
+  end
+
+  # the full config path
+  def self.full_config_path(repo_url)
+    "#{base_config_path(repo_url)}/#{CONFIG_DIR}"
+  end
 
+  # 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)
+    # get the full url
+    repo_url = EbmSharedLib.get_config_repo_url(config_repo_url)
+
+    # get the local config dir
+    base_config_path = base_config_path(repo_url)
+
+    # make the root if missing
+    FileUtils.mkpath(base_config_path)
+
+    # and the full config path
+    config_path = full_config_path(repo_url)
+
+    # 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
+      # pull failed, try to clone
+      cmd = "git clone #{repo_url} #{CONFIG_DIR}"
+      if EbmSharedLib::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
+
+  # read and parse a json file
+  def self.read_json_file(file_path, err_msg = nil)
     begin
-      json = File.open(config_path, 'r') {|f| f.read }
+      json = File.open(file_path, 'r') {|f| f.read }
       info = JSON.parse(json)
       info.recursively_symbolize_keys!
     rescue
@@ -91,10 +138,44 @@ module EbmSharedLib
     end
   end
 
+  # write the map as json into the specified file
+  def self.write_json_file(map, file_path, err_msg = nil)
+    begin
+
+      json = JSON.pretty_generate(map)
+
+      File.open(file_path, 'w') { |file| file.write(json) }
+    rescue
+      msg = err_msg.nil? ? "Error creating JSON file: #{file_path}" : err_msg
+      raise msg
+    end
+  end
+
+  # write the prepared settings, expects us to pass
+  # dir to write into
+  def self.write_settings(map, dir, err_msg = nil)
+    settings_path = "#{dir}/#{SETTINGS_FILE}"
+    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}"
+
+    read_json_file(config_file_path, err_msg)
+  end
+
+  # read top level settings within a prepared dir
+  # lets us get to the appropriate config file
+  def self.read_settings(err_msg = nil)
+    settings_path = "#{Dir.pwd}/#{SETTINGS_FILE}"
+    settings = read_json_file(settings_path, err_msg)
+  end
+
   # expects us to be in the top level dir that has the same name
   # as the config.  Such as /Users/gseitz/Develop/ebay/iphone_3.1
   # will extract the config_name of iphone_3.1
-  def self.config_name_from_dir(dir)
+  def self.config_name_from_dir
     config_name = "#{Dir.pwd}".split("/").last
   end
 
@@ -118,13 +199,20 @@ module EbmSharedLib
     branch = result.rstrip.split("/").last
   end
 
-  def self.get_config_from_top_dir(prepare)
-      # determine config_name by extracting parent of our directory
-      config_name = EbmSharedLib.config_name_from_dir(Dir.pwd)
-
-      # try to make sure the repo is available
-      EbmSharedLib.prepare_config_repo if (prepare)
-
-      info = EbmSharedLib.read_repo_config(config_name, "Config not found, make sure you are in the top level version directory.")
+  # read the repo_config file for the prepared directory by
+  # first fetching the settings from this dir
+  def self.get_config_from_top_dir(err_msg = nil)
+    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.")
+      repo_url = settings[:config_repo_url]
+      config_name = settings[:config_name]
+    rescue
+      # use defaults since failed to load settings
+      config_name = config_name_from_dir()
+      repo_url = get_config_repo_url(nil)
+    end
+    read_repo_config(repo_url, config_name, "Config not found, make sure you are in the top level directory.")
   end
 end

data/lib/info.rb

@@ -7,6 +7,6 @@
 #
 class Info
   def self.version
-    "0.0.25"
+    "0.0.26"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ebm
 version: !ruby/object:Gem::Version 
-  version: 0.0.25
+  version: 0.0.26
 platform: ruby
 authors: 
 - Greg Seitz
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-07-17 00:00:00 Z
+date: 2013-08-01 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: subcommand
@@ -59,6 +59,7 @@ files:
 - lib/commands/push.rb
 - lib/commands/status.rb
 - lib/commands/tag.rb
+- lib/commands/version.rb
 - lib/commands.rb
 - lib/ebm.rb
 - lib/ebmsharedlib/monkey_patches.rb