git_tree 0.2.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 34ccd05ecc6f42587797fe03361bed486df6ba5591baaf3cefa715669c27f07f
-  data.tar.gz: 9f547d654742f88d5db2b2163299c3fda8152a5e257546d6aab23690b2f95f5f
+  metadata.gz: 45ac579ee8e240d6c78bd782b40b1ca473ffd5e7f1d87a1fb81b53012516465c
+  data.tar.gz: 32b342b9e45b35a64beca464cf9a0e3af514ea5867cd864916ff551425f3dcd7
 SHA512:
-  metadata.gz: 1e87d794586327101150260f1d5942ba5d487b9f91b54d6db7a0d0d6e6a93e88952898704341d8643b4b3cd0f723e6ceb07e52a4d64b453198d280180bdaa755
-  data.tar.gz: 2144afb4d96f9f9dfc09e28a6d6caac5758a61c3f8bf108b236a28c7cda3c4efc6ba52a2a1e41c7765f3d7ab69a00c3ea63a6b3e6b1a33be103a491ace9a65c4
+  metadata.gz: 7ecfa103809f6cd8d63bbd76b69cbbf5d7af5c746b16a7d533d7bfc9a269687413413b98b7fa5aab27028f37a7d8e2ef4df40decd49a07828549cedfb072c47a
+  data.tar.gz: 1dc61521613c96dbb776de98b02b269a3dc0d0aa2605e534fdc19d4facf103c8e4a9fa6dddef143720b841e672b9fc5072c74b81b643cc1fd6ea4ba502a1a821

data/.rubocop.yml

@@ -66,6 +66,9 @@ Naming/FileName:
 RSpec/ExampleLength:
   Max: 20
 
+RSpec/FilePath:
+  Enabled: false
+
 RSpec/MultipleExpectations:
   Max: 15
 
@@ -88,8 +91,7 @@ Style/RegexpLiteral:
   Enabled: false
 
 Style/StringConcatenation:
-  Exclude:
-    - spec/**/*
+  Enabled: false
 
 Style/StringLiterals:
   Enabled: false

data/CHANGELOG.md

@@ -1,4 +1,9 @@
-## 0.2.0 / 2023-05-02
+## 0.2.2 / 2023-05-23
+  * `git_tree_evars` now checks for previous definitions and issues warnings.
+## 0.2.1 / 2023-05-03
+  * Removed the here document wrapper from the output of `git_tree_evars`.
+
+## 0.2.0 / 2023-05-03
   * Renamed gem to `git_tree`
   * Renamed `replicate_git_tree` command to `git_tree_replicate`.
   * Added `.evars` support with new executable: `git_tree_evars`

data/README.md

@@ -15,13 +15,12 @@ Directories containing a file called `.ignore` are ignored.
 
 
 ## Usage
-Both commands requires only one parameter:
-the name of the top-level directory to scan.
+Both commands require one environment variable reference to be passed to them.
+Enclose the name of the environment variable within single quotes,
+which will prevent the shell from expanding it before invoking the command.
 
-You must pass an environment variable to both commands.
-Enclosing the name of the env var in single quotes,
-which will prevent the shell from expanding it before invoking either command:
 
+## `Git_tree_replicate` Usage
 The following creates a script in the current directory called `work.sh`,
 that replicates the desired portions of the directory tree of git repos pointed to by `$work`:
 ```shell
@@ -29,8 +28,8 @@ $ git_tree_replicate '$work' > work.sh
 ```
 
 The generated environment variables will all be relative to the
-env var you provided.
-You will understand what this means once you try it and look at the generated script.
+path pointed to by the expanded environment variable that you provided.
+You will understand what this means once you look at the generated script.
 
 When `git_tree_replicate` completes,
 edit the generated script to suit, then
@@ -58,14 +57,24 @@ if [ ! -d "sinatra/sinatras-skeleton/.git" ]; then
 fi
 ```
 
+## `Git_tree_evars` Usage
+The `git_tree_evars` command should be run on the target computer.
+The command requires only one parameter:
+an environment variable reference, pointing to the top-level directory to replicate.
+The environment variable reference must be contained within single quotes to prevent expansion by the shell.
+
+The following appends to any script in the `$work` directory called `.evars`.
+The script defines environment variables that point to each git repos pointed to by `$work`:
+```shell
+$ git_tree_evars '$work' >> $work/.evars
+```
+
+
 ### Generated Script from `git_tree_evars`
 Following is a sample of environment variable definitions.
 You can edit it to suit.
-Notice that it appends these environment variable definitions to `$work/.evars`.
-You could cause it to replace the contents of that file by changing the `>>` to `>`.
 
 ```shell
-cat <<EOF >> $work/.evars
 export work=/mnt/c/work
 export ancientWarmth=$work/ancientWarmth/ancientWarmth
 export ancientWarmthBackend=$work/ancientWarmth/ancientWarmthBackend
@@ -74,7 +83,6 @@ export survey_analytics=$work/ancientWarmth/survey-analytics
 export survey_creator=$work/ancientWarmth/survey-creator
 export django=$work/django/django
 export frobshop=$work/django/frobshop
-EOF
 ```
 
 The environment variable definitions are meant to be saved into a file that is `source`d upon boot.
@@ -97,7 +105,7 @@ $ cd $my_project
 ## Installation
 Type the following at a shell prompt:
 
-```ruby
+```shell
 $ gem install git_tree
 ```
 

data/Rakefile

@@ -1,5 +1,5 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 task default: :spec

data/bindir/git_tree_evars

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
 
-require 'git_tree'
+require 'git_tree_evars'
 
 GitTree.command_evars

data/bindir/git_tree_replicate

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
 
-require 'git_tree'
+require 'git_tree_replicate'
 
 GitTree.command_replicate

data/git_tree.gemspec

@@ -41,5 +41,6 @@ Gem::Specification.new do |spec| # rubocop:disable Metrics/BlockLength
   spec.summary = 'Installs two commands that scan a git directory tree and write out scripts for replication.'
   spec.version = GitUrlsVersion::VERSION
 
+  spec.add_dependency 'rainbow'
   spec.add_dependency 'rugged'
 end

data/lib/git_tree/version.rb

@@ -1,3 +1,3 @@
 module GitUrlsVersion
-  VERSION = '0.2.0'.freeze
+  VERSION = '0.2.2'.freeze
 end

data/lib/git_tree.rb

@@ -1,38 +1,19 @@
-module GitTree
-  require 'find'
-  require 'rugged'
-  require_relative 'util'
-
-  # @param root might be "$envar" or a fully qualified directory name ("/a/b/c")
-  def self.command_evars(root = ARGV[0])
-    abort "Error: Argument must start with a dollar sign ($)" unless root.start_with? '$'
-
-    base = MslinnUtil.expand_env root
-    dirs = directories_to_process base
-
-    # puts "# root=#{root}, base=#{base}"
-    puts make_env_vars root, base, dirs
-  end
-
-  # @param root might be "$envar" or a fully qualified directory name ("/a/b/c")
-  def self.command_replicate(root = ARGV[0])
-    abort "Error: Argument must start with a dollar sign ($)" unless root.start_with? '$'
+require 'find'
+require 'rainbow/refinement'
+require 'rugged'
+require_relative 'util'
 
-    base = MslinnUtil.expand_env root
-    dirs = directories_to_process base
-
-    # puts "# root=#{root}, base=#{base}"
-    puts make_replicate_script root, base, dirs
-  end
+module GitTree
+  using Rainbow
 
   # @return array containing directory names to process
   #   Each directory name ends with a slash, to ensure symlinks are dereferences
   def self.directories_to_process(root)
     root_fq = File.expand_path root
