git_explorer 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 98edb707164d29c0dbffbece848ed603f2f60f33
-  data.tar.gz: b480b70d00cf0e3d4ee4f3d99cae732a49784c6b
+  metadata.gz: cb8027b449b71edf38c5951620f15b71c76fb8c6
+  data.tar.gz: 1698c8b3eecaa2efceace6f8f8501c264401e935
 SHA512:
-  metadata.gz: 538f7a0065fb79ec208dd1dd5c3b4fb07c249ec791c0162ccfdc81098074c1b6c8ebc443fdf71ea49fedb4eeef02e59524cf8766a0741151a5e1cab16329a509
-  data.tar.gz: 5ff1ee5a3d94b6ea6e893c2e61cb669f7c9d8b8560cbef0499dd06387f9ffd2f99152467bae1f599781d741a415b9a7d7c1d909202bf9b76ba88d976986458b4
+  metadata.gz: f16b35903320168e99b70d049b20d752188d0b781585c1a2303441591a202190a89dfb5008e8484594d38b6a30d674d29a8fd3255b6026811c2e962b15a34e59
+  data.tar.gz: f25a4e3848044aac14c37a73a901491fd3493ff8c4f6cbfab4a7a6b16d88083092afd2d9febc0a9f5d1086def059af7801b0a1970eb0e2d815f1f42c70556ba7

data/README.md

@@ -21,7 +21,7 @@ Linux:
 
 Start explore with:
 ```bash
-~$ git-explore <root_path>
+~$ git-explorer explore <root_path>
 ```
 
 All your git repositories from <root_path> will be scanned and the output will be similar to:
@@ -43,7 +43,7 @@ In a try to add a feature to my old ls command, I've created the **light explore
 ![light demo](light_demo.gif)
 
 ```bash
-~$ git explore --light
+~$ git-explorer explore --light
 ```
 
 The output will decorate any directory that is also a git repository:

data/lib/git_explorer.rb

@@ -11,8 +11,10 @@ module GitExplorer
     -> (status_output) {
       project_name = status_output[/^(?<project_name>.*)$/, "project_name"]
       branch = status_output[/On branch\s(?<branch>.*)/, "branch"]
-      status = :up_to_date unless status_output[/not staged/]
-      status = :not_staged if status_output[/not staged/]
+      status = []
+      status << :up_to_date if status_output[/up-to-date/]
+      status << :not_staged if status_output[/not staged/]
+      status << :to_be_committed if status_output[/to be committed/]
       files = status_output.scan(/modified: \s*(.*)$/).flatten
       GitStatus.new(status, project_name, branch, files)
     }
@@ -21,8 +23,10 @@ module GitExplorer
   def extract_light_status(status_output)
     project_name = status_output[/^(?<project_name>.*)$/, "project_name"]
     branch = status_output[/On branch\s(?<branch>.*)/, "branch"]
-    status = :up_to_date unless status_output[/not staged/]
-    status = :not_staged if status_output[/not staged/]
+    status = []
+    status << :up_to_date if status_output[/up-to-date/]
+    status << :not_staged if status_output[/not staged/]
+    status << :to_be_committed if status_output[/to be committed/]
     files = status_output.scan(/modified: \s*(.*)$/).flatten
     GitStatus.new(status, project_name, branch, files)
   end
@@ -47,6 +51,24 @@ module GitExplorer
     run("basename `git -C #{path} rev-parse --show-toplevel`; git -C #{path} status", config={:capture=>true, :verbose=>false})
   end
 
+  def translate_status(statuses)
+    possible_status = {
+        to_be_committed: '✚',
+        up_to_date: '✔',
+        not_staged: '●',
+        conflict: '✖'
+    }
+
+    statuses.inject('') {|string, status| string = string + possible_status[status].to_s}
+  end
+
+  def translate_color(statuses)
+    return :green if statuses == [:up_to_date]
+    return :red if statuses == [:conflict]
+
+    :cyan
+  end
+
   class Explorer < Thor
     include Thor::Actions
     include GitExplorer
@@ -65,10 +87,9 @@ module GitExplorer
             .map{|line| Line.new(line.full_line, '', git_repository?(extract_path(line.full_line, root_dir)))}
             .map{|line| Line.new(line.full_line, (extract_light_status(git_status(extract_path(line.full_line, root_dir))) if line.git_repository == true), line.git_repository)}
             .map{|line|
-          say(message="#{line.full_line} ")
-          say(message="#{'[' + line.state.branch + ']'} ✖ ", color=(:red)) if line.git_repository == true and line.state.status != :up_to_date
-          say(message="#{'[' + line.state.branch + ']'} ✔ ", color=(:green)) if line.git_repository == true and line.state.status == :up_to_date
-          say(message="\n")
+              say(message="#{line.full_line} ")
+              say(message="#{'[' + line.state.branch + ']'} #{translate_status(line.state.status)} ", color=(translate_color(line.state.status))) if line.git_repository
+              say(message="\n")
         }
       else
         run("find #{root_dir} -type d -name .git", config={:capture=>true, :verbose=>false})
@@ -79,6 +100,5 @@ module GitExplorer
             .map{|status| say(message="#{status.project_name} is #{status.status} on branch #{status.branch}\n#{status.files.map{|f| "\t#{f}\n"}.join}", color=(:red if status.status.equal?(:not_staged)))}
       end
     end
-
   end
 end

data/lib/gitexplorer/version.rb

@@ -1,3 +1,3 @@
 module GitExplorer
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git_explorer
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Alex Rocha
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-08 00:00:00.000000000 Z
+date: 2016-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler