thegarage-gitx 2.0.3 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b56a879d33daf6209b8e0a9a921c968d376add4b
-  data.tar.gz: 95b83e8304ad4cfecadac685d71264b5e7d78527
+  metadata.gz: c0eea3b7dfcd17fef52f113c503608c7db7ad81d
+  data.tar.gz: 04eadf25b646e3aaff99d96e64c3adf1617b6df7
 SHA512:
-  metadata.gz: 7146b3e4f1c47734f923d15a85b155cd874aebea870cd27cad5edea6713f9dbde1e939a3b239e33789fd5f7d4518814ec32949bd8f3d1353d7980f42dac9b350
-  data.tar.gz: b862ca780f3ccedcaba97349024c5b001c9710d12b865df1a5bbe09a3c920557bda8e4bb0af32da3846812e3b885ff49aa782e2ff42ada5078c629eeb3b46dda
+  metadata.gz: bea835e6b0f8984ef7ce84c487a67d82ca47220853b1a25b548e21b04e132451bfd575b887730f50b9cc8e26c23ad57d171f8c5a3e8578f5cda4e9860129f44a
+  data.tar.gz: cb1ca449eb9a0923b03f10ee20c83d2fff59001df18ef50c7a6137af194256956884c17db8137931bf3b6c0821465cabc91da9bd470508b841b10c67e8e1a793

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

@@ -31,6 +31,10 @@ module Thegarage
           end
         end
 
+        def checkout_branch(branch_name)
+          repo.head = "refs/heads/#{branch_name}"
+        end
+
         # lookup the current branch of the repo
         def current_branch
           repo.branches.find(&:head?)

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

@@ -7,6 +7,7 @@ module Thegarage
     module Cli
       class StartCommand < BaseCommand
         EXAMPLE_BRANCH_NAMES = %w( api-fix-invalid-auth desktop-cleanup-avatar-markup share-form-add-edit-link )
+        VALID_BRANCH_NAME_REGEX = /^[A-Za-z0-9\-_]+$/
 
         desc 'start', 'start a new git branch with latest changes from master'
         def start(branch_name = nil)
@@ -14,16 +15,21 @@ module Thegarage
             branch_name = ask("What would you like to name your branch? (ex: #{EXAMPLE_BRANCH_NAMES.sample})")
           end
 
-          run_cmd "git checkout #{Thegarage::Gitx::BASE_BRANCH}"
+          checkout_branch Thegarage::Gitx::BASE_BRANCH
           run_cmd 'git pull'
-          run_cmd "git checkout -b #{branch_name}"
+          repo.create_branch branch_name, 'master'
+          checkout_branch branch_name
         end
 
         private
 
         def valid_new_branch_name?(branch)
-          remote_branches = Rugged::Branch.each_name(repo, :remote).to_a.map { |branch| branch.split('/').last }
-          branch =~ /^[A-Za-z0-9\-_]+$/ && !remote_branches.include?(branch)
+          return false if remote_branches.include?(branch)
+          branch =~ VALID_BRANCH_NAME_REGEX
+        end
+
+        def remote_branches
+          @remote_branches ||= Rugged::Branch.each_name(repo, :remote).to_a.map { |branch| branch.split('/').last }
         end
       end
     end

data/lib/thegarage/gitx/version.rb

@@ -1,5 +1,5 @@
 module Thegarage
   module Gitx
-    VERSION = '2.0.3'
+    VERSION = '2.0.4'
   end
 end

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

@@ -10,18 +10,15 @@ describe Thegarage::Gitx::Cli::StartCommand do
     }
   end
   let(:cli) { Thegarage::Gitx::Cli::StartCommand.new(args, options, config) }
-  let(:branch) { double('fake branch', name: 'feature-branch') }
-
-  before do
-    allow(cli).to receive(:current_branch).and_return(branch)
-  end
+  let(:repo) { cli.send(:repo) }
 
   describe '#start' do
     context 'when user inputs branch that is valid' do
       before do
-        expect(cli).to receive(:run_cmd).with('git checkout master').ordered
+        expect(cli).to receive(:checkout_branch).with('master').ordered
         expect(cli).to receive(:run_cmd).with('git pull').ordered
-        expect(cli).to receive(:run_cmd).with('git checkout -b new-branch').ordered
+        expect(repo).to receive(:create_branch).with('new-branch', 'master').ordered
+        expect(cli).to receive(:checkout_branch).with('new-branch').ordered
 
         cli.start 'new-branch'
       end
@@ -31,11 +28,12 @@ describe Thegarage::Gitx::Cli::StartCommand do
     end
     context 'when user does not input a branch name' do
       before do
-        expect(cli).to receive(:ask).and_return('another-new-branch')
+        expect(cli).to receive(:ask).and_return('new-branch')
 
-        expect(cli).to receive(:run_cmd).with('git checkout master').ordered
+        expect(cli).to receive(:checkout_branch).with('master').ordered
         expect(cli).to receive(:run_cmd).with('git pull').ordered
-        expect(cli).to receive(:run_cmd).with('git checkout -b another-new-branch').ordered
+        expect(repo).to receive(:create_branch).with('new-branch', 'master').ordered
+        expect(cli).to receive(:checkout_branch).with('new-branch').ordered
 
         cli.start
       end
@@ -45,11 +43,12 @@ describe Thegarage::Gitx::Cli::StartCommand do
     end
     context 'when user inputs an invalid branch name' do
       before do
-        expect(cli).to receive(:ask).and_return('another-new-branch')
+        expect(cli).to receive(:ask).and_return('new-branch')
 
-        expect(cli).to receive(:run_cmd).with('git checkout master').ordered
+        expect(cli).to receive(:checkout_branch).with('master').ordered
         expect(cli).to receive(:run_cmd).with('git pull').ordered
-        expect(cli).to receive(:run_cmd).with('git checkout -b another-new-branch').ordered
+        expect(repo).to receive(:create_branch).with('new-branch', 'master').ordered
+        expect(cli).to receive(:checkout_branch).with('new-branch').ordered
 
         cli.start 'a bad_branch-name?'
       end
@@ -57,5 +56,20 @@ describe Thegarage::Gitx::Cli::StartCommand do
         should meet_expectations
       end
     end
+    context 'when branch already exists in remote repo' do
+      before do
+        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 'master'
+      end
+      it 'prompts user to enter a new branch name' do
+        should meet_expectations
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thegarage-gitx
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.4
 platform: ruby
 authors:
 - Ryan Sonnek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-14 00:00:00.000000000 Z
+date: 2014-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rugged