shiplane 0.2.19 → 0.2.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b03b75bfdf471b5bb888eac4d452c033d5deea577b5af4bbb9c1b592619ab85e
-  data.tar.gz: c74a64d196981bd6933d0b5fd0d44eb75b8f2ce8483016fbf73decc0b5841058
+  metadata.gz: 1e673d54a2bcd03b638734aa05a26dcba8927e5cd1666a2db72c15af9a9d2c58
+  data.tar.gz: 0a03a2e3274433448d283f759bfcfc47169f84abaa78461ff326941b51469069
 SHA512:
-  metadata.gz: ef9d5a2b95141604995e131e6b1ff916b37b36659fbde655b5262f26ef473f21c5825bc74db0c271fd7564b2aed43b458531fc74f4fce2752c6e04c6d62cb469
-  data.tar.gz: 18eb80803d06a84f944f7f41509c35ef779636863d9d93c8f78fdbd1b7d88a2b453924fc153ad5c7c34a48979e7d0b450115d40458da191732ab30d9113b5c7c
+  metadata.gz: 0b26b1dd7cf7d5d71b23ed071b8968f81713c45d7109b45e0bdf724e2fadd0b40017cc1641e48cfd721e826c2d100017a84ba9088e804d7146bb6cbc87e627ca
+  data.tar.gz: 35ef36de90463a85c7793e8156dc6bf4414049c1f821b1356b24322b0238c6f528863bbdecc3485d29eacbeaea5b04aa0819fd81433a5295273d09e14806b0b7

data/lib/shiplane/build.rb

