envirobly 0.7.2 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a1ffc05f7ea0f1e40889fa8a817bd44f9cf9fc3ee4d7197e48f46bd17706b017
-  data.tar.gz: 053373d7435caa5b10d301afafd3ef76777f29bffb59c108cd6ef4399d666061
+  metadata.gz: 1502f5b98c25be6da48fbdd5ebf525723d8985d4e45eef5693611a0aea9db82a
+  data.tar.gz: 5684ae39ecb8f3f7006979e849a9746d17bb33dd849f8173836d2b9afa1cc6cb
 SHA512:
-  metadata.gz: f0d071e480b64d91210ae0eb422d29707950c3288ca7e8a85354bfbaff1e78bec44e0bb88606edf264aab94bf2478e85fd6a85fba1f920e2b028c55c457bdc3b
-  data.tar.gz: ee38e1c77c0b66b90d4b36d3c89a217caef7f71f1e9c34d32ac4731eba898b265519e018501a5d5ebe41f644ca5e8534e04cf07b4ef5afa592595f60ddd5f453
+  metadata.gz: 8273cfe4dddd1f1da589add660066d5bd2b3c70f1ff0df92f0461f9b4c0b416f99276cb1a69ea1e1f13529ab6e18aca9f3720bb5e3896f8403251ee58e935bfd
+  data.tar.gz: a9e26055d4d0de16d449aec2ddc23921d61496969eb2ebd5812dc0279a8d2a1848c5e9ea074bfe5ea7c1f35c89af69162510ecfc88c5b8f7fa137c0241120c76

data/lib/envirobly/api.rb

@@ -12,22 +12,33 @@ class Envirobly::Api
     @access_token = Envirobly::AccessToken.new
   end
 
+  def validate_shape(params)
+    post_as_json(api_v1_shape_validations_url, params:, headers: authorization_headers).tap do |response|
+      unless successful_response?(response)
+        $stderr.puts "Validation request responded with #{response.code}. Aborting."
+        exit 1
+      end
+    end
+  end
+
   def create_deployment(params)
     post_as_json(api_v1_deployments_url, params:, headers: authorization_headers).tap do |response|
-      unless response.code.to_i == 200
+      unless successful_response?(response)
         $stderr.puts "Deployment creation request responded with #{response.code}. Aborting."
+        # TODO: render 422 validation failed nicely
+        $stderr.puts response.object
         exit 1
       end
     end
   end
 
-  RETRY_INTERVAL_SECONDS = 3
-  MAX_RETRIES = 5
+  MAX_RETRIES = 20
+  RETRY_INTERVAL_SECONDS = 2
   def get_deployment_with_delay_and_retry(url, tries = 1)
     sleep RETRY_INTERVAL_SECONDS * tries
     response = get_as_json URI(url)
 
-    if response.code.to_i == 200
+    if successful_response?(response)
       response
     elsif MAX_RETRIES <= tries
       $stderr.puts "Max retries exhausted while waiting for deployment credentials. Aborting."
@@ -55,6 +66,10 @@ class Envirobly::Api
   end
 
   private
+    def api_v1_shape_validations_url
+      URI::HTTPS.build(host: HOST, path: "/api/v1/shape_validations")
+    end
+
     def api_v1_deployments_url
       URI::HTTPS.build(host: HOST, path: "/api/v1/deployments")
     end
@@ -74,7 +89,7 @@ class Envirobly::Api
 
       http.request(request).tap do |response|
         def response.object
-          @json_parsed_body ||= JSON.parse body
+          @json_parsed_body ||= JSON.parse(body)
         end
       end
     end
@@ -86,4 +101,8 @@ class Envirobly::Api
     def authorization_headers
       { "Authorization" => @access_token.as_http_bearer }
     end
+
+    def successful_response?(response)
+      (200..299).include?(response.code.to_i)
+    end
 end

data/lib/envirobly/aws/credentials.rb

@@ -1,8 +1,13 @@
+# @deprecated
 class Envirobly::Aws::Credentials
   def initialize(params)
     @params = params
   end
 
