lamby 4.3.3 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dce401866a14fbce98621f6c677ab0f17df796c1c9c0792d4a1030adc69eadbd
-  data.tar.gz: 593c2f449b053f4bdc6ae2dbe74602f0debd93d57a57a1811d7f791bc1b40fc9
+  metadata.gz: bed40f788bb3ef9eecb63040924c583bee423ac369179f76aa5fe43fe797e3ec
+  data.tar.gz: 7fd33a98bb6cd19b202a16ef58f5a03f7f7e1e21f75e6342330b318ebb260bed
 SHA512:
-  metadata.gz: 4f119c574a97288c37eb7c5c97643650d2d730fe16ab7b7e6b06a777088e069b6050c4ab023856e32c10c7da0029d74067eb8db37492b0dc0c1a0ed3948f7ee9
-  data.tar.gz: 1bf90e93726e78a75f408801976f65c7dafe369cc14d567fb4ddb337832a0b3dfb10fb1d8e2f91b9b7cf20d42c176f914f0b33c3641accbbc8fd757ec3d56ba6
+  metadata.gz: 8dca95a577c3afbcb3fbcb9715e54987b04cd830abeda28ac9c4df82f088a50ea866ce8a6f19212e003d80cb3d88c37370393e79c69f9f023c34ae81f967f8d5
+  data.tar.gz: d795ac32b599d239ad6ccfde9da12e88b79bfcff854766c77c0630ca69acbaac9f2cbd5e5c56ee9eb48c46b70bd4d683b67fc7dbf1c2cef61c6dbf0f42a81728

data/CHANGELOG.md

@@ -2,6 +2,15 @@
 
 See this http://keepachangelog.com link for information on how we want this documented formatted.
 
+## v5.0.0
+
+### Changed
+
+- ⚠️ Breaking Changes ⚠️
+- Remove Lamby::Runner & Lamby::Command in favor of LambdaConsole Ruby gem.
+- New runner pattern exceptions from above. Now: LambdaConsole::Run::UnknownCommandPattern
+- Switch your own runner events to new https://github.com/rails-lambda/lambda-console spec.
+
 ## v4.3.1, v4.3.2
 
 ### Changed

data/Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: .
   specs:
-    lamby (4.3.3)
+    lamby (5.0.0)
+      lambda-console-ruby
       rack
 
 GEM
@@ -98,6 +99,7 @@ GEM
     i18n (1.12.0)
       concurrent-ruby (~> 1.0)
     jmespath (1.6.2)
+    lambda-console-ruby (1.0.0)
     lambdakiq (2.2.0)
       activejob
       aws-sdk-sqs

data/lamby.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
   spec.add_dependency 'rack'
+  spec.add_dependency 'lambda-console-ruby'
   spec.add_development_dependency 'aws-sdk-ssm'
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'

data/lib/lamby/config.rb

@@ -53,7 +53,7 @@ module Lamby
     end
 
     def runner_patterns
-      Runner::PATTERNS
+      LambdaConsole::Run::PATTERNS
     end
 
     def handled_proc

data/lib/lamby/handler.rb

@@ -92,10 +92,8 @@ module Lamby
         Lambdakiq.cmd event: @event, context: @context
       elsif lambda_cable?
         LambdaCable.cmd event: @event, context: @context
-      elsif command?
-        Lamby::Command.cmd event: @event, context: @context
-      elsif runner?
-        Lamby::Runner.cmd event: @event, context: @context
+      elsif LambdaConsole.handle?(@event)
+        LambdaConsole.handle(@event)
       elsif event_bridge?
         Lamby.config.event_bridge_handler.call @event, @context
       else
@@ -121,14 +119,6 @@ module Lamby
       defined?(::Lambdakiq) && ::Lambdakiq.jobs?(@event)
     end
 
-    def runner?
-      Lamby::Runner.handle?(@event)
-    end
-
-    def command?
-      Lamby::Command.handle?(@event)
-    end
-
     def lambda_cable?
       defined?(::LambdaCable) && ::LambdaCable.handle?(@event, @context)
     end

data/lib/lamby/version.rb

@@ -1,3 +1,3 @@
 module Lamby
