ebm 0.0.15 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
-SHA512: 
-  metadata.gz: f7b603272b2c9fc59edce589b9c11b4e5782d1edcf898b396e15f3fef9fb7dbbbd0fea03e9d0483bef301e96e8fc4dac1a03d530c99a37bb518946b850ae73d9
-  data.tar.gz: 00de09579c0f9729536c6c63e613b3ec6014e07421ec518610379cc9e8165c4a3a0168356c681e4f0e436ec4eb2460676e3309321e8d32cb01128b1266dcf5a4
 SHA1: 
-  metadata.gz: c749515fc92f8758856798292830057d2299b95c
-  data.tar.gz: 51601bc0d48c15c7b2b29e57e165a09f8c619f29
+  data.tar.gz: 367cd483688c378a1979e31d5a54c5ace5b147c4
+  metadata.gz: 49faf13adbf47da860c7f57af3f7fc34d7525422
+SHA512: 
+  data.tar.gz: 7ec095e60931d255776b90fca492af8f6910a3401e4fc9b17b2ea338d40433ff81724010ae4a73e7b3619b8734bae5ff78f1bbfdfe7decd3dbc155cf2a148a4d
+  metadata.gz: 40d95b1f00c62395c9bbd6af7224c9e158afca688e9073875bf89b86b9799b3e0c15000874bee290f5fdceb756f5b8737233abfb59722442de8d9d1320fb2813

data/lib/commands/commit.rb

@@ -0,0 +1,88 @@
+#
+#   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.") do |v|
+        options[:comment] = v
+      end
+
+      opts.on("--add", "Also add all new files.") do |v|
+        options[:add] = 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]
+
+      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)
+
+      # 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 ."
+            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}\""
+          msg = EbmSharedLib::CL.do_cmd_output(cmd, repo_path)
+          puts msg
+          exit_code = $?.exitstatus
+          if exit_code != 0
+            line = msg.split("\n").last   # last line
+            # ugly hack to not show as error when nothing to commit
+            if line != "nothing to commit (working directory clean)"
+              raise "Git commit failed for #{repo_name}."
+            end
+          end
+        end
+      end
+
+    end
+
+  end
+end

data/lib/commands/{list_configs.rb → configs.rb}

@@ -6,7 +6,7 @@
 #   http://www.ebay.com
 #
 module Commands
-  class ListConfigs
+  class Configs
 
     # holds the options that were passed
     # you can set any initial defaults here
@@ -22,17 +22,15 @@ module Commands
     end
 
     def register(opts, global_options)
-      opts.banner = "Usage: list_configs"
-      opts.description = "List all possible configurations."
+      opts.banner = "Usage: configs"
+      opts.description = "List all configurations."
     end
 
 
     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|
@@ -44,6 +42,7 @@ module Commands
           nil
         end
       }
+      puts "\nCurrent configurations:"
       config_names.each do |name|
         puts name unless name.nil?
       end

data/lib/commands/prepare.rb

@@ -19,7 +19,6 @@ module Commands
     def required_options
       @required_options ||= Set.new [
           :config,
-          :initials,
       ]
     end
 
@@ -31,7 +30,7 @@ module Commands
         options[:config] = v
       end
 
-      opts.on('-i', "--initials name", "Required - Initials prepended to your branch For example --initials gws will result in something like gws_iphone_3.0.") do |v|
+      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
 
@@ -120,7 +119,15 @@ module Commands
       # the file is expected to be in JSON format
       config_name = options[:config]
       initials = options[:initials]
-      nobranch = options[:nobranch]
+      nobranch = !!options[:nobranch]
+
+      if (nobranch && initials)
+        raise "You must specify either the --initials or --nobranch, not both."
+      end
+
+      if (initials.nil? && nobranch == false)
+        raise "You must specify either --initials or --nobranch"
+      end
 
       # try to make sure the repo is available
       EbmSharedLib.prepare_config_repo

data/lib/commands/pull.rb

@@ -23,7 +23,7 @@ module Commands
 
     def register(opts, global_options)
       opts.banner = "Usage: pull [options]"
-      opts.description = "Prepare your build environment"
+      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
@@ -50,12 +50,9 @@ module Commands
         raise "You can't specify both a pull from a tag and a pull from a remote version branch together."
       end
 
-      # determine config_name by extracting parent of our directory
-      config_name = EbmSharedLib.config_name_from_dir(Dir.pwd)
+      # get config based on name of current dir
+      info = EbmSharedLib.get_config_from_top_dir(false)
 
-      # 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
 
@@ -81,10 +78,10 @@ module Commands
           else
             if remote_version
               # pulling from remote version branch
-              cmd = "git pull origin #{branch}"
+              cmd = "git pull --no-edit --recurse-submodules=yes origin #{branch}"
             else
               # pull from the remote branch of the current branch