@@ -75,6 +75,8 @@ module Shiplane
     def build_command(artifact_name)
       [
         'docker-compose',
+        '-f',
+        docker_compose_filepath,
         '--env-file',
         build_environment_filepath,
         'build',
@@ -131,8 +133,12 @@ module Shiplane
       @shiplane_config ||= Shiplane::Configuration.new(stage: stage)
     end
 
+    def docker_compose_filepath
+      @docker_compose_filepath ||= File.join(project_folder, 'docker-compose.yml')
+    end
+
     def docker_config
-      @docker_config ||= YAML.load(File.new(File.join(project_folder, 'docker-compose.yml')))
+      @docker_config ||= YAML.load(File.new(docker_compose_filepath), aliases: true)
     end
 
     def buildable_artifacts
@@ -201,8 +207,8 @@ module Shiplane
 end
 
 class StepFailureException < RuntimeError
-  def initialize(command, artifact_name)
-    message = "Command [#{command}] failed for artifact: #{artifact_name}" if artifact_name
+  def initialize(command, artifact_name, error_message: nil)
+    message = "Command [#{command}] failed for artifact: #{artifact_name}#{error_message ? "\nError Message Received: #{error_message}" : ''}" if artifact_name
     super(message)
   end
 end

data/lib/shiplane/checkout_artifact.rb

@@ -1,4 +1,5 @@
 require 'fileutils'
+require 'open3'
 
 module Shiplane
   class CheckoutArtifact
@@ -21,6 +22,18 @@ module Shiplane
       @appname ||= project_config['appname']
     end
 
+    def current_sha
+      stdout, *_ = Open3.capture3("git rev-parse HEAD")
+
+      stdout
+    end
+
+    def current_short_sha
+      stdout, *_ = Open3.capture3("git rev-parse --short HEAD")
+
+      stdout
+    end
+
     def bitbucket_origin?
       project_config['version_control_host'] == 'bitbucket'
     end
@@ -34,11 +47,11 @@ module Shiplane
     end
 
     def bitbucket_token
-      @bitbucket_token ||= ENV['BITBUCKET_APP_PASSWORD']
+      @bitbucket_token ||= ENV['BITBUCKET_TOKEN']
     end
 
     def bitbucket_username
-      @bitbucket_username ||= ENV['BITBUCKET_APP_USERNAME']
+      @bitbucket_username ||= ENV['BITBUCKET_USERNAME']
     end
 
     def git_url
@@ -72,15 +85,25 @@ module Shiplane
       puts "Checking out Application #{appname}[#{sha}]..."
       make_directory
 
-      success = system("echo 'Downloading #{git_url}/archive/#{sha}.tar.gz --output #{archive_filename}'")
-      success = success && download_archive
-      success = success && unpack_archive
+      success = send(checkout_strategy[:method])
 
       raise "Errors encountered while downloading archive" unless success
       puts "Finished checking out Application"
       tasks.each(&method(:send))
     end
 
+    def checkout_strategies
+      @checkout_strategies ||= [
+        { method: :archive_and_unpack_commit, conditions: -> { commit_exists? } },
+        { method: :download_archive, conditions: -> { !bitbucket_origin? } },
+        { method: :checkout_via_git, conditions: -> { true } },
+      ]
+    end
+
+    def checkout_strategy
+      @checkout_strategy ||= checkout_strategies.find{|strategy| strategy[:conditions].call }
+    end
+
     def archive_filename
       @archive_filename ||= "#{appname}-#{sha}.tar.gz"
     end
@@ -90,12 +113,80 @@ module Shiplane
     end
 
     def download_archive
-      return true if File.exist? archive_path
+      puts "Downloading #{git_url} --output #{archive_filename}"
+      puts "Deploying SHA different from current version. Checking out from Git Repository"
+
+      success = system("curl -L #{git_url} --output #{archive_path}")
+      success && unpack_archive
+    end
+
+    def git_host_url
+      return "bitbucket.org" if bitbucket_origin?
+      return "github.com" if github_origin?
+
+      # TODO
+      raise 'Gitlab needs fixing'
+    end
+
+    def target_sha_is_current?
+      sha == current_short_sha.strip || sha == current_sha.strip
+    end
 
-      system("curl -L #{git_url} --output #{archive_path}")
+    def copy_current_directory
+      puts "Current directory is target SHA. Copying for build"
+
+      FileUtils.cp_r(".", build_directory)
+    end
+
+    def archive_and_unpack_commit
+      puts "Creating archive from local git repo in #{archive_filename}..."
+      success = system("git archive --format=tar.gz -o #{archive_path} #{sha}")
+
+      puts "Unpacking archive to #{build_directory}..."
+      FileUtils.rm_rf(build_directory) if File.directory?(build_directory)
+      FileUtils.mkdir_p build_directory
+
+      success && system("(cd #{app_directory} && tar -xzf #{appname}-#{sha}.tar.gz -C #{build_directory})")
+    end
+
+    def git_clone_url
+      "https://#{bitbucket_username}:#{bitbucket_token}@#{git_host_url}/#{project_config['origin']}.git"
+    end
+
+    def target_sha_is_current?
+      sha == current_short_sha.strip || sha == current_sha.strip
+    end
+
+    def commit_exists?
+      system("git rev-parse #{sha}")
+    end
+
+    def checkout_via_git
+      FileUtils.rm_rf(build_directory) if File.directory?(build_directory)
+      FileUtils.mkdir_p build_directory
+
+      success = true
+      puts "Cloning from #{git_clone_url}..."
+      success = success && system("git clone --depth=1 #{git_clone_url} #{build_directory}")
+      FileUtils.cd build_directory do
+        puts "Fetching Single SHA"
+        fetch_success = system("git fetch origin #{sha} && git reset --hard FETCH_HEAD")
+
+        unless fetch_success
+          puts "Unable to fetch single commit. Fetching FULL history"
+          fetch_success = system("git fetch --unshallow && git fetch origin #{sha} && git reset --hard #{sha}")
+        end
+
+        success = success && fetch_success
+
+        puts "Removing Git folders before building..."
+        success = success && FileUtils.rm_rf("#{build_directory}/.git")
+      end
+      success
     end
 
     def unpack_archive
+      puts "Unpacking archive to #{build_directory}..."
       FileUtils.rm_rf(build_directory) if File.directory?(build_directory)
       FileUtils.mkdir_p build_directory
 

data/lib/shiplane/compose_hash.rb

@@ -14,7 +14,7 @@ module Shiplane
     end
 
     def compose_hash
-      @compose_hash ||= YAML.load(compose_file)
+      @compose_hash ||= YAML.load(compose_file, aliases: true)
     end
 
     def whitelisted_hash

data/lib/shiplane/configuration.rb

@@ -12,7 +12,7 @@ module Shiplane
     end
 
     def config
-      @config ||= YAML.load_file(shiplane_config_file)
+      @config ||= YAML.load_file(shiplane_config_file, aliases: true)
     end
 
     def build_config

data/lib/shiplane/host.rb

@@ -82,7 +82,7 @@ module Shiplane
     end
 
     def self.config
-      @config ||= YAML.load(File.read(config_filepath))
+      @config ||= YAML.load(File.read(config_filepath), aliases: true)
     end
 
     def self.config_filepath

data/lib/shiplane/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shiplane
 version: !ruby/object:Gem::Version
-  version: 0.2.19
+  version: 0.2.20
 platform: ruby
 authors:
 - John Epperson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-29 00:00:00.000000000 Z
+date: 2022-05-30 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.19
+        version: 0.2.20
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.19
+        version: 0.2.20
 - !ruby/object:Gem::Dependency
   name: shiplane_deployers_capistrano_docker
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.19
+        version: 0.2.20
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.19
+        version: 0.2.20
 - !ruby/object:Gem::Dependency
   name: dotenv
   requirement: !ruby/object:Gem::Requirement