dopstick 0.0.6 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 17fe9695f451b433549bf25b5d8d5484388771739fc32333c4d3a4a6bcfa9348
-  data.tar.gz: 4791e172a00147a6e7e920eff00e15b26c6ec73d3964a4854e91847989049da3
+  metadata.gz: 68fe169c88729fa6813fff9f0ffa304105af9814c7c0f11f0fe74e2142190e1a
+  data.tar.gz: f633e7161ecb3c87310570eb2e3ada006d5fef01297ce2ccbc16bf47af0c9814
 SHA512:
-  metadata.gz: 65edec1f5c5d373b5ead2dd1631fe4b5638cd396a11d10ad727e35ac6fc8f010134a06f9fb0c4b27b4b95ef62fb9d4556abfe2123252e3d933a07a36348065f1
-  data.tar.gz: df7abe336abf35acaea9cc3e295cd547a5c376f448ffe80e9862d909d78b15d3ad300930c376c50c0a0ee2d5f3415b9a18b595ec75e9ff2ee94a7752aaf86ada
+  metadata.gz: d7e51df4841b4d4ac11459fa0e72ad1a7821bf0f22dc94fef6034da76da8c13a06945f8fbfba814ce6798d61d2cd6a3a549817e2abc241f945135723333c337f
+  data.tar.gz: c3aa86a1041cb3b8a86b4ce7d985c716cb9b7064472dbc22dbf7900f307a7cdc3de7859862034dbf82635c2d35472fbc5e6a70d02a5b9e1c03ce2af463063fa6

data/.github/FUNDING.yml

@@ -1,4 +1,4 @@
 # These are supported funding model platforms
-
+---
 github: [fnando]
 custom: ["https://www.paypal.me/nandovieira/🍕"]

data/.github/dependabot.yml

@@ -0,0 +1,15 @@
+---
+# Documentation:
+# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"
+
+  - package-ecosystem: bundler
+    directory: "/"
+    schedule:
+      interval: "daily"

data/.github/workflows/tests.yml

@@ -1,15 +1,11 @@
+---
 name: Tests
 
 on:
   pull_request:
-    branches:
-      - main
   push:
-    branches:
-      - main
-
-  schedule:
-    - cron: "0 10 * * *"
+  workflow_dispatch:
+    inputs: {}
 
 jobs:
   build:
@@ -18,23 +14,25 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [2.6.x, 2.7.x]
+        ruby: ["2.7", "3.0"]
         gemfile:
           - Gemfile
 
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v2.4.0
 
       - uses: actions/cache@v2
         with:
           path: vendor/bundle
           key: >
-            ${{ runner.os }}-${{ matrix.ruby }}-gems-${{ hashFiles(matrix.gemfile) }}
+            ${{ runner.os }}-${{ matrix.ruby }}-gems-${{
+            hashFiles(matrix.gemfile) }}
           restore-keys: >
-            ${{ runner.os }}-${{ matrix.ruby }}-gems-${{ hashFiles(matrix.gemfile) }}
+            ${{ runner.os }}-${{ matrix.ruby }}-gems-${{
+            hashFiles(matrix.gemfile) }}
 
       - name: Set up Ruby
-        uses: actions/setup-ruby@v1
+        uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
 

data/.rubocop.yml

@@ -3,7 +3,7 @@ inherit_gem:
   rubocop-fnando: .rubocop.yml
 
 AllCops:
-  TargetRubyVersion: 2.6
+  TargetRubyVersion: 2.7
   NewCops: enable
   Exclude:
     - tmp/**/*

data/CHANGELOG.md

@@ -11,7 +11,13 @@ Prefix your message with one of the following:
 - [Security] in case of vulnerabilities.
 -->
 
-## Unreleased
+## v0.0.7 - 2021-12-04
+
+- [Fixed] Set proper package ecosystem on dependabot's config file.
+- [Changed] Update ruby default versions to 2.7 and 3.0.
+- [Changed] Update node default versions to 16 and 17.
+
+## v0.0.6 - 2020-12-09
 
 - [Fixed] Babel loader's order is backwards, so TypeScript first, then
   JavaScript.

data/dopstick.gemspec

@@ -7,12 +7,13 @@ Gem::Specification.new do |spec|
   spec.version = Dopstick::VERSION
   spec.authors = ["Nando Vieira"]
   spec.email   = ["me@fnando.com"]
