hephaestus 0.8.12 → 0.8.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '06528561509ef978d2df34dc6ae67b75a91d26a67fda79fa97fbdd4dde886ab4'
-  data.tar.gz: eb3559c45d3a7bf42221d346a344baaabbe44880dd755c87da5ff8109da11e93
+  metadata.gz: 89c0585bf79ff89a4a35d183a6bdec69ec180effa6c5254aec22467093efeefa
+  data.tar.gz: 0aefd45fc0dd8549a845f49b510ba9ec7fbe991c85af3f7c9e65e79ed613c9ca
 SHA512:
-  metadata.gz: 56d6a0b8f9f823cc930230c9d2462d6f0fec6f801487acdbae3add9a63d7508100cf862c48c836e18bdfdcd30f7b261b77726469be194db352cb55ba90fdb119
-  data.tar.gz: 1ea2bffff5ee8de27ae0de2a4657775bbad4bdddb82f369787e09ebb3fc9ec541316564e69609eb3fa70e708c9970667816e6f7e57a596fd50f567071c514a3a
+  metadata.gz: 1dcf277f2074215cbf3b207d99534f5bdcf2fd6deb9ed62d6c10e3c87680da8184a30a7e5cfce6ce58e05df6173fb1d808e1fc48edb45f4f1ee4627af2bf2054
+  data.tar.gz: 96c5fbb95236e5fe15fd538742c89010e6d9a581b2cfbf3ce70677b7412a1a48301c8f58a68521b7f0b0d45a79f253ca0f5eb31f2475049584d322c491b6214a

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# [v0.8.12.1] - 16-12-2024
+## What's Changed
+* general updates by @gjtorikian in https://github.com/yettoapp/hephaestus/pull/95
+
+
+**Full Changelog**: https://github.com/yettoapp/hephaestus/compare/v0.8.12...v0.8.12.1
 # [v0.8.12] - 16-12-2024
 ## What's Changed
 * Update template generator by @gjtorikian in https://github.com/yettoapp/hephaestus/pull/93

data/bin/hephaestus

@@ -34,6 +34,16 @@ if (str = ARGV.first)
   end
 end
 
+if ARGV.empty?
+  puts "Please provide a path for the new application"
+  puts
+  puts "See --help for more info"
+  exit 0
+elsif ["-v", "--version"].include?(ARGV[0])
+  puts Hephaestus::VERSION
+  exit 0
+end
+
 if ENV.fetch("HEPHAESTUS_NO_EXTERNAL", "0") == "1"
   puts Rainbow("Skipping Hephaestus check...").yellow
 else
@@ -59,16 +69,6 @@ end
 
 puts Rainbow("Looking good! Proceeding...").blue
 
-if ARGV.empty?
-  puts "Please provide a path for the new application"
-  puts
-  puts "See --help for more info"
-  exit 0
-elsif ["-v", "--version"].include?(ARGV[0])
-  puts Hephaestus::VERSION
-  exit 0
-end
-
 path = ARGV.first
 if File.exist?(path)
   puts Rainbow("\nError: The directory #{path} already exists.").red

data/lib/hephaestus/generators/app_generator.rb

@@ -8,7 +8,6 @@ require "tempfile"
 require "hephaestus/app_name"
 module Hephaestus
   class AppGenerator < Rails::Generators::AppGenerator
-    include ExitOnFailure
     include Hephaestus::AppName
 
     hide!
@@ -55,12 +54,17 @@ module Hephaestus
 
     def customize_gemfile
       say(set_color("Customizing Gemfile...", :cyan))
-      build(:replace_gemfile)
+      template("Gemfile", "Gemfile", force: true)
+      # FIXME: unsure why, but when the generators are called, Rails expects Gemfiles in these locations?
+      copy_file("Gemfile", File.join(Hephaestus::AppGenerator.source_root, "Gemfile"))
+      copy_file("Gemfile", File.join(Hephaestus::AppGenerator.source_root, "..", "Gemfile"))
+      replace_in_files(Hephaestus::AppGenerator.source_root, %|ruby File.read(".ruby-version").strip|, %|ruby "#{Hephaestus::RUBY_VERSION}"|)
+
       unless ENV.fetch("HEPHAESTUS_NO_EXTERNAL", "0") == "1"
         capture_stdout do
