ebm 0.0.34 → 0.0.35

checksums.yaml

@@ -1,7 +1,7 @@
---- 
-SHA1: 
-  data.tar.gz: 880aa4afa58fb431557e4c536274c9d6e3e2b58b
-  metadata.gz: ca00f9018019aac30177d270abeace65ff36ae5e
-SHA512: 
-  data.tar.gz: 9fdc5737c5a322c469aabb9923afe7c970bc2e0bcf11c613a1aac8dbe1cccd6a67ecab661b90d99aa6f931a98b91f2bc718c7b359717dc34c654c7c891dc7a92
-  metadata.gz: 3085c7992fba5e92ee3a5800837d1cd9ac8d833f708d711f1d3ff058d4f27d9151c031cc41a755ab5d3fd43be23b9f7ab35cadb78499759864fcd68d5e7996b0
+---
+SHA1:
+  metadata.gz: 45fae87b7c177cd761ba24301d0122fee2cb12ef
+  data.tar.gz: a18668eeea450ba475337bc90c22064ea528f8c1
+SHA512:
+  metadata.gz: a9c96ae05d4ca446d9bc8ad634ec1e9c29a48fde16cd944449be26bde84d76217a15fb09261d31c802709199d011cd49b958b810df9a3689003d51caab19e71c
+  data.tar.gz: 91d364cec191198fcb72bcb6f9d40abc8ba7ac3ecf00812cccf15ffc35046afff451478092761f7580218556c43e39b825acd156ee34d960e7a87da7d434c6be

data/lib/commands.rb

@@ -19,10 +19,12 @@ require "ebmsharedlib/utilities"
 require 'commands/prepare'
 require 'commands/configs'
 require 'commands/make_sample'
+require 'commands/remove_merged_branches'
 require 'commands/tag'
 require 'commands/status'
 require 'commands/periodic'
 require 'commands/pull'
 require 'commands/push'
+require 'commands/prune'
 require 'commands/commit'
 require 'commands/version'

data/lib/commands/prune.rb

@@ -0,0 +1,53 @@
+#
+#   Rick Hoiberg
+#
+#   Copyright 2013, eBay Inc.
+#   All rights reserved.
+#   http://www.ebay.com
+#
+module Commands
+  class Prune
+
+    # 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: prune"
+      opts.description = "Removes branches in the local repository that no longer exist on origin."
+    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
+
+      # determine config_name by extracting parent of our directory
+      info = EbmSharedLib.get_config_from_top_dir
+
+      # 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}"
+      		cmd = "git remote prune origin"
+          if EbmSharedLib::CL.do_cmd_result(cmd, repo_path) != 0
+            raise "Git push origin failed for #{repo_name}.  Make sure you run the command from within a top level repo directory."
+          end
+        end
+      end
+    end
+  end
+end

data/lib/commands/remove_merged_branches.rb

@@ -0,0 +1,60 @@
+#
+#   Greg Seitz
+#
+#   Copyright 2013, eBay Inc.
+#   All rights reserved.
+#   http://www.ebay.com
+#
+module Commands
+  class RemoveMergedBranches
+
+    # 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: status"
+      opts.description = "Shows the git status of all repos in the config."
+      opts.on('-n', "--dry-run", "Perform a dry run.") do |v|
+        options[:dry_run] = true
+      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
+
+      # determine config_name by extracting parent of our directory
+      info = EbmSharedLib.get_config_from_top_dir
+      dry_run = !!options[:dry_run] ? "--dry-run" : ""
+
+      # Back up to version parent dir.  This directory contains the top level repos.
+#      top_dir = File.expand_path("#{Dir.pwd}/..")
+      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}"
+          File.open("#{repo_name}/merged_branches.txt").each do |line|
+        	  cmd = "git push #{dry_run} origin :#{line}"
+            if EbmSharedLib::CL.do_cmd_result(cmd, repo_path) != 0
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/commands/version.rb

@@ -29,6 +29,5 @@ module Commands
     def run(global_options)
       puts "#{Info.version}"
     end
-
   end
 end

data/lib/ebm.rb

@@ -24,8 +24,7 @@ class Ebm
 
   # required options
   def required_options
-    @required_options ||= Set.new [
-    ]
+    @required_options ||= Set.new []
   end
 
   # the options that were set
@@ -46,10 +45,12 @@ class Ebm
     sub_commands[:prepare] = Commands::Prepare.new
     sub_commands[:configs] = Commands::Configs.new
     sub_commands[:make_sample] = Commands::MakeSample.new
+    sub_commands[:remove_merged_branches] = Commands::RemoveMergedBranches.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[:prune] = Commands::Prune.new
     sub_commands[:push] = Commands::Push.new
     sub_commands[:commit] = Commands::Commit.new
     sub_commands[:version] = Commands::Version.new
@@ -157,9 +158,11 @@ class Ebm
   def print_actions
     cmdtext = "Commands are:"
     @commands.sort.map do |c, opt|
-      #puts "inside opt.call loop"
+      puts "inside opt.call loop"
       desc = opt.call.description
-      cmdtext << "\n   #{c} : #{desc}"
+      unless c == "remove_merged_branches"
+        cmdtext << "\n   #{c} : #{desc}"
+      end
     end
 
     # print aliases

data/lib/info.rb

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

metadata

@@ -1,72 +1,87 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: ebm
-version: !ruby/object:Gem::Version 
-  version: 0.0.34
+version: !ruby/object:Gem::Version
+  version: 0.0.35
 platform: ruby
-authors: 
+authors:
 - Greg Seitz
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-10-22 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-11-14 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: subcommand
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: json_pure
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: json_pure
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
         version: 1.5.2
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: ruby-hmac
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.5.2
+- !ruby/object:Gem::Dependency
+  name: ruby-hmac
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
         version: 0.4.0
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: highline
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.4.0
+- !ruby/object:Gem::Dependency
+  name: highline
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
         version: 1.6.12
   type: :runtime
-  version_requirements: *id004
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.6.12
 description: Allows configuration of various build systems for eBay mobile
 email: 
-executables: 
+executables:
 - ebm
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/commands/commit.rb
 - lib/commands/configs.rb
 - lib/commands/make_sample.rb
 - lib/commands/periodic.rb
 - lib/commands/prepare.rb
+- lib/commands/prune.rb
 - lib/commands/pull.rb
 - lib/commands/push.rb
+- lib/commands/remove_merged_branches.rb
 - lib/commands/status.rb
 - lib/commands/tag.rb
 - lib/commands/version.rb
@@ -81,31 +96,27 @@ files:
 - LICENSE
 homepage: 
 licenses: []
-
 metadata: {}
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --charset=UTF-8
-require_paths: 
+require_paths:
 - lib
 - lib/commands
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "1.8"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "1.3"
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '1.8'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '1.3'
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: eBay Mobile build tools
 test_files: []
-