-              cmd = "git pull"
+              cmd = "git pull --no-edit --recurse-submodules=yes"
             end
             if EbmSharedLib::CL.do_cmd_result(cmd, repo_path) != 0
               raise "Git pull failed for #{repo_name}."

data/lib/commands/push.rb

@@ -0,0 +1,78 @@
+#
+#   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] = 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]
+
+      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)
+
+      # 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 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}"
+          end
+          if EbmSharedLib::CL.do_cmd_result(cmd, repo_path) != 0
+            raise "Git push failed for #{repo_name}."
+          end
+        end
+      end
+
+    end
+
+  end
+end

data/lib/commands/status.rb

@@ -23,7 +23,7 @@ module Commands
 
     def register(opts, global_options)
       opts.banner = "Usage: status"
-      opts.description = "Shows the git status of all repos in the config.  Expects to be called from within a top level repo."
+      opts.description = "Shows the git status of all repos in the config."
 
     end
 
@@ -33,15 +33,7 @@ module Commands
       # the file is expected to be in JSON format
 
       # determine config_name by extracting parent of our directory
-      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 the top level directory (i.e. iphone_3.1)."
-#      end
-
-      # 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.")
+      info = EbmSharedLib.get_config_from_top_dir(false)
 
       # 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

@@ -52,12 +52,7 @@ module Commands
         raise "You cannot use --commit_and_push with --delete."
       end
 
-      # determine config_name by extracting 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)
+      info = EbmSharedLib.get_config_from_top_dir(false)
 
       # 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
@@ -75,12 +70,7 @@ module Commands
             if commit_and_push
               # they want to commit whatever has changed and push to current remote
               # first grab the current branch name
-              cmd = "git symbolic-ref HEAD"
-              result = EbmSharedLib::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
-              branch = result.rstrip.split("/").last
+              branch = EbmSharedLib.get_current_branch(repo, repo_path)
 
               # we have the local branch so now commit and push to the remote branch
               cmd = "git commit -am \"Committing changes via ebm tag --commit_and_push for tag #{tag}.\""

data/lib/commands.rb

@@ -15,9 +15,11 @@ require "ebmsharedlib/utilities"
 
 
 require 'commands/prepare'
-require 'commands/list_configs'
+require 'commands/configs'
 require 'commands/make_sample'
 require 'commands/tag'
 require 'commands/status'
 require 'commands/periodic'
 require 'commands/pull'
+require 'commands/push'
+require 'commands/commit'

data/lib/ebm.rb

@@ -44,12 +44,14 @@ class Ebm
   # define sub commands here
   def define_sub_commands
     sub_commands[:prepare] = Commands::Prepare.new
-    sub_commands[:list_configs] = Commands::ListConfigs.new
+    sub_commands[:configs] = Commands::Configs.new
     sub_commands[:make_sample] = Commands::MakeSample.new
     sub_commands[:tag] = Commands::Tag.new
     sub_commands[:status] = Commands::Status.new
     sub_commands[:periodic] = Commands::Periodic.new
     sub_commands[:pull] = Commands::Pull.new
+    sub_commands[:push] = Commands::Push.new
+    sub_commands[:commit] = Commands::Commit.new
   end
 
   def setup

data/lib/ebmsharedlib/utilities.rb

@@ -46,6 +46,7 @@ module EbmSharedLib
       exit_code = 0
       result = ""
 
+      puts cmd
       if dir.nil? == false
         Dir.chdir(dir){
           result = `#{cmd}`
@@ -104,4 +105,25 @@ module EbmSharedLib
     @printer ||= Printer.new
   end
 
+  # get the current banch
+  def self.get_current_branch(repo, repo_path)
+    repo_name = EbmSharedLib.get_repo_name(repo[:git_path])
+
+    cmd = "git symbolic-ref HEAD"
+    result = EbmSharedLib::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
+    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.")
+  end
 end

data/lib/info.rb

@@ -7,6 +7,6 @@
 #
 class Info
   def self.version
-    "0.0.15"
+    "0.0.16"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ebm
 version: !ruby/object:Gem::Version 
-  version: 0.0.15
+  version: 0.0.16
 platform: ruby
 authors: 
 - Greg Seitz
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-06-26 00:00:00 Z
+date: 2013-06-27 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: subcommand
@@ -50,11 +50,13 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- lib/commands/list_configs.rb
+- lib/commands/commit.rb
+- lib/commands/configs.rb
 - lib/commands/make_sample.rb
 - lib/commands/periodic.rb
 - lib/commands/prepare.rb
 - lib/commands/pull.rb
+- lib/commands/push.rb
 - lib/commands/status.rb
 - lib/commands/tag.rb
 - lib/commands.rb