repos_report 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d129f122271f340349a4a78749ac82baf33f271b
-  data.tar.gz: 70537a1d76d6e11e36c1079625631da9e1b1974a
+  metadata.gz: fc3663c3fa77e055d3842b6cb0e8c8b013dfc276
+  data.tar.gz: 33357575db4cf1081f7603349271b4c63c88c19f
 SHA512:
-  metadata.gz: e152954230055922dc2d899b5f273ce04706e0b92613c9da7a8d2027c89bfebf0fc7e4fa058677afe45b6b7bd79a120e0c13241725a664ecb7cecb9a13cba869
-  data.tar.gz: 1b7aa9f5c59788ef9d24822927eb756e0ff754f5d8f7a22351b3975478cde228cca3be81f1d5b9bceb3efdc1da3a910580b08e23923790e19b059fbda93c25a8
+  metadata.gz: d1229ff946f8684703910b0a3cb6a875ef3701e656871530f67eef41ece5bd32c65d4cccecfc0e8334d8492742bf5b12db627edd8276e7da8deec92b35e910d8
+  data.tar.gz: 5e26abfc0206fadd5f9aa413595118d111b9155b62dddbd7f1c2eb7685d20c55c1246e3b71172d91eb6b6e1717cc09902e9fe7ceaa8286471f91e532fcf1923f

data/lib/repos_report.rb

@@ -3,19 +3,10 @@ require_relative 'repos_report/repo_finder'
 module ReposReport
   class << self
     def print_status_of_projects_under(directory)
-  		
       repos = RepoFinder.repos_in_or_below(directory)
 
       if repos.any?
-        padding_amount = whitespace_padding_for(repos)
-
-        puts
-
-        repos.each do |r|
-          puts r.concise_status(padding_amount)
-        end
-
-        puts
+        print_statuses_of(repos)
       else
         puts "No repos found in this directory."
       end
@@ -24,21 +15,33 @@ module ReposReport
     def list_all_repos(directory)
       repos = RepoFinder.repos_in_or_below(directory)
 
-      puts
-
-      repos.each do |repo|
-        puts repo.directory
+      newline_pad_output do
+        repos.each do |repo|
+          puts repo.directory
+        end
       end
-
-      puts
     end
 
     private
 
+    def print_statuses_of(repos)
+      padding_amount = whitespace_padding_for(repos)
+
+      newline_pad_output do
+        repos.each do |r|
+          puts r.concise_status(padding_amount)
+        end
+      end
+    end
+
     def whitespace_padding_for(repos)
       longest_repo_project_name(repos) + 3
     end
 
+    def newline_pad_output
+      puts; yield; puts
+    end
+
     def longest_repo_project_name(array_of_repos)
       array_of_repos.map(&:project_name_length).max
     end

data/lib/repos_report/repo.rb

@@ -12,6 +12,8 @@ class Repo
   end
 
   def concise_status(whitespace_padding)
+    set_git_variables # Not needed unless this method is run
+
     if issues.any?
       message_with_issues(whitespace_padding).red
     else
@@ -27,6 +29,12 @@ class Repo
     @directory.split("/").last
   end
 
+  def set_git_variables
+    @origin_master_output ||= `cd #{@directory}; git for-each-ref --format="%(upstream:track) %(upstream:short)" | grep origin/master`
+    @git_remote_output ||= `cd #{@directory}; git remote`
+    @git_status_output ||= `cd #{@directory}; git status`
+  end
+
   def message_with_issues(whitespace_padding)
     project_name + whitespace_padding(whitespace_padding) + issues.join(', ')
   end
@@ -40,34 +48,15 @@ class Repo
   end
 
   def issues
-    [
-      unpulled_or_unpushed_commits, 
-      uncommitted_changes
-    ].compact
+    issue_array = []
+    issue_array << 'UNPUSHED COMMITS' if @origin_master_output.include? 'ahead'
+    issue_array << 'UNPULLED COMMITS' if @origin_master_output.include? 'behind'
+    issue_array << 'NO REMOTE ORIGIN' unless @git_remote_output.include? 'origin'
+    issue_array << 'UNCOMMITTED CHANGES' if @git_status_output =~ uncommitted_changes_regex
+    issue_array
   end
 
-  def unpulled_or_unpushed_commits
-
-    ahead_or_behind = `cd #{@directory}; git for-each-ref --format="%(upstream:track) %(upstream:short)" | grep origin/master`
-
-    if ahead_or_behind.include? 'ahead'
-      'UNPUSHED COMMITS'
-    elsif ahead_or_behind.include? 'behind'
-      'UNPULLED COMMITS'
-    elsif `cd #{@directory}; git remote`.include? 'origin'
-      nil
-    else
-      'NO REMOTE ORIGIN'
-    end
-  end
-
-  def uncommitted_changes
-    changes = false
-
-    changes = true if `cd #{@directory}; git status | grep 'Changes not staged for commit'`.length > 0
-    changes = true if `cd #{@directory}; git status | grep 'Changes to be committed'`.length > 0
-    changes = true if `cd #{@directory}; git status | grep 'Untracked files'`.length > 0
-
-    changes ? "UNCOMMITTED CHANGES" : nil
+  def uncommitted_changes_regex
+    /(Changes not staged for commit)|(Changes to be committed)|(Untracked files)/
   end
 end

data/lib/repos_report/version.rb

@@ -1,3 +1,3 @@
 module ReposReport
-  VERSION = "2.0.2"
+  VERSION = "2.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: repos_report
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - neurodynamic