dopstick 0.0.4 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe33ac2b2b1d210b9c5f54cf0f6039ebd8548dfc7893fdebf54e9118a6d44618
-  data.tar.gz: da37488ed41ebe8f16473376c0aad18c98da952bed00ace9b66220b6d13e46a0
+  metadata.gz: 88e28fc1753aaa4198ed8021100c401d532d1574daaa5017953ea00b8794ac74
+  data.tar.gz: d5fd3840b247b6bb1d8b4e2a1780a71e9fda02a887433290e0f50100902fc594
 SHA512:
-  metadata.gz: 66650b1b3fb60790d1c750749d250bea61c7da3b6e88e116e87b5d93142d1922492edb887e95cd9fd013dec702a89deafc2c7d52d547e9b72ca347b419552898
-  data.tar.gz: 382c93b122eebd71c54e3b255159a72b89eed321cbd63e992547bd8565dd5710e7d2a6e6e23fdefceb712ca5bb80ccaafb53e27889645d82dddd1131037bcc07
+  metadata.gz: 13785048ac2360a3237879f43c723b1a7663f826fe4ec3448aa1af36be3c7265debbd23a0fee5401a2b7032eda383e6fda118c39a49e9ea6f9288104cdaa2220
+  data.tar.gz: 5e5db46af35eabcea97fadae738235ec38a155e372066ee3deb0eaa7ce0c9fbeaf5e71fdb787141ff989c256f6eac00f59617517884f23af461f958c2334ee5f

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,22 @@ 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.
+
+## v0.0.5 - 2020-11-14
+
+- [Fixed] Jest configuration wasn't considering the full import path.
+
+## v0.0.4 - 2020-11-14
 
 - [Added] Generate
   [dependabot](https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates)

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/Node" \
+  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/gem/generator.rb

@@ -111,16 +111,16 @@ module Dopstick
         end
 
         no_commands do
-          def render_tree(skip_content_spaces = false, &block)
+          def render_tree(skip_content_spaces = false)
             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) + block.call
+            content << ((spacer * options.namespace_size) + yield)
 
             (options.namespace_size - 1).downto(0) do |count|
               content << "#{'  ' * count}end"
@@ -153,6 +153,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
@@ -14,7 +15,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = Gem::Requirement.new(">= <%= options.oldest_ruby_version %>")
 
   github_url = <%= options.github_url.inspect %>
-  github_tree_url = "#{options.github_url}/tree/v#{spec.version}"
+  github_tree_url = "#{github_url}/tree/v#{spec.version}"
 
   spec.homepage = github_url
   spec.metadata["homepage_uri"] = spec.homepage

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 }}
 

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

@@ -94,6 +94,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/jest.erb

@@ -6,7 +6,7 @@ module.exports = {
   roots: ["<rootDir>/src"],
   modulePaths: ["src"],
   moduleNameMapper: {
-    "^~/": "<rootDir>/src/",
+    "^~/(.*?)$": "<rootDir>/src/$1",
   },
   testPathIgnorePatterns: ["/vendor/bundle/", "node_modules"],
 };

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:
@@ -28,8 +29,6 @@ jobs:
           path: vendor/bundle
           key: >
             ${{ runner.os }}-${{ matrix.node }}-npm-${{ hashFiles("package.json") }}
-          restore-keys: >
-            ${{ runner.os }}-${{ matrix.node }}-npm-${{ hashFiles("package.json") }}
 
       - name: Set up Node
         uses: actions/setup-node@v2-beta

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

@@ -16,7 +16,7 @@ module.exports = {
     rules: [
       {
         test: /\.ts$/,
-        use: [{ loader: "ts-loader" }, { loader: "babel-loader" }],
+        use: [{ loader: "babel-loader" }, { loader: "ts-loader" }],
         exclude: /node_modules/,
       },
       {

data/lib/dopstick/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dopstick
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.8
 platform: ruby
 authors:
 - Nando Vieira
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-11-14 00:00:00.000000000 Z
+date: 2022-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -122,7 +122,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Generate a project skeleton for creating a Ruby/Nodepackage.
+description: Generate a project skeleton for creating a Ruby/NPM package.
 email:
 - me@fnando.com
 executables:
@@ -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"
@@ -206,12 +207,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.4
-  changelog_uri: https://github.com/fnando/dopstick/tree/v0.0.4/CHANGELOG.md
-  documentation_uri: https://github.com/fnando/dopstick/tree/v0.0.4/README.md
-  license_uri: https://github.com/fnando/dopstick/tree/v0.0.4/LICENSE.md
+  source_code_uri: https://github.com/fnando/dopstick/tree/v0.0.8
+  changelog_uri: https://github.com/fnando/dopstick/tree/v0.0.8/CHANGELOG.md
+  documentation_uri: https://github.com/fnando/dopstick/tree/v0.0.8/README.md
+  license_uri: https://github.com/fnando/dopstick/tree/v0.0.8/LICENSE.md
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -220,15 +222,15 @@ 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/Nodepackage.
+summary: Generate a project skeleton for creating a Ruby/NPM package.
 test_files: []