ebm 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
 SHA512: 
-  metadata.gz: bca2e2f71adac9af6d77828f81f82c682c9e2fce2c7d104ee3e90a7b24bf4ede0e37cad617038d4d7593fadd71ccb7f8e1f3970bc7ea9e0f44cc43e565f3d2bf
-  data.tar.gz: b25a98e1e2a4f8f7f8887c321184e7c59c514b118bed2d2b550a7d15bf21d172bd0190a79c2ac6c4bcec6065e47c4af899b7d5f03026c5a9359527975bd16702
+  data.tar.gz: a5288eddde61f146b76a5323777a2ffa4d48e14e54b64abd01304015269d7dd9b287fc5c7517bbf5828fc9be16af6bddb19c020bab0940fefc3531963d7f7fa1
+  metadata.gz: e0a5b7cc6803014087c90cb96a2c4a7da188c2d394108be89b5fa47ea9d04febaf57cff2684deda96d9d0abd5fb66c759e6f8b1ec2b105c42f5030c69baaee23
 SHA1: 
-  metadata.gz: c89aa4c077150d65300a6e029b102fc252660cec
-  data.tar.gz: 9942ef91186a68105d8b6baaade6bfca9c5518b1
+  data.tar.gz: 953745eaba17febc3998f2d7845c20e307333635
+  metadata.gz: 26c13b28d3cb2c0f80a7d48de48c7d8db95efe4d

data/lib/commands/list_configs.rb

@@ -30,6 +30,10 @@ module Commands
     def run(global_options)
       puts    # add empty line
       # show contents of configs directory for files with .config extension