-          bundle_command("install")
-          bundle_command("update")
-          bundle_command("lock --add-platform x86_64-linux")
+          run("BUNDLE_GEMFILE=\"#{destination_root}/Gemfile\" bundle install", abort_on_failure: false)
+          run("BUNDLE_GEMFILE=\"#{destination_root}/Gemfile\" bundle update")
+          run("BUNDLE_GEMFILE=\"#{destination_root}/Gemfile\" bundle lock --add-platform x86_64-linux")
         end
       end
     end
@@ -69,7 +73,7 @@ module Hephaestus
       say(set_color("Copying GitHub Actions...", :cyan))
 
       capture_stdout do
-        directory(Hephaestus.source_path(".github"), ".github", force: true)
+        directory("hephaestus_github", ".github", force: true)
       end
     end
 
@@ -77,7 +81,7 @@ module Hephaestus
       say(set_color("Copying .vscode/...", :cyan))
 
       capture_stdout do
-        directory(Hephaestus.source_path(".vscode"), ".vscode")
+        directory("hephaestus_vscode", ".vscode")
       end
     end
 
@@ -132,7 +136,6 @@ module Hephaestus
         directory("lib/schemas/api/2023-03-06", "lib/schemas/api/2023-03-06")
       end
 
-      # This is h
       # we do this to specify the template source, otherwise the generator wants to use Rails own `bin` dir
       source = File.join(Hephaestus::Engine.root, "templates", "bin")
       directory(source, "bin", force: true)
@@ -173,6 +176,9 @@ module Hephaestus
       #   generate("hephaestus:sorbet")
       # end
 
+      replace_in_file(File.join("lib", "schemas", "api", "2023-03-06", "openapi.json"), %r{app/paths.json}, "#{plug_name}/paths.json")
+      File.rename(File.join(destination_root, "lib", "schemas", "api", "2023-03-06", "paths", "app.json"), File.join(destination_root, "lib", "schemas", "api", "2023-03-06", "paths", "#{plug_name}.json"))
+
       say(set_color("Creating first commit...", :cyan))
       capture_stdout do
         invoke(:commit)

data/lib/hephaestus/generators/base.rb

@@ -8,7 +8,6 @@ module Hephaestus
   module Generators
     class Base < Rails::Generators::Base
       include Hephaestus::Actions
-      include ExitOnFailure
 
       class << self
         def default_source_root

data/lib/hephaestus/generators/deployment_generator.rb

@@ -10,8 +10,8 @@ module Hephaestus
     end
 
     def dotenv
-      copy_file(".env.sample", ".env")
-      copy_file(".env.sample", ".env.sample")
+      copy_file("hephaestus_env.sample", ".env")
+      copy_file("hephaestus_env.sample", ".env.sample")
     end
 
     def docker

data/lib/hephaestus/version.rb

@@ -2,7 +2,7 @@
 # frozen_string_literal: true
 
 module Hephaestus
-  VERSION = "0.8.12"
+  VERSION = "0.8.12.1"
   RAILS_VERSION = ">= 8.0"
   RUBY_VERSION = File
     .read("#{File.dirname(__FILE__)}/../../.ruby-version")

data/lib/hephaestus.rb

@@ -11,7 +11,6 @@ require "debug" if debugging?
 
 require "hephaestus/version"
 require "hephaestus/engine"
-require "hephaestus/exit_on_failure"
 
 require "hephaestus/generators/app_generator"
 require "hephaestus/generators/config_generator"

data/templates/hephaestus_env.sample

@@ -0,0 +1,12 @@
+# RAILS_MASTER_KEY="GENERATE_A_NEW_KEY"
+YETTO_PLUG_PEM="REPLACE_ME_WITH_YETTO_VALUE"
+YETTO_SIGNING_SECRET="super-secret"
+YETTO_PLUG_ID="REPLACE_ME_WITH_YETTO_VALUE"
+
+# don't forget to add these into your credentials file: `bin/rails credentials:edit --environment development`
+# APP_ID:  find this in 1pass
+# APP_CLIENT_ID:  find this in 1pass
+# APP_CLIENT_SECRET: find this in 1pass
+# APP_NONCE: generate this randomly
+# JWT_PEM:  find this in 1pass
+

data/templates/hephaestus_github/dependabot.yml

@@ -0,0 +1,27 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: weekly
+      day: monday
+      time: "09:00"
+      timezone: "Etc/UTC"
+    groups:
+      github-actions:
+        patterns:
+          - "*"
+    open-pull-requests-limit: 10
+
+  - package-ecosystem: bundler
+    directory: "/"
+    schedule:
+      interval: monthly
+      day: monday
+      time: "09:00"
+      timezone: "Etc/UTC"
+    open-pull-requests-limit: 10
+    groups:
+      bundler-dependencies:
+        patterns:
+          - "*"

data/templates/hephaestus_github/workflows/automerge.yml

@@ -0,0 +1,14 @@
+name: PR auto-{approve,merge}
+
+on:
+  workflow_dispatch:
+  pull_request_target:
+
+permissions:
+  pull-requests: write
+  contents: write
+
+jobs:
+  bot-check:
+    uses: yettoapp/actions/.github/workflows/automerge.yml@main
+    secrets: inherit

data/templates/hephaestus_github/workflows/deploy.yml

@@ -0,0 +1,30 @@
+name: Deployments
+on:
+  push:
+    branches:
+      - production
+  workflow_dispatch:
+    inputs:
+      target:
+        required: true
+        type: choice
+        description: The name of the environment that you're deploying the application to
+        options:
+          - staging
+          - production
+      forced:
+        description: "Whether to perform the deploy regardless of test state."
+        required: false
+        type: boolean
+        default: false
+
+jobs:
+  deployment:
+    name: Deploy app
+    uses: yettoapp/actions/.github/workflows/fly_deployment.yml@main
+    with:
+      target: ${{ github.event_name != 'workflow_dispatch' && 'production' || inputs.target }}
+      forced: ${{ github.event_name == 'workflow_dispatch' && inputs.forced || false }}
+    secrets:
+      gh_token: ${{ secrets.GH_DEPLOYMENTS_TOKEN }}
+      fly_token: ${{ inputs.target == 'staging' && secrets.FLY_STAGING_API_TOKEN || secrets.FLY_PRODUCTION_API_TOKEN }}

data/templates/hephaestus_github/workflows/licenses.yml

@@ -0,0 +1,17 @@
+name: License
+
+on:
+  workflow_dispatch:
+  pull_request_target:
+
+permissions:
+  pull-requests: write
+  contents: write
+
+jobs:
+  verify:
+    uses: yettoapp/actions/.github/workflows/run_license_verify.yml@main
+    secrets:
+      gh_token: ${{ secrets.GH_SISYPHUS_YETTO_REPO_TOKEN }}
+    with:
+      ruby: true

data/templates/hephaestus_github/workflows/lint.yml

@@ -0,0 +1,17 @@
+name: Linting
+
+on:
+  pull_request:
+    paths:
+      - "**/*.rb"
+
+env:
+  RAILS_ENV: test
+
+jobs:
+  verify:
+    uses: yettoapp/actions/.github/workflows/lint.yml@main
+    secrets:
+      gh_token: ${{ secrets.GH_SISYPHUS_YETTO_REPO_TOKEN }}
+    with:
+      ruby: true

data/templates/hephaestus_github/workflows/security.yml

@@ -0,0 +1,19 @@
+name: Security
+
+on:
+  workflow_dispatch:
+  pull_request_target:
+
+env:
+  RAILS_ENV: test
+  BUNDLE_WITH: "ci"
+
+permissions:
+  pull-requests: write
+  contents: write
+
+jobs:
+  ruby:
+    uses: yettoapp/actions/.github/workflows/ruby_security_checks.yml@main
+    secrets:
+      gh_token: ${{ secrets.GH_SISYPHUS_YETTO_REPO_TOKEN }}

data/templates/hephaestus_github/workflows/sorbet.yml

@@ -0,0 +1,19 @@
+name: Sorbet
+
+on:
+  pull_request_target:
+    paths:
+      - "**/*.rb"
+      - "Gemfile.lock"
+
+jobs:
+  update:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ github.head_ref }}
+          token: ${{ secrets.GH_SISYPHUS_YETTO_REPO_TOKEN }}
+
+      - uses: yettoapp/actions/run-sorbet-update@main

data/templates/hephaestus_github/workflows/test.yml.tt

@@ -0,0 +1,21 @@
+name: Test
+
+on:
+  workflow_dispatch:
+  pull_request_target:
+
+jobs:
+  ruby:
+    uses: yettoapp/actions/.github/workflows/rails_sqlite_test_suite.yml@main
+    secrets:
+      gh_token: ${{ secrets.GH_SISYPHUS_YETTO_REPO_TOKEN }}
+    with:
+      system_tests: false
+
+  docker:
+    uses: yettoapp/actions/.github/workflows/test_dockerbuild.yml@main
+    secrets:
+      gh_token: ${{ secrets.GH_SISYPHUS_YETTO_REPO_TOKEN }}
+      fly_token: ${{ secrets.FLY_PRODUCTION_API_TOKEN }}
+    with:
+      app_name: "plug-<%= plug_name %>-production"

data/templates/hephaestus_github/workflows/updater.yml

@@ -0,0 +1,18 @@
+name: Updates
+on:
+  workflow_dispatch:
+    inputs:
+      action:
+        required: true
+        type: string
+      value:
+        required: false
+        type: string
+
+jobs:
+  update:
+    name: Update app
+    uses: yettoapp/actions/.github/workflows/updater.yml@main
+    with:
+      action: ${{ inputs.action }}
+      value: ${{ inputs.value }}

data/templates/hephaestus_vscode/extensions.json

@@ -0,0 +1,9 @@
+{
+  "recommendations": [
+    "shopify.ruby-extensions-pack",
+    "bradlc.vscode-tailwindcss",
+    "johnpapa.vscode-peacock",
+    "manuelpuyol.erb-linter",
+    "esbenp.prettier-vscode"
+  ]
+}

data/templates/hephaestus_vscode/launch.json

@@ -0,0 +1,13 @@
+{
+  // Use IntelliSense to learn about possible attributes.
+  // Hover to view descriptions of existing attributes.
+  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "type": "rdbg",
+      "name": "Attach rdbg",
+      "request": "attach"
+    },
+  ]
+}

data/templates/hephaestus_vscode/settings.json

