ebm 0.0.35 → 0.0.36

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 45fae87b7c177cd761ba24301d0122fee2cb12ef
-  data.tar.gz: a18668eeea450ba475337bc90c22064ea528f8c1
+  metadata.gz: e01e34fd0e0fb60f1d0aa96ded8834191e50502c
+  data.tar.gz: df9abd77254e4141b25a7d2b63b678cb8d9619e0
 SHA512:
-  metadata.gz: a9c96ae05d4ca446d9bc8ad634ec1e9c29a48fde16cd944449be26bde84d76217a15fb09261d31c802709199d011cd49b958b810df9a3689003d51caab19e71c
-  data.tar.gz: 91d364cec191198fcb72bcb6f9d40abc8ba7ac3ecf00812cccf15ffc35046afff451478092761f7580218556c43e39b825acd156ee34d960e7a87da7d434c6be
+  metadata.gz: c0db7315f413799a57965c62508baf77ab2790ad8ab262297ef58457b84a598de56fb5a5ce2fecd2a1416a3aa29e33a6c2f66ec04d61c5a03ac9af66a031c365
+  data.tar.gz: e9a6ffde83a164d98530026d19c81e60d8c7a6ddac11b06f9d714875edccc59eb0e7d392ddb02b82c24834a8dc78b57c7cc5ba859b74b834e43a62bcb1c7e392

data/lib/commands.rb

@@ -24,6 +24,7 @@ require 'commands/tag'
 require 'commands/status'
 require 'commands/periodic'
 require 'commands/pull'
+require 'commands/format_helper'
 require 'commands/push'
 require 'commands/prune'
 require 'commands/commit'

data/lib/commands/format_helper.rb

@@ -0,0 +1,106 @@
+#
+#   Greg Seitz
+#
+#   Copyright 2013, eBay Inc.
+#   All rights reserved.
+#   http://www.ebay.com
+#
+module Commands
+  class FormatHelper
+
+    # 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: format_helper [options]"
+      opts.description = "Create checkouts and removes after format merge - only for android code reformat."
+      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)
+
+      if ARGV.length > 0
+        raise "You must specify all arguments with their options."
+      end
+      dry_run = !!options[:dry_run]
+
+      # 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} format_helper:\n");
+
+        cmd = "git status --short"
+        result = EbmSharedLib::CL.do_cmd_output(cmd, repo_path)
+        if $?.exitstatus != 0
+          raise "Git status failed for #{repo_name}."
+        end
+
+        pairs = result.split
+
+        len = pairs.length
+        cur = 0
+        matches = 0
+        while true
+          if cur == len
+            break
+          end
+          code = pairs[cur]
+          cur += 1
+          path = pairs[cur]
+          cur += 1
+          if code == "UU"
+            matches +=1
+            #puts "#{code} - #{path}"
+            cmd = "git checkout --ours -- #{path}"
+            if dry_run
+              puts cmd
+            else
+              if EbmSharedLib::CL.do_cmd_result(cmd, repo_path) != 0
+                raise "Git checkout failed for #{path}."
+              end
+              cmd = "git add #{path}"
+              if EbmSharedLib::CL.do_cmd_result(cmd, repo_path) != 0
+                raise "Git add failed for #{path}."
+              end
+            end
+          elsif code == "DU"
+            matches += 1
+            cmd = "git rm #{path}"
+            if dry_run
+              puts cmd
+            else
+              if EbmSharedLib::CL.do_cmd_result(cmd, repo_path) != 0
+                raise "Git rm failed for #{path}."
+              end
+            end
+          end
+        end
+      end
+    end
+
+  end
+end

data/lib/ebm.rb

@@ -50,6 +50,7 @@ class Ebm
     sub_commands[:status] = Commands::Status.new
     sub_commands[:periodic] = Commands::Periodic.new
     sub_commands[:pull] = Commands::Pull.new
+    sub_commands[:format_helper] = Commands::FormatHelper.new
     sub_commands[:prune] = Commands::Prune.new
     sub_commands[:push] = Commands::Push.new
     sub_commands[:commit] = Commands::Commit.new

data/lib/info.rb

@@ -7,6 +7,6 @@
 #
 class Info
   def self.version
-    "0.0.35"
+    "0.0.36"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ebm
 version: !ruby/object:Gem::Version
-  version: 0.0.35
+  version: 0.0.36
 platform: ruby
 authors:
 - Greg Seitz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-14 00:00:00.000000000 Z
+date: 2013-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: subcommand
@@ -75,6 +75,7 @@ extra_rdoc_files: []
 files:
 - lib/commands/commit.rb
 - lib/commands/configs.rb
+- lib/commands/format_helper.rb
 - lib/commands/make_sample.rb
 - lib/commands/periodic.rb
 - lib/commands/prepare.rb