-    abort "Error: #{root_fq} is a file, instead of a directory. Cannot recurse." if File.file? root_fq
+    abort "Error: #{root_fq} is a file, instead of a directory. Cannot recurse.".red if File.file? root_fq
 
     root_fq = MslinnUtil.deref_symlink(root_fq).to_s
-    abort "Error: #{root_fq} does not exist. Halting." unless Dir.exist? root_fq
+    abort "Error: #{root_fq} does not exist. Halting.".red unless Dir.exist? root_fq
 
     result = []
     Find.find(root_fq) do |path|
@@ -47,80 +28,4 @@ module GitTree
     end
     result.map { |x| x.delete_prefix("#{root_fq}/") }
   end
-
-  def self.env_var_name(path)
-    name = path.include?('/') ? File.basename(path) : path
-    name.tr(' ', '_').tr('-', '_')
-  end
-
-  def self.help(msg = nil)
-    puts msg if msg
-    puts <<~END_HELP
-      Replicates tree of git repos and writes a bash script to STDOUT that clones the repos in the tree.
-      Adds upstream remotes as required.
-
-      Directories containing a file called .ignore are ignored.
-    END_HELP
-    exit 1
-  end
-
-  def self.make_env_var(name, value)
-    "export #{env_var_name(name)}=#{value}"
-  end
-
-  # @param root might be "$envar" or a fully qualified directory name ("/a/b/c")
-  # @param base a fully qualified directory name ("/a/b/c")
-  # @param dirs directory list to process
-  def self.make_env_vars(root, base, dirs)
-    result = []
-    result << "cat <<EOF >> #{root}/.evars"
-    result << make_env_var(env_var_name(base), MslinnUtil.deref_symlink(base))
-    dirs.each do |dir|
-      result << make_env_var(env_var_name(dir), "#{root}/#{dir}")
-    end
-    result << "EOF\n"
-    result.join "\n"
-  end
-
-  # @param root might be "$envar" or a fully qualified directory name ("/a/b/c")
-  # @param base a fully qualified directory name ("/a/b/c")
-  # @param dirs directory list to process
-  def self.make_replicate_script(root, base, dirs)
-    help "Error: Please specify the subdirectory to traverse.\n\n" if root.to_s.empty?
-
-    Dir.chdir(base) do
-      result = dirs.map { |dir| replicate_one(dir) }
-      result.join "\n"
-    end
-  end
-
-  def self.replicate_one(dir)
-    output = []
-    project_dir = File.basename dir
-    parent_dir = File.dirname dir
-    repo = Rugged::Repository.new dir
-    origin_url = repo.config['remote.origin.url']
-
-    output << "if [ ! -d \"#{dir}/.git\" ]; then"
-    output << "  mkdir -p '#{parent_dir}'"
-    output << "  pushd '#{parent_dir}' > /dev/null"
-    output << "  git clone #{origin_url}"
-
-    repo.remotes.each do |remote|
-      next if remote.name == 'origin' || remote.url == 'no_push'
-
-      output << "  git remote add #{remote.name} '#{remote.url}'"
-    end
-
-    output << '  popd > /dev/null'
-
-    # git_dir_name = File.basename Dir.pwd
-    # if git_dir_name != project_dir
-    #   output << '  # Git project directory was renamed, renaming this copy to match original directory structure'
-    #   output << "  mv #{git_dir_name} #{project_dir}"
-    # end
-    output << "fi"
-    output << ''
-    output
-  end
 end

data/lib/git_tree_evars.rb