@@ -0,0 +1,58 @@
+{
+  "[javascript]" : {
+    "editor.codeActionsOnSave" : {
+      "source.fixAll.eslint" : "explicit"
+    }
+  },
+  "[json]" : {
+    "editor.defaultFormatter" : "vscode.json-language-features"
+  },
+  "[markdown]" : {
+    "editor.defaultFormatter" : "esbenp.prettier-vscode"
+  },
+  "[ruby]" : {
+    "editor.defaultFormatter" : "Shopify.ruby-lsp"
+  },
+  "files.associations" : {
+    "*.css" : "tailwindcss",
+    "*.rbedited" : "ruby",
+    "*.rbi" : "ruby",
+    "*.rbupdated" : "ruby"
+  },
+  "peacock.color" : "#26FF9A",
+  "rubyLsp.enabledFeatures" : {
+    "codeActions" : true,
+    "diagnostics" : true,
+    "documentHighlights" : true,
+    "documentLink" : true,
+    "documentSymbols" : true,
+    "foldingRanges" : true,
+    "formatting" : true,
+    "onTypeFormatting" : true,
+    "selectionRanges" : true,
+    "semanticHighlighting" : true
+  },
+  "tailwindCSS.emmetCompletions" : true,
+  "tailwindCSS.includeLanguages" : {
+    "plaintext" : "html"
+  },
+  "workbench.colorCustomizations" : {
+    "activityBar.activeBackground" : "#59ffb2",
+    "activityBar.background" : "#59ffb2",
+    "activityBar.foreground" : "#15202b",
+    "activityBar.inactiveForeground" : "#15202b99",
+    "activityBarBadge.background" : "#c480ff",
+    "activityBarBadge.foreground" : "#15202b",
+    "commandCenter.border" : "#15202b99",
+    "sash.hoverBorder" : "#59ffb2",
+    "statusBar.background" : "#26ff9a",
+    "statusBar.foreground" : "#15202b",
+    "statusBarItem.hoverBackground" : "#00f281",
+    "statusBarItem.remoteBackground" : "#26ff9a",
+    "statusBarItem.remoteForeground" : "#15202b",
+    "titleBar.activeBackground" : "#26ff9a",
+    "titleBar.activeForeground" : "#15202b",
+    "titleBar.inactiveBackground" : "#26ff9a99",
+    "titleBar.inactiveForeground" : "#15202b99"
+  }
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hephaestus
 version: !ruby/object:Gem::Version
-  version: 0.8.12
+  version: 0.8.12.1
 platform: ruby
 authors:
 - Garen Torikian
@@ -430,7 +430,6 @@ files:
 - lib/hephaestus/app_builder.rb
 - lib/hephaestus/app_name.rb
 - lib/hephaestus/engine.rb
-- lib/hephaestus/exit_on_failure.rb
 - lib/hephaestus/generators/app_generator.rb
 - lib/hephaestus/generators/base.rb
 - lib/hephaestus/generators/config_generator.rb
@@ -492,7 +491,20 @@ files:
 - templates/config/routes.rb.tt
 - templates/db/queue_schema.rb
 - templates/db/schema.rb
+- templates/hephaestus_env.sample
+- templates/hephaestus_github/dependabot.yml
+- templates/hephaestus_github/workflows/automerge.yml
+- templates/hephaestus_github/workflows/deploy.yml
+- templates/hephaestus_github/workflows/licenses.yml
+- templates/hephaestus_github/workflows/lint.yml
+- templates/hephaestus_github/workflows/security.yml
+- templates/hephaestus_github/workflows/sorbet.yml
+- templates/hephaestus_github/workflows/test.yml.tt
+- templates/hephaestus_github/workflows/updater.yml
 - templates/hephaestus_gitignore
+- templates/hephaestus_vscode/extensions.json
+- templates/hephaestus_vscode/launch.json
+- templates/hephaestus_vscode/settings.json
 - templates/lib/plug_app/schemas/api/2023-03-06/components/parameters/headers/yetto.json
 - templates/lib/plug_app/schemas/api/2023-03-06/components/parameters/plugInstallation.json
 - templates/lib/plug_app/schemas/api/2023-03-06/components/schemas/plug.json

data/lib/hephaestus/exit_on_failure.rb

@@ -1,22 +0,0 @@
-# typed: false
-# frozen_string_literal: true
-
-require "active_support/concern"
-require "English"
-
-module Hephaestus
-  module ExitOnFailure
-    extend ActiveSupport::Concern
-
-    def bundle_command(*)
-      super
-      exit(false) if $CHILD_STATUS.exitstatus.nonzero? # rubocop:disable Rails/Exit
-    end
-
-    module ClassMethods
-      def exit_on_failure?
-        true
-      end
-    end
-  end
-end