avm-tools 0.69.2 → 0.69.3

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: dfc5d456e6af7146005267a2cde8312b31b99dab08864cff3641607feabfca8a
4
- data.tar.gz: 49a01ba7df2fdbd651cd89185ffc8b0dc3de1754bf590dfd3872cfaaaf210c6c
3
+ metadata.gz: 83ba40f1bd12e44664ec4bd6824bc269eb6a5012f51fdb7fdf38f90194f084d8
4
+ data.tar.gz: 872cf085c7de0dda3da9104b28b8a48ac100473ae902d4596e89295ee808b40b
5
5
  SHA512:
6
- metadata.gz: 923ca13f3beda2ffc8c36ef97b13be6d503e92f8a7075a20f4ac692b6542d7a1c470492909ccfc39ef8888581e607ee7f5c086b1ccd07ad04e945a901f678e76
7
- data.tar.gz: 98cc6fbb347ee06e2c0df2f490bff6898606ccd604aec40014ab75f2e633163c4087c1926e2cba9dba319bd6df7bc3ea7597aeea53536ceca4ccf437e205f178
6
+ metadata.gz: 3654fc45fe954c2a3caaa7d9d0d6bfc2ad883d0e2f93cb85fe798f0e12785eeb1f2da2c72cc0921e514a48c9942f2a05cf2afc0788faa6e574af3af78195bf22
7
+ data.tar.gz: f14791c5d6f811644243763d6e2e3d6dfb0c6812dd1d55f2e7d96afc65ac16aea399178cb9fe335a047808e7a34a457741f5eda4598e196237d44e02a4bf133b
@@ -2,6 +2,6 @@
2
2
 
3
3
  module Avm
4
4
  module Tools
5
- VERSION = '0.69.2'
5
+ VERSION = '0.69.3'
6
6
  end
7
7
  end
@@ -0,0 +1,4 @@
1
+ # frozen_string_literal: true
2
+
3
+ require 'eac_ruby_utils/core_ext'
4
+ require 'eac_cli/patches'
@@ -0,0 +1,4 @@
1
+ # frozen_string_literal: true
2
+
3
+ require 'eac_ruby_utils/require_sub'
4
+ ::EacRubyUtils.require_sub(__FILE__)
@@ -0,0 +1,5 @@
1
+ # frozen_string_literal: true
2
+
3
+ Dir["#{File.dirname(__FILE__)}/#{::File.basename(__FILE__, '.*')}/*.rb"].sort.each do |path|
4
+ require path
5
+ end
@@ -0,0 +1,24 @@
1
+ # frozen_string_literal: true
2
+
3
+ require 'eac_ruby_utils/core_ext'
4
+ require 'eac_cli/runner'
5
+ require 'eac_cli/runner_with'
6
+
7
+ class Object
8
+ def runner_with(*runners)
9
+ include ::EacCli::Runner
10
+ enable_simple_cache
11
+ enable_console_speaker
12
+ runners.each do |runner|
13
+ include runner_with_to_module(runner)
14
+ end
15
+ end
16
+
17
+ private
18
+
19
+ def runner_with_to_module(runner)
20
+ return runner if runner.is_a?(::Module)
21
+
22
+ "EacCli::RunnerWith::#{runner.to_s.camelize}".constantize
23
+ end
24
+ end
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module EacCli
4
- VERSION = '0.7.0'
4
+ VERSION = '0.8.0'
5
5
  end
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module EacGit
4
- VERSION = '0.3.1'
4
+ VERSION = '0.3.2'
5
5
  end
@@ -8,6 +8,8 @@
8
8
  # Exit on any errors:
9
9
  set -e
10
10
 
11
+ export FILTER_BRANCH_SQUELCH_WARNING=1
12
+
11
13
  # Import Bash+ helper functions:
12
14
  SOURCE="$BASH_SOURCE"
13
15
  while [[ -h $SOURCE ]]; do
