discharger 0.2.7 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 54e7191b459cff13f22f5b7e079a599fb3dedbf91aa8f1c939e64363df6e4c55
-  data.tar.gz: fd53ba816f8684f7a6852c23c35a062d0bd8f8a5c7b9ef36ad56c8cb7b1ba77a
+  metadata.gz: 8d98bb157c8cb3b219d105f4c6f1b18715cba0706a6cedf93f1991852fc11a04
+  data.tar.gz: 1115667f6e8c9e94662b7ba7d76769e522b3fa26961b6217b78420fe9b095baa
 SHA512:
-  metadata.gz: be138616dc7af6ac3810418dbe0595b68ab5cbf5ff47e1c39c994efc87d555bf724f9ae90ee6fd430dfe30a5ada709d015771b7e939ef4dda24552bb50bc7365
-  data.tar.gz: ab0f5de7b28d24f73c736cc6f4cf3adcbe5fa932835d53594b71102e859b20f0fa2e07f7b56b3b5571c3ded87f52812356509966d86371c2bd0eb70bfdb9767e
+  metadata.gz: 85870fbc537b4d4c3c86326c3c6cfc0f06adeeba24a831ff65f7ab858004e068baa6f1b69ec46945dbbdbfd42094f2614614402f931369815f72c13c970d38d6
+  data.tar.gz: 4ac3f985792dc65968030f09319e08e41a840df0c96113791bdee1afa8c8aa989ec347b1ebb7412cdbb42b1331c411403f620948dc3ae14a3e78bf5adce667cd

data/lib/discharger/procedure.rb

@@ -0,0 +1,117 @@
+module Discharger
+  class Procedure
+    include Railway::Steps
+
+    def initialize(name, system_command: nil, **data)
+      @name = name
+      @data = data
+      @system_command = system_command || method(:syscall)
+      @steps = nil
+    end
+
+    def call
+      result = run_steps(
+        *step_procs,
+        branches: {
+          permission_denied: :handle_permissions,
+          network_error: :retry_network_operation,
+          any_failure: ->(_) {
+            puts "An error occurred but we'll try to recover"
+            Success()
+          }
+        }
+      )
+
+      if result.failure?
+        puts "Failed: #{result.error}".bg(:red).black
+        return false
+      end
+      true
+    end
+
+    def step_procs
+      steps.map do |step|
+        ->(_) { @system_command.call(step) }
+      end
+    end
+
+    # Run a multiple system commands and return a Result
+    # If any command fails, returns a Failure result
+    def syscall(*cmd, output: $stdout, error: $stderr)
+      puts cmd.join(" ").bg(:green).black
+      stdout, stderr, status = Open3.capture3(*cmd)
+
+      if status.success?
+        output.puts stdout
+        Success(stdout)
+      else
+        error.puts stderr
+
+        # Different failure types based on the error
+        if stderr.include?("Permission denied")
+          Failure(stderr, :permission_denied)
+        elsif stderr.include?("Network")
+          Failure(stderr, :network_error)
+        else
+          Failure(stderr)
+        end
+      end
+    rescue => e
+      Failure("Exception: #{e.message}")
+    end
+
+    # Version that supports evaluating the result with a block
+    def syscall_with_block(*cmd, output: $stdout, error: $stderr, &block)
+      result = syscall(*cmd, output: output, error: error)
+
+      if result.success? && block_given?
+        stdout, stderr, status = result.value, "", $?
+        block_result = !!yield(stdout, stderr, status)
+
+        # Handle the bypassed rule case
+        if !block_result && stderr.match?(/bypassed rule violations/i)
+          block_result = true
+        end
+
+        return block_result ? Success(stdout) : Failure(stderr)
+      end
+
+      result
+    end
+
+    # Handle permission errors
+    def handle_permissions(result)
+      puts "Permission error: #{result.error}"
+      # Try to fix permissions
+      if fix_permissions
+        Success("Permissions fixed")
+      else
+        result # Return the original failure if we couldn't fix it
+      end
+    end
+
+    # Retry network operations
+    def retry_network_operation(result)
+      3.times do |i|
+        puts "Network error, retrying (#{i + 1}/3)..."
+        sleep 2
+        result = retry_last_command
+        return result if result.success?
+      end
+      Failure("Network operation failed after 3 retries")
+    end
+  end
+
+  class Build < Procedure
+    def steps
+      @steps ||= [
+        ["fetch origin #{working_branch}"],
+        ["checkout #{working_branch}"],
+        ["reset --hard origin/#{working_branch}"],
+        ["branch -D #{staging_branch} 2>/dev/null || true"],
+        ["checkout -b #{staging_branch}"],
+        ["push origin #{staging_branch} --force"]
+      ]
+    end
+  end
+end

data/lib/discharger/railway.rb

@@ -0,0 +1,111 @@
+module Discharger
+  module Railway
+    # Represents the result of an operation - either Success or Failure
+    class Result
+      attr_reader :value, :error, :status
+
+      def initialize(status, value = nil, error = nil)
+        @status = status
+        @value = value
+        @error = error
+      end
+
+      def success?
+        @status == :success
+      end
+
+      def failure?
+        !success?
+      end
+
+      # Get the failure type/status
+      def failure_type
+        failure? ? @status : nil
+      end
+
+      # Factory method for creating success results
+      def self.success(value = nil)
+        new(:success, value)
+      end
+
+      # Factory method for creating failure results
+      def self.failure(error = nil, type = :error)
+        new(type, nil, error)
+      end
+
+      # Allows chaining operations if this result is a success
+      def then
+        return self if failure?
+        yield(value)
+      end
+    end
+
+    # Module to include in classes that want to use railway flows
+    module Steps
+      def Success(value = nil)
+        Result.success(value)
+      end
+
+      def Failure(error = nil, type = :error)
+        Result.failure(error, type)
+      end
+
+      # Execute a series of steps with branching logic
+      def run_steps(*steps, branches: {})
+        result = Success()
+        step_index = 0
+
+        while step_index < steps.length
+          step = steps[step_index]
+
+          # Execute the current step
+          result = execute_step(step, result.value)
+
+          if result.failure?
+            # Check if there's a branch for this failure type
+            branch = branches[result.status] || branches[:any_failure]
+
+            if branch
+              if branch.is_a?(Integer)
+                # Jump to the specified step index
+                step_index = branch
+                next
+              elsif branch.is_a?(Proc)
+                # Execute the branch handler
+                branch_result = branch.call(result)
+                return branch_result if branch_result.is_a?(Result)
+                # If the branch handler doesn't return a Result, continue with the next step
+              elsif branch.is_a?(Symbol)
+                # Execute the named method
+                branch_result = send(branch, result)
+                return branch_result if branch_result.is_a?(Result)
+              elsif branch == :continue
+                # Continue to the next step despite the failure
+              else
+                return result # Default: stop processing on failure
+              end
+            else
+              return result # No branch defined, stop processing
+            end
+          end
+
+          step_index += 1
+        end
+
+        result
+      end
+
+      private
+
+      def execute_step(step, input)
+        if step.is_a?(Proc)
+          step.call(input)
+        elsif step.is_a?(Symbol)
+          send(step, input)
+        else
+          raise ArgumentError, "Step must be a Proc or Symbol, got #{step.class}"
+        end
+      end
+    end
+  end
+end

data/lib/discharger/task.rb

@@ -147,7 +147,7 @@ module Discharger
           ["git push origin #{production_branch}:#{production_branch} v#{current_version}:v#{current_version}"],
           ["git push origin v#{current_version}"]
         ) do
-          tasker["#{name}:slack"].invoke("Released #{app_name} #{current_version} to production.", release_message_channel, ":chipmunk:")
+          tasker["#{name}:slack"].invoke("Released #{app_name} #{current_version} (#{commit_identifier.call}) to production.", release_message_channel, ":chipmunk:")
           if last_message_ts.present?
             text = File.read(Rails.root.join(changelog_file))
             tasker["#{name}:slack"].reenable
@@ -206,11 +206,13 @@ module Discharger
           syscall(
             ["git fetch origin #{working_branch}"],
             ["git checkout #{working_branch}"],
+            ["git reset --hard origin/#{working_branch}"],
             ["git branch -D #{staging_branch} 2>/dev/null || true"],
             ["git checkout -b #{staging_branch}"],
             ["git push origin #{staging_branch} --force"]
           ) do
-            tasker["#{name}:slack"].invoke("Building #{app_name} #{commit_identifier.call} on #{staging_branch}.", release_message_channel)
+            current_version = Object.const_get(version_constant)
+            tasker["#{name}:slack"].invoke("Building #{app_name} #{current_version} (#{commit_identifier.call}) on #{staging_branch}.", release_message_channel)
             syscall ["git checkout #{working_branch}"]
           end
         end

data/lib/discharger/version.rb

@@ -1,3 +1,3 @@
 module Discharger
-  VERSION = "0.2.7"
+  VERSION = "0.2.9"
 end

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: discharger
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.9
 platform: ruby
 authors:
 - Jim Gay
 - Savannah Moore
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-02-05 00:00:00.000000000 Z
+date: 2025-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: open3
@@ -92,7 +91,9 @@ files:
 - README.md
 - Rakefile
 - lib/discharger.rb
+- lib/discharger/procedure.rb
 - lib/discharger/railtie.rb
+- lib/discharger/railway.rb
 - lib/discharger/task.rb
 - lib/discharger/version.rb
 - lib/generators/discharger/install/install_generator.rb
@@ -103,7 +104,6 @@ metadata:
   homepage_uri: https://github.com/SOFware/discharger
   source_code_uri: https://github.com/SOFware/discharger.git
   changelog_uri: https://github.com/SOFware/discharger/blob/main/CHANGELOG.md
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -118,8 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.22
-signing_key:
+rubygems_version: 3.6.3
 specification_version: 4
 summary: Tasks for discharging an application for deployment.
 test_files: []