hephaestus 0.8.11 → 0.8.12

data/templates/test/support/rails.rb

@@ -1,40 +1,20 @@
 # typed: false
 # frozen_string_literal: true
 
-ENV["RAILS_ENV"] ||= "test"
-require_relative "../../config/environment"
-
-module ActiveSupport
-  class TestCase
-    extend T::Sig
-
-    # Run tests in parallel with specified workers
-    parallelize(workers: :number_of_processors)
-
-    def setup
-      @organization_id ||= "org_#{Faker::Alphanumeric.alphanumeric(number: 26).upcase}"
-      @plug_installation_id ||= "pli_#{Faker::Alphanumeric.alphanumeric(number: 26).upcase}"
-      @inbox_id ||= "ibx_#{Faker::Alphanumeric.alphanumeric(number: 26).upcase}"
-      @plug_id ||= "plg_#{Faker::Alphanumeric.alphanumeric(number: 26).upcase}"
-      @message_id ||= "msg_#{Faker::Alphanumeric.alphanumeric(number: 26).upcase}"
-      @conversation_id ||= "cnv_#{Faker::Alphanumeric.alphanumeric(number: 26).upcase}"
-    end
-
-    def file_fixture_path(dir, name)
-      Rails.root.join("test", "fixtures", "files", dir, name)
-    end
-
-    def assert_expected_args(expected_args)
-      lambda do |job_args_arr|
-        job_args_arr.first.each do |actual_args|
-          actual_key = actual_args.first
-          actual_value = actual_args.second
-
-          expected_value = expected_args[actual_key]
-
-          assert_equal(expected_value, actual_value, "Expected `#{actual_key}` to be `#{expected_value.nil? ? "nil" : expected_value}`, but was `#{actual_value.nil? ? "nil" : actual_value}`")
-        end
-      end
-    end
-  end
+def create_installation(valid: true, expires_at: 8.hours.from_now)
+  {
+    installed_on_inbox: {
+      id: @inbox_id,
+      organization: {
+        id: @organization_id,
+        status: "active",
+      },
+    },
+    plug: {
+      id: @plug_id,
+    },
+    # TODO: fill these out!
+    settings: {},
+    credentials: {},
+  }
 end

data/templates/test/support/webmocks/app_webmock.rb.tt

@@ -0,0 +1,29 @@
+# typed: false
+# frozen_string_literal: true
+
+module Webmocks
+  module <%= capital_plug_name %>Webmock
+    extend T::Sig
+    extend T::Helpers
+
+    # TODO: Add webmocks here which are specific to your application
+    # For example, if your application interacts with GitHub, you can add webmocks for GitHub here
+    #
+    # sig { params(state: String).returns(T.untyped) }
+    # def assert_requested_user_access_token(state)
+    #   assert_requested(:post, "https://github.com/login/oauth/access_token?#{token_query_params(state)}")
+    # end
+
+    # sig { params(state: String, valid: T::Boolean, status: Integer).returns(T.untyped) }
+    # def stub_request_user_access_token(state, valid: true, status: 200)
+    #   response_body = JSON.parse(file_fixture_path("gh_access_token", valid ? "valid.json" : "invalid.json").read).deep_symbolize_keys
+    #   stub_request(:post, "https://github.com/login/oauth/access_token?#{token_query_params(state)}")
+    #     .to_return(
+    #       status: status,
+    #       headers: { content_type: "application/json; charset=utf-8" },
+    #       body: response_body.to_json,
+    #     )
+    # end
+
+  end
+end

data/templates/test/test_helper.rb

@@ -1,37 +1,7 @@
 # typed: false
 # frozen_string_literal: true
 
-require "debug" if ENV.fetch("DEBUG", false)
+require "hephaestus/test_helper"
 
-if ENV["COVERAGE"] == "1"
-  require "simplecov"
-  require "simplecov-console"
-
-  SimpleCov.start("rails")
-
-  # do not crash on failure; we want a distinct job to report the coverage error
-  module SimpleCov
-    class << self
-      def result_exit_status(_)
-        SimpleCov::ExitCodes::SUCCESS
-      end
-    end
-  end
-end
-
-require "httpx"
-require "webmock/minitest"
-require "httpx/adapters/webmock"
-WebMock.enable!
-WebMock.disable_net_connect!(allow_localhost: true)
-
-require_relative "support/rails"
-
-require "minitest/pride"
-
-require "webmock/minitest"
 # Load everything else from test/support
 Dir[File.expand_path("support/**/*.rb", __dir__)].each { |rb| require(rb) }
-
-# https://github.com/freerange/mocha#rails
-require "mocha/minitest"

data/templates/vendor/fly/{fly-production.toml → fly-production.toml.tt}

@@ -2,16 +2,12 @@
 # See https://fly.io/docs/reference/configuration/ for information about how to use this file.
 #
 
