gitoc 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d8b6b5dd358d217cb2ba8ad12dd703789d5247a083e129bc86d5875756f27493
-  data.tar.gz: 5d7867eca5b70d823a240ed4bf80e6ed324d9b9e3e586775e0f7eb8388e9bfc6
+  metadata.gz: 513d44a622185a25c2b61a76fc13428929270accd5a0b6d3d18c3486a1a091b5
+  data.tar.gz: 3098d79bbf8b4c9d0e2ee94e3364e2605068f511f9b4244a1548940da95e276a
 SHA512:
-  metadata.gz: d1a30f8ef8937307c43e0fd9bee373c9128011b8ef7fca067ca50325788eb0c7c42b917dc03d0de5123f65301f30598720c8ff278acebf6f0260bfe13c0658bb
-  data.tar.gz: 8054851334fd52afd83c2afa1375a91c046b50cc36e6d93e9905b526a33f689b1ab655e71b9b591918833ba4e37769e6c9efa6724f6ad3751ab5cf8290f6ebec
+  metadata.gz: e47a187855854a4649e51239b185ab44a2201f302d632c1f88f3fa50b55899a6c244385e206b8f246c97b0544b23671166da58de9f56cfc943a3840fa291325d
+  data.tar.gz: fe55eba056525dfafca3bce14bf14103a9ddc45d7f1cd6bfe9336f6663ddd6a80dc0eff1da108e246f3f82a63ad1f3c611a40b4206a0227409f617f189ba827f

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## Release v0.4.0 (17 Nov 2021)
+
+* gitoc check scans the filesystem and the GiTOC file
+* gitoc generate replaces gitoc dump
+
+
 ## Release v0.3.0 (26 Oct 2021)
 
 * first public release

data/README.md

@@ -1,3 +1,5 @@
+[![Gem Version](https://badge.fury.io/rb/gitoc.svg)](https://badge.fury.io/rb/gitoc)
+
 # Gitoc
 
 GiTOC generates a table of contents from a local directory tree of git repositories. Use this GiTOC file to clone all your git repositories to a new location (computer) or run a command on all your repositories.

data/lib/gitoc/cli.rb

@@ -8,26 +8,45 @@ class Gitoc::Cli < Thor
   class_option :base, default: "~/git", desc: "Local git base directory"
   class_option :toc, default: "~/.gitoc.yaml", desc: "GiTOC file"
 
-  desc "check", "Check GiTOC file"
+  desc "check", "Check local repositories and GiTOC file"
   def check
     init_base
 
-    list = repositories.map do |repo|
-      path, url = repo.to_hash.values
-      path = set_color(path, :red) if url.nil? || url.empty?
-      [path, url]
+    # Get all repositories from the filesystem
+    # and tag them with :fs
+    repositories = repositories_fs.map do |repository_fs|
+      [repository_fs, [:fs]]
     end
 
-    print_table list
+    # Add missing repositories from the GiTOC file
+    # and tag all repositories from the GiTOC file with :toc
+    repositories_gitoc.each do |repository_gitoc|
+      _, tags = repositories.find {|repository_fs, _| repository_fs == repository_gitoc }
+      if tags
+        tags << :toc
+      else
+        repositories << [repository_gitoc, [:toc]]
+      end
+    end
+
+    # Sort repositories list
+    # and build table rows: [path, url, comment]
+    rows = repositories.sort_by {|repository, _| repository.rel_path }.map do |repository, tags|
+      path, url = repository.to_hash.values
+      url = "-" if url.nil? || url.empty?
+      comment = tags.include?(:fs) && tags.include?(:toc) ? "" : {fs: "not in GiTOC", toc: "not on filesystem"}[tags.first]
+
+      [path, url, comment]
+    end
+
+    print_table rows  
   end
 
-  desc "dump", "Recursively scan base for git repositories and generate GiTOC file"
-  def dump
+  desc "generate", "Recursively scan base for git repositories and generate/update GiTOC file"
+  def generate
     init_base
 
-    toc = Gitoc::Repository.base.glob("**/.git").map do |git_dir|
-      Gitoc::Repository.new(git_dir.parent)
-    end.sort_by(&:path).map(&:to_hash)
+    toc = repositories_fs.map(&:to_hash)
 
     # Write git_toc file
     gitoc.write toc.to_yaml
@@ -40,7 +59,7 @@ class Gitoc::Cli < Thor
 
     each_repository do |repo|
       if repo.exist?
-        say "Skip repository, #{repo.path} already exists.", :red
+        puts "Skip repository, #{repo.path} already exists."
         next
       end
 
@@ -54,7 +73,7 @@ class Gitoc::Cli < Thor
 
     each_repository do |repo|
       unless repo.exist?
-        say "Skip repository, #{repo.path} doesn't exist.", :red
+        puts "Skip repository, #{repo.path} doesn't exist."
         next
       end
 
@@ -85,8 +104,8 @@ class Gitoc::Cli < Thor
     @gitoc ||= Pathname.new(options[:toc]).expand_path
   end
 
-  def repositories
-    @repositories ||= begin
+  def repositories_gitoc
+    @repositories_gitoc ||= begin
       unless gitoc.exist?
         say "#{gitoc} not found", :red
         exit 1
@@ -98,10 +117,16 @@ class Gitoc::Cli < Thor
     end
   end
 
+  def repositories_fs
+    @repositories_fs ||= Gitoc::Repository.base.glob("**/.git").map do |git_dir|
+      Gitoc::Repository.new(git_dir.parent)
+    end.sort_by(&:path)
+  end
+
   def each_repository
-    repositories.each_with_index do |repo, index|
+    repositories_gitoc.each_with_index do |repo, index|
       puts
-      say "~/#{repo.path.relative_path_from(home)} (#{index + 1}/#{repositories.count})", :cyan
+      say "~/#{repo.path.relative_path_from(home)} (#{index + 1}/#{repositories_gitoc.count})", :cyan
 
       unless repo.url?
         say "Skip repository with no remote.origin.url", :red

data/lib/gitoc/repository.rb

@@ -18,9 +18,17 @@ class Gitoc::Repository
     @url = url
   end
 
+  def == other
+    self.to_hash == other.to_hash
+  end
+
+  def rel_path
+    @rel_path ||= path.relative_path_from(self.class.base)
+  end
+
   def to_hash
     {
-      path: path.relative_path_from(self.class.base).to_s,
+      path: rel_path.to_s,
       url: url
     }
   end

data/lib/gitoc/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Gitoc
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitoc
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Patrick Marchi
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-10-26 00:00:00.000000000 Z
+date: 2021-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -70,8 +70,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
-summary: gitoc 0.3.0
+summary: gitoc 0.4.0
 test_files: []