Merge branch 'develop' into feature/refactor_annotate_routes/processors

Author: nard-tech

.github/workflows/ci.yml

@@ -14,29 +14,22 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: ['2.4.x', '2.5.x', '2.6.x']
+        ruby: ['2.4', '2.5', '2.6']
 
     steps:
       - name: Checkout
         uses: actions/checkout@v1
 
       - name: Setup Ruby
-        uses: actions/setup-ruby@v1
+        uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
 
       - name: Install sqlite
         run: |
           sudo apt-get install libsqlite3-dev
 
-      - name: Update System
-        run: |
-          gem update --system --no-document
-
-      - name: Bundle install for Annotate models
-        run: |
-          bundle install --jobs=4 --retry=3
-
       - name: Run Tests
         run: INTEGRATION_TESTS=1 bundle exec rspec
 

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,54 @@
+name: "Code scanning - action"
+
+on:
+  push:
+    branches-ignore:
+      - pr/*
+      - scratch/*
+  pull_request:
+  schedule:
+    - cron: '0 20 * * 7'
+
+jobs:
+  CodeQL-Build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+      with:
+        # We must fetch at least the immediate parents so that if this is
+        # a pull request then we can checkout the head.
+        fetch-depth: 2
+
+    # If this run was triggered by a pull request event, then checkout
+    # the head of the pull request instead of the merge commit.
+    - run: git checkout HEAD^2
+      if: ${{ github.event_name == 'pull_request' }}
+      
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      # Override language selection by uncommenting this and choosing your languages
+      # with:
+      #   languages: go, javascript, csharp, python, cpp, java
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v1
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    #- run: |
+    #   make bootstrap
+    #   make release
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1

.github/workflows/release-drafter.yml

@@ -0,0 +1,17 @@
+name: Release Drafter
+
+on:
+  push:
+    branches:
+      - develop
+
+jobs:
+  update_release_draft:
+    runs-on: ubuntu-latest
+    steps:
+      # Drafts your next Release notes as Pull Requests are merged into "develop"
+      - uses: release-drafter/release-drafter@v5
+        with:
+          config-name: release-drafter.yml
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2020-04-06 10:14:15 +0900 using RuboCop version 0.68.1.
+# on 2021-03-29 22:40:05 +0900 using RuboCop version 0.68.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -55,7 +55,7 @@ Layout/EmptyLineAfterMagicComment:
     - 'annotate.gemspec'
     - 'spec/lib/annotate/annotate_models_spec.rb'
 
-# Offense count: 7
+# Offense count: 3
 # Cop supports --auto-correct.
 # Configuration parameters: AllowForAlignment, AllowBeforeTrailingComments, ForceEqualSignAlignment.
 Layout/ExtraSpacing:
@@ -64,6 +64,13 @@ Layout/ExtraSpacing:
     - 'lib/annotate/annotate_models.rb'
     - 'lib/tasks/annotate_routes.rake'
 
+# Offense count: 14
+# Cop supports --auto-correct.
+# Configuration parameters: IndentationWidth.
+# SupportedStyles: special_inside_parentheses, consistent, align_brackets
+Layout/IndentFirstArrayElement:
+  EnforcedStyle: consistent
+
 # Offense count: 5
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, IndentationWidth.
@@ -72,7 +79,7 @@ Layout/MultilineOperationIndentation:
   Exclude:
     - 'lib/annotate/annotate_models.rb'
 
-# Offense count: 6
+# Offense count: 4
 # Cop supports --auto-correct.
 # Configuration parameters: AllowForAlignment.
 Layout/SpaceAroundOperators:
@@ -190,7 +197,7 @@ Metrics/BlockNesting:
 Metrics/CyclomaticComplexity:
   Max: 25
 
-# Offense count: 28
+# Offense count: 29
 # Configuration parameters: CountComments, ExcludedMethods.
 Metrics/MethodLength:
   Max: 40
@@ -204,7 +211,7 @@ Naming/AccessorMethodName:
   Exclude:
     - 'lib/annotate.rb'
 
-# Offense count: 103
+# Offense count: 105
 # Configuration parameters: Blacklist.
 # Blacklist: (?-mix:(^|\s)(EO[A-Z]{1}|END)(\s|$))
 Naming/HeredocDelimiterNaming:
@@ -292,7 +299,7 @@ Style/FormatStringToken:
   Exclude:
     - 'lib/annotate/annotate_models.rb'
 
-# Offense count: 31
+# Offense count: 33
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: when_needed, always, never
@@ -368,7 +375,7 @@ Style/NumericPredicate:
     - 'lib/annotate.rb'
     - 'lib/annotate/annotate_models.rb'
 
-# Offense count: 12
+# Offense count: 13
 # Cop supports --auto-correct.
 # Configuration parameters: PreferredDelimiters.
 Style/PercentLiteralDelimiters:
@@ -453,7 +460,7 @@ Style/StderrPuts:
     - 'lib/annotate.rb'
     - 'lib/annotate/annotate_models.rb'
 
-# Offense count: 107
+# Offense count: 57
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, ConsistentQuotesInMultiline.
 # SupportedStyles: single_quotes, double_quotes
@@ -502,7 +509,7 @@ Style/UnneededPercentQ:
   Exclude:
     - 'annotate.gemspec'
 
-# Offense count: 380
+# Offense count: 391
 # Cop supports --auto-correct.
 # Configuration parameters: AutoCorrect, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
 # URISchemes: http, https

.travis.yml

@@ -7,6 +7,8 @@ rvm:
 env:
   - RAILS_ENV=development RACK_ENV=development INTEGRATION_TESTS=1
 
+cache: bundler
+
 addons:
   apt_packages:
     - libsqlite3-dev

README.md

@@ -104,8 +104,8 @@ Into environment gems from Github checkout:
 
     git clone https://github.com/ctran/annotate_models.git annotate_models
     cd annotate_models
-    rake build
-    gem install pkg/annotate-*.gem
+    rake gem
+    gem install dist/annotate-*.gem
 
 ## Usage
 

annotate.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.executables = ['annotate']
   s.extra_rdoc_files = ['README.md', 'CHANGELOG.md']
   s.files = `git ls-files -z LICENSE.txt *.md *.gemspec bin lib`.split("\x0")
-  s.homepage = 'http://github.com/ctran/annotate_models'
+  s.homepage = 'https://github.com/ctran/annotate_models'
   s.licenses = ['Ruby']
   s.require_paths = ['lib']
   s.rubygems_version = '2.1.11'
@@ -25,5 +25,8 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency(%q<rake>, '>= 10.4', '< 14.0')
   s.add_runtime_dependency(%q<activerecord>, ['>= 3.2', '< 7.0'])
 
-  s.metadata = { "github_repo" => "ssh://github.com/ctran/annotate_models" }
+  s.metadata = {
+    "bug_tracker_uri" => "https://github.com/ctran/annotate_models/issues/",
+    "source_code_uri" => "https://github.com/ctran/annotate_models.git"
+  }
 end