+  def to_h
+    @params
+  end
+
   def as_env_vars
     [
       %(AWS_ACCESS_KEY_ID="#{@params.fetch("access_key_id")}"),

data/lib/envirobly/aws/s3.rb

@@ -0,0 +1,221 @@
+require "zlib"
+require "json"
+require "open3"
+require "concurrent"
+require "aws-sdk-s3"
+
+class Envirobly::Aws::S3
+  OBJECTS_PREFIX = "blobs"
+  MANIFESTS_PREFIX = "manifests"
+  CONCURRENCY = 6
+
+  def initialize(bucket:, region:, credentials: nil)
+    @region = region
+    @bucket = bucket
+
+    client_options = { region: }
+    unless credentials.nil?
+      client_options.merge! credentials.transform_keys(&:to_sym)
+    end
+
+    @client = Aws::S3::Client.new(client_options)
+    resource = Aws::S3::Resource.new(client: @client)
+    @bucket_resource = resource.bucket(@bucket)
+  end
+
+  def push(commit)
+    if object_exists?(manifest_key(commit.object_tree_checksum))
+      print "Build context is already uploaded"
+      $stdout.flush
+      return
+    end
+
+    # puts "Pushing #{commit.object_tree_checksum} to #{@bucket}"
+
+    manifest = []
+    objects_count = 0
+    objects_to_upload = []
+    remote_object_hashes = list_object_hashes
+
+    commit.object_tree.each do |chdir, objects|
+      objects.each do |(mode, type, object_hash, path)|
+        objects_count += 1
+        path = File.join chdir.delete_prefix(commit.working_dir), path
+        manifest << [ mode, type, object_hash, path.delete_prefix("/") ]
+
+        next if remote_object_hashes.include?(object_hash)
+        objects_to_upload << [ chdir, object_hash ]
+      end
+    end
+
+    upload_git_objects(objects_to_upload)
+    upload_manifest manifest_key(commit.object_tree_checksum), manifest
+  end
+
+  def pull(object_tree_checksum, target_dir)
+    puts "Pulling #{object_tree_checksum} into #{target_dir}"
+
+    manifest = fetch_manifest(object_tree_checksum)
+    FileUtils.mkdir_p(target_dir)
+
+    puts "Downloading #{manifest.size} files"
+    pool = Concurrent::FixedThreadPool.new(CONCURRENCY)
+
+    manifest.each do |(mode, type, object_hash, path)|
+      pool.post do
+        target_path = File.join target_dir, path
+
+        if mode == Envirobly::Git::Commit::SYMLINK_FILE_MODE
+          fetch_symlink(object_hash, target_path:)
+        else
+          fetch_object(object_hash, target_path:)
+
+          if mode == Envirobly::Git::Commit::EXECUTABLE_FILE_MODE
+            FileUtils.chmod("+x", target_path)
+          end
+        end
+      end
+    end
+
+    pool.shutdown
+    pool.wait_for_termination
+  end
+
+  private
+    def list_object_hashes
+      @client.list_objects({
+        bucket: @bucket,
+        prefix: "#{OBJECTS_PREFIX}/"
+      }).map do |response|
+        response.contents.map do |object|
+          object.key.delete_prefix("#{OBJECTS_PREFIX}/").delete_suffix(".gz")
+        end
+      end.flatten
+    end
+
+    def object_key(object_hash)
+      "#{OBJECTS_PREFIX}/#{object_hash}.gz"
+    end
+
+    def manifest_key(object_tree_checksum)
+      "#{MANIFESTS_PREFIX}/#{object_tree_checksum}.gz"
+    end
+
+    def object_exists?(key)
+      @client.head_object(bucket: @bucket, key:)
+      true
+    rescue Aws::S3::Errors::NotFound
+      false
+    end
+
+    def compress_and_upload_object(object_hash, chdir:)
+      key = object_key object_hash
+
+      Tempfile.create([ "envirobly-push", ".gz" ]) do |tempfile|
+        gz = Zlib::GzipWriter.new(tempfile)
+
+        Open3.popen3("git", "cat-file", "-p", object_hash, chdir:) do |_, stdout, stderr, thread|
+          IO.copy_stream(stdout, gz)
+
+          unless thread.value.success?
+            raise "`git cat-file -p #{object_hash}` failed: #{stderr.read}"
+          end
+        ensure
+          gz.close
+        end
+
+        @client.put_object(bucket: @bucket, body: tempfile, key:)
+
+        # puts "⤴ #{key}"
+      end
+    end
+
+    def upload_git_objects(objects)
+      pool = Concurrent::FixedThreadPool.new(CONCURRENCY)
+      uploaded = Concurrent::AtomicFixnum.new
+      objects_count = objects.count
+
+      notifier = Thread.new do
+        next unless objects_count > 0
+
+        # Hide cursor
+        # print "\e[?25l"
+        # $stdout.flush
+
+        loop do
+          value = uploaded.value
+          print "\rUploading build context files: #{value}/#{objects_count}"
+          $stdout.flush
+          sleep 0.5
+          break if value >= objects_count
+        end
+
+        # Show cursor again
+        # print "\e[?25h\n"
+      end
+
+      objects.each do |(chdir, object_hash)|
+        pool.post do
+          compress_and_upload_object(object_hash, chdir:)
+          uploaded.increment
+        end
+      end
+
+      pool.shutdown
+      pool.wait_for_termination
+      notifier.join
+    end
+
+    def upload_manifest(key, content)
+      Tempfile.create([ "envirobly-push", ".gz" ]) do |tempfile|
+        gz = Zlib::GzipWriter.new(tempfile)
+        gz.write JSON.dump(content)
+        gz.close
+
+        @client.put_object(bucket: @bucket, body: tempfile, key:)
+
+        # puts "⤴ #{key}"
+      end
+    end
+
+    def fetch_manifest(ref)
+      stream = @bucket_resource.object(manifest_key(ref)).get.body
+      JSON.parse Zlib::GzipReader.new(stream).read
+    rescue Aws::S3::Errors::NoSuchKey
+      puts "Commit #{ref} doesn't exist at s3://#{@bucket}"
+      exit 1
+    end
+
+    def fetch_object(object_hash, target_path:)
+      FileUtils.mkdir_p File.dirname(target_path)
+
+      key = object_key object_hash
+      stream = @bucket_resource.object(key).get.body
+
+      File.open(target_path, "wb") do |target|
+        gz = Zlib::GzipReader.new(stream)
+        IO.copy_stream(gz, target)
+        gz.close
+      end
+    end
+
+    def fetch_symlink(object_hash, target_path:)
+      FileUtils.mkdir_p File.dirname(target_path)
+
+      key = object_key object_hash
+      gz = Zlib::GzipReader.new @bucket_resource.object(key).get.body
+      symlink_to = gz.read
+      gz.close
+
+      FileUtils.ln_s symlink_to, target_path
+    end
+
+    def format_duration(duration)
+      total_seconds = duration.to_i
+      minutes = (total_seconds / 60).floor
+      seconds = (total_seconds % 60).ceil
+      result = [ "#{seconds}s" ]
+      result.prepend "#{minutes}m" if minutes > 0
+      result.join " "
+    end
+end

data/lib/envirobly/cli/main.rb

@@ -1,34 +1,56 @@
 class Envirobly::Cli::Main < Envirobly::Base
   desc "version", "Show Envirobly CLI version"
+  method_option :pure, type: :boolean, default: false
   def version
-    puts Envirobly::VERSION
+    if options.pure
+      puts Envirobly::VERSION
+    else
+      puts "envirobly CLI v#{Envirobly::VERSION}"
+    end
   end
 
   desc "validate", "Validates config"
   def validate
-    commit = Envirobly::Git::Unstaged.new
-    config = Envirobly::Config.new(commit)
-    config.validate
-
-    if config.errors.any?
-      puts "Issues found validating `#{Envirobly::Config::PATH}`:"
-      puts
-      config.errors.each_with_index do |error, index|
-        puts "  #{index + 1}. #{error}"
+    configs = Envirobly::Configs.new
+    api = Envirobly::Api.new
+
+    params = { validation: configs.to_params }
+    response = api.validate_shape params
+
+    if response.object.fetch("valid")
+      puts "All checks pass."
+    else
+      response.object.fetch("errors").each do |config_path, messages|
+        puts "#{config_path}:"
+        puts
+        messages.each_with_index do |message, index|
+          puts "    #{message}"
+          puts
+        end
       end
-      puts
+
       exit 1
-    else
-      puts "All checks pass."
     end
   end
 
-  desc "deploy ENVIRONMENT", "Deploy to environment identified by name or URL"
+  desc "deploy [ENVIRON_NAME]", <<~TXT
+    Deploy to environment identified by name.
+    When name is empty, current git branch name is used.
+  TXT
   method_option :commit, type: :string, default: "HEAD"
   method_option :dry_run, type: :boolean, default: false
-  def deploy(environment)
-    abort_if_aws_cli_is_missing
-    Envirobly::Deployment.new environment, options
+  method_option :account_id, type: :numeric
+  method_option :project_name, type: :string
+  method_option :project_region, type: :string
+  def deploy(environ_name = Envirobly::Git.new.current_branch)
+    deployment = Envirobly::Deployment.new(
+      environ_name:,
+      commit_ref: options.commit,
+      account_id: options.account_id,
+      project_name: options.project_name,
+      project_region: options.project_region
+    )
+    deployment.perform(dry_run: options.dry_run)
   end
 
   desc "set_access_token TOKEN", "Save and use an access token generated at Envirobly"
@@ -44,12 +66,47 @@ class Envirobly::Cli::Main < Envirobly::Base
     Envirobly::AccessToken.new(token).save
   end
 
-  private
-    def abort_if_aws_cli_is_missing
-      `which aws`
-      unless $?.success?
-        $stderr.puts "AWS CLI is missing. Please install it first: https://docs.aws.amazon.com/cli/latest/userguide/getting-started-install.html"
-        exit 1
-      end
+  desc "push", "Push commit manifest and blobs to S3"
+  def push(region, bucket, ref = "HEAD")
+    commit = Envirobly::Git::Commit.new ref
+    s3 = Envirobly::Aws::S3.new(region:, bucket:)
+    s3.push commit
+  end
+
+  desc "pull", "Download working copy from S3"
+  def pull(region, bucket, ref, path)
+    Envirobly::Duration.measure("Build context download took %s") do
+      s3 = Envirobly::Aws::S3.new(region:, bucket:)
+      s3.pull ref, path
     end
+  end
+
+  desc "object_tree", "Show object tree used for deployments"
+  method_option :commit, type: :string, default: "HEAD"
+  def object_tree
+    commit = Envirobly::Git::Commit.new options.commit
+    puts "Commit: #{commit.ref}"
+    pp commit.object_tree
+    puts "SHA256: #{commit.object_tree_checksum}"
+  end
+
+  desc "measure", "POC of Envirobly::Duration"
+  def measure
+    Envirobly::Duration.measure do
+      print "Doing something for 2s"
+      sleep 2
+    end
+
+    Envirobly::Duration.measure do
+      print "Doing something else for 100ms"
+      sleep 0.1
+    end
+
+    Envirobly::Duration.measure("Custom message, took %s") do
+      puts "Sleeping 2.5s with custom message"
+      sleep 2.5
+    end
+
+    puts "Done."
+  end
 end

data/lib/envirobly/colorize.rb

@@ -0,0 +1,21 @@
+module Envirobly::Colorize
+  GREEN  = "\e[32m"
+  RED    = "\e[31m"
+  YELLOW = "\e[33m"
+  BLUE   = "\e[34m"
+  RESET  = "\e[0m"
+  BOLD   = "\e[1m"
+  FAINT  = "\e[2m"
+
+  def faint(text)
+    [ FAINT, text, RESET ].join
+  end
+
+  def green(text)
+    [ GREEN, text, RESET ].join
+  end
+
+  def yellow(text)
+    [ YELLOW, text, RESET ].join
+  end
+end

data/lib/envirobly/configs.rb

@@ -0,0 +1,79 @@
+require "dotenv"
+
+class Envirobly::Configs
+  DIR = ".envirobly"
+  ENV = "env"
+  BASE = "deploy.yml"
+  OVERRIDES_PATTERN = /deploy\.([a-z0-9\-_]+)\.yml/i
+  DEFAULTS_DIR = File.join DIR, "defaults"
+  DEFAULT_ACCOUNT_PATH = File.join(DEFAULTS_DIR, "account.yml")
+  DEFAULT_PROJECT_PATH = File.join(DEFAULTS_DIR, "project.yml")
+
+  def initialize(dir = DIR)
+    @dir = Pathname.new dir
+  end
+
+  def to_params
+    {
+      configs:,
+      env_vars:
+    }
+  end
+
+  def default_project_id
+    if File.exist?(DEFAULT_PROJECT_PATH)
+      content = YAML.safe_load_file(DEFAULT_PROJECT_PATH)
+      if content["url"] =~ /projects\/(\d+)/
+        return $1.to_i
+      end
+    end
+
+    nil
+  end
+
+  def default_account_id
+    if File.exist?(DEFAULT_ACCOUNT_PATH)
+      content = YAML.safe_load_file(DEFAULT_ACCOUNT_PATH)
+      if content["url"] =~ /accounts\/(\d+)/
+        return $1.to_i
+      end
+    end
+
+    nil
+  end
+
+  def save_default_account(url)
+    return if File.exist?(DEFAULT_ACCOUNT_PATH)
+
+    FileUtils.mkdir_p(DEFAULTS_DIR)
+    content = YAML.dump({ "url" => url })
+    File.write(DEFAULT_ACCOUNT_PATH, content)
+  end
+
+  def save_default_project(url)
+    return if File.exist?(DEFAULT_PROJECT_PATH)
+
+    FileUtils.mkdir_p(DEFAULTS_DIR)
+    content = YAML.dump({ "url" => url })
+    File.write(DEFAULT_PROJECT_PATH, content)
+  end
+
+  private
+    def configs
+      Dir.entries(@dir).map do |file|
+        path = File.join(@dir, file)
+
+        next unless File.file?(path) && config_file?(file)
+
+        [ "#{DIR}/#{file}", File.read(path) ]
+      end.compact.to_h
+    end
+
+    def env_vars
+      Dotenv.parse @dir.join(ENV)
+    end
+
+    def config_file?(file)
+      file == BASE || file.match?(OVERRIDES_PATTERN)
+    end
+end

data/lib/envirobly/deployment.rb

@@ -1,50 +1,88 @@
+require "yaml"
+
 class Envirobly::Deployment
-  def initialize(environment, options)
-    commit = Envirobly::Git::Commit.new options.commit
+  include Envirobly::Colorize
+
+  def initialize(environ_name:, commit_ref:, account_id:, project_name:, project_region:)
+    @environ_name = environ_name
+    @commit = Envirobly::Git::Commit.new commit_ref
 
-    unless commit.exists?
-      $stderr.puts "Commit #{options.commit} doesn't exist in this repository. Aborting."
+    unless @commit.exists?
+      $stderr.puts "Commit #{commit_ref} doesn't exist in this repository. Aborting."
       exit 1
     end
 
-    config = Envirobly::Config.new(commit)
-    config.validate
-
-    if config.errors.any?
-      $stderr.puts "Errors found while parsing #{Envirobly::Config::PATH}:"
-      $stderr.puts
-      config.errors.each do |error|
-        $stderr.puts "  - #{error}"
-      end
-      $stderr.puts
-      $stderr.puts "Please fix these, commit the changes and try again."
-      exit 1
+    @configs = Envirobly::Configs.new
+
+    if account_id.nil?
+      account_id = @configs.default_account_id
     end
 
-    config.compile(environment)
-    params = config.to_deployment_params
+    project_id = nil
+    if project_name.nil?
+      project_id = @configs.default_project_id
+    end
+
+    @params = {
+      account: {
+        id: account_id
+      },
+      project: {
+        id: project_id,
+        name: project_name,
+        region: project_region
+      },
+      deployment: {
+        environ_name:,
+        commit_ref: @commit.ref,
+        commit_time: @commit.time,
+        commit_message: @commit.message,
+        object_tree_checksum: @commit.object_tree_checksum,
+        **@configs.to_params
+      }
+    }
+  end
 
-    puts "Deployment config:"
-    puts params.to_yaml
+  def perform(dry_run:)
+    puts [ "Deploying commit", yellow(@commit.short_ref), faint("→"), green(@environ_name) ].join(" ")
+    puts
+    puts "    #{@commit.message}"
+    puts
 
-    exit if options.dry_run?
+    if dry_run
+      puts YAML.dump(@params)
+      return
+    end
 
+    # Create deployment
     api = Envirobly::Api.new
-    response = api.create_deployment params
-    deployment_url = response.object.fetch("url")
-    response = api.get_deployment_with_delay_and_retry deployment_url
-    credentials = Envirobly::Aws::Credentials.new response.object.fetch("credentials")
-    bucket = response.object.fetch("bucket")
-
-    puts "Uploading build context, please wait..."
-    unless commit.archive_and_upload(bucket:, credentials:).success?
-      $stderr.puts "Error exporting build context. Aborting."
-      exit 1
+
+    Envirobly::Duration.measure do
+      print "Preparing project..."
+      response = api.create_deployment @params
+
+      @configs.save_default_account(response.object.fetch("account_url"))
+      @configs.save_default_project(response.object.fetch("project_url"))
+
+      # Fetch credentials for build context upload
+      @deployment_url = response.object.fetch("url")
+      @credentials_response = api.get_deployment_with_delay_and_retry @deployment_url
     end
 
-    puts "Build context uploaded."
-    api.put_as_json deployment_url
+    credentials = @credentials_response.object.fetch("credentials")
+    region = @credentials_response.object.fetch("region")
+    bucket = @credentials_response.object.fetch("bucket")
+    watch_deployment_url = @credentials_response.object.fetch("deployment_url")
+
+    Envirobly::Duration.measure do
+      # Upload build context
+      s3 = Envirobly::Aws::S3.new(bucket:, region:, credentials:)
+      s3.push @commit
+
+      # Perform deployment
+      api.put_as_json @deployment_url
+    end
 
-    # TODO: Output URL to watch the deployment progress
+    puts "Follow at #{watch_deployment_url}"
   end
 end

data/lib/envirobly/duration.rb

@@ -0,0 +1,36 @@
+require "benchmark"
+
+class Envirobly::Duration
+  class << self
+    include Envirobly::Colorize
+
+    def measure(message = nil)
+      measurement = Benchmark.measure do
+        yield
+      end
+
+      duration = format_duration(measurement)
+
+      if message.nil?
+        puts [ "", green("✔"), faint(duration) ].join(" ")
+      else
+        puts sprintf(message, duration)
+      end
+    end
+
+    def format_duration(tms)
+      ms = (tms.real * 1000).to_i
+
+      if ms >= 60_000
+        minutes = ms / 60_000
+        seconds = (ms % 60_000) / 1000
+        sprintf("%dm%ds", minutes, seconds)
+      elsif ms >= 1000
+        seconds = ms / 1000
+        sprintf("%ds", seconds)
+      else
+        sprintf("%dms", ms)
+      end
+    end
+  end
+end

data/lib/envirobly/git/commit.rb

@@ -1,10 +1,15 @@
 require "time"
 require "open3"
 
-class Envirobly::Git::Commit
+class Envirobly::Git::Commit < Envirobly::Git
+  EXECUTABLE_FILE_MODE = "100755"
+  SYMLINK_FILE_MODE = "120000"
+
+  attr_reader :working_dir
+
   def initialize(ref, working_dir: Dir.getwd)
     @ref = ref
-    @working_dir = working_dir
+    super working_dir
   end
 
   def exists?
@@ -15,6 +20,10 @@ class Envirobly::Git::Commit
     @normalized_ref ||= git(%(rev-parse #{@ref})).stdout.strip
   end
 
+  def short_ref
+    @short_ref ||= ref[0..6]
+  end
+
   def message
     git(%(log #{@ref} -n1 --pretty=%B)).stdout.strip
   end
@@ -36,25 +45,35 @@ class Envirobly::Git::Commit
     git(%(show #{@ref}:#{path})).stdout
   end
 
-  def objects_with_checksum_at(path)
-    git(%{ls-tree #{@ref} --format='%(objectname) %(path)' #{path}}).stdout.lines.map(&:chomp).
-      reject { _1.split(" ").last == Envirobly::Config::DIR }
-  end
+  def object_tree(ref: @ref, chdir: @working_dir)
+    @object_tree ||= begin
+      objects = {}
+      objects[chdir] = []
 
-  def archive_and_upload(bucket:, credentials:)
-    git(%(archive --format=tar.gz #{ref} | #{credentials.as_inline_env_vars} aws s3 cp - #{archive_uri(bucket)}))
-  end
+      git(%(ls-tree -r #{ref}), chdir:).stdout.lines.each do |line|
+        mode, type, object_hash, path = line.split(/\s+/)
+
+        next if path.start_with?("#{Envirobly::Configs::DIR}/")
 
-  private
-    OUTPUT = Struct.new :stdout, :stderr, :exit_code, :success?
-    def git(cmd)
-      Open3.popen3("git #{cmd}", chdir: @working_dir) do |stdin, stdout, stderr, thread|
-        stdin.close
-        OUTPUT.new stdout.read, stderr.read, thread.value.exitstatus, thread.value.success?
+        if type == "commit"
+          objects.merge! object_tree(ref: object_hash, chdir: File.join(chdir, path))
+        else
+          objects[chdir] << [ mode, type, object_hash, path ]
+        end
       end
-    end
 
-    def archive_uri(bucket)
-      "s3://#{bucket}/#{ref}.tar.gz"
+      objects
     end
+  end
+
+  def object_tree_checksum
+    digestable = object_tree.values.flatten.to_json
+    @object_tree_checksum ||= Digest::SHA256.hexdigest(digestable)
+  end
+
+  # @deprecated
+  def objects_with_checksum_at(path)
+    git(%{ls-tree #{@ref} --format='%(objectname) %(path)' #{path}}).stdout.lines.map(&:chomp).
+      reject { _1.split(" ").last == Envirobly::Configs::DIR }
+  end
 end

data/lib/envirobly/git.rb

@@ -1,2 +1,17 @@
-module Envirobly::Git
+class Envirobly::Git
+  def initialize(working_dir = Dir.getwd)
+    @working_dir = working_dir
+  end
+
+  OUTPUT = Struct.new :stdout, :stderr, :exit_code, :success?
+  def git(cmd, chdir: @working_dir)
+    Open3.popen3("git #{cmd}", chdir:) do |stdin, stdout, stderr, thread|
+      stdin.close
+      OUTPUT.new stdout.read, stderr.read, thread.value.exitstatus, thread.value.success?
+    end
+  end
+
+  def current_branch
+    git("branch --show-current").stdout.strip
+  end
 end

data/lib/envirobly/version.rb

@@ -1,3 +1,3 @@
 module Envirobly
-  VERSION = "0.7.2"
+  VERSION = "0.10.0"
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: envirobly
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.10.0
 platform: ruby
 authors:
 - Robert Starsi
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-28 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -52,6 +51,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.0
+- !ruby/object:Gem::Dependency
+  name: aws-sdk-s3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.182'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.182'
+- !ruby/object:Gem::Dependency
+  name: concurrent-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: dotenv
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement
@@ -122,7 +163,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description:
 email: klevo@klevo.sk
 executables:
 - envirobly
@@ -137,11 +177,14 @@ files:
 - lib/envirobly/api.rb
 - lib/envirobly/aws.rb
 - lib/envirobly/aws/credentials.rb
+- lib/envirobly/aws/s3.rb
 - lib/envirobly/base.rb
 - lib/envirobly/cli.rb
 - lib/envirobly/cli/main.rb
-- lib/envirobly/config.rb
+- lib/envirobly/colorize.rb
+- lib/envirobly/configs.rb
 - lib/envirobly/deployment.rb
+- lib/envirobly/duration.rb
 - lib/envirobly/git.rb
 - lib/envirobly/git/commit.rb
 - lib/envirobly/git/unstaged.rb
@@ -150,7 +193,6 @@ homepage: https://github.com/envirobly/envirobly-cli
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -165,8 +207,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
-signing_key:
+rubygems_version: 3.6.7
 specification_version: 4
 summary: Envirobly command line interface
 test_files: []

data/lib/envirobly/config.rb

@@ -1,208 +0,0 @@
-require "yaml"
-require "json"
-require "digest"
-
-class Envirobly::Config
-  DIR = ".envirobly"
-  PATH = "#{DIR}/project.yml"
-
-  attr_reader :errors, :result, :raw
-
-  def initialize(commit)
-    @commit = commit
-    @errors = []
-    @result = {}
-    @project_url = nil
-    @raw = @commit.file_content PATH
-    @project = parse
-  end
-
-  def dig(*args)
-    @project.dig(*args)
-  rescue NoMethodError
-    nil
-  end
-
-  def validate
-    return unless @project
-    validate_top_level_keys
-    validate_services @project.fetch(:services)
-    validate_environments
-  end
-
-  def compile(environment = nil)
-    return unless @project
-    @environment = environment
-    @result = @project.slice(:services)
-    set_project_url
-    merge_environment_overrides! unless @environment.nil?
-    append_image_tags!
-  end
-
-  def to_deployment_params
-    {
-      environ: {
-        name: @environment,
-        project_url: @project_url
-      },
-      commit: {
-        ref: @commit.ref,
-        time: @commit.time,
-        message: @commit.message
-      },
-      config: @result,
-      raw_config: @raw
-    }
-  end
-
-  private
-    def parse
-      YAML.safe_load @raw, aliases: true, symbolize_names: true
-    rescue Psych::Exception => exception
-      @errors << exception.message
-      nil
-    end
-
-    def set_project_url
-      @project_url = dig :project
-    end
-
-    NON_BUILDABLE_TYPES = %w[ postgres mysql valkey ]
-    BUILD_DEFAULTS = {
-      dockerfile: [ "Dockerfile", :file_exists? ],
-      build_context: [ ".", :dir_exists? ]
-    }
-    def append_image_tags!
-      @result[:services].each do |name, service|
-        next if NON_BUILDABLE_TYPES.include?(service[:type]) || service[:image].present?
-        checksums = []
-
-        BUILD_DEFAULTS.each do |attribute, options|
-          value = service.fetch(attribute, options.first)
-          if @commit.public_send(options.second, value)
-            checksums << @commit.objects_with_checksum_at(value)
-          end
-        end
-
-        if checksums.size == 2
-          @result[:services][name][:image_tag] = Digest::SHA1.hexdigest checksums.to_json
-        end
-      end
-    end
-
-    def merge_environment_overrides!
-      return unless services = @project.dig(:environments, @environment.to_sym)
-      services.each do |name, service|
-        service.each do |attribute, value|
-          if value.is_a?(Hash) && @result[:services][name][attribute].is_a?(Hash)
-            @result[:services][name][attribute].merge! value
-            @result[:services][name][attribute].compact!
-          else
-            @result[:services][name][attribute] = value
-          end
-        end
-      end
-    end
-
-    VALID_TOP_LEVEL_KEYS = %i[ project services environments ]
-    def validate_top_level_keys
-      unless @project.is_a?(Hash)
-        @errors << "Config doesn't contain a top level hash structure."
-        return
-      end
-
-      @errors << "Missing `project: <url>` top level attribute." if @project[:project].blank?
-
-      @project.keys.each do |key|
-        unless VALID_TOP_LEVEL_KEYS.include?(key)
-          @errors << "Top level key `#{key}` is not allowed. Allowed keys: #{VALID_TOP_LEVEL_KEYS.map{ "`#{_1}`" }.join(", ")}."
-        end
-      end
-    end
-
-    VALID_SERVICE_KEYS = %i[
-      type
-      image
-      build
-      engine_version
-      instance_type
-      min_instances
-      max_instances
-      volume_size
-      volume_mount
-      dockerfile
-      build_context
-      command
-      release_command
-      env
-      health_check
-      http
-      private
-      aliases
-    ]
-    NAME_FORMAT = /\A[a-z0-9\-_\.\/]+\z/i
-    BUILD_VALUE_FORMAT = /\Av[\d+]\z/
-    def validate_services(services)
-      unless services.is_a?(Hash)
-        @errors << "`services` key must be a hash."
-        return
-      end
-
-      services.each do |name, service|
-        unless name =~ NAME_FORMAT
-          @errors << "`#{name}` is not a valid service name. Use aplhanumeric characters, dash, underscore, slash or dot."
-        end
-
-        unless service.is_a?(Hash)
-          @errors << "Service `#{name}` must be a hash."
-          next
-        end
-
-        service.each do |attribute, value|
-          unless VALID_SERVICE_KEYS.include?(attribute)
-            @errors << "Service `#{name}` attribute `#{attribute}` is not a valid attribute."
-          end
-
-          if attribute == :build
-            unless value =~ BUILD_VALUE_FORMAT
-              @errors << "Service `#{name}` attribute `#{attribute}` format needs to be a number prefixed with letter \"v\", for example \"v1\"."
-            end
-          end
-        end
-
-        BUILD_DEFAULTS.each do |attribute, options|
-          value = service.fetch(attribute, options.first)
-          unless @commit.public_send(options.second, value)
-            @errors << "Service `#{name}` specifies `#{attribute}` as `#{value}` which doesn't exist in this commit."
-          end
-        end
-
-        service.fetch(:env, {}).each do |key, value|
-          if value.is_a?(Hash) && value.has_key?(:file)
-            unless @commit.file_exists?(value.fetch(:file))
-              @errors << "Environment variable `#{key}` referring to a file `#{value.fetch(:file)}` doesn't exist in this commit."
-            end
-          end
-        end
-      end
-    end
-
-    def validate_environments
-      return unless @project.has_key?(:environments)
-
-      environments = @project.fetch :environments, nil
-
-      unless environments.is_a?(Hash)
-        @errors << "`environments` key must be a hash."
-        return
-      end
-
-      environments.each do |environment, services|
-        unless environment =~ NAME_FORMAT
-          @errors << "`#{environment}` is not a valid environment name. Use aplhanumeric characters, dash, underscore, slash or dot."
-        end
-
-        validate_services services
-      end
-    end
-end