review-tools 0.1.4 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e8c00d2fda28874469e81b072c8b674551207c15c2cd26b185a44c50939cbfb
-  data.tar.gz: 1963e00c644ff8464962e32e38cd606ee9925f57b9a2f3dd137546e6798feddf
+  metadata.gz: a35696c465254cd6de8c5bac93b7c291f96086e27b2581d07dcd1696353eb4d4
+  data.tar.gz: 30c55b1b9b5b40b586140a12ec3576dc35e15d878a8849f0786c914698507599
 SHA512:
-  metadata.gz: c68ea3044becaa080e98da48be833c522985495557a5d74a2b7498681e845c03d37882d7ffdc9af58c495791449f45ce73a9aedf0d45a18625f6628d1884c339
-  data.tar.gz: d79f80afd6b95247ac36ad84a2daf34425005a4ffc0f294538023d560d300abf335c225ad77ef60541c0a055e3bc748ec7a733b86fb8a726e2559617b84e45a1
+  metadata.gz: 017dc06a9697b3781fb3aa0e58e61ef2547e0f6102fbfa2d80e30a6b59e51d0a9433c9664d3e43bd7c2a43e530769b98e7602f79015d66a936db5ff22acf41a6
+  data.tar.gz: e5275446d2d7a5d8a7c97a879fca69a43d9af27e4c9f6f0d921081d7a65839686e9b47ea295d6f0682bcf2b41cfe8b6cf71bc4e605c4aef6f2c59428a0d61455

data/Gemfile

@@ -6,7 +6,9 @@ git_source(:github) do |repo_name|
   "https://github.com/#{repo_name}.git"
 end
 
-gem 'nokogiri'
+gemspec
+
+gem 'nokogiri', '~> 1.10.4'
 
 group :development, :test do
   gem 'rake', '~> 10.0'

data/Gemfile.lock

@@ -1,8 +1,14 @@
+PATH
+  remote: .
+  specs:
+    review-tools (0.1.6)
+      nokogiri (~> 1.10.4)
+
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.6.0)
-      public_suffix (>= 2.0.2, < 4.0)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
     ast (2.4.0)
     byebug (11.0.1)
     coderay (1.1.2)
@@ -18,14 +24,14 @@ GEM
     gitlab (4.12.0)
       httparty (~> 0.14, >= 0.14.0)
       terminal-table (~> 1.5, >= 1.5.1)
-    httparty (0.17.0)
+    httparty (0.17.1)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
     jaro_winkler (1.5.3)
     method_source (0.9.2)
-    mime-types (3.2.2)
+    mime-types (3.3)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2019.0331)
+    mime-types-data (3.2019.0904)
     mini_portile2 (2.4.0)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
@@ -34,9 +40,9 @@ GEM
     octokit (4.14.0)
       sawyer (~> 0.8.0, >= 0.5.3)
     parallel (1.17.0)
-    parser (2.6.3.0)
+    parser (2.6.4.1)
       ast (~> 2.4.0)
-    path_expander (1.0.4)
+    path_expander (1.1.0)
     pronto (0.10.0)
       gitlab (~> 4.0, >= 4.0.0)
       httparty (>= 0.13.7)
@@ -56,7 +62,7 @@ GEM
     pry-byebug (3.7.0)
       byebug (~> 11.0)
       pry (~> 0.10)
-    public_suffix (3.1.1)
+    public_suffix (4.0.1)
     rainbow (3.0.0)
     rake (10.5.0)
     rspec (3.8.0)
@@ -80,13 +86,13 @@ GEM
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 1.7)
     ruby-progressbar (1.10.1)
-    ruby_parser (3.13.1)
+    ruby_parser (3.14.0)
       sexp_processor (~> 4.9)
     rugged (0.28.3.1)
     sawyer (0.8.2)
       addressable (>= 2.3.5)
       faraday (> 0.8, < 2.0)
-    sexp_processor (4.12.1)
+    sexp_processor (4.13.0)
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
     thor (0.20.3)
@@ -96,13 +102,15 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  bundler (~> 2.0)
   byebug
-  nokogiri
+  nokogiri (~> 1.10.4)
   pronto
   pronto-flay
   pronto-rubocop
   pry-byebug
   rake (~> 10.0)
+  review-tools!
   rspec
 
 BUNDLED WITH

data/README.md

@@ -30,9 +30,9 @@ Or install it yourself as:
 >
 > **Open**	hgwr wants to merge 4 commits into master from dev
 
-2. Copy `into master from dev` and paste like `run_review.sh into master from dev` to terminal.
+2. Copy `into master from dev` and paste like `run_review into master from dev` to terminal.
 
-3. Then, `run_review.sh into master from dev` executes these operaitons.
+3. Then, Run `run_review into master from dev`. It executes these operaitons.
 
 - `git checkout ...`
 - Preparing environments. (e.g. Database migrations)
@@ -53,7 +53,10 @@ additional_db_preparation: |
   bundle exec bin/rails db:some:your:task
 
 additional_test_tasks: |
