hephaestus 0.4.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 514b3a3d6af4cd4f265334e540510abeba70de3758c4c92e6dd3a6297c6e428b
-  data.tar.gz: d852903702132b3add71f638494809ad6bc167bbbb3f83ec625bd21999cbd081
+  metadata.gz: a6ea72738e1e92fb2cde19166a290573e1a4f3d51f4889c13fcfb0530998ff28
+  data.tar.gz: 6a5980d8b598044f144feda0aae7a74cafd156349fcd7871ff1b431c21fad32c
 SHA512:
-  metadata.gz: 35438e55bf05ced5fb9e90002f01ada1ee1b3ae9d8af941bf910a169c9d0ac45ace87f0ec8c086640b2c5c50d68bee7db8569c33bc92fc56cac5d83abe05fd77
-  data.tar.gz: 0b8d7b5cd5b5aa26328c704e44ed0385ba0865719d5e48440a50484475b7e0dc0644939ad94944111d9e1cdcbf3ba7ac560672675772ea8a0e6b6265c1206eb1
+  metadata.gz: 5b901a9802f9b40d387ee9f476583e79c3e04fd8f0f324497dd27dfe67464d408cc694ce0875aefe36ab1dabed4f1e7ceff25ce5f2a672868590da1893b2099a
+  data.tar.gz: 48c94b50e1cf0420e91c69d1c2c17e8d5d96e4aead81f43a284d6f6999f31910cf29b9b9b349998c89403839eb559705a93337288637764292e3fc5ae1f7b9c6

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+## [v0.5.0] - 13-10-2023
+## What's Changed
+* More edits by @gjtorikian in https://github.com/yettoapp/hephaestus/pull/11
+
+
+**Full Changelog**: https://github.com/yettoapp/hephaestus/compare/v0.4.0...v0.5.0
+## [v0.4.0] - 29-09-2023
+## What's Changed
+* Yet more changes by @gjtorikian in https://github.com/yettoapp/hephaestus/pull/10
+
+
+**Full Changelog**: https://github.com/yettoapp/hephaestus/compare/v0.3.1...v0.4.0
 ## [v0.3.1] - 18-09-2023
 **Full Changelog**: https://github.com/yettoapp/hephaestus/compare/v0.3.0...v0.3.1
 ## [v0.3.0] - 12-09-2023

data/bin/hephaestus

@@ -70,5 +70,6 @@ ARGV.push("--minimal")
 ARGV.push("--no-skip-active-job")
 ARGV.push("--skip-asset-pipeline")
 ARGV.push("--skip-active-record")
+ARGV.push("--skip-docker")
 
 Hephaestus::AppGenerator.start

data/lib/hephaestus/app_builder.rb

@@ -73,7 +73,7 @@ module Hephaestus
     def setup_slack_logger
       config = <<~EOD
         config.after_initialize do
-          Rails.logger.extend(ActiveSupport::Logger.broadcast(SlackWebhookLogger.logger))
+          Rails.logger.broadcast_to(SlackWebhookLogger.logger)
         end
       EOD
       configure_environment("production", config)
@@ -158,17 +158,17 @@ module Hephaestus
     def replace_generic_variables
       say(set_color("Replacing generic variable names...", :cyan))
       replace_in_files(destination_root, /App(?!lication)/, short_app_name.capitalize)
-      replace_in_files(destination_root, %r{(?<!yetto|plugs\.yetto\.)app(?!lication|/|roximate)}, short_app_name.downcase)
+      replace_in_files(destination_root, %r{(?<!yetto|sw|plugs\.yetto\.)app(?!lication|/|roximate)}, short_app_name.downcase)
       replace_in_files(destination_root, "PlugApp", app_name.underscore.camelcase)
       replace_in_files(destination_root, "plug-app", app_name.dasherize)
       replace_in_files("destination_root}/.github/workflows/test.yml", "plug-app", app_name.dasherize)
       replace_in_files(destination_root, "PLUG_APP", app_name.underscore.upcase)
-      # these usually take the form of "plug_app", as a hack to prevent them from changing by the other
-      # rename methods...I think. I actually can't say for sure I remember what it's for.
-      replace_in_files(destination_root, "plug_", "")
+      replace_in_files(destination_root, "plug_app", app_name.underscore)
 
-      # this is erroneously changed
+      # these are erroneously changed
       replace_in_file("script/server", "/usr/src/#{short_app_name.downcase}", "/usr/src/app")
