shalala 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ca88e78836e4744c0c07f92c5dce712b346f3667d892ecd3dbf9764d4cff1ec
-  data.tar.gz: 97957e540122129c3e200f840b5eb269b4577d58daec08a540d584a1568191bc
+  metadata.gz: 2d7d98725bed220f0686428ba4216fab567d6845635c6c872780ac43cc0afc54
+  data.tar.gz: 7805862925c34b2111ab63539e7926d93d8af393624aba8e8423a2b16128af93
 SHA512:
-  metadata.gz: af34805ae8b66e2183dcc8f582950fda18ba1fc96e318d4f0e2d2094ff19f0522ad40846ec742e07a72cfbf1a0c4d7d8d804507a0a2b1d42e3fb8b48dfe4c28b
-  data.tar.gz: e67655ec1ac7627196ff8fbea71881db4ce8e2cd5a1646e6cb9eb9c99bd77992d0423468e2fa3cf2e691cc390dd83fd6dbd9f88b50ab059c5fdde66fb77e1b41
+  metadata.gz: af1aa4e824ff3183bef04da95570a17aacf798f5639756e4acfd3c3e7e8d6b1fb3793e800c6ae359ddf62ca468c76d62c45b5d1df7c3db8972096aa452efbf93
+  data.tar.gz: 197f054ebdfee7c2e281fd7871e596b110c76ec954c64f74899f1a54734c72a5a033886b660d0f0f6abec0b52941e365bbfb3014b9c20f4607a94a211da0c9d5

data/README.md

@@ -30,7 +30,11 @@ bundle install
 
 ## Mounting
 
-The engine mounts itself at `/commit` via an initializer, so no manual route declaration is required.
+Mount the app in your Routes file:
+
+```
+mount Shalala::App => "/commit"
+```
 
 ## Usage examples
 

data/lib/shalala/app.rb

@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+module Shalala
+  class App
+    def self.call(env)
+      new.call(env)
+    end
+
+    def call(env)
+      commit = resolved_commit
+      branch = resolved_branch
+
+      if commit
+        body = "commit: #{commit}\nbranch: #{branch}"
+        [200, { "content-type" => "text/plain" }, [body]]
+      else
+        [404, { "content-type" => "text/plain" }, ["Not Found"]]
+      end
+    end
+
+    private
+
+    def resolved_commit
+      env_commit = ENV["GIT_COMMIT"]
+      return env_commit if env_commit && !env_commit.empty?
+      return current_git_commit if development_environment?
+
+      nil
+    end
+
+    def resolved_branch
+      env_branch = ENV["GIT_BRANCH"]
+      return env_branch if env_branch && !env_branch.empty?
+
+      current_git_branch
+    end
+
+    def development_environment?
+      (ENV["RACK_ENV"] || "development") == "development"
+    end
+
+    def current_git_commit
+      sha = `git rev-parse HEAD`.strip
+      $?.success? ? sha : nil
+    rescue StandardError
+      nil
+    end
+
+    def current_git_branch
+      branch = `git branch --show-current`.strip
+      return branch if $?.success? && !branch.empty?
+
+      fallback = `git rev-parse --abbrev-ref HEAD`.strip
+      $?.success? ? fallback : nil
+    rescue StandardError
+      nil
+    end
+  end
+end

data/lib/shalala/engine.rb

@@ -3,15 +3,5 @@
 module Shalala
   class Engine < ::Rails::Engine
     isolate_namespace Shalala
-
-    initializer "shalala.mount_route" do |app|
-      app.config.to_prepare do
-        next if app.routes.named_routes.key?(:shalala)
-
-        app.routes.append do
-          mount Shalala::Engine, at: "/commit", as: :shalala
-        end
-      end
-    end
   end
 end

data/lib/shalala/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Shalala
-  VERSION = "1.0.0"
+  VERSION = "2.0.0"
 end

data/lib/shalala.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
-require "rails"
-require "shalala/engine"
+require "shalala/app"
 
 module Shalala
 end

data/shalala.gemspec

@@ -9,22 +9,21 @@ Gem::Specification.new do |spec|
   spec.authors = ["Ryan Bigg"]
   spec.email = ["ryan@example.com"]
 
-  spec.summary = "Rails engine exposing current git commit"
-  spec.description = "Mounts /commit and returns a git commit SHA based on environment rules."
+  spec.summary = "Rack app exposing current git commit"
+  spec.description = "Mount at any path to return the current git commit SHA based on environment rules."
   spec.homepage = "https://github.com/radar/shalala"
   spec.license = "MIT"
   spec.required_ruby_version = ">= 3.1"
 
   spec.files = Dir[
-    "app/**/*",
-    "config/**/*",
     "lib/**/*",
     "*.md",
     "*.gemspec",
     "Rakefile"
   ]
 
-  spec.add_dependency "rails", ">= 7.0"
+  spec.add_dependency "rack"
 
-  spec.add_development_dependency "rspec-rails", ">= 6.0"
+  spec.add_development_dependency "rspec", ">= 3.0"
+  spec.add_development_dependency "rack-test"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shalala
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Ryan Bigg
@@ -10,34 +10,49 @@ cert_chain: []
 date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
-description: Mounts /commit and returns a git commit SHA based on environment rules.
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+description: Mount at any path to return the current git commit SHA based on environment
+  rules.
 email:
 - ryan@example.com
 executables: []
@@ -46,9 +61,8 @@ extra_rdoc_files: []
 files:
 - README.md
 - Rakefile
-- app/controllers/shalala/commits_controller.rb
-- config/routes.rb
 - lib/shalala.rb
+- lib/shalala/app.rb
 - lib/shalala/engine.rb
 - lib/shalala/version.rb
 - shalala.gemspec
@@ -72,5 +86,5 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 rubygems_version: 3.6.9
 specification_version: 4
-summary: Rails engine exposing current git commit
+summary: Rack app exposing current git commit
 test_files: []

data/app/controllers/shalala/commits_controller.rb

@@ -1,58 +0,0 @@
-# frozen_string_literal: true
-
-module Shalala
-  class CommitsController < ActionController::Base
-    def show
-      commit = resolved_commit
-      branch = resolved_branch
-
-      if commit.present?
-        render plain: "commit: #{commit}\nbranch: #{branch}"
-      else
-        head :not_found
-      end
-    end
-
-    private
-
-    def resolved_commit
-      env_commit = ENV["GIT_COMMIT"]
-      return env_commit if env_commit.present?
-      return current_git_commit if development_environment?
-
-      nil
-    end
-
-    def resolved_branch
-      env_branch = ENV["GIT_BRANCH"]
-      return env_branch if env_branch.present?
-
-      current_git_branch
-    end
-
-    def development_environment?
-      Rails.env.development?
-    end
-
-    def current_git_commit
-      Dir.chdir(Rails.root) do
-        sha = `git rev-parse HEAD`.strip
-        $?.success? ? sha : nil
-      end
-    rescue StandardError
-      nil
-    end
-
-    def current_git_branch
-      Dir.chdir(Rails.root) do
-        branch = `git branch --show-current`.strip
-        return branch if $?.success? && branch.present?
-
-        fallback_branch = `git rev-parse --abbrev-ref HEAD`.strip
-        $?.success? ? fallback_branch : nil
-      end
-    rescue StandardError
-      nil
-    end
-  end
-end

data/config/routes.rb

@@ -1,5 +0,0 @@
-# frozen_string_literal: true
-
-Shalala::Engine.routes.draw do
-  root to: "commits#show"
-end