-  VERSION = '4.3.3'
+  VERSION = '5.0.0'
 end

data/lib/lamby.rb

@@ -1,6 +1,7 @@
 require 'lamby/logger'
 require 'rack'
 require 'base64'
+require 'lambda-console-ruby'
 require 'lamby/version'
 require 'lamby/config'
 require 'lamby/rack'
@@ -8,8 +9,6 @@ require 'lamby/rack_alb'
 require 'lamby/rack_rest'
 require 'lamby/rack_http'
 require 'lamby/debug'
-require 'lamby/runner'
-require 'lamby/command'
 require 'lamby/handler'
 
 if defined?(Rails)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lamby
 version: !ruby/object:Gem::Version
-  version: 4.3.3
+  version: 5.0.0
 platform: ruby
 authors:
 - Ken Collins
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-06-15 00:00:00.000000000 Z
+date: 2023-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: lambda-console-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: aws-sdk-ssm
   requirement: !ruby/object:Gem::Requirement
@@ -163,7 +177,6 @@ files:
 - images/social2.png
 - lamby.gemspec
 - lib/lamby.rb
-- lib/lamby/command.rb
 - lib/lamby/config.rb
 - lib/lamby/debug.rb
 - lib/lamby/handler.rb
@@ -175,7 +188,6 @@ files:
 - lib/lamby/rack_http.rb
 - lib/lamby/rack_rest.rb
 - lib/lamby/railtie.rb
-- lib/lamby/runner.rb
 - lib/lamby/ssm_parameter_store.rb
 - lib/lamby/tasks.rake
 - lib/lamby/version.rb

data/lib/lamby/command.rb

@@ -1,43 +0,0 @@
-module Lamby
-  class Command
-
-    class << self
-
-      def handle?(event)
-        event.dig('x-lambda-console', 'command') ||
-          event.dig('lamby', 'command')
-      end
-
-      def cmd(event:, context:)
-        new(event).call
-      end
-
-    end
-
-    def initialize(event)
-      @event = event
-      @body = ''
-    end
-
-    def call
-      begin
-        body = eval(command, TOPLEVEL_BINDING).inspect
-        { statusCode: 200, headers: {}, body: body }
-      rescue Exception => e
-        body = "#<#{e.class}:#{e.message}>".tap do |b|
-          if e.backtrace
-            b << "\n"
-            b << e.backtrace.join("\n")
-          end
-        end
-        { statusCode: 422, headers: {}, body: body }
-      end
-    end
-
-    def command
-      @event.dig('x-lambda-console', 'command') ||
-        @event.dig('lamby', 'command')
-    end
-
-  end
-end

data/lib/lamby/runner.rb

@@ -1,64 +0,0 @@
-require 'open3'
-
-module Lamby
-  class Runner
-    class Error < StandardError ; end
-    class UnknownCommandPattern < Error ; end
-
-    PATTERNS = [%r{.*}]
-
-    class << self
-
-      def handle?(event)
-        event.dig('x-lambda-console', 'runner') ||
-          event.dig('lamby', 'runner')
-      end
-
-      def cmd(event:, context:)
-        new(event).call
-      end
-
-    end
-
-    def initialize(event)
-      @event = event
-      @body = ''
-    end
-
-    def call
-      validate!
-      status = Open3.popen3(env, command, chdir: chdir) do |_stdin, stdout, stderr, thread|
-        @body << stdout.read
-        @body << stderr.read
-        puts @body
-        thread.value.exitstatus
-      end
-      { statusCode: status, headers: {}, body: @body }
-    end
-
-    def command
-      @event.dig('x-lambda-console', 'runner') ||
-        @event.dig('lamby', 'runner')
-    end
-
-    private
-
-    def chdir
-      defined?(::Rails) ? ::Rails.root : Dir.pwd
-    end
-
-    def validate!
-      return if pattern?
-      raise UnknownCommandPattern.new(command)
-    end
-
-    def pattern?
-      PATTERNS.any? { |p| p === command }
-    end
-
-    def env
-      Hash[ENV.to_hash.map { |k,v| [k, ENV[k]] }]
-    end
-
-  end
-end