+      # try to make sure the repo is available
+      EbmSharedLib.prepare_config_repo
+      info = EbmSharedLib.read_repo_config(config_name)
+
       config_path = "#{EbmSharedLib::CONFIG_PATH}/configs"
       config_names = Pathname.glob("#{config_path}/*.config").map { |file_info|
         if file_info.directory? == false

data/lib/commands/make_sample.rb

@@ -47,12 +47,14 @@ module Commands
                 {
                   :branch => "iphone_3.1",
                   :create_dev_branch => true,
-                  :git_path => "git@github.scm.corp.ebay.com:eBayMobile/ebaycore.git",
+                  :git_path => "git@github.scm.corp.ebay.com:eBayMobile/ios_iphone_core.git",
+                  :taggable => true,
                 },
                 {
-                  :branch => "iphone_3.1",
+                  :branch => "nautilus_3.1",
                   :create_dev_branch => true,
-                  :git_path => "git@github.scm.corp.ebay.com:eBayMobile/ios_common.git",
+                  :git_path => "git@github.scm.corp.ebay.com:eBayMobile/ios_nautilus.git",
+                  :taggable => true,
                 },
                 {
                   :tag => "2.2.9",

data/lib/commands/prepare.rb

@@ -71,7 +71,7 @@ module Commands
       end
 
       # extract the directory name that this repo ended up in
-      repo_name = git_path.split("/").last.split(".git")[0]
+      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
@@ -97,6 +97,12 @@ module Commands
         end
       end
 
+      # pull any submodules
+      cmd = "git submodule init && 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)
@@ -106,15 +112,9 @@ module Commands
       config_name = options[:config]
       initials = options[:initials]
 
-      config_path = "#{EbmSharedLib::CONFIG_PATH}/configs/#{config_name}#{EbmSharedLib::CONFIG_SUFFIX}"
-
-      begin
-        json = File.open(config_path, 'r') {|f| f.read }
-        info = JSON.parse(json)
-        info.recursively_symbolize_keys!
-      rescue
-        raise "Error opening config file JSON: #{config_path}"
-      end
+      # try to make sure the repo is available
+      EbmSharedLib.prepare_config_repo
+      info = EbmSharedLib.read_repo_config(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.

data/lib/commands/tag.rb

@@ -0,0 +1,81 @@
+#
+#   Greg Seitz
+#
+#   Copyright 2013, eBay Inc.
+#   All rights reserved.
+#   http://www.ebay.com
+#
+module Commands
+  class Tag
+
+    # 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,
+          :tag,
+      ]
+    end
+
+    def register(opts, global_options)
+      opts.banner = "Usage: tag [options]"
+      opts.description = "Apply or delete a tag for all taggable repos in a config"
+
+      opts.on('-c', "--config name", "Required - Name of the config we are preparing from.") do |v|
+        options[:config] = v
+      end
+
+      opts.on('-t', "--tag name", "Required - Name of the tag.") do |v|
+        options[:tag] = v
+      end
+
+      opts.on('-d', "--delete", "When set causes tag to be deleted.") do |v|
+        options[:delete] = 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
+      config_name = options[:config]
+      tag = options[:tag]
+      delete_tag = options[:delete]
+
+      # try to make sure the repo is available
+      EbmSharedLib.prepare_config_repo
+      info = EbmSharedLib.read_repo_config(config_name)
+
+      # 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
+      # to be in that directory when you run the command).
+      top_dir = "#{Dir.pwd}"
+
+      repos = info[:repos]
+      repos.each do |repo|
+        if repo[:taggable]
+          repo_name = EbmSharedLib.get_repo_name(repo[:git_path])
+          repo_path = "#{top_dir}/#{repo_name}"
+          if delete_tag == true
+            cmd = "git tag -d #{tag} && git push origin :refs/tags/#{tag}"
+          else
+            cmd = "git tag #{tag} && git push origin refs/tags/#{tag}"
+          end
+          if EbmSharedLib::CL.do_cmd_result(cmd, repo_path) != 0
+            raise "Tagging operation failed for #{repo_name}."
+          end
+
+        end
+      end
+
+    end
+
+  end
+end

data/lib/commands.rb

@@ -17,3 +17,4 @@ require "ebmsharedlib/utilities"
 require 'commands/prepare'
 require 'commands/list_configs'
 require 'commands/make_sample'
+require 'commands/tag'

data/lib/ebm.rb

@@ -46,12 +46,11 @@ class Ebm
     sub_commands[:prepare] = Commands::Prepare.new
     sub_commands[:list_configs] = Commands::ListConfigs.new
     sub_commands[:make_sample] = Commands::MakeSample.new
+    sub_commands[:tag] = Commands::Tag.new
   end
 
   def setup
     options.clear
-    # try to make sure the repo is available
-    EbmSharedLib.prepare_config_repo
     # global options
     global_options do |opts|
       opts.banner = "Version: #{Info.version} - Usage: #{CMD} [options] [subcommand [options]]"

data/lib/ebmsharedlib/utilities.rb

@@ -58,6 +58,23 @@ module EbmSharedLib
 
   end
 
+  # read and return the config info for this repo
+  def self.read_repo_config(config_name)
+    config_path = "#{EbmSharedLib::CONFIG_PATH}/configs/#{config_name}#{EbmSharedLib::CONFIG_SUFFIX}"
+
+    begin
+      json = File.open(config_path, 'r') {|f| f.read }
+      info = JSON.parse(json)
+      info.recursively_symbolize_keys!
+    rescue
+      raise "Error opening config file JSON: #{config_path}"
+    end
+  end
+
+  def self.get_repo_name(git_path)
+    repo_name = git_path.split("/").last.split(".git")[0]
+  end
+
   def self.printer
     @printer ||= Printer.new
   end

data/lib/info.rb

@@ -7,6 +7,6 @@
 #
 class Info
   def self.version
-    "0.0.4"
+    "0.0.5"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ebm
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - Greg Seitz
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-05-23 00:00:00 Z
+date: 2013-05-24 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: subcommand
@@ -53,6 +53,7 @@ files:
 - lib/commands/list_configs.rb
 - lib/commands/make_sample.rb
 - lib/commands/prepare.rb
+- lib/commands/tag.rb
 - lib/commands.rb
 - lib/ebm.rb
 - lib/ebmsharedlib/monkey_patches.rb