+  spec.metadata = {"rubygems_mfa_required" => "true"}
 
   spec.summary     = "Generate a project skeleton for creating a Ruby/NPM " \
                      "package."
   spec.description = spec.summary
   spec.license     = "MIT"
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.6.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
 
   github_url = "https://github.com/fnando/dopstick"
   github_tree_url = "#{github_url}/tree/v#{spec.version}"

data/lib/dopstick/cli.rb

@@ -48,12 +48,12 @@ module Dopstick
            desc: "Set the codebase namespace. By default, it's inferred from " \
                  "the gem name."
     option :ruby_versions,
-           default: %w[2.6 2.7],
+           default: %w[2.7 3.0 3.1],
            type: :array,
            desc: "Set Ruby versions that are officially supported. Multiple " \
                  "versions must separated by space."
     option :node_versions,
-           default: %w[14.x 12.x],
+           default: %w[16.x 17.x],
            type: :array,
            desc: "Set Node versions that are officially supported. Multiple " \
                  "versions must separated by space."

data/lib/dopstick/generator/base/templates/dependabot.erb

@@ -9,7 +9,7 @@ updates:
     schedule:
       interval: "daily"
 
-  - package-ecosystem: "bundler"
+  - package-ecosystem: <%= dependabot_package_ecosystem %>
     directory: "/"
     schedule:
       interval: "daily"

data/lib/dopstick/generator/base/templates/funding.erb

@@ -1,4 +1,4 @@
 # These are supported funding model platforms
-
+---
 github: [<%= options.github_user %>]
 custom: ["https://paypal.me/<%= options.paypal_user %>/🍕"]

data/lib/dopstick/generator/base/templates/issue_template_config.erb

@@ -0,0 +1,5 @@
+---
+contact_links:
+  - name: "🤨 Q&A"
+    url: <%= options.github_url %>/discussions/new?category=q-a
+    about: Have a question? Ask it away here!

data/lib/dopstick/generator/gem/generator.rb

@@ -51,6 +51,8 @@ module Dopstick
           template "feature_request.erb",
                    ".github/ISSUE_TEMPLATE/feature_request.md"
           template "pull_request.erb", ".github/PULL_REQUEST_TEMPLATE.md"
+          template "issue_template_config.erb",
+                   ".github/ISSUE_TEMPLATE/config.yml"
           template "dependabot.erb", ".github/dependabot.yml"
           template "codeowners.erb", ".github/CODEOWNERS"
         end
@@ -115,12 +117,12 @@ module Dopstick
             content = []
 
             options.namespace_names.each_with_index do |name, count|
-              content << ("  " * count) + "module #{name}"
+              content << (("  " * count) + "module #{name}")
             end
 
             spacer = skip_content_spaces ? "" : "  "
 
-            content << (spacer * options.namespace_size) + yield
+            content << ((spacer * options.namespace_size) + yield)
 
             (options.namespace_size - 1).downto(0) do |count|
               content << "#{'  ' * count}end"
@@ -153,6 +155,19 @@ module Dopstick
               File.read("#{self.class.source_root}/#{file}")
             ).result(binding)
           end
+
+          def dependabot_package_ecosystem
+            "bundler"
+          end
+
+          def ruby_versions_for_workflow
+            options.ruby_versions.map do |v|
+              canonical_segments = ::Gem::Version.new(v).canonical_segments
+              canonical_segments << 0 if canonical_segments.size < 2
+
+              canonical_segments.join(".").inspect
+            end.join(", ")
+          end
         end
       end
     end

data/lib/dopstick/generator/gem/templates/gemspec.erb

@@ -7,6 +7,7 @@ Gem::Specification.new do |spec|
   spec.version = <%= options.namespace %>::VERSION
   spec.authors = [<%= options.user_name.inspect %>]
   spec.email   = [<%= options.user_email.inspect %>]
+  spec.metadata = {"rubygems_mfa_required" => "true"}
 
   spec.summary     = <%= options.description.inspect %>
   spec.description = spec.summary

data/lib/dopstick/generator/gem/templates/readme.erb