-app = "plug-app-production"
+app = "plug-<%= plug_name %>-production"
 primary_region = "iad"
 
-[env]
-RAILS_ENV = "production"
-LD_PRELOAD_PATH = "/usr/lib/x86_64-linux-gnu/libjemalloc.so.2"
-
 [processes]
-web = "./bin/rails server"
-worker = "bundle exec sidekiq"
+web = "/app/bin/rails server"
+supervisor = "/app/bin/jobs"
 
 [[vm]]
 cpu_kind = "performance"
@@ -23,7 +19,17 @@ processes = ["web"]
 cpu_kind = "performance"
 cpus = 1
 memory = "2gb"
-processes = ["worker"]
+processes = ["supervisor"]
+
+[[restart]]
+policy = "always"
+retries = 5
+processes = ["supervisor"]
+
+[[restart]]
+policy = "on-failure"
+retries = 5
+processes = ["web"]
 
 [http_service]
 internal_port = 3000
@@ -39,13 +45,20 @@ hard_limit = 250
 
 [checks]
 [checks.alive]
-type = "tcp"
-interval = "15s"
+type = "http"
+interval = "10s"
 timeout = "2s"
 grace_period = "5s"
+method = "GET"
+path = "/up"
+protocol = "http"
+tls_skip_verify = false
+processes = ["web"]
+[checks.alive.headers]
+X-Forwarded-Proto = "https"
 
 [[statics]]
-guest_path = "/plug-app/public"
+guest_path = "/plug-<%= plug_name %>/public"
 url_prefix = "/"
 
 [deploy]

data/templates/vendor/fly/{fly-staging.toml → fly-staging.toml.tt}

@@ -1,13 +1,13 @@
-app = "plug-app-staging"
-primary_region = "iad"
+#
+# See https://fly.io/docs/reference/configuration/ for information about how to use this file.
+#
 
-[env]
-RAILS_ENV = "staging"
-LD_PRELOAD_PATH = "/usr/lib/x86_64-linux-gnu/libjemalloc.so.2"
+app = "plug-<%= plug_name %>-staging"
+primary_region = "iad"
 
 [processes]
-web = "./bin/rails server"
-worker = "bundle exec sidekiq"
+web = "/app/bin/rails server"
+supervisor = "/app/bin/jobs"
 
 [[vm]]
 cpu_kind = "shared"
@@ -19,7 +19,11 @@ processes = ["web"]
 cpu_kind = "shared"
 cpus = 2
 memory = "1gb"
-processes = ["worker"]
+processes = ["supervisor"]
+
+[[restart]]
+policy = "on-failure"
+retries = 5
 
 [http_service]
 internal_port = 3000
@@ -33,15 +37,14 @@ type = "requests"
 soft_limit = 200
 hard_limit = 250
 
-[checks]
-[checks.alive]
-type = "tcp"
-interval = "15s"
-timeout = "2s"
-grace_period = "5s"
+[[services]]
+auto_stop_machines = "stop"
+auto_start_machines = true
+min_machines_running = 0
+processes = ["supervisor"]
 
 [[statics]]
-guest_path = "/plug-app/public"
+guest_path = "/plug-<%= plug_name %>/public"
 url_prefix = "/"
 
 [deploy]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hephaestus
 version: !ruby/object:Gem::Version
-  version: 0.8.11
+  version: 0.8.12
 platform: ruby
 authors:
 - Garen Torikian
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-12-11 00:00:00.000000000 Z
+date: 2024-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bootsnap
@@ -24,7 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  force_ruby_platform: false
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -53,7 +52,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.15'
-  force_ruby_platform: false
 - !ruby/object:Gem::Dependency
   name: hiredis
   requirement: !ruby/object:Gem::Requirement
@@ -68,7 +66,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
-  force_ruby_platform: false
 - !ruby/object:Gem::Dependency
   name: httpsensible
   requirement: !ruby/object:Gem::Requirement
@@ -83,7 +80,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.3'
-  force_ruby_platform: false
 - !ruby/object:Gem::Dependency
   name: jbuilder
   requirement: !ruby/object:Gem::Requirement
@@ -98,7 +94,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.12'
-  force_ruby_platform: false
 - !ruby/object:Gem::Dependency
   name: jwt
   requirement: !ruby/object:Gem::Requirement
@@ -113,7 +108,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.8'
-  force_ruby_platform: false
 - !ruby/object:Gem::Dependency
   name: lograge
   requirement: !ruby/object:Gem::Requirement
@@ -128,7 +122,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.14'
-  force_ruby_platform: false
 - !ruby/object:Gem::Dependency
   name: mission_control-jobs
   requirement: !ruby/object:Gem::Requirement
