ding 0.8.4 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 34dd7cd7e774700fffbb9c92df0062d4973cc818
-  data.tar.gz: 66c376f6198436513b8492125f3550ed1f05a395
+  metadata.gz: 04e92ee8a732f0ef2129453db6ff013a7ee13cf5
+  data.tar.gz: ee7f8df5dcb0f7ad17638a10b73613acbfc54098
 SHA512:
-  metadata.gz: 3085835587bc68f1277a0702bbe3a805c1de7f31e432fd6168e0e62f33f9eada4cf05559df78779545f87e70ffaac5b7a33cb4ded49d94476f902feec8783f1d
-  data.tar.gz: 4e4bb4db05bfccc6cae4156192c44977439124353535fe88d74b1702dd9f31a6039bbb8da062a59b079fda92705abd6a131818aa724282a8ed110d76f22294de
+  metadata.gz: 61ff465ab0358cdb2e25618f4b47fcec61cff4ea5a22d506aca1202980c787dc3792892b85264cbc54a67d6401c502739b77a0e994749ebffe323edabfbe376e
+  data.tar.gz: 75ba13e9398eca7ed442acf148210d066fca51ab0955d7679a490d5c5d8b29c7b2d3c2997f437d95385f6d676d5004110549500d5130895c31e66cff0c76d6ca

data/README.md

@@ -22,9 +22,11 @@ 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_TESTING_BRANCH      - branch to over-ride 'testing' branch
     DING_SACROSANCT_BRANCHES - space separated list of protected branches
 
+The testing branch can also be over-ridden by passing the `-b` option.
+
 ## Using Ding
 
 There are several commands available with global options for verbosity and forcing actions:
@@ -33,32 +35,39 @@ There are several commands available with global options for verbosity and forci
       ding help [COMMAND]  # Describe available commands or one specific command
       ding key-gen         # Create a new private/public key pair and associated ssh config
       ding key-show        # Copy a public ssh key signature to the system clipboard (use -v to also display the signature)
-      ding test            # Push a feature branch to the testing branch (this is the default action)
+      ding push            # Push a feature branch to the testing branch (this is the default action)
 
     Options:
       -f, [--force], [--no-force]      # use the force on commands that allow it e.g. git push
       -v, [--verbose], [--no-verbose]  # show verbose output such as full callstack on errors
 
-### ding test
+### ding push
 
-This is the default action so running `ding` is the equivalent of `ding test`.
+This is the default action so running `ding` is the equivalent of `ding push`.
 
 There is an option to specify the feature branch pattern to display for
 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
+    $ ding help push
 
     Usage:
-      ding test
+      ding push
 
     Options:
+      -b  [--branch=BRANCH]            # specify an over-ride destination branch
       -m, [--merged], [--no-merged]    # display branches that have been merged
       -p, [--pattern=PATTERN]          # specify a pattern for listing branches
                                        # Default: origin/XAP*
 
-    Push a feature branch to the testing branch
+    Push feature branch(es) to the testing branch (this is the default action)
+
+The destination branch is selected in the following order:
+
+1. The branch specified by the `-b` option
+1. The branch specified in `ENV['DING_TESTING_BRANCH']`
+1. Otherwise defaults to the `testing` branch
 
 ### ding key-gen
 

data/lib/ding/cli.rb

@@ -6,13 +6,15 @@ module Ding
     class_option :force,   type: 'boolean', aliases: '-f', default: true,  desc: 'use the force on commands that allow it e.g. git push'
     class_option :verbose, type: 'boolean', aliases: '-v', default: false, desc: 'show verbose output such as full callstack on errors'
 
-    default_task :test
+    default_task :push
 
-    desc "test", "Push a feature branch(es) to the testing branch (this is the default action)"
+    desc "push", "Push feature branch(es) to the testing branch (this is the default action)"
+    option :branch,  type: 'string',   aliases: '-b', default: nil,           desc: 'specify an over-ride destination branch'
     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
+    def push
       develop_branch, testing_branch = Ding::DEVELOP_BRANCH.dup, Ding::TESTING_BRANCH.dup
+      testing_branch = options[:branch] if options[:branch]
       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|

data/lib/ding/version.rb

@@ -1,3 +1,3 @@
 module Ding
-  VERSION = "0.8.4"
+  VERSION = "1.0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ding
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 1.0.0
 platform: ruby
 authors:
 - Warren Bain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-23 00:00:00.000000000 Z
+date: 2015-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler