shiplane 0.2.28 → 0.2.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2391faa18bc8bc93fe158d581bb4172c4fbcecb984ded9c55814c3a837574183
-  data.tar.gz: c28b94b6a745e3c5dae297d10e2e2501a7f049609d884540652ca8089d32008c
+  metadata.gz: b2ea5d4baf2676256974282972611a395344d73afccc81cff676560cd89f1410
+  data.tar.gz: 890da5156c4d5868acfc6e718aaff0258af6c7f1c24b042ea7f5590cb20d065e
 SHA512:
-  metadata.gz: 0300ba7631721c8a84113fdcb5b46411cd11d76d05cc1d6a3209e7a506eb02824ed60bf5245f3331de8bd05219252297b96a61516e423cda31e50f71e2a9c1e7
-  data.tar.gz: 58ee8bda581cefd9d4f84b4e19951c6d86e38c919cb0029e8a4885439de29e524219fed3874c8e12cd42ad4dc96f44b72fac5ae5b3e596fb4cfade66b1f007cd
+  metadata.gz: 0d02813438dbfbfd83b6681657a4bc54feeaadd423066041a05c2e045e707d0987505ba5249da9cba95408fee8f765482832fa397f5d01e3116f1f30e2b61e9d
+  data.tar.gz: 3b5fb0d6a04ccd3a56662bbc943362db2c9a0110229210365429d5f20229c2662f9c704ab43d5d1767eb27e8f9024b7c4d9e1b556639f101e60f17cb544d519e

data/lib/shiplane/build.rb

@@ -5,6 +5,7 @@ require_relative 'checkout_artifact'
 require_relative 'convert_compose_file'
 require_relative 'convert_dockerfile'
 require_relative 'configuration'
+require_relative 'safe_yaml_loading'
 
 module Shiplane
   class Build
@@ -139,7 +140,7 @@ module Shiplane
     end
 
     def docker_config
-      @docker_config ||= YAML.load(File.new(docker_compose_filepath))
+      @docker_config ||= Shiplane::SafeYamlLoading.load_file(docker_compose_filepath)
     end
 
     def buildable_artifacts

data/lib/shiplane/compose_hash.rb

@@ -1,4 +1,5 @@
 require_relative 'extensions'
+require_relative 'safe_yaml_loading'
 
 module Shiplane
   class ComposeHash
@@ -14,7 +15,7 @@ module Shiplane
     end
 
     def compose_hash
-      @compose_hash ||= YAML.load(compose_file)
+      @compose_hash ||= Shiplane::SafeYamlLoading.load(compose_file)
     end
 
     def whitelisted_hash

data/lib/shiplane/configuration.rb

@@ -1,3 +1,5 @@
+require_relative 'safe_yaml_loading'
+
 module Shiplane
   class Configuration
     attr_accessor :project_folder, :stage
@@ -12,7 +14,7 @@ module Shiplane
     end
 
     def config
-      @config ||= YAML.load_file(shiplane_config_file)
+      @config ||= Shiplane::SafeYamlLoading.load_file(shiplane_config_file)
     end
 
     def build_config

data/lib/shiplane/deploy/container_configuration.rb

@@ -91,6 +91,7 @@ module Shiplane
           "--network=#{networks.first}",
           "--network-alias=#{network_alias}",
           virtual_host ? "-e VIRTUAL_HOST=#{virtual_host}" : nil,
+          "-e VIRTUAL_PORT=#{port}",
           letsencrypt_host ? "-e LETSENCRYPT_HOST=#{letsencrypt_host}" : nil,
           letsencrypt_email ? "-e LETSENCRYPT_EMAIL=#{letsencrypt_email}" : nil,
           environment.map{ |key, value| "-e #{key}=#{value}" },

data/lib/shiplane/host.rb

@@ -1,6 +1,8 @@
 require 'sshkit'
 require 'sshkit/dsl'
 
+require_relative 'safe_yaml_loading'
+
 module Shiplane
   class Host
     extend Forwardable
@@ -82,7 +84,7 @@ module Shiplane
     end
 
     def self.config
-      @config ||= YAML.load(File.read(config_filepath))
+      @config ||= Shiplane::SafeYamlLoading.load_file(config_filepath)
     end
 
     def self.config_filepath

data/lib/shiplane/safe_yaml_loading.rb

@@ -0,0 +1,23 @@
+require 'yaml'
+
+module Shiplane
+  class SafeYamlLoading
+    def self.load_file(filepath)
+      load(File.read(filepath))
+    end
+
+    def self.load_with_aliases(yaml)
+      YAML.load(yaml, aliases: true)
+    end
+
+    def self.load_without_aliases(yaml)
+      YAML.load(yaml)
+    end
+
+    if Psych && Gem::Version.new(Psych::VERSION) > Gem::Version.new("4.0.0")
+      define_singleton_method :load, method(:load_with_aliases)
+    else
+      define_singleton_method :load, method(:load_without_aliases)
+    end
+  end
+end

data/lib/shiplane/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Shiplane
-  VERSION = "0.2.28"
+  VERSION = "0.2.29"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shiplane
 version: !ruby/object:Gem::Version
-  version: 0.2.28
+  version: 0.2.29
 platform: ruby
 authors:
 - John Epperson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-20 00:00:00.000000000 Z
+date: 2024-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shiplane_bootstrappers_chef
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.28
+        version: 0.2.29
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.28
+        version: 0.2.29
 - !ruby/object:Gem::Dependency
   name: shiplane_deployers_capistrano_docker
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.28
+        version: 0.2.29
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.28
+        version: 0.2.29
 - !ruby/object:Gem::Dependency
   name: dotenv
   requirement: !ruby/object:Gem::Requirement
@@ -150,6 +150,7 @@ files:
 - lib/shiplane/host.rb
 - lib/shiplane/railtie.rb
 - lib/shiplane/safe_build.rb
+- lib/shiplane/safe_yaml_loading.rb
 - lib/shiplane/tasks/install.rake
 - lib/shiplane/version.rb
 homepage: https://github.com/kirillian/shiplane