thegarage-gitx 2.4.0 → 2.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a1ab3df33daeff39133b9a20762d4ba94b5b857e
-  data.tar.gz: 7ea13bc4808220392044c53a7be1ce0f1ba8c4a7
+  metadata.gz: 4b6f8520b6fa00eb4d8b5bd41b2d299e82391e2d
+  data.tar.gz: a4ed62c3ae3a6fe20e01751690ceb441a9347a71
 SHA512:
-  metadata.gz: 569761fcf3d90042b470592bbc82dfb2b82c08e758ed5aa9d5dd49aa454b95f7fa87bab51d3ec943bf5f425d5123bd8e56e25c4bd6f2b8430046cedcac931c60
-  data.tar.gz: d4ed23efd5342cac379163240fbf7dd9feb550b1c68e97151bb9ff64cab2ce426d9df89616ae450a3d5a20c9ce2da57ab3470c8a64977033e2629d2f87606ff7
+  metadata.gz: 64bc132adcc7aa7ea0fd72a7d5b3070f74a53619f8b73bcc4e4f4697c6dab65b1410fef999d2f03bbb9dd355810576c6ea75e6e8d48f7c7989e24cba8f568644
+  data.tar.gz: 73960b3ec6ad32a0435a3f2e5c3bc1656a9628c057fd7c5a2e583920785e991532832a4db03aa02c2b4cfc9d3781f97da91cb1721e6a668c946269c86f679f8a

data/lib/thegarage/gitx/cli/start_command.rb

@@ -24,12 +24,14 @@ module Thegarage
         private
 
         def valid_new_branch_name?(branch)
-          return false if remote_branches.include?(branch)
+          return false if repo_branches.include?(branch)
           branch =~ VALID_BRANCH_NAME_REGEX
         end
 
-        def remote_branches
-          @remote_branches ||= repo.branches.each_name(:remote).to_a.map { |branch| branch.split('/').last }
+        def repo_branches
+          @branch_names ||= repo.branches.each_name.map do |branch|
+            branch.split('/').last
+          end
         end
       end
     end

data/lib/thegarage/gitx/version.rb

@@ -1,5 +1,5 @@
 module Thegarage
   module Gitx
-    VERSION = '2.4.0'
+    VERSION = '2.4.1'
   end
 end

data/spec/thegarage/gitx/cli/start_command_spec.rb

@@ -56,8 +56,29 @@ describe Thegarage::Gitx::Cli::StartCommand do
         should meet_expectations
       end
     end
+    context 'when branch already exists in local repo' do
+      let(:branches) { double(each_name: ['bar']) }
+      before do
+        expect(repo).to receive(:branches).and_return(branches)
+
+        expect(cli).to receive(:ask).and_return('new-branch')
+
+        expect(cli).to receive(:checkout_branch).with('master').ordered
+        expect(cli).to receive(:run_cmd).with('git pull').ordered
+        expect(repo).to receive(:create_branch).with('new-branch', 'master').ordered
+        expect(cli).to receive(:checkout_branch).with('new-branch').ordered
+
+        cli.start 'bar'
+      end
+      it 'prompts user to enter a new branch name' do
+        should meet_expectations
+      end
+    end
     context 'when branch already exists in remote repo' do
+      let(:branches) { double(each_name: ['origin/bar']) }
       before do
+        expect(repo).to receive(:branches).and_return(branches)
+
         expect(cli).to receive(:ask).and_return('new-branch')
 
         expect(cli).to receive(:checkout_branch).with('master').ordered
@@ -65,7 +86,7 @@ describe Thegarage::Gitx::Cli::StartCommand do
         expect(repo).to receive(:create_branch).with('new-branch', 'master').ordered
         expect(cli).to receive(:checkout_branch).with('new-branch').ordered
 
-        cli.start 'master'
+        cli.start 'bar'
       end
       it 'prompts user to enter a new branch name' do
         should meet_expectations

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thegarage-gitx
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.4.1
 platform: ruby
 authors:
 - Ryan Sonnek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-27 00:00:00.000000000 Z
+date: 2014-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rugged