+      replace_in_file("vendor/fly/fly-production.toml", "#{short_app_name.downcase} = ", "app = ")
+      replace_in_file("vendor/fly/fly-staging.toml", "#{short_app_name.downcase} = ", "app =")
     end
 
     private

data/lib/hephaestus/exit_on_failure.rb

@@ -10,7 +10,7 @@ module Hephaestus
 
     def bundle_command(*)
       super
-      exit(false) if $CHILD_STATUS.exitstatus.nonzero?
+      exit(false) if $CHILD_STATUS.exitstatus.nonzero? # rubocop:disable Rails/Exit
     end
 
     module ClassMethods

data/lib/hephaestus/generators/app_generator.rb

@@ -52,6 +52,8 @@ module Hephaestus
       build(:replace_gemfile)
       capture_stdout do
         bundle_command("install")
+        bundle_command("update")
+        bundle_command("binstub foreman")
         bundle_command("lock --add-platform x86_64-linux")
       end
     end
@@ -202,11 +204,12 @@ module Hephaestus
 
         * Set `settings/branches` to protect `production`
           * ✅ Require status checks to pass before merging
-          * 🖊️ Status checks that are required: `test`, `ruby / brakeman`, `ruby / bundle-audit`.
+          * 🖊️ Status checks that are required: `ruby / test_without_services`, `docker / test-build`, `ruby / brakeman`, `ruby / bundle-audit`.
+
             You can only set those 👆 after you've opened the first PR on GitHub. Crazy, I know!!
             But, doing so is *essential* for automerge to function properly.
 
-        * Speaking of which, in `/settings`
+        * In `/settings`:
           * ✅ Allow auto-merge
           * ✅ Automatically delete head branches
       OUTPUT
@@ -229,22 +232,22 @@ module Hephaestus
     end
 
     private def capture_stdout
-      stream = "stdout"
-      captured_stream = Tempfile.new(stream)
-      stream_io = eval("$#{stream}", binding, __FILE__, __LINE__)
-      origin_stream = stream_io.dup
-      stream_io.reopen(captured_stream)
+      # stream = "stdout"
+      # captured_stream = Tempfile.new(stream)
+      # stream_io = eval("$#{stream}", binding, __FILE__, __LINE__)
+      # origin_stream = stream_io.dup
+      # stream_io.reopen(captured_stream)
 
       yield
 
-      stream_io.rewind
-      captured_stream.read
-    ensure
-      unless captured_stream.nil?
-        captured_stream.close
-        captured_stream.unlink
-      end
-      stream_io.reopen(origin_stream) unless stream_io.nil?
+      # stream_io.rewind
+      # captured_stream.read
+
+      # unless captured_stream.nil?
+      #   captured_stream.close
+      #   captured_stream.unlink
+      # end
+      # stream_io.reopen(origin_stream) unless stream_io.nil?
     end
   end
 end

data/lib/hephaestus/generators/core_generator.rb

@@ -19,7 +19,7 @@ module Hephaestus
     end
 
     def jobs
-      copy_file("app/jobs/application_job.rb", "app/jobs/application_job.rb")
+      copy_file("app/jobs/application_job.rb", "app/jobs/application_job.rb", force: true)
       copy_file("app/jobs/update_yetto_job.rb", "app/jobs/update_yetto_job.rb")
     end
 

data/lib/hephaestus/generators/deployment_generator.rb

@@ -20,5 +20,11 @@ module Hephaestus
       copy_file("Dockerfile", "Dockerfile")
       copy_file("bin/docker-entrypoint", "bin/docker-entrypoint")
     end
+
+    def fly
+      directory("vendor/fly", "vendor/fly")
+      copy_file("Dockerfile", "Dockerfile")
+      copy_file("bin/docker-entrypoint", "bin/docker-entrypoint")
+    end
   end
 end

data/lib/hephaestus/version.rb

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

data/lib/hephaestus.rb

@@ -11,10 +11,15 @@ require "debug" if debugging?
 
 require "hephaestus/version"
 require "hephaestus/exit_on_failure"
+
 require "hephaestus/generators/app_generator"
-Dir.glob(File.join(__dir__, "hephaestus", "generators", "*.rb")).each do |file|
-  require file
-end
+require "hephaestus/generators/config_generator"
+require "hephaestus/generators/core_generator"
+require "hephaestus/generators/deployment_generator"
+require "hephaestus/generators/lib_generator"
+require "hephaestus/generators/license_generator"
+require "hephaestus/generators/rubocop_generator"
+require "hephaestus/generators/sorbet_generator"
 
 require "hephaestus/actions"
 require "hephaestus/actions/strip_comments_action"