@@ -0,0 +1,65 @@
+require 'shellwords'
+require_relative 'git_tree'
+
+module GitTree
+  using Rainbow
+
+  # @param root might be "$envar" or a fully qualified directory name ("/a/b/c")
+  def self.command_evars(root = ARGV[0])
+    abort "Error: Argument must start with a dollar sign ($)".red unless root.start_with? '$'
+
+    base = MslinnUtil.expand_env root
+    dirs = directories_to_process base
+
+    # puts "# root=#{root}, base=#{base}"
+    puts make_env_vars root, base, dirs
+  end
+
+  def self.env_var_name(path)
+    name = path.include?('/') ? File.basename(path) : path
+    name.tr(' ', '_').tr('-', '_')
+  end
+
+  def self.help_evars(msg = nil)
+    puts msg if msg
+    puts <<~END_HELP
+      Examines a tree of git repos and writes a bash script to STDOUT that defines environment variables that point to the repos in the tree.
+      Does not redefine existing environment variables.
+
+      Directories containing a file called .ignore are ignored.
+    END_HELP
+    exit 1
+  end
+
+  def self.make_env_var(name, value)
+    "export #{env_var_name(name)}=#{value}"
+  end
+
+  # @param root should be an "$envar" that points to the root of a directory tree containing git repos.
+  # @param base a fully qualified directory name ("/a/b/c")
+  # @param dirs directory list to process
+  def self.make_env_vars(root, base, dirs)
+    help_evars "Error: Please specify the subdirectory to traverse.\n\n" if root.to_s.empty?
+
+    result = []
+    result << make_env_var(env_var_name(base), MslinnUtil.deref_symlink(base))
+    dirs.each do |dir|
+      ename = env_var_name dir
+      ename_value = MslinnUtil.expand_env "$#{ename}"
+      ename_value = ename_value.shellescape.delete_prefix('\\') unless ename_value.empty?
+      if ename_value.to_s.empty?
+        result << make_env_var(ename, "#{root}/#{dir}")
+      else
+        msg = "$#{ename} was previously defined as #{ename_value}"
+        dir = MslinnUtil.expand_env(ename_value)
+        if Dir.exist? dir
+          warn msg.cyan
+        else
+          msg += ", but that directory does not exist, so redefining #{ename}."
+          warn msg.green
+        end
+      end
+    end
+    result.map { |x| "#{x}\n" }.join
+  end
+end

data/lib/git_tree_replicate.rb

@@ -0,0 +1,68 @@
+require_relative 'git_tree'
+
+module GitTree
+  # @param root might be "$envar" or a fully qualified directory name ("/a/b/c")
+  def self.command_replicate(root = ARGV[0])
+    abort "Error: No directories were specified" if root.to_s.empty?
+    abort "Error: Argument must start with a dollar sign ($)" unless root.start_with? '$'
+
+    base = MslinnUtil.expand_env root
+    dirs = directories_to_process base
+
+    # puts "# root=#{root}, base=#{base}"
+    puts make_replicate_script root, base, dirs
+  end
+
+  def self.help_replicate(msg = nil)
+    puts msg if msg
+    puts <<~END_HELP
+      Replicates tree of git repos and writes a bash script to STDOUT that clones the repos in the tree.
+      Adds upstream remotes as required.
+
+      Directories containing a file called .ignore are ignored.
+    END_HELP
+    exit 1
+  end
+
+  # @param root should be an "$envar" that points to the root of a directory tree containing git repos.
+  # @param base a fully qualified directory name ("/a/b/c")
+  # @param dirs directory list to process
+  def self.make_replicate_script(root, base, dirs)
+    help_replicate "Error: Please specify the subdirectory to traverse.\n\n" if root.to_s.empty?
+
+    Dir.chdir(base) do
+      result = dirs.map { |dir| replicate_one(dir) }
+      result.join "\n"
+    end
+  end
+
+  def self.replicate_one(dir)
+    output = []
+    project_dir = File.basename dir
+    parent_dir = File.dirname dir
+    repo = Rugged::Repository.new dir
+    origin_url = repo.config['remote.origin.url']
+
+    output << "if [ ! -d \"#{dir}/.git\" ]; then"
+    output << "  mkdir -p '#{parent_dir}'"
+    output << "  pushd '#{parent_dir}' > /dev/null"
+    output << "  git clone #{origin_url}"
+
+    repo.remotes.each do |remote|
+      next if remote.name == 'origin' || remote.url == 'no_push'
+
+      output << "  git remote add #{remote.name} '#{remote.url}'"
+    end
+
+    output << '  popd > /dev/null'
+
+    # git_dir_name = File.basename Dir.pwd
+    # if git_dir_name != project_dir
+    #   output << '  # Git project directory was renamed, renaming this copy to match original directory structure'
+    #   output << "  mv #{git_dir_name} #{project_dir}"
+    # end
+    output << "fi"
+    output << ''
+    output
+  end
+end

data/lib/util.rb

@@ -1,4 +1,66 @@
 module MslinnUtil
+  # @param paths [Array[String]] all start with a leading '/' (they are assumed to be absolute paths).
+  # @return [String] the longest path prefix that is a prefix of all paths in array.
+  #   If array is empty, return ''.
+  #   If only the leading slash matches, and allow_root_match is true, return '/', else return ''.
+  def self.common_prefix(paths, allow_root_match: false)
+    return '' if paths.empty?
+
+    relative_paths = paths.reject { |x| x.start_with? '/' }
+    abort "Error: common_prefix received relative paths:" + relative_paths.map { |x| "  #{x}\n" } \
+      unless relative_paths.empty?
+
+    if paths.length == 1
+      result = paths.first.split('/').slice(0...-1).join('/')
+      return result.empty? && allow_root_match ? '/' : result
+    end
+
+    arr = paths.sort
+    first = arr.first.split('/')
+    last = arr.last.split('/')
+    i = 0
+    i += 1 while first[i] == last[i] && i <= first.length
+    result = first.slice(0, i).join('/')
+
+    result.empty? && allow_root_match ? '/' : result
+  end
+
+  # @param paths [Array[String]] absolute paths to examine
+  # @param level [Int] minimum # of leading directory names in result, origin 1
+  def self.roots(paths, level, allow_root_match: false)
+    abort "Error: level must be positive, but it is #{level}." unless level.positive?
+    return allow_root_match ? '/' : '' if paths.empty?
+
+    abort("Error: level parameter must be positive, #{level} was supplied instead.") if level <= 0
+
+    if paths.length == 1
+      root = File.dirname(paths.first)
+      return allow_root_match ? '/' : '' if root == '/'
+
+      return root
+    end
+
+    loop do
+      paths = trim_to_level(paths, level) # does this change paths in the caller?
+      return paths.first if paths.length == 1
+
+      level -= 1
+      break if level.zero?
+    end
+
+    allow_root_match ? '/' : ''
+  end
+
+  # @param paths [Array[String]] absolute paths to examine
+  # @param level is origin 1
+  def self.trim_to_level(paths, level)
+    result = paths.map do |x|
+      elements = x.split('/').reject(&:empty?)
+      '/' + elements[0..level - 1].join('/')
+    end
+    result.sort.uniq
+  end
+
   # @return Path to symlink
   def self.deref_symlink(symlink)
     require 'pathname'
@@ -15,5 +77,4 @@ module MslinnUtil
       ENV.fetch(Regexp.last_match(1), nil)
     end
   end
-
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: git_tree
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.2
 platform: ruby
 authors:
 - Mike Slinn
 autorequire:
 bindir: bindir
 cert_chain: []
-date: 2023-05-03 00:00:00.000000000 Z
+date: 2023-05-24 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rainbow
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rugged
   requirement: !ruby/object:Gem::Requirement
@@ -48,6 +62,8 @@ files:
 - git_tree.gemspec
 - lib/git_tree.rb
 - lib/git_tree/version.rb
+- lib/git_tree_evars.rb
+- lib/git_tree_replicate.rb
 - lib/util.rb
 homepage: https://www.mslinn.com/git/1100-git-tree.html
 licenses: