dopstick 0.0.5 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 67d8b2be08b351c27515e62ca76bee7b29e8d98980f0624ca7b6e931b3dfcfc4
-  data.tar.gz: d878cb9f1762827c315121c2ab107af72181f33362a9944c10903b733da01e3e
+  metadata.gz: 42446a66e285e1f148cf24c355d855dca254c32086ede5c12dea2101715fa4ed
+  data.tar.gz: f4f9358edf3b97602abb0584f0b09aa7877f1e62df7c17be0f1f6d6080f4aeb6
 SHA512:
-  metadata.gz: eac9428db86f3c28346a4ae6dc38cd6dc08d90f4fdef7b35179c4a0b36bfdb2c67244967d7791050012a897ecffbee29e39a45662483dac7b2a0127bb4b705cd
-  data.tar.gz: ca31cdc4a53c79daa502559b1cc4793b24bbb6577de57fcfc1f0e253929d737abcaf446d815bd8458cf2c5a625e918006cd1b7c4be00b43b15902bc33cd4f101
+  metadata.gz: 28cbbe929c06a4c5a691016f5755ec4ed0c58bc5b6750d36940d084c54600dfa1d54744b9c53ae813269224db38ef1208997ebbdfc9a3e9d77cbf947c8061151
+  data.tar.gz: 9de528b5dbb5d9515c8668e62234641bfe49bb0ec5f401fc0d5135673f4d0fc4632985298f566e35e175269212afa65967f3731b2d6fedb3fac35bb40d2550fc

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,6 +11,17 @@ Prefix your message with one of the following:
 - [Security] in case of vulnerabilities.
 -->
 
+## 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.

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

@@ -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/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:
@@ -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.5"
+  VERSION = "0.0.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dopstick
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.9
 platform: ruby
 authors:
 - Nando Vieira
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-11-14 00:00:00.000000000 Z
+date: 2022-01-12 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.5
-  changelog_uri: https://github.com/fnando/dopstick/tree/v0.0.5/CHANGELOG.md
-  documentation_uri: https://github.com/fnando/dopstick/tree/v0.0.5/README.md
-  license_uri: https://github.com/fnando/dopstick/tree/v0.0.5/LICENSE.md
+  source_code_uri: https://github.com/fnando/dopstick/tree/v0.0.9
+  changelog_uri: https://github.com/fnando/dopstick/tree/v0.0.9/CHANGELOG.md
+  documentation_uri: https://github.com/fnando/dopstick/tree/v0.0.9/README.md
+  license_uri: https://github.com/fnando/dopstick/tree/v0.0.9/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: []