data/templates/.licensed.yml

@@ -11,10 +11,16 @@ allowed:
 
 ignored:
   bundler:
+    - base64 # BSD-2-Clause ("This file is released under the same license as ruby.")
+    - bigdecimal # BSD-2-Clause ("This file is released under the same license as ruby.")
     - bundler-audit # GPL-3.0; but also, only used in CI/test
     - date # BSD-2-Clause
+    - drb # BSD-2-Clause ("This file is released under the same license as ruby.")
+    - io-console # BSD-2-Clause
+    - mutex_m # BSD-2-Clause ("This file is released under the same license as ruby.")
     - net-protocol # BSD-2-Clause
     - racc # BSD-2-Clause
+    - reline # BSD-2-Clause ("This file is released under the same license as ruby.")
     - ruby2_keywords # BSD-2-Clause; ignored because of custom LICENSE text
     - sidekiq # LGPL-3.0; ignored because of custom LICENSE text
 

data/templates/Dockerfile

@@ -4,8 +4,8 @@
 ARG RUBY_VERSION=3.2.1
 FROM ruby:$RUBY_VERSION-slim as base
 
-# Rails app lives here
-WORKDIR /plug-github
+# The plug-app code lives here
+WORKDIR /plug-app
 
 # Set production environment
 ARG RAILS_ENV="production"

data/templates/Gemfile.erb

@@ -116,3 +116,5 @@ group :ci do
   gem "brakeman", "~> 5.3"
   gem "bundle-audit", "~> 0.1"
 end
+
+gem "hephaestus", group: [:development, :test]

data/templates/app/controllers/concerns/authable.rb

@@ -17,7 +17,7 @@ module Authable
     state = params.fetch(:state, "")
     _, _, gh_nonce, _, _, _, _ = parse_state(state)
 
-    return if ActiveSupport::SecurityUtils.secure_compare((gh_nonce || ""), PLUG_APP_NONCE)
+    return false if ActiveSupport::SecurityUtils.secure_compare((gh_nonce || ""), PLUG_APP_NONCE)
 
     self.status = PlugApp::HTTP::BAD_REQUEST_I
     self.response_body = ::ErrorSerializer.format(PlugApp::HTTP::BAD_REQUEST)

data/templates/app/controllers/settings_controller.rb

@@ -6,6 +6,14 @@ class SettingsController < ApplicationController
 
   include PathParameter::SettingsParameters
 
+  before_action :ensure_json_request
+  sig { void }
+  def ensure_json_request
+    return if request.format.json?
+
+    not_acceptable
+  end
+
   sig { void }
   def new
     @step = T.let(params.fetch(:step, 1).to_i || 1, T.nilable(Integer))

data/templates/app/services/yetto_service.rb

@@ -8,7 +8,7 @@ class YettoService
 
   # explicitly different than what's in environment.rb, because local
   # Yetto expects HTTP; environment.rb can use HTTPS because it passes through ngrok.io
-  PROTOCOL = Rails.env.development? ? "http://" : "https://"
+  PROTOCOL = Rails.env.development? ? "http" : "https"
   YETTO_API_VERSION_TLD = "#{PROTOCOL}://#{YETTO_API_TLD}/#{YETTO_API_VERSION}"
   JWT_ALGORITHM = "RS256"
 

data/templates/lib/tasks/test_tasks.rake

@@ -3,7 +3,7 @@
 
 require "rake/testtask"
 
-if Rails.env.development? || Rails.env.test?
+if Rails.env.local?
   begin
     require "rubocop/rake_task"
 

data/templates/test/test_helper.rb

@@ -25,7 +25,7 @@ require "httpx/adapters/webmock"
 WebMock.enable!
 WebMock.disable_net_connect!(allow_localhost: true)
 
-require_relative "./support/rails"
+require_relative "support/rails"
 
 require "minitest/pride"
 

data/templates/vendor/fly/fly-production.toml

@@ -1,4 +1,3 @@
-# fly.toml app configuration file generated for plug-app on 2023-05-05T07:11:14-04:00
 #
 # See https://fly.io/docs/reference/configuration/ for information about how to use this file.
 #

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hephaestus
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Garen Torikian
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-09-29 00:00:00.000000000 Z
+date: 2023-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -251,7 +251,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 3.4.7
 requirements: []
-rubygems_version: 3.4.20
+rubygems_version: 3.4.21
 signing_key: 
 specification_version: 4
 summary: Generate a Rails app that can be used to create plugs for Yetto.