hephaestus 0.8.14 → 0.8.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c6f1564007f86900d81b992b6df2f93428859cb5a8c6c22a15a5cef29eb7d198
-  data.tar.gz: bd340377613e44ea895a03871835863cc059cd740c9800c64e56e19b481ecc4a
+  metadata.gz: 66776a01bac23f71c5c9f71a7e4402537d6fd0ce5bb610cfccdef823e5440d6f
+  data.tar.gz: 0604c98bfb0f1ab6cdd4ec752c5d882c5112533cb848db0c782f54e08c36ec64
 SHA512:
-  metadata.gz: 4b1399f84f3bb750c0b8de78a729d3e2b47c43bfb8abf5d6f611928162dd2a9c61b7044a39c4348626e2ff819f0eb9b4ff0e67f6dcb78a3c318616a3b42e452c
-  data.tar.gz: 855af63634afe1b2e6a6cb1af37358270f7508c2e8720426c512f0abb7c8b6e6b7eeae661b8237149906c3f86e806e08aeb53b7896f9eaff50c11b5ce4720d20
+  metadata.gz: dde18716b4669fd1b6d361aca85d7f26784e9321df6b2c8215103b014b6fd94aff01b70fa564ce356b9119e1495abeefe585e86cab6899b26195ba935a1e3183
+  data.tar.gz: 57ff4c8ca8ac52aafe85421dbc5fac30e26b43d2ce5f5ed4fce9f4396d48bbb945c4802ccdfc5fd50d6915ed10d204d37d0893a3542a9107abfec810d54f6082

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+# [v0.8.15.1] - 16-01-2025
+## What's Changed
+* Bugfixes by @gjtorikian in https://github.com/yettoapp/hephaestus/pull/107
+
+
+**Full Changelog**: https://github.com/yettoapp/hephaestus/compare/v0.8.15...v0.8.15.1
+# [v0.8.15] - 15-01-2025
+## What's Changed
+* Move hephaestus' plug scripts to subfolder + other fixups by @gjtorikian in https://github.com/yettoapp/hephaestus/pull/104
+
+
+**Full Changelog**: https://github.com/yettoapp/hephaestus/compare/v0.8.14...v0.8.15
 # [v0.8.14] - 19-12-2024
 ## What's Changed
 * Add scripting logic to Hephaestus by @gjtorikian in https://github.com/yettoapp/hephaestus/pull/102

data/bin/hephaestus

@@ -101,7 +101,8 @@ end
 case ARGV[0]
 when "run"
   ENV["HEPHAESTUS_CAPITAL_PLUG_NAME"] = `grep 'module Plug\S*' config/application.rb | sed -E 's/module Plug//'`.strip
-  script_dir = File.join(ENGINE_ROOT, "script")
+  ENV["HEPHAESTUS_LOWERCASE_PLUG_NAME"] = ENV["HEPHAESTUS_CAPITAL_PLUG_NAME"].underscore
+  script_dir = File.join(ENGINE_ROOT, "script", "templates")
   puts `#{File.join(script_dir, ARGV[1..-1].join(' '))}`
 else
   Hephaestus::AppGenerator.start

data/config/queue.yml

@@ -4,9 +4,8 @@ default: &default
       batch_size: 500
   workers:
     - queues: [plug_<%= plug_shortname %>_high_priority*, plug_<%= plug_shortname %>_mid_priority*, plug_<%= plug_shortname %>_low_priority*]
-      threads: 5
     - queues: "plug_<%= plug_shortname %>_*" # default, mailers, etc
-      threads: 3
+      threads: 1
 
 development:
   <<: *default

data/lib/hephaestus/app_name.rb

@@ -10,12 +10,12 @@ module Hephaestus
       "plug-#{Rails.application.class.module_parent.name.underscore[5..-1]}"
     end
 
-    # like, `slack`, github, or `html_proofer`
+    # like, `slack`, `github`, or `html_proofer`
     def plug_name
       app_name.split("-", 2).last
     end
 
-    # like, `Slack`, `GitHub`, or `html_proofer
+    # like, `Slack`, `GitHub`, or `HtmlProofer`
     def capital_plug_name
       plug_name.camelcase
     end

data/lib/hephaestus/engine.rb

