eac_tools 0.31.0 → 0.31.1

data/sub/eac_git/vendor/git-subrepo/test/setup

@@ -0,0 +1,205 @@
+#!/usr/bin/env bash
+
+set -e
+
+# Set the GIT_SUBREPO_ROOT for testing.
+source $PWD/.rc
+
+# Set this locally for Windows:
+git config core.autocrlf input
+
+export BASHLIB="`
+  find $PWD -type d |
+  grep -E '/(bin|lib)$' |
+  xargs -n1 printf "%s:"
+`"
+export PATH="$BASHLIB:$PATH"
+source bash+ :std
+
+source 'lib/git-subrepo'
+
+# TODO: Move to test/tmp
+export TMP="tmp"
+rm -fr $TMP
+
+#export GIT_EXEC_PATH="$PWD/lib:$(git --exec-path)"
+export UPSTREAM="$TMP/upstream"
+export OWNER="$TMP/owner"
+export COLLAB="$TMP/collab"
+
+mkdir -p "$UPSTREAM" "$OWNER" "$COLLAB"
+
+cp -r test/repo/{foo,bar,init} "$UPSTREAM/"
+
+###
+# Test helper functions:
+###
+clone-foo-and-bar() {
+  (
+    # foo will act as the main repo
+    git clone $UPSTREAM/foo $OWNER/foo
+    (
+        cd $OWNER/foo
+        git config core.autocrlf input
+        git config user.name "FooUser"
+        git config user.email "foo@foo"
+    )
+    # bar will act as the subrepo
+    git clone $UPSTREAM/bar $OWNER/bar
+    (
+        cd $OWNER/bar
+        git config core.autocrlf input
+        git config user.name "BarUser"
+        git config user.email "bar@bar"
+    )
+  ) &> /dev/null || die
+}
+
+subrepo-clone-bar-into-foo() {
+  (
+    cd $OWNER/foo
+    git subrepo clone ../../../$UPSTREAM/bar
+  ) &> /dev/null || die
+}
+
+add-new-files() {
+  local file
+  for file in $*; do
+    echo "new file $file" > "$file"
+    git add "$file"
+  done
+  git commit --quiet -m "add new file: $file" &> /dev/null
+}
+
+remove-files() {
+  local file
+  for file in $*; do
+    git rm "$file"
+  done
+  git commit --quiet -m "Removed file: $file" &> /dev/null
+}
+
+modify-files() {
+  local file
+  for file in $*; do
+    echo 'a new line' >> "$file"
+    git add "$file"
+  done
+  git commit -m "modified file: $file"
+}
+
+modify-files-ex() {
+  local file
+  for file in $*; do
+    echo "$file" >> "$file"
+    git add "$file"
+  done
+  git commit -m "modified file: $file"
+}
+
+test-exists() {
+  for f in "$@"; do
+    if [[ $f =~ ^! ]]; then
+      f="${f#!}"
+      if [[ $f =~ /$ ]]; then
+        ok "`[ ! -d "$f" ]`" \
+          "Directory '$f' does not exist"
+      else
+        ok "`[ ! -f "$f" ]`" \
+          "File '$f' does not exist"
+      fi
+    else
+      if [[ $f =~ /$ ]]; then
+        ok "`[ -d "$f" ]`" \
+          "Directory '$f' exists"
+      else
+        ok "`[ -f "$f" ]`" \
+          "File '$f' exists"
+      fi
+    fi
+  done
+}
+
+test-exists-in-index() {
+  for f in $*; do
+    if [[ "$f" =~ ^! ]]; then
+      f="${f#!}"
+      if [[ "$f" =~ /$ ]]; then
+        ok "`[ ! $(git ls-tree --full-tree --name-only -r HEAD "$f") ]`" \
+          "Directory '$f' does not exist in index"
+      else
+        ok "`[ ! $(git ls-tree --full-tree --name-only -r HEAD "$f") ]`" \
+          "File '$f' does not exist in index"
+      fi
+    else
+      if [[ "$f" =~ /$ ]]; then
+        ok "`[ $(git ls-tree --full-tree --name-only -r HEAD "$f") ]`" \
+          "Directory '$f' exists in index"
+      else
+        ok "`[ $(git ls-tree --full-tree --name-only -r HEAD "$f") ]`" \
+          "File '$f' exists in index"
+      fi
+    fi
+  done
+}
+
+test-gitrepo-comment-block() {
+  is "$(grep -E '^;' $gitrepo)" "\
+; DO NOT EDIT (unless you know what you are doing)
+;
+; This subdirectory is a git \"subrepo\", and this file is maintained by the
+; git-subrepo command. See https://github.com/git-commands/git-subrepo#readme
+;" \
+    'Comment header block is correct'
+}
+
+test-gitrepo-field() {
+  is "`git config -f $gitrepo subrepo.$1`" \
+    "$2" \
+    ".gitrepo $1 is correct"
+}
+
+test-commit-count() {
+  is "`cd $1; git rev-list --count $2`" \
+    "$3" \
+    "commit count is correct"
+}
+
+save-original-state() {
+  original_head_ref="$(cd $1; cat .git/HEAD)"
+  original_branch="${original_head_ref#ref: refs/heads/}"
+  original_head_commit="$(cd $1; git rev-parse HEAD)"
+  original_gitrepo="$(cd $1; cat $2/.gitrepo)"
+}
+
+assert-original-state() {
+  current_head_ref="$(cd $1; cat .git/HEAD)"
+  current_branch="${current_head_ref#ref: refs/heads/}"
+  current_head_commit="$(cd $1; git rev-parse HEAD)"
+  current_gitrepo="$(cd $1; cat $2/.gitrepo)"
+
+  is "$current_head_ref" \
+    "$original_head_ref" \
+    "Current HEAD is still $original_head_ref"
+
+  is "$current_branch" \
+    "$original_branch" \
+    "Current branch is still $original_branch"
+
+  is "$current_head_commit" \
+    "$original_head_commit" \
+    "Current HEAD commit is still $original_head_commit"
+
+  is "$current_gitrepo" \
+    "$original_gitrepo" \
+    "$2/.gitrepo has not changed"
+}
+
+catch() {
+  local error=; error="$("$@" 2>&1 || true)"
+  echo "$error"
+}
+
+teardown() {
+  rm -fr $TMP
+}

data/sub/eac_git/vendor/git-subrepo/test/status.t

@@ -0,0 +1,68 @@
+#!/usr/bin/env bash
+
+set -e
+
+source test/setup
+
+use Test::More
+
+{
+  output="$(git subrepo status)"
+
+  like "$output" "2 subrepos:" \
+    "'status' intro ok"
+
+  like "$output" "Git subrepo 'ext/bashplus':" \
+    "ext/bashplus is in 'status'"
+
+  like "$output" "Git subrepo 'ext/test-more-bash':" \
+    "ext/test-more-bash is in 'status'"
+
+  unlike "$output" "Git subrepo 'ext/test-more-bash/ext/bashplus':" \
+    "ext/test-more-bash/ext/bashplus is not in 'status'"
+
+  unlike "$output" "Git subrepo 'ext/test-more-bash/ext/test-tap-bash':" \
+    "ext/test-more-bash/ext/test-tap-bash is not in 'status'"
+}
+
+{
+  output="$(git subrepo status --ALL)"
+
+  like "$output" "4 subrepos:" \
+    "'status --ALL' intro ok"
+
+  like "$output" "Git subrepo 'ext/bashplus':" \
+    "ext/bashplus is in 'status --ALL'"
+
+  like "$output" "Git subrepo 'ext/test-more-bash':" \
+    "ext/test-more-bash is in 'status --ALL'"
+
+  like "$output" "Git subrepo 'ext/test-more-bash/ext/bashplus':" \
+    "ext/test-more-bash/ext/bashplus is in 'status --ALL'"
+
+  like "$output" "Git subrepo 'ext/test-more-bash/ext/test-tap-bash':" \
+    "ext/test-more-bash/ext/test-tap-bash is in 'status --ALL'"
+}
+
+{
+  output="$(git subrepo status --all)"
+
+  like "$output" "2 subrepos:" \
+    "'status --all' intro ok"
+
+  like "$output" "Git subrepo 'ext/bashplus':" \
+    "ext/bashplus is in 'status --all'"
+
+  like "$output" "Git subrepo 'ext/test-more-bash':" \
+    "ext/test-more-bash is in 'status --all'"
+
+  unlike "$output" "Git subrepo 'ext/test-more-bash/ext/bashplus':" \
+    "ext/test-more-bash/ext/bashplus is not in 'status --all'"
+
+  unlike "$output" "Git subrepo 'ext/test-more-bash/ext/test-tap-bash':" \
+    "ext/test-more-bash/ext/test-tap-bash is not in 'status --all'"
+}
+
+done_testing 15
+
+teardown

data/sub/eac_git/vendor/git-subrepo/test/submodule.t

@@ -0,0 +1,45 @@
+#!/usr/bin/env bash
+
+# Test that a subrepo that contains a submodule retains the submodule reference
+# so that the tree hash stays the same. (However, the subrepo's submodule won't
+# be directly usable since the .gitmodules file isn't in the top level.)
+
+set -e
+
+source test/setup
+
+use Test::More
+
+clone-foo-and-bar
+
+# Add submodule reference along with a new file to the bar repo:
+(
+  cd $OWNER/bar
+  git clone ../foo submodule
+  add-new-files file
+  git add submodule file
+  git commit --amend -C HEAD
+) &> /dev/null || die
+
+(
+  cd $OWNER/foo
+  git subrepo clone ../bar
+) &> /dev/null || die
+
+(
+  cd $OWNER/bar
+  modify-files file
+) &> /dev/null || die
+
+{
+  is "$(
+   cd $OWNER/foo
+    git subrepo pull bar
+  )" \
+    "Subrepo 'bar' pulled from '../bar' (master)." \
+    'subrepo pull command output is correct'
+}
+
+done_testing
+
+teardown

data/sub/eac_ruby_utils/eac_ruby_utils.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.files = Dir['{lib}/**/*', 'MIT-LICENSE', 'README.rdoc']
 
   s.add_dependency 'activesupport', '>= 4', '< 7'
-  s.add_dependency 'addressable', '~> 2.8'
+  s.add_dependency 'addressable', '~> 2.8', '>= 2.8.1'
   s.add_dependency 'bundler'
   s.add_dependency 'filesize', '~> 0.2'
   s.add_dependency 'net-ssh', '~> 4.2'

data/sub/eac_ruby_utils/lib/eac_ruby_utils/method_class.rb

@@ -13,7 +13,7 @@ module EacRubyUtils
     end
 
     class Setup
-      common_constructor :method_class do
+      common_constructor :method_class, :static_method, default: [false] do
         perform
       end
 
@@ -29,7 +29,9 @@ module EacRubyUtils
       end
 
       def sender_module
-        method_class.module_parent
+        r = method_class.module_parent
+        r = r.singleton_class if static_method
+        r
       end
     end
   end

data/sub/eac_ruby_utils/lib/eac_ruby_utils/patches/class/static_method_class.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/static_method_class'
+
+class Module
+  def enable_static_method_class
+    ::EacRubyUtils.patch(self, ::EacRubyUtils::StaticMethodClass)
+  end
+end

data/sub/eac_ruby_utils/lib/eac_ruby_utils/static_method_class.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/method_class'
+require 'eac_ruby_utils/patches/module/common_concern'
+
+module EacRubyUtils
+  module StaticMethodClass
+    common_concern do
+      ::EacRubyUtils::MethodClass::Setup.new(self, true)
+    end
+  end
+end

data/sub/eac_ruby_utils/lib/eac_ruby_utils/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacRubyUtils
-  VERSION = '0.103.0'
+  VERSION = '0.104.0'
 end

data/sub/eac_ruby_utils/spec/lib/eac_ruby_utils/patches/{module → class}/method_class_spec.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'eac_ruby_utils/method_class'
-require 'eac_ruby_utils/patches/module/method_class'
+require 'eac_ruby_utils/patches/class/method_class'
 
 RSpec.describe ::Class do
   let(:stub_method_class) do

data/sub/eac_ruby_utils/spec/lib/eac_ruby_utils/patches/class/static_method_class_spec.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/method_class'
+require 'eac_ruby_utils/patches/class/static_method_class'
+
+RSpec.describe ::Class do
+  let(:stub_method_class) do
+    described_class.new do
+      def self.name
+        'StubMethodClass'
+      end
+
+      enable_static_method_class
+    end
+  end
+
+  describe '#enable_static_method_class' do
+    it { expect(stub_method_class.included_modules).to include(::EacRubyUtils::StaticMethodClass) }
+  end
+end

data/sub/eac_ruby_utils/spec/lib/eac_ruby_utils/static_method_class_spec.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/static_method_class'
+
+::RSpec.describe ::EacRubyUtils::StaticMethodClass do
+  let(:sender_class) do
+    ::Class.new do
+      class << self
+        def sender_value
+          'AAA'
+        end
+      end
+    end
+  end
+
+  let(:method_class) do
+    the_described_class = described_class
+    ::Class.new do
+      def self.name
+        'TheSender::PerformX'
+      end
+
+      include the_described_class
+      attr_accessor :sender, :method_param
+
+      def initialize(sender, method_param)
+        self.sender = sender
+        self.method_param = method_param
+      end
+
+      def result
+        "#{sender.sender_value},#{method_param}"
+      end
+    end
+  end
+
+  before do
+    ::Object.const_set('TheSender', sender_class)
+    sender_class.const_set('PerformX', method_class)
+  end
+
+  it { expect(sender_class).to respond_to(:perform_x) }
+  it { expect(sender_class.perform_x('BBB')).to eq('AAA,BBB') }
+end