ding 1.2.5 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 852f8d7b2c81e1f9add37fc53fa7c1451507beb8
-  data.tar.gz: bea5f5455250cd77a750981d0095bc96ba93bce8
+  metadata.gz: 180b7234cd043dfd76225d56d47570ec10706bac
+  data.tar.gz: 172c523dcd96ae30955fc186ddc4aae228e45b1f
 SHA512:
-  metadata.gz: 89077adae81bba83de931a1ab9dd14a821e33b9c4f573e51a73dca48a9285959dde0fe981b91c7779bbc3df08d5936ea406baf561dee279bdc39b6fd3ac3d7e4
-  data.tar.gz: bd458bcc277ddb7d01e6bd6e977503859972ab12127c3c924c92edaab63ce20299488e5dd8e1ed95ca7b568196e275bd1275da35bb96daf209b7557387b7b532
+  metadata.gz: 91f84d350bd8750d8c61584edbbe890bd24888e9e4f4eceaa02b74e184c07a25be23d32ec9bc6cdbe1021e364e206ea92238b53a63db21c11ea3e5de0cda7b6c
+  data.tar.gz: fb79be5665c7d84a51ca379a17aac8ba51c3f5b73ca056e47096df9f9452d8970bef249320fac721258b84bd226038fe0cf97da8c9069cbeda728510b86c5baf

data/README.md

@@ -57,11 +57,12 @@ listed, this can be over-ridden by using the `-m` flag.
       ding push
 
     Options:
-      -b, [--branch=BRANCH]            # specify an over-ride destination branch
+      -b, [--branch=BRANCH]            # specify an over-ride for the testingbranch
       -l, [--local], [--no-local]      # operate on local branches (merged from remote)
       -m, [--merged], [--no-merged]    # display branches that have been merged
-      -p, [--pattern=PATTERN]          # specify a pattern for listing branches
+      -p, [--pattern=PATTERN]          # specify a pattern for listing feature branches
                                        # Default: *XAP*
+      -s, [--skip], [--no-skip]        # skip feature branch selection; just push develop to testing
       -f, [--force]                    # use the force on commands that allow it e.g. git push
                                        # Default: true
       -v, [--verbose], [--no-verbose]  # show verbose output such as full callstack on errors

data/lib/ding/cli.rb

@@ -8,24 +8,34 @@ module Ding
 
     default_task :push
 
-    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 :local,   type: 'boolean', aliases: '-l', default: false,         desc: 'operate on local branches (merged from remote)'
-    option :merged,  type: 'boolean', aliases: '-m', default: false,         desc: 'only display branches that have been merged'
-    option :pattern, type: 'string',  aliases: '-p', default: '*XAP*',       desc: 'specify a pattern for listing branches'
+    desc "push", <<-EOS
+      Creates the testing branch from develop, merges selected feature branch(es) and pushes to the remote (this is the
+      default action). The name of the testing branch is 'testing' unless the -b option is supplied. The 'development' branch
+      name can be over-ridden using ENV vars - see the source documentation for details of ENV var support. For all
+      boolean options, the default is 'false' unless otherwise stated above.
+
+      EOS
+    option :branch,  type: 'string',  aliases: '-b', default: nil,     desc: 'specify an over-ride for the testing branch'
+    option :local,   type: 'boolean', aliases: '-l', default: false,   desc: 'operate on local branches (merged from remote)'
+    option :merged,  type: 'boolean', aliases: '-m', default: false,   desc: 'only display branches that have been merged'
+    option :pattern, type: 'string',  aliases: '-p', default: '*XAP*', desc: 'specify a pattern for listing feature branches'
+    option :skip,    type: 'string',  aliases: '-s', default: false,   desc: 'skip feature branch selection; just push develop to testing'
     def push
       testing_branch = options[:branch] || Ding::TESTING_BRANCH.dup
+      develop_branch = Ding::DEVELOP_BRANCH.dup
 
-      say "\nDing ding ding: let's merge one or more feature branches to #{testing_branch}:\n\n", :green
+      if options[:skip]
+        say "\nDing ding ding: let's push the development branch to #{testing_branch}:\n\n", :green
+      else
+        say "\nDing ding ding: let's merge one or more feature branches to #{testing_branch}:\n\n", :green
+      end
 
       repo = Ding::Git.new(options).tap do |r|
         if r.is_dirty?
           say "> Local repo is dirty, resetting state", :yellow
           r.reset_local_state
         end
-
-        develop_branch = r.branch_in_context(Ding::DEVELOP_BRANCH.dup)
-        r.checkout develop_branch
+        r.checkout r.branch_in_context(develop_branch)
 
         say "> Deleting #{testing_branch}", :green
         r.delete_branch(testing_branch)
@@ -34,30 +44,35 @@ module Ding
         r.update
       end
 
-      branches = repo.remote_branches(options[:pattern])
-      if branches.empty?
-        say "\n --> No feature branches available to test, I'm out of here!\n\n", :red
-        exit 1
+      unless options[:skip]
+        branches = repo.remote_branches(options[:pattern])
+        if branches.empty?
+          say "\n --> No feature branches available to test, I'm out of here!\n\n", :red
+          exit 1
+        end
+        feature_branches = ask_which_item(branches, "\nWhich feature branch should I use?", :multiple)
+        say "\n"
       end
-      feature_branches = ask_which_item(branches, "\nWhich feature branch should I use?", :multiple)
 
-      commit_parents = repo.commit_parents(testing_branch)
+      original_commit_parents = repo.commit_parents(testing_branch)
 
       repo.tap do |r|
-        say "\n> Deleting any synched #{testing_branch}", :green
+        say "> Deleting any synched #{testing_branch}", :green
         r.delete_branch(testing_branch)
 
-        say "> Creating #{testing_branch}", :green
+        say "> Creating #{testing_branch} from #{develop_branch}", :green
         r.create_branch(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}", :green
-          else
-            say "   ✗  #{branch}", :red
-            merge_errors = true
+        unless options[:skip]
+          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}", :green
+            else
+              say "   ✗  #{branch}", :red
+              merge_errors = true
+            end
           end
         end
 
@@ -69,8 +84,10 @@ module Ding
           exit 1
         end
 
-        if repo.commit_parents(testing_branch).sort == commit_parents.sort
-          result = options[:verbose] ? ": #{commit_parents}" : ''
+        if original_commit_parents &&
+            (remote_commit_parents = repo.commit_parents(testing_branch)) &&
+            remote_commit_parents.sort == original_commit_parents.sort
+          result = options[:verbose] ? ": #{original_commit_parents}" : ''
           say "\n  --> That did not alter the testing branch commit parents#{result}!\n", :yellow
         end
       end
@@ -154,7 +171,6 @@ module Ding
     # presents a list of choices and allows either a single or multiple selection
     # returns the selected choices in an array or exits 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 << "\n > Enter a single selection, "
       prompt << "multiple selections separated by ',', 'A' for all, " if mode == :multiple
@@ -177,8 +193,8 @@ module Ding
       elsif answers[reply]
         answers.values_at(reply)
       elsif mode == :single
-          say "\n  --> That's not a valid selection, I'm out of here!\n\n", :red
-          exit 1
+        say "\n  --> That's not a valid selection, I'm out of here!\n\n", :red
+        exit 1
       elsif mode == :multiple && reply.upcase == 'A'
         answers.values
       elsif mode == :multiple && !replies.empty?

data/lib/ding/helpers.rb

@@ -3,7 +3,11 @@ module Ding
     # NOTE: only for commands where we are interested in the effect
     # as unless verbose is turned on, stdout and stderr are suppressed
     def run_cmd(cmd)
-      cmd << ' &>/dev/null ' unless self.options[:verbose]
+      if self.options[:verbose]
+        puts "$ #{cmd}"
+      else
+        cmd << ' &>/dev/null '
+      end
       system cmd
     end
   end

data/lib/ding/models/git.rb

@@ -41,7 +41,8 @@ module Ding
     end
 
     def commit_parents(branch)
-      %x(git rev-list --parents -n 1 #{remote_version(branch)}).split.drop(1)
+      remote_branch = remote_version(branch)
+      %x(git rev-list --parents -n 1 #{remote_branch}).split.drop(1) if branch_exists?(remote_branch)
     end
 
     def delete_branch(branch)

data/lib/ding/version.rb

@@ -1,3 +1,3 @@
 module Ding
-  VERSION = "1.2.5"
+  VERSION = "1.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ding
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.3.0
 platform: ruby
 authors:
 - Warren Bain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-30 00:00:00.000000000 Z
+date: 2016-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler