ebm 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
-SHA1: 
-  metadata.gz: 8ad007e4af3a408677cb93bc4df24416f14238a4
-  data.tar.gz: 2a7a8ed1badc38a107658cac981bb3a62e14d165
 SHA512: 
-  metadata.gz: f171c575262087494253ed30c057dec0affd6d2d9195a9592017dc6da2286ed33dd008d038446f0c69834e23eaa4c2e1b34fee4410a995dca24e174f3085a58c
-  data.tar.gz: 794b5095d08a3f7d847273c8cd290e25f419b1bcd75a8b2785b52fc24dea257752ba98a9f8644b0f668eee791a2c9a924cbed20f3157451f1add3cbc76f35206
+  data.tar.gz: dfe1224e61bb17252599956595bc87af6bff06e26d7904e2cd061bbb81bbf3fe42f79b5180c484e629146b10c15224dcb6052f32d4895ee1ffbe470d2c26ebfd
+  metadata.gz: 57467a5d326b1c76f046b0c90ef6abbe6ae2674689facd201c055f2d3f5a63f530b1b07208f286e2dd426c7a3ead79ac892afc627a8fac5a0baa1c1087a005fd
+SHA1: 
+  data.tar.gz: ef8fcd209905525a617b89701640b0ef94b2e1a1
+  metadata.gz: d222c1df8e6aaaaf53206431c5b0397ed212c3b4

data/lib/commands/pull.rb

@@ -0,0 +1,89 @@
+#
+#   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 = "Prepare your build environment"
+
+      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
+
+    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
+      tag = options[:tag]
+      force = options[:force]
+
+      if ARGV.length > 0
+        raise "You must specify all arguments with their options. You probably meant to use -b for the branch"
+      end
+
+      # 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
+      info = EbmSharedLib.read_repo_config(config_name, "Config not found, make sure you are in the top level version directory.")
+      # 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}"
+          puts("\n#{repo_name} pull:\n");
+
+          cmd = "git fetch --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
+          else
+            # use a normal pull from the specified remote repo
+            cmd = "git pull"
+            if EbmSharedLib::CL.do_cmd_result(cmd, repo_path) != 0
+              raise "Git pull failed for #{repo_name}."
+            end
+          end
+          cmd = "git submodule update"
+          if EbmSharedLib::CL.do_cmd_result(cmd, repo_path) != 0
+            raise "Updating submodules for #{repo_name} failed."
+          end
+        end
+      end
+
+    end
+
+  end
+end

data/lib/commands/status.rb

@@ -33,9 +33,10 @@ module Commands
       # the file is expected to be in JSON format
 
       # determine config_name by extracting parent of our directory
-      config_name = "#{Dir.pwd}".split("/")[-2]
+      config_name = EbmSharedLib.config_name_from_dir(Dir.pwd)
+#      config_name = "#{Dir.pwd}".split("/")[-2]
       if config_name.nil?
-        raise "No version directory found.  This command must be run from within one of your top level repos."
+        raise "No version directory found.  This command must be run from the top level directory (i.e. iphone_3.1)."
       end
 
       # try to make sure the repo is available

data/lib/commands.rb

@@ -20,3 +20,4 @@ require 'commands/make_sample'
 require 'commands/tag'
 require 'commands/status'
 require 'commands/periodic'
+require 'commands/pull'

data/lib/ebm.rb

@@ -49,6 +49,7 @@ class Ebm
     sub_commands[:tag] = Commands::Tag.new
     sub_commands[:status] = Commands::Status.new
     sub_commands[:periodic] = Commands::Periodic.new
+    sub_commands[:pull] = Commands::Pull.new
   end
 
   def setup

data/lib/ebmsharedlib/utilities.rb

@@ -59,7 +59,7 @@ module EbmSharedLib
   end
 
   # read and return the config info for this repo
-  def self.read_repo_config(config_name)
+  def self.read_repo_config(config_name, err_msg = nil)
     config_path = "#{EbmSharedLib::CONFIG_PATH}/configs/#{config_name}#{EbmSharedLib::CONFIG_SUFFIX}"
 
     begin
@@ -67,7 +67,8 @@ module EbmSharedLib
       info = JSON.parse(json)
       info.recursively_symbolize_keys!
     rescue
-      raise "Error opening config file JSON: #{config_path}"
+      msg = err_msg.nil? ? "Error opening config file JSON: #{config_path}" : err_msg
+      raise msg
     end
   end
 

data/lib/info.rb

@@ -7,6 +7,6 @@
 #
 class Info
   def self.version
-    "0.0.12"
+    "0.0.13"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ebm
 version: !ruby/object:Gem::Version 
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors: 
 - Greg Seitz
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-05-31 00:00:00 Z
+date: 2013-06-25 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: subcommand
@@ -54,6 +54,7 @@ files:
 - lib/commands/make_sample.rb
 - lib/commands/periodic.rb
 - lib/commands/prepare.rb
+- lib/commands/pull.rb
 - lib/commands/status.rb
 - lib/commands/tag.rb
 - lib/commands.rb