From f24ac1f3c8ae00799ef17846a83388f7f893be5c Mon Sep 17 00:00:00 2001 From: Jordon Bedwell Date: Tue, 13 Nov 2018 09:57:48 -0600 Subject: [PATCH] Sync development files. --- .codeclimate.yml | 18 +--------- .../bug_report.md} | 27 +++++++++----- .github/ISSUE_TEMPLATE/feature_request.md | 22 ++++++++++++ .github/security | 1 + Rakefile | 35 ++----------------- script/install | 7 ++-- script/sync | 2 +- script/test | 20 +++++------ 8 files changed, 60 insertions(+), 72 deletions(-) rename .github/{issue_template.md => ISSUE_TEMPLATE/bug_report.md} (59%) create mode 100644 .github/ISSUE_TEMPLATE/feature_request.md create mode 100644 .github/security diff --git a/.codeclimate.yml b/.codeclimate.yml index aa5ad873..123ae648 100644 --- a/.codeclimate.yml +++ b/.codeclimate.yml @@ -1,23 +1,7 @@ version: "2" plugins: - # -- - # ๐Ÿ˜ž - # @see https://github.com/seattlerb/ruby_parser/issues/255 - # This can break on some Regexps. - # So it's disabled. - # -- - duplication: - enabled: false rubocop: - # -- - # ๐Ÿคจ - # We must set the default version we want. - # Sometimes CodeClimate lags. - # -- - channel: rubocop-0-52 - enabled: true - config: - file: .rubocop.yml + enabled: false ratings: paths: - "spec/tests/**.rb" diff --git a/.github/issue_template.md b/.github/ISSUE_TEMPLATE/bug_report.md similarity index 59% rename from .github/issue_template.md rename to .github/ISSUE_TEMPLATE/bug_report.md index c1eb6524..cbc4350b 100644 --- a/.github/issue_template.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -1,12 +1,19 @@ +--- +name: Bug Report +about: Report an Issue! +--- + -- [ ] I tried updating to the latest version. - - [ ] I can't, there is an issue. +- [ ] I tried updating to the latest version + - [ ] I can't, there is an issue + - [ ] This is about an < latest + - [ ] I understand older versions may be unsupported - [ ] I Am on Windows - [ ] Ubuntu Bash on Windows - [ ] Fedora Bash on Windows @@ -14,9 +21,13 @@ - [ ] I Am on Linux - [ ] Ubuntu - [ ] Fedora -- [ ] I Am on macOS + - [ ] CentOS + - [ ] Redhat + - [ ] Debian +- [ ] I am on macOS 10.13 +- [ ] I am on macOS 10.14 - [ ] I'm on Docker - - [ ] I understand Docker may be unsupported. + - [ ] I understand Docker may be unsupported ## Description diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md new file mode 100644 index 00000000..e869739b --- /dev/null +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -0,0 +1,22 @@ +--- +name: Feature Request +about: Suggest an Idea! +--- + +- [ ] This feature is not on the latest version + +## Request + + + +## Examples + +```sh +# Your example +# Maybe multiple +# Examples? +``` diff --git a/.github/security b/.github/security new file mode 100644 index 00000000..5a22f834 --- /dev/null +++ b/.github/security @@ -0,0 +1 @@ +* @envygeeks diff --git a/Rakefile b/Rakefile index e8762c63..a0902515 100644 --- a/Rakefile +++ b/Rakefile @@ -4,38 +4,9 @@ # Author: Jordon Bedwell # Encoding: utf-8 -# -- -# ๐Ÿ”– -# RSpec, MiniTest, Whatever. -# -- -task :spec do - exec "script/test" -end -# -- -# ๐Ÿ”– -# RSpec, MiniTest, Whatever. -# -- -task :test do - exec "script/test" -end -# -- -# ๐Ÿ”– -# @see .rubocop.yml -# Rubocop. -# -- -task :rubocop do - exec "script/lint" -end -# -- -# ๐Ÿ”– -# @see .rubocop.yml -# Rubocop. -# -- -task :lint do - exec "script/lint" -end - -# -- +task default: [:spec] +task(:spec) { exec "script/test" } +task(:test) { exec "script/test" } Dir.glob("script/rake.d/*.rake").each do |v| load v end diff --git a/script/install b/script/install index 979cbf11..88a57f00 100755 --- a/script/install +++ b/script/install @@ -7,8 +7,11 @@ set -e f=script/script.d/install [ "$SKIP_SCRIPTD" != "true" ] && [ -x $f ] && exec $f "$@" -if bundle check 1>/dev/null 2>&1; then bundle update - else bundle install --path vendor/bundle +if bundle check 1>/dev/null 2>&1; then + bundle update +else + bundle install --path \ + vendor/bundle fi bundle clean diff --git a/script/sync b/script/sync index 7fa86bb0..bf60741c 100755 --- a/script/sync +++ b/script/sync @@ -22,7 +22,7 @@ trim() { # Determine what we are working with. # -- -skip_if_exists=(Gemfile) +skip_if_exists=(Gemfile .travis.yml) sync_language=$(git config envygeeks.language || echo "") skip_if_external=(CONTRIBUTING.md CODE_OF_CONDUCT.md .github/codeowners) skip_if_external+=(.github/issue_template.md .github/pull_request_template.md) diff --git a/script/test b/script/test index fb08fa97..543aa852 100755 --- a/script/test +++ b/script/test @@ -26,15 +26,11 @@ hasGem() { # having to do excessive customization of the CI. # -- f=script/script.d/test -if [ "$LINTING" != "true" ]; then - [ "$SKIP_SCRIPTD" != "true" ] && [ -x $f ] && exec $f "$@" - hasGem "minitest" && [ $# -gt 0 ] && exec ruby -rminitest/autorun "$@" - hasGem "minitest" && exec ruby -rminitest/autorun test/**/*_{test,spec}.rb - hasGem "rspec" && exec bundle exec rspec "$@" - hasGem "rspec-rails" && exec bundle exec rspec "$@" - [ -x bin/rails ] && exec bin/rails test "$@" - [ $# -gt 0 ] && exec ruby -Itest "$@" - exec ruby -Itest test/**/*_test.rb -else - script/lint "$@" -fi +[ "$SKIP_SCRIPTD" != "true" ] && [ -x $f ] && exec $f "$@" +hasGem "minitest" && [ $# -gt 0 ] && exec ruby -rminitest/autorun "$@" +hasGem "minitest" && exec ruby -rminitest/autorun test/**/*_{test,spec}.rb +hasGem "rspec" && exec bundle exec rspec "$@" +hasGem "rspec-rails" && exec bundle exec rspec "$@" +[ -x bin/rails ] && exec bin/rails test "$@" +[ $# -gt 0 ] && exec ruby -Itest "$@" +exec ruby -Itest test/**/*_test.rb