furi-git-prompt 0.0.4 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bdd2a3245f4c931c64d1ea6a87be8f3f3b90d7e6
-  data.tar.gz: 1df2e2d5a953a19f4c0b8238236befe7ab1a0e19
+  metadata.gz: f9e5ed6478cfdddcd30c864c75cb7c5d169e19b5
+  data.tar.gz: cb5d1cd5ae5721fcab7289b3718314e6ff8af253
 SHA512:
-  metadata.gz: 93f45f74c2a13ce7000d76740a38ca391a9419dfda7b5f8e056d519cb4c87fc4bec86862b4c52fd8e7ed3014b698a15ff80a5127a1baae4ec3840a6f55d442b6
-  data.tar.gz: fd0f30aa3373e50900a7651bdac1515dc920c9dd3ce65729d981c833b07d5e55038b438157d185f2bc92f23650d6e72e14ce164839373b0dbf2cca04336496fd
+  metadata.gz: 08e4a08dc195538bfeff736d80f58268f74db5636a054fcaab5a91b0c60a26f7e34ce4ce0f5e4676ad58a94cab7918ae43e43da184dc3dee00f5af01e850d1d3
+  data.tar.gz: b1eab1c25b2ae338ca4cfbf7892ab58139b081fb17b20ea1544aa5f0d0c9fe9f93d60b6552a4104942b8d9d222605798edd6e6c96b2f2fefa905625f956313af

data/lib/furi/git/git.rb

@@ -6,6 +6,11 @@ class Git
   end
 
   def branch
-    @git_system.git_branch
+    git_branch_match = @git_system.git_branch.match(/\* ([^\s.]*)/i)
+    if git_branch_match
+      git_branch_match.captures[0]
+    else
+      ''
+    end
   end
 end

data/lib/furi/git/git_system_call.rb

@@ -1,5 +1,5 @@
 class GitSystemCall
   def git_branch
-    %x(git branch)
+    %x(git branch 2> /dev/null)
   end
 end

data/lib/furi/git/prompt/version.rb

@@ -1,7 +1,7 @@
 module Furi
   module Git
     module Prompt
-      VERSION = '0.0.4'
+      VERSION = '0.0.7'
     end
   end
 end

data/spec/furi/git/git_spec.rb

@@ -3,9 +3,33 @@ require 'rspec'
 require 'furi/git/git'
 
 describe Git do
-
-  it 'show current branch name of a git repository' do
-    GitSystemCall.any_instance.stub(:git_branch).and_return('master')
+  it 'shows the current branch name of a git repository' do
+    GitSystemCall.any_instance.stub(:git_branch).and_return('* master')
     Git.new.branch.should == 'master'
   end
+
+  context 'more than one git repository exist' do
+    it 'shows the current branch name of a git repository if branch is first item in list' do
+      GitSystemCall.any_instance.stub(:git_branch).and_return("* master\n  sec branch\n  third branch")
+      Git.new.branch.should == 'master'
+    end
+
+    it 'shows the current branch name of a git repository if branch is second item in list' do
+      GitSystemCall.any_instance.stub(:git_branch).and_return("  sec branch\n * master\n  third branch")
+      Git.new.branch.should == 'master'
+    end
+
+    it 'shows the current branch name of a git repository if branch is last item in list' do
+      GitSystemCall.any_instance.stub(:git_branch).and_return("  sec branch\n  third branch\n * master")
+      Git.new.branch.should == 'master'
+    end
+  end
+
+  context 'no git repository exist' do
+    it 'shows nothing' do
+      GitSystemCall.any_instance.stub(:git_branch).and_return("fatal: Not a git repository (or any of the parent directories): .git\n")
+      Git.new.branch.should be_empty
+    end
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: furi-git-prompt
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.7
 platform: ruby
 authors:
 - Theo Pack