git-multi 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 64099842d760a6707023b63b428934a14ab4f07e146db6e39818008a77d2b827
-  data.tar.gz: c8c664a4cc5c837cb99102b14bbc706acbe04f7d7adf1b3ceea5e570255f69f8
+  metadata.gz: c1bda879ee8b1b3320c8d5490201645cf2f686f8e82cb8200fb1b0a2f8538588
+  data.tar.gz: 072b2cfb7ed429f2a8f78b969ce808a4a0365ab37575c86deceb02c2bbe85701
 SHA512:
-  metadata.gz: ba020b0a40bc31977567375f0812fa7a33953de174cc5276c23b328bebb567ebd025869daf1d4fb2b148a5b8bd8e7e109dd1e6da6b3536965f3d61ddfc850493
-  data.tar.gz: b5e5cf66109a7b3df7f7b9f8976560f43f8a45d17c2e60b6ba3024399b12088c8d44fb7833537242610a90267d95b9e61ffab62622ab3f4b4d0061f1d31b059e
+  metadata.gz: 2565edfd604e66bbcfeda950c83e5da58ac5f4fbda2173e1705dd56ff98ad8c04b2f757edcaa8c4a45e37e7ab184361db8b3ff2645c95f3b3fd1c100ab7f2279
+  data.tar.gz: 3d56e12752052a25dc64fed40684ae88125d6f330930efbd3a553b1874127a6d721e249306c1b8d2090f102b7cd836d565ca182dba2fd94412687232492dd846

data/exe/git-multi

@@ -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 '--report'  then Git::Multi::Commands.report
+  when '--report'  then Git::Multi::Commands.report(multi_repo)
   when '--count'   then Git::Multi::Commands.count
   when '--refresh' then Git::Multi::Commands.refresh
   when '--json'    then Git::Multi::Commands.json(multi_repo)

data/lib/git/multi/commands.rb

@@ -16,11 +16,17 @@ module Git
         Kernel.exec "open #{Git::Multi::HTML_PAGE}"
       end
 
-      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)
+      def report(multi_repo = nil)
+        case multi_repo
+        when nil
+          Report.home_status(Git::Multi::HOME)
+          Report.workarea_status(Git::Multi::WORKAREA)
+          Report.for(*MULTI_REPOS)
+        when *MULTI_REPOS
+          Report.for(multi_repo)
+        else
+          raise "Unknown multi repo: #{multi_repo}"
+        end
       end
 
       def count
@@ -71,14 +77,14 @@ module Git
       end
 
       def clone(multi_repo = nil)
-        Git::Multi.missing_repositories_for(multi_repo).each do |repo|
-          FileUtils.mkdir_p repo.parent_dir
-          repo.just_do_it(
-            ->(project) {
-              Kernel.system "git clone -q #{project.rels[:ssh].href.shellescape}"
+        Git::Multi.missing_repositories_for(multi_repo).each do |repository|
+          FileUtils.mkdir_p repository.parent_dir # create multi-repo workarea
+          repository.just_do_it(
+            ->(repo) {
+              Kernel.system "git clone -q #{repo.rels[:ssh].href.shellescape}"
             },
-            ->(project) {
-              Kernel.system "git clone -q #{project.rels[:ssh].href.shellescape}"
+            ->(repo) {
+              Kernel.system "git clone -q #{repo.rels[:ssh].href.shellescape}"
             },
             in: 'parent_dir'
           )
@@ -98,33 +104,33 @@ module Git
       end
 
       def query(args = [], multi_repo = nil)
-        Git::Multi.repositories_for(multi_repo).each do |repo|
-          repo.just_do_it(
-            ->(project) {
+        Git::Multi.repositories_for(multi_repo).each do |repository|
+          repository.just_do_it(
+            ->(repo) {
               args.each do |attribute|
-                puts "#{attribute}: #{project[attribute]}"
+                puts "#{attribute}: #{repo[attribute]}"
               end
             },
-            ->(project) {
-              print "#{project.full_name}: "
-              puts args.map { |attribute| project[attribute] }.join(' ')
+            ->(repo) {
+              print "#{repo.full_name}: "
+              puts args.map { |attribute| repo[attribute] }.join(' ')
             },
           )
         end
       end
 
       def find(commands, multi_repo = nil)
-        Git::Multi.cloned_repositories_for(multi_repo).each do |repo|
-          Dir.chdir(repo.local_path) do
+        Git::Multi.cloned_repositories_for(multi_repo).each do |repository|
+          Dir.chdir(repository.local_path) do
             if repo.instance_eval(commands.join(' && '))
               repo.just_do_it(
-                ->(_project) { nil },
-                ->(project) { puts project.full_name },
+                ->(_repo) { nil },
+                ->(repo) { puts repo.full_name },
               )
             end
           rescue Octokit::NotFound
-            # project no longer exists on github.com
-            # consider running "git multi --stale"...
+            # repository no longer exists on GitHub
+            # consider running "git multi --stale"!
           end
         end
       end
@@ -134,8 +140,8 @@ module Git
           Dir.chdir(repo.local_path) do
             repo.instance_eval(commands.join(' ; '))
           rescue Octokit::NotFound
-            # project no longer exists on github.com
-            # consider running "git multi --stale"...
+            # repository no longer exists on GitHub
+            # consider running "git multi --stale"!
           end
         end
       end
@@ -152,13 +158,13 @@ module Git
 
       def system(args = [], multi_repo = nil)
         cmd = args.map!(&:shellescape).join(' ')
-        Git::Multi.cloned_repositories_for(multi_repo).each do |repo|
-          repo.just_do_it(
-            ->(_project) {
+        Git::Multi.cloned_repositories_for(multi_repo).each do |repository|
+          repository.just_do_it(
+            ->(_repo) {
               Kernel.system cmd
             },
-            ->(project) {
-              Kernel.system "#{cmd} 2>&1 | sed -e 's#^##{project.full_name.shellescape}: #'"
+            ->(repo) {
+              Kernel.system "#{cmd} 2>&1 | sed -e 's#^##{repo.full_name.shellescape}: #'"
             },
             in: 'local_path'
           )

data/lib/git/multi/config.rb

@@ -0,0 +1,31 @@
+module Git
+  module Multi
+
+    module_function
+
+    def local_option(path, name, default = nil)
+      value = `git -C #{path} config --local --get #{name}`.chomp.freeze
+      value.empty? && default ? default : value
+    end
+
+    def local_list(filename, name)
+      list = `git config --file #{filename} --get-all #{name}`
+      list.split($RS).map(&:strip).map(&:freeze)
+    end
+
+    def global_option(name, default = nil)
+      value = `git config --global --get #{name}`.chomp.freeze
+      value.empty? && default ? default : value
+    end
+
+    def global_list(name, default = nil)
+      global_option(name, default).split(',').map(&:strip).map(&:freeze)
+    end
+
+    def env_var(name, default = nil)
+      value = ENV[name].dup.freeze
+      (value.nil? || value.empty?) && default ? default : value
+    end
+
+  end
+end

data/lib/git/multi/report.rb

@@ -0,0 +1,132 @@
+module Git
+  module Multi
+    module Report
+
+      TICK  = ['2714'.hex].pack('U*').green.freeze
+      CROSS = ['2718'.hex].pack('U*').red.freeze
+      ARROW = ['2794'.hex].pack('U*').blue.freeze
+
+      module_function
+
+      def home_status(home)
+        directory_status(['${HOME}', home], home)
+      end
+
+      def workarea_status(workarea)
+        directory_status(['${WORKAREA}', abbreviate(workarea, :home)], workarea)
+      end
+
+      def owner_status(message, workarea, owner)
+        directory_status(
+          [
+            message,
+            File.join(abbreviate(workarea, :workarea), owner),
+          ],
+          File.join(workarea, owner)
+        )
+
+        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} repositories"])
+        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 project_status(message, superproject)
+        github_count = Git::Multi.repositories_for(superproject).count
+
+        if github_count.zero?
+          setting_status([message, 'listed but not configured'], false, false)
+        else
+          setting_status([message], true)
+          Git::Multi.repositories_for(superproject).each do |repo|
+            if File.directory? repo.local_path
+              setting_status(["\tcloned ", repo.full_name], true)
+            else
+              setting_status(["\tmissing", repo.full_name], false, false)
+            end
+          end
+        end
+      end
+
+      def for(*multi_repos)
+        multi_repos.each do |multi_repo|
+          case (user = org = project = multi_repo)
+          when *USERS
+            owner_status("user \"#{user}\"", Git::Multi::WORKAREA, user)
+          when *ORGANIZATIONS
+            owner_status("org \"#{org}\"", Git::Multi::WORKAREA, org)
+          when *SUPERPROJECTS
+            project_status("superproject \"#{project}\"", project)
+          else
+            raise "Unknown multi repo: #{multi_repo}"
+          end
+        end
+      end
+
+      private_class_method def describe(token)
+        if token.nil?
+          '(nil)'
+        elsif token.empty?
+          '(empty)'
+        else
+          "#{'*' * 36}#{token[36..-1]}"
+        end
+      end
+
+      private_class_method def symbolize(token)
+        case token
+        when Git::Multi.env_var('OCTOKIT_ACCESS_TOKEN')
+          then '${OCTOKIT_ACCESS_TOKEN}'
+        when Git::Multi.global_option('github.token')
+          then 'github.token'
+        else '(unset)'
+        end
+      end
+
+      private_class_method def abbreviate(directory, root_dir = nil)
+        case root_dir
+        when :home
+          then directory.gsub(Git::Multi::HOME, '${HOME}')
+        when :workarea
+          then directory.gsub(Git::Multi::WORKAREA, '${WORKAREA}')
+        else abbreviate(abbreviate(directory, :workarea), :home)
+        end
+      end
+
+      private_class_method def setting_status(messages, valid = false, optional = true)
+        fields = messages.compact.join(' - ')
+        icon = valid ? TICK : optional ? ARROW : CROSS
+        puts "#{icon}  #{fields}"
+      end
+
+      private_class_method def file_status(file, message = 'File')
+        setting_status(
+          [
+            message,
+            abbreviate(file),
+            File.file?(file) ? "#{File.size(file).commify} bytes" : nil,
+          ],
+          file && !file.empty? && File.file?(file),
+          false
+        )
+      end
+
+      private_class_method def directory_status(messages, directory)
+        setting_status(
+          messages,
+          directory && !directory.empty? && File.directory?(directory),
+          false
+        )
+      end
+
+    end
+  end
+end

data/lib/git/multi/version.rb

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

data/lib/git/multi.rb

@@ -15,9 +15,9 @@ require 'ext/sawyer/resource'
 
 require 'git/hub'
 
-require 'git/multi/utils'
+require 'git/multi/config'
+require 'git/multi/report'
 require 'git/multi/version'
-require 'git/multi/settings'
 require 'git/multi/commands'
 
 module Git
@@ -26,16 +26,23 @@ module Git
     HOME             = Dir.home
 
     DEFAULT_WORKAREA = File.join(HOME, 'Workarea')
-    WORKAREA         = git_option('git.multi.workarea', DEFAULT_WORKAREA)
+    WORKAREA         = global_option('git.multi.workarea', DEFAULT_WORKAREA)
 
     DEFAULT_TOKEN    = env_var('OCTOKIT_ACCESS_TOKEN') # same as Octokit
-    TOKEN            = git_option('github.token', DEFAULT_TOKEN)
+    TOKEN            = global_option('github.token', DEFAULT_TOKEN)
 
-    CACHE            = File.join(HOME, '.git', 'multi')
-    REPOSITORIES     = File.join(CACHE, 'repositories.byte')
+    GIT_MULTI_DIR    = File.join(HOME, '.git', 'multi')
 
-    USERS            = git_list('git.multi.users')
-    ORGANIZATIONS    = git_list('git.multi.organizations')
+    FileUtils.mkdir_p(GIT_MULTI_DIR) # ensure `~/.git/multi` directory exists
+
+    GITHUB_CACHE         = File.join(GIT_MULTI_DIR, 'repositories.byte')
+    SUPERPROJECTS_CONFIG = File.join(GIT_MULTI_DIR, 'superprojects.config')
+
+    USERS            = global_list('git.multi.users')
+    ORGANIZATIONS    = global_list('git.multi.organizations')
+    SUPERPROJECTS    = global_list('git.multi.superprojects')
+
+    MULTI_REPOS      = (USERS + ORGANIZATIONS + SUPERPROJECTS)
 
     MAN_PAGE         = File.expand_path('../../man/git-multi.1', __dir__)
     HTML_PAGE        = File.expand_path('../../man/git-multi.html', __dir__)
@@ -47,7 +54,11 @@ module Git
     #
 
     def valid?(multi_repo)
-      (USERS + ORGANIZATIONS).include? multi_repo
+      MULTI_REPOS.include? multi_repo
+    end
+
+    def full_names_for(superproject)
+      local_list(SUPERPROJECTS_CONFIG, "superproject.#{superproject}.repo")
     end
 
     #
@@ -69,16 +80,16 @@ module Git
       ).flatten
     end
 
-    def local_repositories_for(multi_repo = nil)
-      case (owner = multi_repo)
+    def local_repositories_for(owner = nil)
+      case owner
       when nil
-        local_repositories
+        local_repositories # all of them
       when *USERS
         @local_user_repositories[owner]
       when *ORGANIZATIONS
         @local_org_repositories[owner]
       else
-        raise "Unknown multi repo: #{multi_repo}"
+        raise "Unknown owner: #{owner}"
       end
     end
 
@@ -101,16 +112,16 @@ module Git
       ).flatten
     end
 
-    def github_repositories_for(multi_repo = nil)
-      case (owner = multi_repo)
+    def github_repositories_for(owner = nil)
+      case owner
       when nil
-        github_repositories
+        github_repositories # all of them
       when *USERS
         @github_user_repositories[owner]
       when *ORGANIZATIONS
         @github_org_repositories[owner]
       else
-        raise "Unknown multi repo: #{multi_repo}"
+        raise "Unknown owner: #{owner}"
       end
     end
 
@@ -119,9 +130,7 @@ module Git
     #
 
     def refresh_repositories
-      File.directory?(CACHE) || FileUtils.mkdir_p(CACHE)
-
-      File.open(REPOSITORIES, 'wb') do |file|
+      File.open(GITHUB_CACHE, 'wb') do |file|
         Marshal.dump(github_repositories, file)
       end
     end
@@ -151,22 +160,22 @@ module Git
     end
 
     def repositories
-      if File.size?(REPOSITORIES)
+      if File.size?(GITHUB_CACHE)
         # rubocop:disable Security/MarshalLoad
-        @repositories ||= Marshal.load(File.read(REPOSITORIES)).tap do |projects|
-          projects.each_with_index do |project, index|
-            # ensure 'project' has handle on an Octokit client
-            project.client = Git::Hub.send(:client)
-            # adorn 'project', which is a Sawyer::Resource
-            project.parent_dir = Pathname.new(File.join(WORKAREA, project.owner.login))
-            project.local_path = Pathname.new(File.join(WORKAREA, project.full_name))
-            project.fractional_index = "#{index + 1}/#{projects.count}"
-            # fix 'project' => https://github.com/octokit/octokit.rb/issues/727
-            project.compliant_ssh_url = 'ssh://' + project.ssh_url.split(':', 2).join('/')
+        @repositories ||= Marshal.load(File.read(GITHUB_CACHE)).tap do |repos|
+          repos.each_with_index do |repo, index|
+            # ensure 'repo' has handle on an Octokit client
+            repo.client = Git::Hub.send(:client)
+            # adorn 'repo', which is a Sawyer::Resource
+            repo.parent_dir = Pathname.new(File.join(WORKAREA, repo.owner.login))
+            repo.local_path = Pathname.new(File.join(WORKAREA, repo.full_name))
+            repo.fractional_index = "#{index + 1}/#{repos.count}"
+            # fix 'repo' => https://github.com/octokit/octokit.rb/issues/727
+            repo.compliant_ssh_url = 'ssh://' + repo.ssh_url.split(':', 2).join('/')
             # remove optional '.git' suffix from 'git@github.com:pvdb/git-multi.git'
-            project.abbreviated_ssh_url = project.ssh_url.chomp('.git')
-            # extend 'project' with 'just do it' capabilities
-            project.extend Nike
+            repo.abbreviated_ssh_url = repo.ssh_url.chomp('.git')
+            # extend 'repo' with 'just do it' capabilities
+            repo.extend Nike
           end
         end
         # rubocop:enable Security/MarshalLoad
@@ -181,12 +190,20 @@ module Git
     #
 
     def repositories_for(multi_repo = nil)
-      if multi_repo.nil?
-        repositories
-      else
+      case (owner = superproject = multi_repo)
+      when nil
+        repositories # all of them
+      when *USERS, *ORGANIZATIONS
+        repositories.find_all { |repository|
+          repository.owner.login == owner
+        }
+      when *SUPERPROJECTS
+        full_names = full_names_for(superproject)
         repositories.find_all { |repository|
-          repository.owner.login == multi_repo
+          full_names.include?(repository.full_name)
         }
+      else
+        raise "Unknown multi repo: #{multi_repo}"
       end
     end
 
@@ -212,40 +229,41 @@ module Git
 
     def excess_repositories_for(multi_repo = nil)
       repository_full_names = repositories_for(multi_repo).map(&:full_name)
-      local_repositories_for(multi_repo).reject { |project|
-        repository_full_names.include? project.full_name
+      local_repositories_for(multi_repo).reject { |repo|
+        repository_full_names.include? repo.full_name
       }
     end
 
     def stale_repositories_for(multi_repo = nil)
       repository_full_names = github_repositories_for(multi_repo).map(&:full_name)
-      repositories_for(multi_repo).reject { |project|
-        repository_full_names.include? project.full_name
+      repositories_for(multi_repo).reject { |repo|
+        repository_full_names.include? repo.full_name
       }
     end
 
     def spurious_repositories_for(multi_repo = nil)
-      cloned_repositories_for(multi_repo).find_all { |project|
-        origin_url = `git -C #{project.local_path} config --get remote.origin.url`.chomp
+      cloned_repositories_for(multi_repo).find_all { |repo|
+        origin_url = local_option(repo.local_path, 'remote.origin.url')
+
         ![
-          project.clone_url,
-          project.ssh_url,
-          project.compliant_ssh_url,
-          project.abbreviated_ssh_url,
-          project.git_url,
+          repo.clone_url,
+          repo.ssh_url,
+          repo.compliant_ssh_url,
+          repo.abbreviated_ssh_url,
+          repo.git_url,
         ].include? origin_url
       }
     end
 
     def missing_repositories_for(multi_repo = nil)
-      repositories_for(multi_repo).find_all { |project|
-        !File.directory? project.local_path
+      repositories_for(multi_repo).find_all { |repo|
+        !File.directory? repo.local_path
       }
     end
 
     def cloned_repositories_for(multi_repo = nil)
-      repositories_for(multi_repo).find_all { |project|
-        File.directory? project.local_path
+      repositories_for(multi_repo).find_all { |repo|
+        File.directory? repo.local_path
       }
     end
 

data/man/git-multi.1

@@ -2,12 +2,12 @@
 .\"     Title: git-multi
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 11/10/2018
+.\"      Date: 11/12/2018
 .\"    Manual: Git Manual
 .\"    Source: Git 2.19.1.542.gc4df23f792.dirty
 .\"  Language: English
 .\"
-.TH "GIT\-MULTI" "1" "11/10/2018" "Git 2\&.19\&.1\&.542\&.gc4df23" "Git Manual"
+.TH "GIT\-MULTI" "1" "11/12/2018" "Git 2\&.19\&.1\&.542\&.gc4df23" "Git Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -31,7 +31,7 @@
 git-multi \- execute the same git command in multiple repositories
 .SH "VERSION"
 .sp
-This is \fBv2\&.0\&.0\fR of \fIgit multi\fR \&... hooray!
+This is \fBv2\&.1\&.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:
@@ -539,6 +539,11 @@ root directory where repos will been cloned
 .RS 4
 local, binary cache of GitHub repository metadata
 .RE
+.PP
+\fB${HOME}/\&.git/multi/superprojects\&.config\fR
+.RS 4
+definitions for so\-called "superproject" multi repos
+.RE
 .SH "REFERENCES"
 .sp
 .RS 4

data/man/git-multi.erb

@@ -248,6 +248,9 @@ FILES
 `${HOME}/.git/multi/repositories.byte`::
 	local, binary cache of GitHub repository metadata
 
+`${HOME}/.git/multi/superprojects.config`::
+	definitions for so-called "superproject" multi repos
+
 REFERENCES
 ----------
 

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>v2.0.0</code> of <em>git multi</em> &#8230; hooray!</p></div>
+<div class="paragraph"><p>This is <code>v2.1.0</code> of <em>git multi</em> &#8230; hooray!</p></div>
 </div>
 </div>
 <div class="sect1">
@@ -1168,6 +1168,14 @@ git multi --json | jq -r '.[] | select(.fork == true) | .full_name'</code></pre>
         local, binary cache of GitHub repository metadata
 </p>
 </dd>
+<dt class="hdlist1">
+<code>${HOME}/.git/multi/superprojects.config</code>
+</dt>
+<dd>
+<p>
+        definitions for so-called "superproject" multi repos
+</p>
+</dd>
 </dl></div>
 </div>
 </div>
@@ -1201,7 +1209,7 @@ the <code>jq</code> command-line utility:
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2018-11-10 08:44:16 GMT
+ 2018-11-12 14:05:11 GMT
 </div>
 </div>
 </body>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git-multi
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Peter Vandenberk
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-10 00:00:00.000000000 Z
+date: 2018-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octokit
@@ -97,9 +97,9 @@ files:
 - lib/git/hub.rb
 - lib/git/multi.rb
 - lib/git/multi/commands.rb
+- lib/git/multi/config.rb
 - lib/git/multi/gemspec.rb
-- lib/git/multi/settings.rb
-- lib/git/multi/utils.rb
+- lib/git/multi/report.rb
 - lib/git/multi/version.rb
 - man/git-multi.1
 - man/git-multi.erb

data/lib/git/multi/settings.rb

@@ -1,99 +0,0 @@
-module Git
-  module Multi
-    module Settings
-
-      TICK  = ['2714'.hex].pack('U*').green.freeze
-      CROSS = ['2718'.hex].pack('U*').red.freeze
-      ARROW = ['2794'.hex].pack('U*').blue.freeze
-
-      module_function
-
-      def setting_status(messages, valid = false, optional = true)
-        fields = messages.compact.join(' - ')
-        icon = valid ? TICK : optional ? ARROW : CROSS
-        puts "#{icon}  #{fields}"
-      end
-
-      def file_status(file, message = 'File')
-        setting_status(
-          [
-            message,
-            abbreviate(file),
-            File.file?(file) ? "#{File.size(file).commify} bytes" : nil,
-          ],
-          file && !file.empty? && File.file?(file),
-          false
-        )
-      end
-
-      def directory_status(messages, directory)
-        setting_status(
-          messages,
-          directory && !directory.empty? && File.directory?(directory),
-          false
-        )
-      end
-
-      def workarea_status(message, workarea, owner)
-        directory_status(
-          [
-            message,
-            File.join(abbreviate(workarea, :workarea), owner),
-          ],
-          File.join(workarea, owner)
-        )
-
-        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)
-        setting_status(['User', user], user && !user.empty?)
-      end
-
-      def organization_status(orgs)
-        orgs.each do |org|
-          setting_status(['Organization', org], org && !org.empty?, true)
-          setting_status(['Organization', 'member?'], Git::Hub.orgs.include?(org), !Git::Hub.connected?)
-        end
-      end
-
-      def token_status(token)
-        setting_status(['Token', symbolize(token), describe(token)], !token.nil? && !token.empty?)
-        setting_status(['Token', 'valid?'], !token.nil? && !token.empty? && Git::Hub.login, !Git::Hub.connected?)
-        setting_status(['Token', "owned by #{Git::Multi::USER}?"], Git::Hub.login == Git::Multi::USER, !Git::Hub.connected?)
-      end
-
-      def home_status(home)
-        directory_status(['${HOME}', home], home)
-      end
-
-      def main_workarea_status(workarea)
-        directory_status(['${WORKAREA}', abbreviate(workarea, :home)], workarea)
-      end
-
-      def user_workarea_status(users)
-        users.each do |user|
-          workarea_status("Workarea (user: #{user})", Git::Multi::WORKAREA, user)
-        end
-      end
-
-      def organization_workarea_status(orgs)
-        orgs.each do |org|
-          workarea_status("Workarea (org: #{org})", Git::Multi::WORKAREA, org)
-        end
-      end
-
-    end
-  end
-end

data/lib/git/multi/utils.rb

@@ -1,57 +0,0 @@
-module Git
-  module Multi
-
-    module Settings
-
-      module_function
-
-      def describe(token)
-        if token.nil?
-          '(nil)'
-        elsif token.empty?
-          '(empty)'
-        else
-          "#{'*' * 36}#{token[36..-1]}"
-        end
-      end
-
-      def symbolize(token)
-        case token
-        when Git::Multi.env_var('OCTOKIT_ACCESS_TOKEN')
-          then '${OCTOKIT_ACCESS_TOKEN}'
-        when Git::Multi.git_option('github.token')
-          then 'github.token'
-        else '(unset)'
-        end
-      end
-
-      def abbreviate(directory, root_dir = nil)
-        case root_dir
-        when :home
-          then directory.gsub(Git::Multi::HOME, '${HOME}')
-        when :workarea
-          then directory.gsub(Git::Multi::WORKAREA, '${WORKAREA}')
-        else abbreviate(abbreviate(directory, :workarea), :home)
-        end
-      end
-
-    end
-
-    module_function
-
-    def git_option(name, default = nil)
-      value = `git config #{name}`.chomp.freeze
-      value.empty? && default ? default : value
-    end
-
-    def git_list(name, default = nil)
-      git_option(name, default).split(',').map(&:strip)
-    end
-
-    def env_var(name, default = nil)
-      value = ENV[name].freeze
-      (value.nil? || value.empty?) && default ? default : value
-    end
-
-  end
-end