Update to ruby/mspec@8cabcef

1 files changed, 20 insertions, 16 deletions

diff --git a/spec/mspec/tool/pull-latest-mspec-spec b/spec/mspec/tool/pull-latest-mspec-spec
index 67414ed8b8..154a353e64 100755
--- a/spec/mspec/tool/pull-latest-mspec-spec
+++ b/spec/mspec/tool/pull-latest-mspec-spec
@@ -3,20 +3,24 @@
 # Assumes all commits have been synchronized to https://github.com/ruby/spec
 # See spec/mspec/tool/sync/sync-rubyspec.rb
 
-rm -rf spec/mspec
-git clone --depth 1 https://github.com/ruby/mspec.git spec/mspec
-commit=$(git -C spec/mspec log -n 1 --format='%h')
-rm -rf spec/mspec/.git
-rm -f spec/mspec/.travis.yml
-git add spec/mspec
-git commit -m "Update to ruby/mspec@${commit}"
+function sync {
+  dir="$1"
+  repo="$2"
+  short_repo_name="ruby/$(basename "$repo" .git)"
 
-rm -rf spec/ruby
-git clone --depth 1 https://github.com/ruby/spec.git spec/ruby
-commit=$(git -C spec/ruby log -n 1 --format='%h')
-rm -rf spec/ruby/.git
-rm -f spec/ruby/appveyor.yml
-rm -f spec/ruby/.travis.yml
-rm -rf spec/ruby/.github
-git add spec/ruby
-git commit -m "Update to ruby/spec@${commit}"
+  rm -rf "$dir"
+  git clone --depth 1 "$repo" "$dir"
+  commit=$(git -C "$dir" log -n 1 --format='%h')
+  rm -rf "$dir/.git"
+
+  # Remove CI files to avoid confusion
+  rm -f "$dir/appveyor.yml"
+  rm -f "$dir/.travis.yml"
+  rm -rf "$dir/.github"
+
+  git add "$dir"
+  git commit -m "Update to ${short_repo_name}@${commit}"
+}
+
+sync spec/mspec https://github.com/ruby/mspec.git
+sync spec/ruby https://github.com/ruby/spec.git