-  eslint app/assets/javascripts/**/*
+  if [ ! -z "${do_frontend_tst:-}" ]; then
+    npm test
+    eslint app/assets/javascripts/**/*
+  fi
 ```
 
 ## Contributing

data/bin/{check-and-test.sh → check_and_test.sh}

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Usage: check-and-test.sh
+# Usage: check_and_test.sh
 #
 # Example of ~/.config/review-tools.yml
 # 
@@ -17,28 +17,28 @@ trap 'echo "Ctrl-C captured and exit."; exit 1' INT
 trap 'echo "some error occured at $(pwd) and exit."; exit 8' SIGHUP
 
 script_dir=$(cd -P -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd -P)
-source "${script_dir}/common-functions.sh"
+source "${script_dir}/common_functions.sh"
 
 load_environment_variables test_environment_variables
 
 mkdir -p log
 cp /dev/null log/test.log
 
-if [ `(grep 'pronto' Gemfile || true) | wc -l` -eq "1" ]; then
+if [ `(grep 'pronto' Gemfile || true) | wc -l` -ge "1" ]; then
     bundle exec pronto run
-elif [ `(which pront || true) | wc -l` -eq "1" ]; then
+elif [ `(which pront || true) | wc -l` -ge "1" ]; then
     pronto run
 fi
 
-if [ `(grep 'rspec' Gemfile || true) | wc -l` -eq "1" ]; then
+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` -eq "1" ]; then
+if [ `(grep 'rubocop' Gemfile || true) | wc -l` -ge "1" ]; then
     bundle exec rubocop
-elif [ `(which rubocop || true) | wc -l` -eq "1" ]; then
+elif [ `(which rubocop || true) | wc -l` -ge "1" ]; then
     rubocop
 fi
 

data/bin/{git-checkout-target-branches.sh → git_checkout_target_branches.sh}

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Usage: git-checkout-target-branches.sh into milestone/abc from feature/cde
+# Usage: git_checkout_target_branches.sh into milestone/abc from feature/cde
 #
 
 set -o errexit
