review-tools 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ade5a9f9cb16ace9912b5b36263e4299c1ac0b6e0149e403f5a31ad134f07c9d
-  data.tar.gz: 8b2e50d95bc804e3e045bd14861a5febe221b938dec92da2f895361a635b8e78
+  metadata.gz: 7a6ee8fb851ae499fef1f56b1eb8e422db3483cac6f9fa75afa6a9abd6c25dd6
+  data.tar.gz: 077c6675d26778601230ce9cc43243637e696ae9084b2d6d1bb2a4570caf9f02
 SHA512:
-  metadata.gz: 9ece3512583296726455f9366d1ef8be5f2a09aa5929b0784f45167047583a818c9712e6488604f1b3eec010f3f7bc35d637237773ab9de3c47c1f2e993eb46d
-  data.tar.gz: '07482148cac023943c04060f85950f680309f352d65968fd9c69e1438c490c945598f0886c394ff288bcbf15b428d82cee4aad6f27a863d982a6e97128a24d6d'
+  metadata.gz: cf2106a5112b035e7666e73b8f3f4a5ae20a8b76d04f958a98245509382ed69aa3160f223b2a82cd26fdba4baa032dff1e91cac5ac205179bfe519bc6210edbc
+  data.tar.gz: 41d1117841af5a486dec7a7a6275f30af3a5652dd95fdf468906a6b9875807534966670fb9ea157529d816fe15d3977afefe1eb989f7767af23f6ac262041289

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    review-tools (0.2.5)
+    review-tools (0.2.6)
       nokogiri (~> 1.10.4)
 
 GEM

data/README-ja.md

@@ -14,7 +14,7 @@ review-tools gem は、 GitHub 上の Rails プロジェクトの pull request
 こんな感じのワンライナーで、使用している各 Ruby のバージョンへ gem install できます。
 
 ```
-orig_version=`rbenv version | sed -e 's/ .*$//'`; for rbv in `rbenv versions | sed -e 's/^[* ]*//' | cut -d ' ' -f 1 | grep -v system`; do rbenv global $rbv; gem install review-tools; done; rbenv global $orig_version
+orig_version=`rbenv version | sed -e 's/ .*$//'`; for rbv in `rbenv versions | sed -e 's/^[* ]*//' | cut -d ' ' -f 1 | grep -v system`; do rbenv local $rbv; gem install review-tools; done; rbenv global $orig_version
 ```
 
 もしくは Gemfile に加えてしまってもいいでしょう。

data/bin/check_and_test.sh

@@ -30,16 +30,16 @@ elif [ `(which pront || true) | wc -l` -ge "1" ]; then
     pronto run
 fi
 
-if [ `(grep 'rspec' Gemfile || true) | wc -l` -ge "1" ]; then
-    bundle exec rspec spec
-else
-    bundle exec rake test
-fi
-
 if [ `(grep 'rubocop' Gemfile || true) | wc -l` -ge "1" ]; then
     bundle exec rubocop
 elif [ `(which rubocop || true) | wc -l` -ge "1" ]; then
     rubocop
 fi
 
+if [ `(grep 'rspec' Gemfile || true) | wc -l` -ge "1" ]; then
+    bundle exec rspec spec
+else
+    bundle exec rake test
+fi
+
 run_additional_task test_tasks

data/bin/common_functions.sh

@@ -8,6 +8,13 @@ function check_if_git_dir () {
     fi
 }
 
+function change_ruby_version () {
+    if [ -f .ruby-version ]; then
+        rbenv local `cat .ruby-version`
+    fi
+    bundle install --path vendor/bundle --jobs=4 --retry=3
+}
+
 function run_additional_task () {
     task_name="$1"
     if [ -f "${HOME}/.config/review-tools.yml" ]; then

data/bin/git_checkout_target_branches.sh

@@ -24,11 +24,7 @@ src_branch="$4"
 
 check_if_git_dir
 
-git checkout master
 git fetch -a || true
-git gc --prune=now || true
-git remote prune origin || true
-git pull origin master
 
 git checkout "$dst_branch"
 git pull origin "$dst_branch"

data/bin/look_changes_of_routes.sh

@@ -30,9 +30,11 @@ if [ -x bin/rake ]; then
     diff_file="/tmp/changes_of_routes_$$.txt"
 
     git checkout "$dst_branch"
+    change_ruby_version
     bundle exec rake routes > ${dst_routes}
 
     git checkout "$src_branch"
+    change_ruby_version
     bundle exec rake routes > ${src_routes}
 
     diff -u ${dst_routes} ${src_routes} > ${diff_file}

data/bin/prepare_rails_and_frontend.sh

@@ -24,10 +24,7 @@ source "${script_dir}/common_functions.sh"
 
 check_if_git_dir
 
-if [ -f .ruby-version ]; then
-    rbenv local `cat .ruby-version`
-fi
-bundle install --path vendor/bundle --jobs=4 --retry=3
+change_ruby_version
 
 run_additional_task preparation
 

data/bin/run_review.sh

@@ -36,7 +36,7 @@ logifle=~/tmp/run_review_`date +'%Y%m%d-%H%M%S'`.log
     "${script_dir}/look_changes_of_routes.sh" into "$dst_branch" from "$src_branch" || true
         # show_notification "run_review.sh" "Failed: look_changes_of_routes.sh" $error_exit
 
-    if [ -z ${RUN_REVIEW_WITH_NO_TEST:-} ]; then
+    if [ -z ${run_review_with_no_test:-} ]; then
       "${script_dir}/check_and_test.sh" || 
           show_notification "run_review.sh" "Failed: check_and_test.sh" $error_exit
 

data/lib/review/tools/version.rb

@@ -1,5 +1,5 @@
 module Review
   module Tools
-    VERSION = "0.2.5"
+    VERSION = "0.2.6"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: review-tools
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Shigeru Hagiwara
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-05 00:00:00.000000000 Z
+date: 2019-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri