ding 1.2.0 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c1283f43275acdd4e1e0eb77d2d19c529c8f8299
-  data.tar.gz: b0e9cddae73956fe6df73166af79ebeef10ad10e
+  metadata.gz: b6894adf146cfef036be30a3509a7f799be6d206
+  data.tar.gz: 3c7ddb4379dd7df1f909079c7b758daf648ce705
 SHA512:
-  metadata.gz: 0c7ae14659c594f06209893bbd27a30695a39d058036645fb6fdc35fdfc4d0a87dabe5baa4675d81013a50c5519fb536f5f226baa50dd3bd3a2fc4059ea46450
-  data.tar.gz: 569c9bfa49d026813df401273cd3e2ac523b7b4794097d56136a21665c8584646c54bcbf341d75602b3a358b59052e1fdcd2275e99bb4c2d01524d35a1adf386
+  metadata.gz: a7ffdd1ac10d674e21e7cfcd38c9f3bbbb92fa855054e76fc8912f4e69283244500c5ced02432fa143f58738d324a26023122389a7c1dbb7e3bfb527a300cb84
+  data.tar.gz: 08cdc83e6e375be3de31be1f5658315f529bf6de3c15ec2708792024eddf5360c368ef0570bf6608eccf1ee6f5f229357e084be825f8e0322ebc65e2fcd46239

data/lib/ding/cli.rb

@@ -30,11 +30,11 @@ module Ding
         say "> Deleting #{testing_branch}", :green
         r.delete_branch(testing_branch)
 
-        say "> Fetching branches from the remote", :green
-        r.fetch_branches
+        say "> Synchronising with the remote", :green
+        r.update
       end
 
-      branches = repo.branches(options[:pattern])
+      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

data/lib/ding/models/git.rb

@@ -9,9 +9,17 @@ module Ding
       raise "#{repo} is NOT a git repository" unless git_repo?
     end
 
-    def branches(pattern)
+    def local_branches(pattern)
+      branches pattern, false
+    end
+
+    def remote_branches(pattern)
+      branches pattern, true
+    end
+
+    def branches(pattern, remote=true)
       merged = options[:merged] ? '--merged' : '--no-merged'
-      remote = options[:local] ? '' : '--remote'
+      remote = '--remote' if remote
       %x(git branch #{remote} --list #{remote_version(pattern)} #{merged}).split
     end
 
@@ -70,12 +78,9 @@ module Ding
       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"
+      command = options[:local] ? 'git up' : 'git fetch --all'
+      raise "Error synchronising with the remote" unless run_cmd command
     end
 
     def reset_local_state

data/lib/ding/version.rb

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

metadata

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