@@ -549,7 +551,7 @@ subrepo:pull() {
549
551
  fi
550
552
  else
551
553
  o "Merge in changes from $refs_subrepo_fetch"
552
- FAIL=false OUT=true RUN git merge "$refs_subrepo_fetch"
554
+ FAIL=false RUN git merge "$refs_subrepo_fetch"
553
555
  if ! OK; then
554
556
  say "The \"git merge\" command failed:"
555
557
  say
@@ -765,8 +767,8 @@ subrepo:branch() {
765
767
  o "Create with content"
766
768
  local PREVIOUS_IFS=$IFS
767
769
  IFS=$'\n'
768
- local author_info=( $(git log -1 --format=%ad%n%ae%n%an "$commit") )
769
- local commiter_info=( $(git log -1 --format=%cd%n%ce%n%cn "$commit") )
770
+ local author_info=( $(git log -1 --date=default --format=%ad%n%ae%n%an "$commit") )
771
+ local commiter_info=( $(git log -1 --date=default --format=%cd%n%ce%n%cn "$commit") )
770
772
  IFS=$PREVIOUS_IFS
771
773
 
772
774
  # When we create new commits we leave the author information unchanged
@@ -774,7 +776,7 @@ subrepo:branch() {
774
776
  # This should be analog how cherrypicking is handled allowing git
775
777
  # to store both the original author but also the responsible committer
776
778
  # that created the local version of the commit and pushed it.
777
- prev_commit=$(git log -n 1 --format=%B "$commit" |
779
+ prev_commit=$(git log -n 1 --date=default --format=%B "$commit" |
778
780
  GIT_AUTHOR_DATE="${author_info[0]}" \
779
781
  GIT_AUTHOR_EMAIL="${author_info[1]}" \
780
782
  GIT_AUTHOR_NAME="${author_info[2]}" \
@@ -959,7 +961,7 @@ subrepo:clean() {
959
961
 
960
962
  o "Clean $subdir"
961
963
  git:remove-worktree
962
- if [[ -e .git/$ref ]]; then
964
+ if git:branch-exists "$branch"; then
963
965
  o "Remove branch '$branch'."
964
966
  RUN git update-ref -d "$ref"
965
967
  clean_list+=("branch '$branch'")
@@ -1505,7 +1507,7 @@ assert-subdir-ready-for-init() {
1505
1507
  error "The subdir '$subdir' is already a subrepo."
1506
1508
  fi
1507
1509
  # Check that subdir is part of the repo
1508
- if [[ -z $(git log -1 -- $subdir) ]]; then
1510
+ if [[ -z $(git log -1 --date=default -- $subdir) ]]; then
1509
1511
  error "The subdir '$subdir' is not part of this repo."
1510
1512
  fi
1511
1513
  }
@@ -1535,7 +1537,7 @@ get-all-subrepos() {
1535
1537
  add-subrepo() {
1536
1538
  if ! $ALL_wanted; then
1537
1539
  for path in "${subrepos[@]}"; do
1538
- [[ $1 =~ ^$path ]] && return
1540
+ [[ $1/ =~ ^$path/ ]] && return
1539
1541
  done
1540
1542
  fi
1541
1543
  subrepos+=("$1")
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: avm-tools
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.69.2
4
+ version: 0.69.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - Esquilo Azul Company
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2020-09-27 00:00:00.000000000 Z
11
+ date: 2020-10-04 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: aranha-parsers
@@ -560,6 +560,7 @@ files:
560
560
  - vendor/eac_cli/Gemfile
561
561
  - vendor/eac_cli/eac_cli.gemspec
562
562
  - vendor/eac_cli/lib/eac_cli.rb
563
+ - vendor/eac_cli/lib/eac_cli/core_ext.rb
563
564
  - vendor/eac_cli/lib/eac_cli/default_runner.rb
564
565
  - vendor/eac_cli/lib/eac_cli/definition.rb
565
566
  - vendor/eac_cli/lib/eac_cli/definition/argument_option.rb
@@ -574,6 +575,9 @@ files:
574
575
  - vendor/eac_cli/lib/eac_cli/parser/options_collection.rb
575
576
  - vendor/eac_cli/lib/eac_cli/parser/parse_result.rb
576
577
  - vendor/eac_cli/lib/eac_cli/parser/positional_collection.rb
578
+ - vendor/eac_cli/lib/eac_cli/patches.rb
579
+ - vendor/eac_cli/lib/eac_cli/patches/object.rb
580
+ - vendor/eac_cli/lib/eac_cli/patches/object/runner_with.rb
577
581
  - vendor/eac_cli/lib/eac_cli/runner.rb
578
582
  - vendor/eac_cli/lib/eac_cli/runner/context.rb
579
583
  - vendor/eac_cli/lib/eac_cli/runner_with.rb