git-multi 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 78f3a989686451a2c8da7e936efccc3c209a5128c2908650b640eef01f7f5997
-  data.tar.gz: 304141ffe253506dfa598a095dd9023e38be5bc8cd9de7c4ff742cada0ccfb2e
+  metadata.gz: 13f924a6a3aad4601b2fd83d11b92f628756ba43bfaaa0d9a968754cd94ee67f
+  data.tar.gz: e75c6fe671c96eedb1c9b0c0c2c545e13ac86ae95dd7225dad99ee75a95728f7
 SHA512:
-  metadata.gz: bbb67393419507f66f7c9936af27224d546f2fb3a69c6be00e1683b70ebce029aeaeabd21dce4ea3d2fdeaedd1e3f9214f9a9961f1be1da03b79ca7232969b0a
-  data.tar.gz: bd96d42a7982341c95f1f453743f6701107fdb2468f66ce9d5b3532f3ed80dea105a04e775f2d3e223bef98986f51e0032451f725eff22544b754a880f52751e
+  metadata.gz: b5ccee6a83810fd1dbfa637d2e083695b31e8449dc76fb66829e642adab2fd42e73b013f220a40fc7889d4b6c308abf549d2cb6e15a1553370b99a82377d359f
+  data.tar.gz: 9aa769c201d6be15ef71b08d4120ba8129c3bfe319fefaf513503161c34e674c93bd7533ba24330e999caa82e928c1dd1f49d3e34fb21cfd8d917f68b3a74807

data/exe/git-multi

@@ -11,7 +11,7 @@ if (command = ARGV.shift).start_with? '++'
   else
     abort \
       "Unknown multi repo: #{multi_repo}\n\n" \
-      '(use --check to list all known multi repos)'
+      '(use --report to list all known multi repos)'
   end
 end
 
@@ -21,7 +21,7 @@ when /\A--/
   when '--version' then Git::Multi::Commands.version
   when '--help'    then Git::Multi::Commands.help
   when '--html'    then Git::Multi::Commands.html
-  when '--check'   then Git::Multi::Commands.check
+  when '--report'  then Git::Multi::Commands.report
   when '--count'   then Git::Multi::Commands.count
   when '--refresh' then Git::Multi::Commands.refresh
   when '--json'    then Git::Multi::Commands.json(multi_repo)
@@ -47,7 +47,6 @@ when /\A--/
 when nil, '', '-h'
   Git::Multi::Commands.help
 else
-  Git::Multi::Commands.report(multi_repo)
   Git::Multi::Commands.exec(command, ARGV, multi_repo)
 end
 

data/git-multi.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
 
   spec.post_install_message = Git::Multi::PIM
 
-  spec.add_dependency 'octokit', '~> 4.12'
+  spec.add_dependency 'octokit', '~> 4.13'
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'pry'

data/lib/git/hub.rb

@@ -77,11 +77,10 @@ module Git
 
     @user_repositories = Hash.new { |repos, (user, type)|
       repos[[user, type]] = begin
-        notify("Refreshing #{type} '#{user}' repositories from GitHub")
-        client
-          .repositories(user, type: type)
-          .sort_by { |repo| repo[:name].downcase }
-      end
+                              client
+                                .repositories(user, type: type)
+                                .sort_by { |repo| repo[:name].downcase }
+                            end
     }
 
     def user_repositories(user, type = :owner)
@@ -95,11 +94,10 @@ module Git
 
     @org_repositories = Hash.new { |repos, (org, type)|
       repos[[org, type]] = begin
-        notify("Refreshing #{type} '#{org}' repositories from GitHub")
-        client
-          .org_repositories(org, type: type)
-          .sort_by { |repo| repo[:name].downcase }
-      end
+                             client
+                               .org_repositories(org, type: type)
+                               .sort_by { |repo| repo[:name].downcase }
+                           end
     }
 
     def org_repositories(org, type = :owner)

data/lib/git/multi.rb

@@ -9,7 +9,6 @@ require 'sawyer'
 
 require 'ext/dir'
 require 'ext/string'
-require 'ext/notify'
 require 'ext/kernel'
 require 'ext/commify'
 require 'ext/sawyer/resource'
@@ -155,7 +154,6 @@ module Git
       if File.size?(REPOSITORIES)
         # rubocop:disable Security/MarshalLoad
         @repositories ||= Marshal.load(File.read(REPOSITORIES)).tap do |projects|
-          notify "Finished loading #{REPOSITORIES}"
           projects.each_with_index do |project, index|
             # ensure 'project' has handle on an Octokit client
             project.client = Git::Hub.send(:client)

data/lib/git/multi/commands.rb

@@ -16,15 +16,11 @@ module Git
         Kernel.exec "open #{Git::Multi::HTML_PAGE}"
       end
 
-      def check
-        # Settings.user_status(Git::Multi::USER)
-        # Settings.organization_status(Git::Multi::ORGANIZATIONS)
-        # Settings.token_status(Git::Multi::TOKEN)
+      def report
         Settings.home_status(Git::Multi::HOME)
         Settings.main_workarea_status(Git::Multi::WORKAREA)
         Settings.user_workarea_status(Git::Multi::USERS)
         Settings.organization_workarea_status(Git::Multi::ORGANIZATIONS)
-        # Settings.file_status(Git::Multi::REPOSITORIES)
       end
 
       def count
@@ -79,7 +75,6 @@ module Git
           FileUtils.mkdir_p repo.parent_dir
           repo.just_do_it(
             ->(project) {
-              notify "Cloning '#{repo.full_name}' repo into #{repo.parent_dir.parent}"
               Kernel.system "git clone -q #{project.rels[:ssh].href.shellescape}"
             },
             ->(project) {
@@ -150,14 +145,6 @@ module Git
         system(args.flatten, multi_repo)
       end
 
-      def report(multi_repo = nil)
-        (missing = Git::Multi.missing_repositories_for(multi_repo)).any? &&
-          notify(
-            missing.map(&:full_name),
-            subtitle: "#{missing.count} missing repos"
-          )
-      end
-
       def exec(command, args = [], multi_repo = nil)
         args.unshift ['git', '--no-pager', command]
         system(args.flatten, multi_repo)

data/lib/git/multi/settings.rb

@@ -8,7 +8,7 @@ module Git
 
       module_function
 
-      def setting_status(messages, valid, optional = false)
+      def setting_status(messages, valid = false, optional = true)
         fields = messages.compact.join(' - ')
         icon = valid ? TICK : optional ? ARROW : CROSS
         if interactive?
@@ -45,10 +45,22 @@ module Git
           [
             message,
             File.join(abbreviate(workarea, :workarea), owner),
-            File.directory?(workarea) ? "#{Dir.new(workarea).git_repos(owner).count.commify} repos" : nil
           ],
           workarea
         )
+
+        github_count = Git::Multi.repositories_for(owner).count
+        cloned_count = Git::Multi.cloned_repositories_for(owner).count
+        missing_count = (github_count - cloned_count)
+        subdir_count = Dir.new(workarea).git_repos(owner).count
+        surplus_count = (subdir_count - cloned_count)
+
+        setting_status(["\tGitHub ", github_count])
+        setting_status(["\tcloned ", cloned_count, "(#{missing_count} missing)"])
+        Git::Multi.missing_repositories_for(owner).each do |missing|
+          setting_status(["\tmissing", missing.full_name], false, false)
+        end
+        setting_status(["\tsubdirs", subdir_count, "(#{surplus_count} surplus)"])
       end
 
       def user_status(user)

data/lib/git/multi/version.rb

@@ -6,7 +6,7 @@ require 'addressable'
 module Git
   module Multi
     NAME = 'git-multi'.freeze
-    VERSION = '1.1.0'.freeze
+    VERSION = '1.2.0'.freeze
 
     DEPENDENCY_VERSIONS = [
       "octokit.rb v#{Octokit::VERSION}",

data/man/git-multi.1

@@ -31,7 +31,7 @@
 git-multi \- execute the same git command in multiple repositories
 .SH "VERSION"
 .sp
-This is \fBv1\&.1\&.0\fR of \fIgit multi\fR \&... hooray!
+This is \fBv1\&.2\&.0\fR of \fIgit multi\fR \&... hooray!
 .SH "SYNOPSIS"
 .sp
 There are some options for \fBgit multi\fR itself, in which case it is invoked as follows:
@@ -85,9 +85,9 @@ you\(cqre looking at it: show the man page
 open the HTML version of the man page
 .RE
 .PP
-\-\-check
+\-\-report
 .RS 4
-checks all the required settings and configurations
+report on various repository stats and metrics
 .RE
 .PP
 \-\-count

data/man/git-multi.erb

@@ -64,8 +64,8 @@ OPTIONS
 --html::
 	open the HTML version of the man page
 
---check::
-	checks all the required settings and configurations
+--report::
+	report on various repository stats and metrics
 
 --count::
 	print out the count of repos (per type)

data/man/git-multi.html

@@ -748,7 +748,7 @@ git-multi(1) Manual Page
 <div class="sect1">
 <h2 id="_version">VERSION</h2>
 <div class="sectionbody">
-<div class="paragraph"><p>This is <code>v1.1.0</code> of <em>git multi</em> &#8230; hooray!</p></div>
+<div class="paragraph"><p>This is <code>v1.2.0</code> of <em>git multi</em> &#8230; hooray!</p></div>
 </div>
 </div>
 <div class="sect1">
@@ -822,11 +822,11 @@ a single organization, the optional <code>++&lt;multi_repo&gt;</code> argument c
 </p>
 </dd>
 <dt class="hdlist1">
---check
+--report
 </dt>
 <dd>
 <p>
-        checks all the required settings and configurations
+        report on various repository stats and metrics
 </p>
 </dd>
 <dt class="hdlist1">
@@ -1200,7 +1200,7 @@ the <code>jq</code> command-line utility:
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2018-11-09 14:11:04 GMT
+ 2018-11-09 16:23:25 GMT
 </div>
 </div>
 </body>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-multi
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Peter Vandenberk
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.12'
+        version: '4.13'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.12'
+        version: '4.13'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -92,7 +92,6 @@ files:
 - lib/ext/commify.rb
 - lib/ext/dir.rb
 - lib/ext/kernel.rb
-- lib/ext/notify.rb
 - lib/ext/sawyer/resource.rb
 - lib/ext/string.rb
 - lib/git/hub.rb

data/lib/ext/notify.rb

@@ -1,20 +0,0 @@
-begin
-  require 'terminal-notifier'
-rescue LoadError
-  # NOOP - "TerminalNotifier" is optional
-  # will only be used if it is installed!
-end
-
-def notify(message, options = {}, verbose = false)
-  # print the given message to STDERR, if the
-  # script is running with "--verbose" option
-  subtitle = options[:subtitle]
-  warn(subtitle ? "#{subtitle}: #{message}" : message) if $VERBOSE
-  # send a given message to the Mac OS X Notification Center
-  # but only if the git-multi script is running interactively
-  # and if the "terminal-notifier" gem has been installed...
-  interactive? && defined?(TerminalNotifier) && begin
-    options[:title] ||= 'git-multi'
-    TerminalNotifier.notify(message, options, verbose)
-  end
-end