ding 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df0176335d68e86af6ccf4969523bb0ac5da0bd8
-  data.tar.gz: 23dc3b2259afcb665653fdf36b376731d7837612
+  metadata.gz: c1283f43275acdd4e1e0eb77d2d19c529c8f8299
+  data.tar.gz: b0e9cddae73956fe6df73166af79ebeef10ad10e
 SHA512:
-  metadata.gz: 019b33111a0df3822be106570f9c8242633b017b0b7836ccb3c29aaadd5bec1d43bc1fe878caa0369cd706c46673d7572f0a8fa94f78e70cd9e21e7c00735738
-  data.tar.gz: c10de9c6c22f53863a2b7f2785dfde6165d748b356667a569af0c04209458ce3f84bad20275b0e04210df4ccf6328075649dfdd348a13f33c6d0c14a200f1417
+  metadata.gz: 0c7ae14659c594f06209893bbd27a30695a39d058036645fb6fdc35fdfc4d0a87dabe5baa4675d81013a50c5519fb536f5f226baa50dd3bd3a2fc4059ea46450
+  data.tar.gz: 569c9bfa49d026813df401273cd3e2ac523b7b4794097d56136a21665c8584646c54bcbf341d75602b3a358b59052e1fdcd2275e99bb4c2d01524d35a1adf386

data/README.md

@@ -56,10 +56,14 @@ 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 destination branch
+      -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
-                                       # Default: origin/XAP*
+                                       # Default: *XAP*
+      -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
 
     Push feature branch(es) to the testing branch (this is the default action)
 

data/lib/ding/cli.rb

@@ -9,12 +9,13 @@ 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 :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'
+    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'
     def push
-      develop_branch, testing_branch = Ding::DEVELOP_BRANCH.dup, Ding::TESTING_BRANCH.dup
-      testing_branch = options[:branch] if options[:branch]
+      testing_branch = options[:branch] || 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|
@@ -23,13 +24,14 @@ module Ding
           r.reset_local_state
         end
 
+        develop_branch = r.branch_in_context(Ding::DEVELOP_BRANCH.dup)
         r.checkout develop_branch
 
         say "> Deleting #{testing_branch}", :green
         r.delete_branch(testing_branch)
 
-        say "> Synchronising with the remote", :green
-        r.update
+        say "> Fetching branches from the remote", :green
+        r.fetch_branches
       end
 
       branches = repo.branches(options[:pattern])

data/lib/ding/models/git.rb

@@ -11,7 +11,8 @@ module Ding
 
     def branches(pattern)
       merged = options[:merged] ? '--merged' : '--no-merged'
-      %x(git branch --remote --list #{remote_version(pattern)} #{merged}).split
+      remote = options[:local] ? '' : '--remote'
+      %x(git branch #{remote} --list #{remote_version(pattern)} #{merged}).split
     end
 
     def branch_exists?(branch)
@@ -61,6 +62,18 @@ module Ding
       raise "Unable to push #{branch} branch!" unless run_cmd push_cmd
     end
 
+    def branch_in_context(branch)
+      if options[:local]
+        local_version(branch)
+      else
+        remote_version(branch)
+      end
+    end
+
+    def fetch_branches
+      raise "Error synchronising with the remote" unless run_cmd 'git fetch --all'
+    end
+
     def update
       raise "Error synchronising with the remote" unless run_cmd "git up"
     end

data/lib/ding/version.rb

@@ -1,3 +1,3 @@
 module Ding
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

metadata

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