ding 0.6.0 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0f255fe679b89e3e89e2d7011c3a82dbecd95434
-  data.tar.gz: b4e0e524d57bf280ca89dff0bde53a33e754657f
+  metadata.gz: 1448685cc5d407fbdd9924ac31a25a64d2faf4ac
+  data.tar.gz: de0955b503538011870dcfaf5e7b95318428c079
 SHA512:
-  metadata.gz: a6de47b962be00866f7d74bdc028261b5e117a43c9eb2a38fb1669aec82b4412e025f1dffa7bb0f135a9a29847b58d7ce331e9412dee98482585aac447ea83ac
-  data.tar.gz: 1eb7ff246c2a3996ab7615647d6a9bfb462658d5faf8274df68e994feede913497c5edd4b2c63ee0b5c8ee9f42394cff207a3fe413cafed0fd80fa5e74d6c385
+  metadata.gz: e9c454b3caf74446e05117033986edf0576af89e7c82bfe7ecd19113bd6014e64b8ba450e42af92b1b5ea0969e250d6dd6bdaade9d0521f48616213396e857c6
+  data.tar.gz: 3474202fb0762eaa9fb0264635f923c265d6d002c4622bab12c05a61e3121912e8bc4064c27db9bcec4b8f846a23e79773a01a79aaf912da697c0456dd523280

data/README.md

@@ -15,12 +15,13 @@ The usual method works:
 
 By default, `ding` will create a branch called `testing` from the
 selected feature branch. It also assumes that the master branch is
-called `master`. Branches named `master` and `develop` cannot be deleted
-by calling `Ding::Git.delete_branch` in code.
+called `master` and the main development branch is called `develop`.
+These main branches cannot be deleted using `Ding::Git.delete_branch`.
 
 These defaults can be over-ridden by providing ENV vars to the shell:
 
     DING_MASTER_BRANCH       - main branch to switch to for synchronising
+    DING_DEVELOP_BRANCH      - used to compare merge against feature
     DING_TESTING_BRANCH      - branch to over-ride from feature branch
     DING_SACROSANCT_BRANCHES - space separated list of protected branches
 
@@ -43,7 +44,9 @@ There are several commands available with global options for verbosity and forci
 This is the default action so running `ding` is the equivalent of `ding test`.
 
 There is an option to specify the feature branch pattern to display for
-selection of the code to be pushed to `testing`.
+selection of the code to be pushed to `testing`. By default, only
+remote branches that haven't already been merged to `develop` will be
+listed, this can be over-ridden by using the `-m` flag.
 
     $ ding help test
 
@@ -51,6 +54,7 @@ selection of the code to be pushed to `testing`.
       ding test
 
     Options:
+      -m, [--merged], [--no-merged]    # display branches that have been merged
       -p, [--pattern=PATTERN]          # specify a pattern for listing branches
                                        # Default: origin/XAP*
 

data/lib/ding/cli.rb

@@ -8,15 +8,16 @@ module Ding
 
     default_task :test
 
-    desc "test", "Push a feature branch to the testing branch (this is the default action)"
-    option :pattern, type: 'string',  aliases: '-p', default: 'origin/XAP*', desc: 'specify a pattern for listing branches'
+    desc "test", "Push a feature branch(es) to the testing branch (this is the default action)"
+    option :merged,  type: 'boolean',  aliases: '-m', default: false,         desc: 'display branches that have been merged'
+    option :pattern, type: 'string',   aliases: '-p', default: 'origin/XAP*', desc: 'specify a pattern for listing branches'
     def test
-      master_branch, testing_branch = Ding::MASTER_BRANCH.dup, Ding::TESTING_BRANCH.dup
-      say "\nDing ding ding: let's push a feature branch to #{testing_branch}...\n\n", :green
+      develop_branch, testing_branch = Ding::DEVELOP_BRANCH.dup, Ding::TESTING_BRANCH.dup
+      say "\nDing ding ding: let's merge one or more feature branches to #{testing_branch}...\n\n", :green
 
       repo = Ding::Git.new(options).tap do |r|
         say "> Synchronising with the remote...", :green
-        r.checkout master_branch
+        r.checkout develop_branch
         r.update
       end
 
@@ -26,17 +27,39 @@ module Ding
         exit 1
       end
 
-      feature_branch = ask_which_item(branches, 'Which feature branch should I use?')
+      feature_branches = ask_which_item(branches, 'Which feature branch should I use?', :multiple)
 
       repo.tap do |r|
         say "\n> Deleting #{testing_branch}...", :green
         r.delete_branch(testing_branch)
-        say "> Checking out #{feature_branch}...", :green
-        r.checkout(feature_branch)
+
+        say "> Checking out #{develop_branch}...", :green
+        r.checkout(develop_branch)
+
         say "> Creating #{testing_branch}...", :green
         r.create_branch(testing_branch)
-        say "> Pushing #{testing_branch} to the remote...", :green
-        r.push(testing_branch)
+
+        say "> Checking out #{testing_branch}...", :green
+        r.checkout(testing_branch)
+
+        say "> Merging in selected feature #{feature_branches.count == 1 ? 'branch' : 'branches'}...", :green
+        merge_errors = false
+        feature_branches.each do |branch|
+          if r.merge_branch(branch)
+            say ">>> #{branch} succeeded", :green
+          else
+            say ">>> #{branch} failed", :red
+            merge_errors = true
+          end
+        end
+
+        unless merge_errors
+          say "> Pushing #{testing_branch} to the remote...", :green
+          r.push(testing_branch)
+        else
+          say "\n  --> There were merge errors, ding dang it!\n\n", :red
+          exit 1
+        end
       end
 
     rescue => e
@@ -100,14 +123,17 @@ module Ding
     private
 
     def show_error(e)
-      say "\n  --> Error: #{e.message}\n\n", :red
+      say "\n  --> ERROR: #{e.message}\n\n", :red
       raise if options[:verbose]
       exit 1
     end
 
-    def ask_which_item(items, prompt)
-      return items.first if items.size == 1
+    # presents a list of choices and allows either a single or multiple selection
+    # returns the selected choices in an array or exist if selection is invalid
+    def ask_which_item(items, prompt, mode=:single)
+      return Array(items.first) if items.size == 1
       str_format = "\n %#{items.count.to_s.size}s: %s"
+      prompt     = prompt << "\n > Enter multiple selections separated by ',' or 'A' for all" if mode == :multiple
       question   = set_color prompt, :yellow
       answers    = {}
 
@@ -118,10 +144,20 @@ module Ding
       end
 
       say question
-      reply = ask("> ").to_s
-      if answers[reply]
-        answers[reply]
-      else
+      reply = ask(" >", :yellow).to_s
+      begin
+        replies = reply.split(',')
+        if answers[reply]
+          answers.values_at(reply)
+        elsif mode == :multiple && reply == 'A'
+          answers.values
+        elsif mode == :multiple && !replies.empty?
+          selected_items = answers.values_at(*replies)
+          raise "Invalid selection" if selected_items.include?(nil)
+          selected_items
+        end
+      rescue
+        raise if options[:verbose]
         say "\n  --> That's not a valid selection, I'm out of here!\n\n", :red
         exit 1
       end

data/lib/ding/models/git.rb

@@ -7,7 +7,8 @@ module Ding
     end
 
     def branches(pattern)
-      %x(git branch --remote --list #{remote_version(pattern)}).split.map {|b| b.split('/').last}
+      merged = options[:merged] ? '--merged' : '--no-merged'
+      %x(git branch --remote --list #{remote_version(pattern)} #{merged}).split
     end
 
     def branch_exists?(branch)
@@ -19,7 +20,11 @@ module Ding
     end
 
     def create_branch(branch)
-      raise "Unable to create #{branch}" unless run_cmd "git branch --track #{branch}"
+      raise "Unable to create #{branch}" unless run_cmd "git branch --no-track #{branch}"
+    end
+
+    def current_branch
+      %x(git rev-parse --abbrev-ref HEAD)
     end
 
     def delete_branch(branch)
@@ -36,6 +41,15 @@ module Ding
       end
     end
 
+    def merge_branch(branch)
+      raise "Can't merge into protected branch #{current_branch}" if Ding::SACROSANCT_BRANCHES.include?(current_branch)
+      success = !!(run_cmd "git merge -m 'Merge branch #{branch} into #{current_branch}' #{branch}")
+      unless success
+        run_cmd 'git merge --abort'
+      end
+      success
+    end
+
     def push(branch)
       checkout branch
       push_cmd = "git push #{remote_name} #{branch}"

data/lib/ding/version.rb

@@ -1,3 +1,3 @@
 module Ding
-  VERSION = "0.6.0"
+  VERSION = "0.7.2"
 end

data/lib/ding.rb

@@ -5,8 +5,9 @@ require 'ding/models/ssh'
 
 module Ding
   MASTER_BRANCH   = ENV['DING_MASTER_BRANCH'] || 'master'
+  DEVELOP_BRANCH   = ENV['DING_DEVELOP_BRANCH'] || 'develop'
   TESTING_BRANCH  = ENV['DING_TESTING_BRANCH'] || 'testing'
-  SACROSANCT_BRANCHES = (ENV['DING_SACROSANCT_BRANCHES'] || 'master develop').split
+  SACROSANCT_BRANCHES = (ENV['DING_SACROSANCT_BRANCHES'] || "#{MASTER_BRANCH} #{DEVELOP_BRANCH}").split
 
   # because we lurve the command line... ding!
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ding
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.2
 platform: ruby
 authors:
 - Warren Bain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-18 00:00:00.000000000 Z
+date: 2015-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler