git-multi 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0340c0b46c0dd30d412c7d464b7711449ef2a2b041c0cd5895f674252580d40d
-  data.tar.gz: 557a9f1f15b6548856b983cca3769e75864030fb183efb0363121bd0de98d1c7
+  metadata.gz: 5662c60b6650e56066d055e7864327c792b31ef2bbb8d963e46ba86f31992707
+  data.tar.gz: 486067d955e4a13f7e09ce5db09793df17bd03858e0ceec46092a2e002857f21
 SHA512:
-  metadata.gz: 5b252d77f45fb68e3e0fee7bb7d018ed55482cf4ef1aa5596a8936d7096819d7e97e3246fa88fb041f4f4ef27effecf42052b28f21669d6e6e09ab3c3224ba40
-  data.tar.gz: 495fe401b67a606740f87f5d57cf63e7e1366e8dfcc17e17b419438723fa5a8f0238a8fdafd54c200abb45e7c1cb272397d707148450880393157ef20c430f99
+  metadata.gz: 2263f8291a3fff25abc42a61502d84a8c525e4c1acca473b7a8040149b088541003234aba3755e4264106cf67c503bf4d5829bcd7a607921cda468f1ec1f139b
+  data.tar.gz: 570f5804de61968cc585506e127a48f14064cf22ab416e31b2fc291b4de131f8cee7dfa23f70446066a3b9de2588e7c62fdb4ca2eabddef847b6d911f2ad11f0

data/Rakefile

@@ -1,3 +1,5 @@
+# rubocop:disable Style/HashSyntax
+
 require 'bundler/gem_tasks'
 
 def gemspec
@@ -21,29 +23,31 @@ Rake::TestTask.new(:test) do |t|
   t.test_files = FileList['test/**/*_test.rb']
 end
 
-# rubocop:disable Style/HashSyntax
-
 task :default => :test
 
-task :documentation => 'man/git-multi.txt'
-
 require 'git/multi'
 
-def query_args
+git_workarea  = File.join(Git::Multi::WORKAREA, 'git', 'git')
+documentation = File.join(git_workarea, 'Documentation')
+git_asciidoc  = File.join(documentation, 'git-multi.txt')
 
-  client = Git::Hub.send(:client) # Octokit GitHub API client
-  repo = client.repo('git/git')   # random GitHub repository
+require 'erb'
 
-  # instead of maintaining a list of valid query args in the help-
-  # file, we determine it at runtime... less is more, and all that
-  repo.fields.sort.each_slice(3).map { |foo, bar, qux|
-    format('%-20s %-20s %-20s', foo, bar, qux).rstrip
-  }.join("\n    ")
-end
+file 'man/git-multi.erb' => 'lib/git/multi/version.rb' # version changes
 
-file 'man/git-multi.txt' => 'man/git-multi.erb' do |task|
-  require 'erb'
+file git_asciidoc => 'man/git-multi.erb' do |task|
   File.write(task.name, ERB.new(File.read(task.source)).result)
 end
 
+task :documentation => git_asciidoc do
+  Dir.chdir(documentation) do
+    # use git's documentation approach and build system
+    %x{ make git-multi.1 git-multi.html }
+    FileUtils.cp 'git-multi.1',    Git::Multi::MAN_PAGE
+    FileUtils.cp 'git-multi.html', Git::Multi::HTML_PAGE
+  end
+end
+
+Rake::Task['build'].enhance([:documentation])
+
 # rubocop:enable Style/HashSyntax

data/lib/git/hub.rb

@@ -59,6 +59,18 @@ module Git
       end
     end
 
+    # pick a (semi-)random repo from GitHub
+
+    def repository_fields
+      client.repo('git/git').fields
+    end
+
+    def query_args
+      repository_fields.sort.each_slice(3).map { |foo, bar, qux|
+        format('%-20s %-20s %-20s', foo, bar, qux).rstrip
+      }.join("\n    ")
+    end
+
     #
     # https://developer.github.com/v3/repos/#list-user-repositories
     #

data/lib/git/multi/version.rb

@@ -5,7 +5,7 @@ require 'psych'
 module Git
   module Multi
     NAME = 'git-multi'
-    VERSION = '1.0.4'
+    VERSION = '1.0.5'
 
     LONG_VERSION = "%s v%s (%s v%s, %s v%s, %s v%s)" % [
       NAME,

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: 09/21/2018
+.\"      Date: 09/22/2018
 .\"    Manual: Git Manual
 .\"    Source: Git 2.19.0.216.g2d3b1c576.dirty
 .\"  Language: English
 .\"
-.TH "GIT\-MULTI" "1" "09/21/2018" "Git 2\&.19\&.0\&.216\&.g2d3b1c" "Git Manual"
+.TH "GIT\-MULTI" "1" "09/22/2018" "Git 2\&.19\&.0\&.216\&.g2d3b1c" "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 \fBv1\&.0\&.3\fR of \fIgit multi\fR \&... hooray!
+This is \fBv1\&.0\&.5\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:

data/man/git-multi.erb

@@ -200,7 +200,7 @@ QUERY ARGUMENTS
 
 The following is a list of valid arguments for the `git multi --query` option:
 
-    <%= query_args %>
+    <%= Git::Hub::query_args %>
 
 JQ INTEGRATION
 --------------

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.0.3</code> of <em>git multi</em> &#8230; hooray!</p></div>
+<div class="paragraph"><p>This is <code>v1.0.5</code> of <em>git multi</em> &#8230; hooray!</p></div>
 </div>
 </div>
 <div class="sect1">
@@ -1179,7 +1179,7 @@ the <code>jq</code> command-line utility:
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2018-09-21 17:15:51 BST
+ 2018-09-22 08:14:58 BST
 </div>
 </div>
 </body>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git-multi
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Peter Vandenberk
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-21 00:00:00.000000000 Z
+date: 2018-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octokit