@@ -1,7 +1,6 @@
 # <%= options.package_name %>
 
 [![Tests](<%= options.github_url %>/workflows/ruby-tests/badge.svg)](https://github.com/fnando/<%= options.package_name %>)
-[![Code Climate](https://codeclimate.com/github/<%= options.github_user %>/<%= options.package_name %>/badges/gpa.svg)](https://codeclimate.com/github/<%= options.github_user %>/<%= options.package_name %>)
 [![Gem](https://img.shields.io/gem/v/<%= options.package_name %>.svg)](https://rubygems.org/gems/<%= options.package_name %>)
 [![Gem](https://img.shields.io/gem/dt/<%= options.package_name %>.svg)](https://rubygems.org/gems/<%= options.package_name %>)
 

data/lib/dopstick/generator/gem/templates/rubocop.erb

@@ -5,6 +5,9 @@ inherit_gem:
 AllCops:
   TargetRubyVersion: <%= options.oldest_ruby_version.split(".").take(2).join(".") %>
   NewCops: enable
+  Exclude:
+    - vendor/**/*
+    - gemfiles/**/*
 <%- if options.package_name.include?("-") -%>
 Naming/FileName:
   Exclude:

data/lib/dopstick/generator/gem/templates/tests_workflow.erb

@@ -1,24 +1,25 @@
+---
 name: ruby-tests
 
 on:
-  pull_request:
-    branches:
-      - main
+  pull_request_target:
   push:
     branches:
       - main
-
-  schedule:
-    - cron: "0 10 * * *"
+  workflow_dispatch:
+    inputs: {}
 
 jobs:
   build:
     name: Tests with Ruby ${{ matrix.ruby }} and ${{ matrix.gemfile }}
     runs-on: "ubuntu-latest"
+    if: |
+      github.actor == 'dependabot[bot]' && github.event_name == 'pull_request_target' ||
+      github.actor != 'dependabot[bot]'
     strategy:
       fail-fast: false
       matrix:
-        ruby: [<%= options.ruby_versions.map {|v| [*Gem::Version.new(v).canonical_segments, "x"].take(3).join(".") }.join(", ") %>]
+        ruby: [<%= ruby_versions_for_workflow %>]
         gemfile:
           - Gemfile
 
@@ -40,11 +41,9 @@ jobs:
           path: vendor/bundle
           key: >
             ${{ runner.os }}-${{ matrix.ruby }}-gems-${{ hashFiles(matrix.gemfile) }}
-          restore-keys: >
-            ${{ runner.os }}-${{ matrix.ruby }}-gems-${{ hashFiles(matrix.gemfile) }}
 
       - name: Set up Ruby
-        uses: actions/setup-ruby@v1
+        uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
 
@@ -68,8 +67,10 @@ jobs:
 
       - name: Run Tests
         env:
+          BUNDLE_GEMFILE: ${{ matrix.gemfile }}
+          <%- if options.active_record? -%>
           PGHOST: localhost
           PGUSER: postgres
-          BUNDLE_GEMFILE: ${{ matrix.gemfile }}
+          <%- end -%>
         run: |
           bundle exec rake

data/lib/dopstick/generator/npm/generator.rb

@@ -56,6 +56,8 @@ module Dopstick
           template "feature_request.erb",
                    ".github/ISSUE_TEMPLATE/feature_request.md"
           template "pull_request.erb", ".github/PULL_REQUEST_TEMPLATE.md"
+          template "issue_template_config.erb",
+                   ".github/ISSUE_TEMPLATE/config.yml"
           template "dependabot.erb", ".github/dependabot.yml"
           template "codeowners.erb", ".github/CODEOWNERS"
         end
@@ -94,6 +96,12 @@ module Dopstick
             run "git add .", capture: true
           end
         end
+
+        no_commands do
+          def dependabot_package_ecosystem
+            "npm"
+          end
+        end
       end
     end
   end

data/lib/dopstick/generator/npm/templates/readme.erb

@@ -1,9 +1,8 @@
 # <%= options.package_name %>
 
 [![Tests](<%= options.github_url %>/workflows/node-tests/badge.svg)](https://github.com/fnando/<%= options.package_name %>)
-[![Code Climate](https://codeclimate.com/github/<%= options.github_user %>/<%= options.package_name %>/badges/gpa.svg)](https://codeclimate.com/github/<%= options.github_user %>/<%= options.package_name %>)
-[![NPM](https://img.shields.io/npm/v/<%= options.package_name %>.svg)](https://npmjs.org/packages/<%= options.package_name %>)
-[![NPM](https://img.shields.io/npm/dt/<%= options.package_name %>.svg)](https://npmjs.org/packages/<%= options.package_name %>)
+[![NPM](https://img.shields.io/npm/v/<%= options.package_name %>.svg)](https://npmjs.org/package/<%= options.package_name %>)
+[![NPM](https://img.shields.io/npm/dt/<%= options.package_name %>.svg)](https://npmjs.org/package/<%= options.package_name %>)
 
 <%= options.description %>
 
@@ -23,7 +22,7 @@ yarn add <%= options.package_name %>
 
 ## Usage
 
-TODO: Write gem usage
+TODO: Write package usage
 
 ## Maintainer
 

data/lib/dopstick/generator/npm/templates/tests_workflow.erb

@@ -1,20 +1,21 @@
+---
 name: node-tests
 
 on:
-  pull_request:
-    branches:
-      - main
+  pull_request_target:
   push:
     branches:
       - main
-
-  schedule:
-    - cron: "0 10 * * *"
+  workflow_dispatch:
+    inputs: {}
 
 jobs:
   build:
     name: Tests with Node ${{ matrix.node }}
     runs-on: "ubuntu-latest"
+    if: |
+      github.actor == 'dependabot[bot]' && github.event_name == 'pull_request_target' ||
+      github.actor != 'dependabot[bot]'
     strategy:
       fail-fast: false
       matrix:
@@ -27,9 +28,7 @@ jobs:
         with:
           path: vendor/bundle
           key: >
-            ${{ runner.os }}-${{ matrix.node }}-npm-${{ hashFiles("package.json") }}
-          restore-keys: >
-            ${{ runner.os }}-${{ matrix.node }}-npm-${{ hashFiles("package.json") }}
+            ${{ runner.os }}-${{ matrix.node }}-npm-${{ hashFiles('package.json') }}
 
       - name: Set up Node
         uses: actions/setup-node@v2-beta

data/lib/dopstick/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Dopstick
-  VERSION = "0.0.6"
+  VERSION = "0.0.10"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dopstick
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.10
 platform: ruby
 authors:
 - Nando Vieira
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-12-09 00:00:00.000000000 Z
+date: 2022-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -135,6 +135,7 @@ files:
 - ".github/ISSUE_TEMPLATE/bug_report.md"
 - ".github/ISSUE_TEMPLATE/feature_request.md"
 - ".github/PULL_REQUEST_TEMPLATE.md"
+- ".github/dependabot.yml"
 - ".github/workflows/tests.yml"
 - ".gitignore"
 - ".rubocop.yml"
@@ -163,6 +164,7 @@ files:
 - lib/dopstick/generator/base/templates/funding.erb
 - lib/dopstick/generator/base/templates/gitignore.erb
 - lib/dopstick/generator/base/templates/issue.erb
+- lib/dopstick/generator/base/templates/issue_template_config.erb
 - lib/dopstick/generator/base/templates/license.erb
 - lib/dopstick/generator/base/templates/pull_request.erb
 - lib/dopstick/generator/base/templates/setup.erb
@@ -206,12 +208,13 @@ homepage: https://github.com/fnando/dopstick
 licenses:
 - MIT
 metadata:
+  rubygems_mfa_required: 'true'
   homepage_uri: https://github.com/fnando/dopstick
   bug_tracker_uri: https://github.com/fnando/dopstick/issues
-  source_code_uri: https://github.com/fnando/dopstick/tree/v0.0.6
-  changelog_uri: https://github.com/fnando/dopstick/tree/v0.0.6/CHANGELOG.md
-  documentation_uri: https://github.com/fnando/dopstick/tree/v0.0.6/README.md
-  license_uri: https://github.com/fnando/dopstick/tree/v0.0.6/LICENSE.md
+  source_code_uri: https://github.com/fnando/dopstick/tree/v0.0.10
+  changelog_uri: https://github.com/fnando/dopstick/tree/v0.0.10/CHANGELOG.md
+  documentation_uri: https://github.com/fnando/dopstick/tree/v0.0.10/README.md
+  license_uri: https://github.com/fnando/dopstick/tree/v0.0.10/LICENSE.md
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -220,14 +223,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
 summary: Generate a project skeleton for creating a Ruby/NPM package.