@@ -70,8 +70,28 @@ module Hephaestus
     end
 
     def op_read(label)
-      %x(#{include_sudo?}op read "#{label}").chomp.tap do
-        raise "Failed to fetch `#{label}` from 1Password" unless $CHILD_STATUS.success?
+      if within_op_rate_limit?
+        %x(#{include_sudo?}op read "#{label}").chomp.tap do
+          Rails.logger.error("Failed to fetch `#{label}` from 1Password") && return unless $CHILD_STATUS.success?
+        end
+      end
+    end
+
+    def within_op_rate_limit?
+      results = %x(#{include_sudo?}op service-account ratelimit --format=json).chomp.tap do |_result|
+        unless $CHILD_STATUS.success?
+          Rails.logger.error("Failed to retrieve rate limits")
+          return false
+        end
+      end
+
+      JSON.parse(results).each do |result|
+        if result["remaining"] < 20
+          Rails.logger.error("You're wildly close to the end of your OP rate limits! Check for problems. I can't continue.")
+          false
+        else
+          true
+        end
       end
     end
 

data/lib/hephaestus/middleware/openapi_validation.rb

@@ -41,6 +41,7 @@ module Hephaestus
           else
             case validated_request.error.type
             when :not_found
+              Rails.logger.error("Request path not found. Is it defined in openai.json? ") if print_user_api_errors?
               [Hephaestus::HTTP::NOT_FOUND_I, { "Content-Type" => "application/json" }, [format_str("Not Found")]]
             else
               error_message = if validated_request.error.errors.present?

data/lib/hephaestus/version.rb

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

data/templates/lib/schemas/api/2023-03-06/components/schemas/{yetto.json → yetto.json.tt}

@@ -1,5 +1,5 @@
 {
-    "CreateAppMessage": {
+    "Create<%= capital_plug_name %>Message": {
         "type": "object",
         "required": [
             "yetto"
@@ -77,7 +77,7 @@
         },
         "additionalProperties": false
     },
-    "ConfigureApp": {
+    "CreatedPlugInstallation": {
         "type": "object",
         "required": [
             "yetto"

data/templates/lib/schemas/api/2023-03-06/paths/app.json

@@ -18,19 +18,6 @@
                     "schema": {
                         "$ref": "../components/schemas/plug.json#/something"
                     }
-                },
-                "example": {
-                    "message": {
-                        "text_content": "Hello _World_",
-                        "is_public": true,
-                        "author": {
-                            "name": "John Doe"
-                        },
-                        "metadata": {}
-                    },
-                    "creator": {
-                        "id": "usr_1234567890"
-                    }
                 }
             }
         },

data/templates/lib/schemas/api/2023-03-06/paths/yetto/plug_installation_created.json

@@ -10,7 +10,7 @@
             "content": {
                 "application/json": {
                     "schema": {
-                        "$ref": "../../components/schemas/yetto.json#/ConfigureApp"
+                        "$ref": "../../components/schemas/yetto.json#/CreatedPlugInstallation"
                     }
                 }
             }

data/templates/root/hephaestus_gitignore

@@ -294,3 +294,4 @@ app/javascript/controllers/*.js
 !app/javascript/controllers/index.js
 
 security_results.json
+vendor/cache/

data/templates/script/edit-credentials

@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+set -e
+
+bundle exec hephaestus run edit-credentials "$1"

data/templates/script/ngrok.tt

@@ -4,4 +4,4 @@ set -e
 
 hostname="$(hostname | tr '[:upper:]' '[:lower:]' | tr '.' '-')"
 
-ngrok http --region=us --domain=${hostname}-plug-<%= plug_name %>.ngrok.io 6661
+ngrok http --domain=${hostname}-plug-<%= plug_name %>.ngrok.io 6661

data/templates/test/controllers/app_controller_test.rb.tt

@@ -176,13 +176,14 @@ class <%= capital_plug_name %>ControllerTest < ActionDispatch::IntegrationTest
     assert_response :bad_request
   end
 
-  test "webhook passes to job when issue_comment is created" do
-    assert_enqueued_with(job: Process<%= capital_plug_name %>IssueCommentJob) do
-      plug(:post, "/webhook", body: @valid_issue_comment_created_webhook_body, headers: { "HTTP_X_GITHUB_EVENT" => "issue_comment", "HTTP_X_HUB_SIGNATURE_256" => auth_header(@valid_issue_comment_created_webhook_body) })
-    end
+  # TODO: Add your own controller tests here; for example
 
-    assert_response :ok
-  end
+  # test "webhook passes to job when issue_comment is created" do
+  #  assert_enqueued_with(job: Process<%= capital_plug_name %>IssueCommentJob) do
+  #    plug(:post, "/webhook", body: @valid_issue_comment_created_webhook_body, headers: { "HTTP_X_GITHUB_EVENT" => "issue_comment", "HTTP_X_HUB_SIGNATURE_256" => auth_header(@valid_issue_comment_created_webhook_body) })
+  #  end
+  #
+  #  assert_response :ok
+  # end
 
-  # TODO: Add your own controller tests here
 end

data/templates/test/controllers/yetto_controller_test.rb

@@ -104,7 +104,7 @@ class YettoControllerTest < ActionDispatch::IntegrationTest
     assert_response :bad_request
   end
 
-  test "it performs some job to do something to your platform" do
+  test "it performs **SomeJob** to **do something** to your platform" do
     incoming_body = @after_create_message
 
     job_args = {

data/templates/test/fixtures/files/access_token/invalid.json

@@ -0,0 +1,3 @@
+{
+    "token_type": "bearer"
+}

data/templates/test/fixtures/files/access_token/valid.json

@@ -0,0 +1,8 @@
+{
+    "access_token": "ghu_access_token",
+    "expires_in": 28800,
+    "refresh_token": "ghr_",
+    "refresh_token_expires_in": 15811200,
+    "scope": "",
+    "token_type": "bearer"
+}

data/templates/test/jobs/some_job_test.rb

@@ -0,0 +1,7 @@
+# typed: false
+# frozen_string_literal: true
+
+require "test_helper"
+
+class SomeJobTest < ActiveJob::TestCase
+end

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

@@ -16,7 +16,7 @@ module Webmocks
 
     # 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
+    #   response_body = JSON.parse(file_fixture_path("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,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hephaestus
 version: !ruby/object:Gem::Version
-  version: 0.8.14
+  version: 0.8.15.1
 platform: ruby
 authors:
 - Garen Torikian
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-19 00:00:00.000000000 Z
+date: 2025-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bootsnap
@@ -377,7 +377,7 @@ dependencies:
 description: 'Hephaestus is a Rails generator to create plugs for Yetto.
 
   '
-email: 
+email:
 executables:
 - hephaestus
 extensions: []
@@ -445,9 +445,9 @@ files:
 - lib/hephaestus/version.rb
 - lib/tasks/hephaestus_tasks.rake
 - lib/tasks/rubocop.rake
-- script/edit-credentials
-- script/setup-vault
-- script/vault.json
+- script/templates/edit-credentials
+- script/templates/setup-vault
+- script/templates/vault.json
 - templates/app/controllers/app_controller.rb.tt
 - templates/app/controllers/application_controller.rb
 - templates/app/controllers/concerns/authable.rb.tt
@@ -495,7 +495,7 @@ files:
 - 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/components/schemas/yetto.json.tt
 - 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
@@ -517,6 +517,7 @@ files:
 - templates/root/hephaestus_ruby-version
 - 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.tt
@@ -528,9 +529,12 @@ files:
 - templates/test/controllers/root_controller_test.rb
 - templates/test/controllers/settings_controller_test.rb.tt
 - templates/test/controllers/yetto_controller_test.rb
+- templates/test/fixtures/files/access_token/invalid.json
+- templates/test/fixtures/files/access_token/valid.json
 - 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/jobs/some_job_test.rb
 - templates/test/support/rails.rb
 - templates/test/support/webmocks/app_webmock.rb.tt
 - templates/test/test_helper.rb
@@ -540,7 +544,7 @@ homepage: http://github.com/yettoapp/hephaestus
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--charset=UTF-8"
 require_paths:
@@ -558,7 +562,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 3.4.7
 requirements: []
 rubygems_version: 3.5.22
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Generate a Rails app that can be used to create plugs for Yetto.
 test_files: []