@@ -143,7 +136,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
-  force_ruby_platform: false
 - !ruby/object:Gem::Dependency
   name: openapi_first
   requirement: !ruby/object:Gem::Requirement
@@ -158,7 +150,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-  force_ruby_platform: false
 - !ruby/object:Gem::Dependency
   name: parser
   requirement: !ruby/object:Gem::Requirement
@@ -173,7 +164,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-  force_ruby_platform: false
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -188,7 +178,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
-  force_ruby_platform: false
 - !ruby/object:Gem::Dependency
   name: puma
   requirement: !ruby/object:Gem::Requirement
@@ -203,7 +192,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '6.4'
-  force_ruby_platform: false
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -218,7 +206,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '8.0'
-  force_ruby_platform: false
 - !ruby/object:Gem::Dependency
   name: rainbow
   requirement: !ruby/object:Gem::Requirement
@@ -233,7 +220,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-  force_ruby_platform: false
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
@@ -248,7 +234,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.2'
-  force_ruby_platform: false
 - !ruby/object:Gem::Dependency
   name: retriable
   requirement: !ruby/object:Gem::Requirement
@@ -263,7 +248,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
-  force_ruby_platform: false
 - !ruby/object:Gem::Dependency
   name: slack_webhook_logger
   requirement: !ruby/object:Gem::Requirement
@@ -278,7 +262,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
-  force_ruby_platform: false
 - !ruby/object:Gem::Dependency
   name: solid_queue
   requirement: !ruby/object:Gem::Requirement
@@ -293,7 +276,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-  force_ruby_platform: false
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -308,7 +290,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-  force_ruby_platform: false
 - !ruby/object:Gem::Dependency
   name: opentelemetry-exporter-otlp
   requirement: !ruby/object:Gem::Requirement
@@ -323,7 +304,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.26'
-  force_ruby_platform: false
 - !ruby/object:Gem::Dependency
   name: opentelemetry-instrumentation-all
   requirement: !ruby/object:Gem::Requirement
@@ -338,7 +318,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.63'
-  force_ruby_platform: false
 - !ruby/object:Gem::Dependency
   name: opentelemetry-sdk
   requirement: !ruby/object:Gem::Requirement
@@ -353,7 +332,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
-  force_ruby_platform: false
 - !ruby/object:Gem::Dependency
   name: opentelemetry-semantic_conventions
   requirement: !ruby/object:Gem::Requirement
@@ -368,7 +346,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.10'
-  force_ruby_platform: false
 - !ruby/object:Gem::Dependency
   name: propshaft
   requirement: !ruby/object:Gem::Requirement
@@ -383,7 +360,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
-  force_ruby_platform: false
 - !ruby/object:Gem::Dependency
   name: dotenv-rails
   requirement: !ruby/object:Gem::Requirement
@@ -452,12 +428,14 @@ files:
 - lib/hephaestus/actions.rb
 - lib/hephaestus/actions/strip_comments_action.rb
 - 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
 - lib/hephaestus/generators/core_generator.rb
+- lib/hephaestus/generators/db_generator.rb
 - lib/hephaestus/generators/deployment_generator.rb
 - lib/hephaestus/generators/lib_generator.rb
 - lib/hephaestus/generators/license_generator.rb
@@ -479,50 +457,41 @@ files:
 - lib/tasks/rubocop.rake
 - lib/version.rb
 - templates/Dockerfile
-- templates/Gemfile.erb
-- templates/Procfile.debug
-- templates/Procfile.dev
+- templates/Gemfile
+- templates/Procfile
 - templates/README.md.erb
-- templates/app/controllers/app_controller.rb
+- templates/app/controllers/app_controller.rb.tt
 - templates/app/controllers/application_controller.rb
-- templates/app/controllers/concerns/authable.rb
+- templates/app/controllers/concerns/authable.rb.tt
 - templates/app/controllers/root_controller.rb
 - templates/app/controllers/settings_controller.rb
-- templates/app/controllers/staff_controller.rb
 - templates/app/controllers/yetto_controller.rb
 - templates/app/jobs/application_job.rb
-- templates/app/jobs/update_yetto_job.rb
 - templates/app/lib/body_parameter.rb
 - templates/app/lib/body_parameter/yetto_parameters.rb
-- templates/app/lib/constants/app.rb
-- templates/app/lib/headers.rb
-- templates/app/lib/headers/yetto.rb
-- templates/app/lib/path_parameter.rb
-- templates/app/lib/path_parameter/settings_parameters.rb
-- templates/app/lib/path_parameter/yetto_parameters.rb
-- templates/app/lib/plug_app/http.rb
-- templates/app/lib/plug_app/middleware/malformed_request.rb
-- templates/app/lib/plug_app/middleware/openapi_validation.rb
-- templates/app/lib/plug_app/middleware/tracing_attributes.rb
-- templates/app/lib/query_parameter.rb
-- templates/app/serializers/error_serializer.rb
-- templates/app/services/http_service.rb
-- templates/app/services/yetto_service.rb
-- templates/app/views/settings/new.json.jbuilder
+- templates/app/lib/constants.rb
+- templates/app/services/app_service.rb.tt
+- templates/app/views/settings/new.json.jbuilder.tt
+- templates/bin/bundle
 - templates/bin/docker-entrypoint
-- templates/compose.yml
-- templates/config/initializers/000-oj.rb
-- templates/config/initializers/cors.rb
+- templates/bin/foreman
+- templates/bin/jobs
+- templates/bin/rails
+- templates/bin/rake
+- templates/bin/setup
+- templates/bin/tapioca
+- templates/config.ru
+- templates/config/application.rb.tt
+- templates/config/boot.rb
+- templates/config/environment.rb
+- templates/config/environments/blank.rb
 - templates/config/initializers/environment.rb
-- templates/config/initializers/filter_parameter_logging.rb
-- templates/config/initializers/inflections.rb
-- templates/config/initializers/lograge.rb
-- templates/config/initializers/opentelemetry.rb
-- templates/config/initializers/sidekiq.rb
-- templates/config/initializers/slack_webhook_logger.rb
 - templates/config/locales/en.yml
 - templates/config/locales/settings/en.yml
-- templates/config/sidekiq.yml
+- templates/config/puma.rb
+- templates/config/routes.rb.tt
+- templates/db/queue_schema.rb
+- templates/db/schema.rb
 - templates/hephaestus_gitignore
 - 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
@@ -533,34 +502,40 @@ files:
 - templates/lib/plug_app/schemas/api/2023-03-06/paths/plug.json
 - templates/lib/plug_app/schemas/api/2023-03-06/paths/yetto/message_created.json
 - templates/lib/plug_app/schemas/api/2023-03-06/paths/yetto/plug_installation_created.json
+- templates/lib/schemas/api/2023-03-06/components/parameters/headers/yetto.json
+- templates/lib/schemas/api/2023-03-06/components/parameters/plugInstallation.json
+- templates/lib/schemas/api/2023-03-06/components/schemas/plug.json
+- templates/lib/schemas/api/2023-03-06/components/schemas/responses.json
+- templates/lib/schemas/api/2023-03-06/components/schemas/yetto.json
+- templates/lib/schemas/api/2023-03-06/openapi.json
+- templates/lib/schemas/api/2023-03-06/paths/app.json
+- templates/lib/schemas/api/2023-03-06/paths/yetto/message_created.json
+- templates/lib/schemas/api/2023-03-06/paths/yetto/plug_installation_created.json
 - templates/lib/tasks/test_tasks.rake
 - templates/script/ci
+- templates/script/docker-build-prod.tt
+- templates/script/docker-run.tt
 - templates/script/edit-credentials
 - templates/script/hmac_text
 - templates/script/licenses
-- templates/script/ngrok
+- templates/script/ngrok.tt
 - templates/script/server
 - templates/script/sorbet
 - templates/script/test
 - templates/sorbet/custom.rbi
+- templates/test/controllers/app_controller_test.rb.tt
 - templates/test/controllers/application_controller_test.rb
 - templates/test/controllers/root_controller_test.rb
-- templates/test/controllers/settings_controller_test.rb
+- templates/test/controllers/settings_controller_test.rb.tt
 - templates/test/controllers/yetto_controller_test.rb
 - templates/test/fixtures/files/fake_pem_file/fake.pem
 - templates/test/fixtures/files/plug_installation_settings/invalid.json
 - templates/test/fixtures/files/plug_installation_settings/valid.json
-- templates/test/fixtures/plug_installation_settings/invalid.json
-- templates/test/fixtures/plug_installation_settings/valid.json
-- templates/test/jobs/update_yetto_job_test.rb
-- templates/test/support/api.rb
 - templates/test/support/rails.rb
-- templates/test/support/webmocks.rb
-- templates/test/support/webmocks/slack_webmock.rb
-- templates/test/support/webmocks/yetto_webmock.rb
+- templates/test/support/webmocks/app_webmock.rb.tt
 - templates/test/test_helper.rb
-- templates/vendor/fly/fly-production.toml
-- templates/vendor/fly/fly-staging.toml
+- templates/vendor/fly/fly-production.toml.tt
+- templates/vendor/fly/fly-staging.toml.tt
 homepage: http://github.com/yettoapp/hephaestus
 licenses:
 - MIT
@@ -575,14 +550,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.3.0
+      version: 3.3.6
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: 3.4.7
 requirements: []
-rubygems_version: 3.5.3
+rubygems_version: 3.5.22
 signing_key: 
 specification_version: 4
 summary: Generate a Rails app that can be used to create plugs for Yetto.