@@ -12,7 +12,7 @@ trap 'echo "Ctrl-C captured and exit."; exit 1' INT
 trap 'echo "some error occured at $(pwd) and exit."; exit 8' SIGHUP
 
 if [ $# -ne 4 ] || [ "$1" != "into" ]  || [ "$3" != "from" ]; then
-    echo "Usage: git-checkout-target-branches.sh into milestone/abc from feature/cde" 1>&2
+    echo "Usage: git_checkout_target_branches into milestone/abc from feature/cde" 1>&2
     exit 1
 fi
 

data/bin/{prepare-rails-and-frontend.sh → prepare_rails_and_frontend.sh}

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Usage: prepare-rails-and-frontend.sh
+# Usage: prepare_rails_and_frontend.sh
 #
 # Example of ~/.config/review-tools.yml
 # 
@@ -20,7 +20,7 @@ trap 'echo "Ctrl-C captured and exit."; exit 1' INT
 trap 'echo "some error occured at $(pwd) and exit."; exit 8' SIGHUP
 
 script_dir=$(cd -P -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd -P)
-source "${script_dir}/common-functions.sh"
+source "${script_dir}/common_functions.sh"
 
 if [ ! -d .git ]; then
     echo "Error: no git repository" 1>&2

data/bin/run_review.sh

@@ -9,13 +9,13 @@ set -o nounset
 set -o xtrace
 
 script_dir=$(cd -P -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd -P)
-source "${script_dir}/common-functions.sh"
+source "${script_dir}/common_functions.sh"
 
 trap 'echo "Ctrl-C captured and exit."; exit 1' INT
 trap 'echo "some error occured at $(pwd) and exit."; exit 8' SIGHUP
 
 if [ $# -ne 4 ] || [ "$1" != "into" ]  || [ "$3" != "from" ]; then
-    echo "Usage: git-checkout-target-branches.sh into milestone/abc from feature/cde" 1>&2
+    echo "Usage: run_review into milestone/abc from feature/cde" 1>&2
     exit 1
 fi
 
@@ -26,17 +26,17 @@ mkdir -p ~/tmp
 logifle=~/tmp/run_review_`date +'%Y%m%d-%H%M%S'`.log
 
 (
-    "${script_dir}/git-checkout-target-branches.sh" into "$dst_branch" from "$src_branch" ||
-        show_notification "run_review.sh" "Failed: git-checkout-target-branches.sh" $error_exit
+    "${script_dir}/git_checkout_target_branches.sh" into "$dst_branch" from "$src_branch" ||
+        show_notification "run_review.sh" "Failed: git_checkout_target_branches.sh" $error_exit
 
-    "${script_dir}/prepare-rails-and-frontend.sh" || 
-        show_notification "run_review.sh" "Failed: prepare-rails-and-frontend.sh" $error_exit
+    "${script_dir}/prepare_rails_and_frontend.sh" || 
+        show_notification "run_review.sh" "Failed: prepare_rails_and_frontend.sh" $error_exit
 
-    "${script_dir}/check-and-test.sh" || 
-        show_notification "run_review.sh" "Failed: check-and-test.sh" $error_exit
+    "${script_dir}/check_and_test.sh" || 
+        show_notification "run_review.sh" "Failed: check_and_test.sh" $error_exit
 
     if [ -r 'coverage/index.html' ]; then
-      "${script_dir}/analyze_coverage.rb" into "$dst_branch" from "$src_branch"
+      "${script_dir}/analyze_coverage" into "$dst_branch" from "$src_branch"
     fi
 
 ) 2>&1 | tee "$logifle"

data/{bin/analyze_coverage.rb → exe/analyze_coverage}

@@ -1,7 +1,6 @@
 #!/usr/bin/env ruby
 
 require 'nokogiri'
-# require 'pry'
 
 unless File.exist?('coverage/index.html')
   warn 'Error: coverage/index.html dose not exist.'
@@ -11,7 +10,7 @@ end
 html_doc = File.open('coverage/index.html') { |f| Nokogiri::HTML(f) }
 
 if ARGV.length != 4 || ARGV[0] != 'into' || ARGV[2] != 'from'
-  warn 'Usage: analyze_coverage.rb into milestone/abc from feature/cde'
+  warn 'Usage: analyze_coverage into milestone/abc from feature/cde'
   exit 1
 end
 
@@ -19,14 +18,13 @@ dst_branch = ARGV[1]
 src_branch = ARGV[3]
 
 `git diff --name-only #{dst_branch}..#{src_branch}`.split("\n").each do |file_name|
-
   next unless file_name =~ /\.rb\z/
 
-  a_tags = html_doc.css(%Q(a[title="#{file_name}"]))
+  a_tags = html_doc.css(%(a[title="#{file_name}"]))
 
   puts "\n========== #{file_name} =========="
-  if a_tags.length == 0
-    puts "  no results"
+  if a_tags.length.zero?
+    puts '  no results'
     next
   end
 
@@ -41,13 +39,12 @@ src_branch = ARGV[3]
     linenumber = li['data-linenumber']
     case li['class']
     when 'missed'
-      printf '%05d x ', linenumber
+      printf '%06d x ', linenumber
     when 'covered'
-      printf '%05d o ', linenumber
+      printf '%06d o ', linenumber
     else
-      printf '%05d ? ', linenumber
+      printf '%06d ? ', linenumber
     end
     puts li.css('code').text
   end
-
 end

data/exe/check_and_test

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+
+bin_dir = File.expand_path('../bin/', File.dirname(__FILE__))
+shell_script_path = File.join(bin_dir, 'check_and_test.sh')
+
+`#{shell_script_path}`

data/exe/git_checkout_target_branches

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+
+bin_dir = File.expand_path('../bin/', File.dirname(__FILE__))
+shell_script_path = File.join(bin_dir, 'git_checkout_target_branches.sh')
+
+`#{shell_script_path} #{ARGV.join(' ')}`

data/exe/prepare_rails_and_frontend

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+
+bin_dir = File.expand_path('../bin/', File.dirname(__FILE__))
+shell_script_path = File.join(bin_dir, 'prepare_rails_and_frontend.sh')
+
+`#{shell_script_path}`

data/exe/run_review

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+
+bin_dir = File.expand_path('../bin/', File.dirname(__FILE__))
+shell_script_path = File.join(bin_dir, 'run_review.sh')
+
+`#{shell_script_path} #{ARGV.join(' ')}`

data/lib/review/tools/version.rb

@@ -1,5 +1,5 @@
 module Review
   module Tools
-    VERSION = "0.1.4"
+    VERSION = "0.1.6"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: review-tools
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.6
 platform: ruby
 authors:
 - Shigeru Hagiwara
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-22 00:00:00.000000000 Z
+date: 2019-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -70,7 +70,12 @@ description: This is a tool that automates the review of pull requests for Rails
   on GitHub.
 email:
 - hgwrsgr@gmail.com
-executables: []
+executables:
+- analyze_coverage
+- check_and_test
+- git_checkout_target_branches
+- prepare_rails_and_frontend
+- run_review
 extensions: []
 extra_rdoc_files: []
 files:
@@ -84,14 +89,18 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- bin/analyze_coverage.rb
-- bin/check-and-test.sh
-- bin/common-functions.sh
+- bin/check_and_test.sh
+- bin/common_functions.sh
 - bin/console
-- bin/git-checkout-target-branches.sh
-- bin/prepare-rails-and-frontend.sh
+- bin/git_checkout_target_branches.sh
+- bin/prepare_rails_and_frontend.sh
 - bin/run_review.sh
 - bin/setup
+- exe/analyze_coverage
+- exe/check_and_test
+- exe/git_checkout_target_branches
+- exe/prepare_rails_and_frontend
+- exe/run_review
 - lib/review/tools.rb
 - lib/review/tools/version.rb
 - review-tools.gemspec