dapp 0.0.24 → 0.1.0

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 1e603aef0451675ef67a7958ce05bdaaa523ae17
-  data.tar.gz: 51b4f14bd8c2080855893a4d7bfb76ebe75616f8
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NjE2N2UwNDhhMzAzYWM1YTEyNGY0YWJkM2UwYTEwYWQ0NjgxYzVmYw==
+  data.tar.gz: !binary |-
+    NjIzMGU2ODk4ZTZiMGRmNmY1MjFiZmM0MTQ4MDMzMWFhYWE5OGYxNg==
 SHA512:
-  metadata.gz: f5f0dd3fce41121aa95383458dc0d3885f352d5eb5b48ebad39f9aa7d2003c9ce0d8bc42bb4f7aa2b166f5547a50ea71ffa9aef5f2f4f25522437c83b1eedaf5
-  data.tar.gz: 8515b76cc3fe969542d3425dac8cdc497b81f8fa3fe49d8918e0be2ee2f7079461f27c6930c66973e00f794572e5a1b23fab8f56ff6718ada186ce101184bc66
+  metadata.gz: !binary |-
+    YWYyNTE0M2JmZDkzZTAzNjAxNzYzNjMyYzZhMTVlNTJjM2I4OTUzMWE1MTkz
+    MmRjMjJmMzE5ODE5MjNkZTE2ZjQwOWNiNjI1MWEwNjc2ZjMwOWMyY2YwZWU0
+    N2JkMzg3MmI2MTUwNGQ4MTM3N2M0YjdkZjk3OWQwYTBiMWNmZGM=
+  data.tar.gz: !binary |-
+    MzVjNzQ3MGE3NzVhOTU4YmFhMWE4ZTcwNGU3YmYyZjFiMGQwN2ZlNDJjZWI1
+    MDYxZjQyMTBmMWVhYzNkYTZjNGJiN2JmZTAyNTQ4NDk3NzY3ZDRkMjIyMjE2
+    NzVkMjdiN2YwMTY1YWFkYTE1NDA1YWIxMmFhOGU5NDRkODdlYzU=

data/bin/dapp

@@ -5,4 +5,20 @@
 require 'rubygems'
 require 'dapp'
 
-Dapp::CLI.new.run
+def net_status_message(exception)
+  net_status = exception.net_status.net_status_normalize(context: exception.net_status.delete(:context))
+  net_status[:message] || [net_status[:error], net_status[:code]].compact.join(': ')
+end
+
+begin
+  Dapp::CLI.new.run
+rescue Dapp::Error::Shellout => e
+  $stderr.puts(net_status_message(e))
+  exit 1
+rescue Dapp::Error::Base => e
+  $stderr.puts(Dapp::Helper::Paint.paint_string(net_status_message(e), :warning))
+  exit 1
+rescue Interrupt => _e
+  $stderr.puts(Dapp::Helper::Paint.paint_string('Interrupted', :warning))
+  exit 1
+end

data/config/en/common.yml

@@ -0,0 +1,23 @@
+en:
+  common:
+    image:
+      signature: "signature: %{signature}"
+      info: "date: %{date}\nsize: %{size} MB"
+      commands: "commands:"
+    process:
+      git_artifact_loading: 'loading git_artifact'
+      chefdk_loading: 'loading chefdk'
+      berks_vendor: 'berks_vendor'
+      git_artifact_fetch: "fetching remote git_artifact '%{name}'"
+    status:
+      process:
+        pushing: '[PUSHING]'
+        building: '[BUILDING]'
+        default: '[RUNNING]'
+      success:
+        default: '[OK]'
+      failed:
+        default: '[FAILED]'
+    state:
+      using_cache: '[USING CACHE]'
+      build: '[BUILD]'

data/config/en/net_status.yml

@@ -0,0 +1,24 @@
+en:
+  net_status:
+    missing_translation: "Missing translation for code: '%{code}'."
+    shellout:
+      shell_command_failed: ">>> START STREAM\n%{stream}\n>>> END STREAM"
+    application:
+      application_not_built: "Application hasn't been built yet!"
+      git_branch_without_name: "Application has specific revision that isn't associated with a branch name!"
+      ci_environment_required: 'CI environment required (Travis or GitLab CI)!'
+    build:
+      from_image_required: 'Missing from_image!'
+      image_already_untagged: "Image `%{name}` already untagged!"
+      image_not_exist: "Image `%{name}` not exist!"
+      image_already_tagged: 'Image with other id already tagged!'
+      built_id_not_defined: '`from.built_id` not defined!'
+    controller:
+      push_command_unexpected_apps: "Push command can process only one application!"
+      no_such_app: "No such app: '%{patterns}' in '%{path}'!"
+      dappfile_not_found: "Dappfile not found!"
+    config:
+      builder_type_conflict: 'Conflict between builder types!'
+      builder_type_unsupported: "Defined unsupported builder type `%{type}`!"
+      docker_from_not_defined: "Docker `from` not defined!"
+      git_artifact_unexpected_attribute: "'%{type}' git artifact doesn't have attribute '%{attr}'!"

data/lib/dapp.rb

@@ -5,24 +5,80 @@ require 'digest'
 require 'timeout'
 require 'base64'
 require 'mixlib/shellout'
+require 'securerandom'
+require 'excon'
+require 'json'
+require 'ostruct'
+require 'time'
+require 'i18n'
+require 'paint'
+
+require 'net_status'
 
 require 'dapp/version'
+require 'dapp/helper/cli'
+require 'dapp/helper/trivia'
+require 'dapp/helper/sha256'
+require 'dapp/helper/i18n'
+require 'dapp/helper/log'
+require 'dapp/helper/paint'
+require 'dapp/helper/streaming'
+require 'dapp/helper/shellout'
 require 'dapp/cli'
+require 'dapp/cli/base'
 require 'dapp/cli/build'
-require 'dapp/builder/chefify'
-require 'dapp/builder/centos7'
-require 'dapp/builder/ubuntu1404'
-require 'dapp/builder/ubuntu1604'
-require 'dapp/builder/ci_tagging'
-require 'dapp/builder/manual_tagging'
-require 'dapp/builder/git_tagging'
-require 'dapp/builder/cascade_tagging'
+require 'dapp/cli/push'
+require 'dapp/cli/smartpush'
+require 'dapp/cli/list'
+require 'dapp/cli/flush'
+require 'dapp/cli/flush/stage_cache'
+require 'dapp/cli/flush/build_cache'
 require 'dapp/filelock'
-require 'dapp/builder'
-require 'dapp/docker'
-require 'dapp/atomizer'
+require 'dapp/config/application'
+require 'dapp/config/main'
+require 'dapp/config/chef'
+require 'dapp/config/shell'
+require 'dapp/config/git_artifact'
+require 'dapp/config/docker'
+require 'dapp/builder/base'
+require 'dapp/builder/chef'
+require 'dapp/builder/chef/berksfile'
+require 'dapp/builder/shell'
+require 'dapp/build/stage/base'
+require 'dapp/build/stage/source_base'
+require 'dapp/build/stage/from'
+require 'dapp/build/stage/infra_install'
+require 'dapp/build/stage/infra_setup'
+require 'dapp/build/stage/app_install'
+require 'dapp/build/stage/app_setup'
+require 'dapp/build/stage/source_1_archive'
+require 'dapp/build/stage/source_1'
+require 'dapp/build/stage/source_2'
+require 'dapp/build/stage/source_3'
+require 'dapp/build/stage/source_4'
+require 'dapp/build/stage/source_5'
+require 'dapp/controller'
+require 'dapp/application/git_artifact'
+require 'dapp/application/logging'
+require 'dapp/application/path'
+require 'dapp/application/tags'
+require 'dapp/application'
+require 'dapp/docker_image'
+require 'dapp/stage_image'
 require 'dapp/git_repo/base'
 require 'dapp/git_repo/own'
-require 'dapp/git_repo/chronicler'
 require 'dapp/git_repo/remote'
 require 'dapp/git_artifact'
+require 'dapp/error/base'
+require 'dapp/error/application'
+require 'dapp/error/build'
+require 'dapp/error/config'
+require 'dapp/error/controller'
+require 'dapp/error/shellout'
+
+# Dapp
+module Dapp
+  def self.root
+    File.expand_path('../..', __FILE__)
+  end
+end

data/lib/dapp/application.rb

@@ -0,0 +1,57 @@
+module Dapp
+  # Application
+  class Application
+    include Helper::Log
+    include Helper::Shellout
+    include Helper::I18n
+    include Helper::Sha256
+    include Logging
+    include GitArtifact
+    include Path
+    include Tags
+    include Dapp::Filelock
+
+    attr_reader :config
+    attr_reader :cli_options
+    attr_reader :ignore_git_fetch
+
+    def initialize(config:, cli_options:, ignore_git_fetch: false)
+      @config = config
+      @cli_options = cli_options
+
+      @build_path = cli_options[:build_dir] || home_path('build')
+      @build_cache_path = cli_options[:build_cache_dir] || home_path('build_cache')
+
+      @last_stage = Build::Stage::Source5.new(self)
+      @ignore_git_fetch = ignore_git_fetch
+    end
+
+    def build!
+      last_stage.build!
+      last_stage.save_in_cache!
+    end
+
+    def export!(repo)
+      fail Error::Application, code: :application_not_built unless last_stage.image.tagged? || dry_run?
+
+      tags.each do |tag|
+        image_name = [repo, tag].join(':')
+        if dry_run?
+          log_state(image_name, state: 'PUSH', styles: { status: :success })
+        else
+          log_process(image_name, process: t(code: 'status.process.pushing')) do
+            last_stage.image.export!(image_name, log_verbose: log_verbose?, log_time: log_time?)
+          end
+        end
+      end
+    end
+
+    def builder
+      @builder ||= Builder.const_get(config._builder.capitalize).new(self)
+    end
+
+    protected
+
+    attr_reader :last_stage
+  end # Application
+end # Dapp

data/lib/dapp/application/git_artifact.rb

@@ -0,0 +1,26 @@
+module Dapp
+  # Application
+  class Application
+    # GitArtifact
+    module GitArtifact
+      def git_artifacts
+        [*local_git_artifacts, *remote_git_artifacts].compact
+      end
+
+      def local_git_artifacts
+        @local_git_artifact_list ||= Array(config._git_artifact._local).map do |ga_config|
+          repo = GitRepo::Own.new(self)
+          Dapp::GitArtifact.new(repo, **ga_config._artifact_options)
+        end
+      end
+
+      def remote_git_artifacts
+        @remote_git_artifact_list ||= Array(config._git_artifact._remote).map do |ga_config|
+          repo = GitRepo::Remote.new(self, ga_config._name, url: ga_config._url, ssh_key_path: ga_config._ssh_key_path)
+          repo.fetch!(ga_config._branch)
+          Dapp::GitArtifact.new(repo, **ga_config._artifact_options)
+        end
+      end
+    end # GitArtifact
+  end # Application
+end # Dapp

data/lib/dapp/application/logging.rb

@@ -0,0 +1,120 @@
+module Dapp
+  # Application
+  class Application
+    # Logging
+    module Logging
+      def log?
+        !log_quiet?
+      end
+
+      def log_quiet?
+        cli_options[:log_quiet]
+      end
+
+      def log_verbose?
+        cli_options[:log_verbose]
+      end
+
+      def log_time?
+        cli_options[:log_time]
+      end
+
+      def dry_run?
+        cli_options[:dry_run]
+      end
+
+      DEFAULT_STYLE = {
+        message: :step,
+        process: :secondary,
+        status:  :secondary,
+        success: :success,
+        failed:  :warning,
+        time:    :default
+      }.freeze
+
+      def log_state(message, state:, styles: {})
+        styles[:message] ||= DEFAULT_STYLE[:message]
+        styles[:status] ||= DEFAULT_STYLE[:status]
+
+        message = slice(message)
+        state   = rjust(state, message)
+        formatted_message = paint_string(message, styles[:message])
+        formatted_status  = paint_string(state, styles[:status])
+
+        log "#{formatted_message}#{formatted_status}"
+      end
+
+      def log_process(message, process: nil, short: false, style: {}, &blk)
+        style[:message] ||= DEFAULT_STYLE[:message]
+        style[:process] ||= DEFAULT_STYLE[:process]
+        style[:failed] ||= DEFAULT_STYLE[:failed]
+        style[:success] ||= DEFAULT_STYLE[:success]
+
+        if log_verbose? && !short
+          process ||= t(code: 'status.process.default')
+          log_process_verbose(message, process: process, style: style, &blk)
+        else
+          log_process_short(message, style: style, &blk)
+        end
+      end
+
+      def log_secondary_process(message, **kvargs, &blk)
+        log_process(message, **kvargs.merge(style: { message: :secondary, success: :secondary }), &blk)
+      end
+
+      def log_process_verbose(message, process:, style: {}, &blk)
+        process         = paint_string(rjust(process, message), style[:process])
+        info            = paint_string(message, style[:message]) + process
+        success_message = paint_string(slice(message), style[:message]) +
+          paint_string(rjust(t(code: 'status.success.default'), message), style[:success])
+        failed_message  = paint_string(slice(message) +
+          rjust(t(code: 'status.failed.default'), message), style[:failed])
+        log_process_default(info, success_message, failed_message, &blk)
+      end
+
+      def log_process_short(message, style: {}, &blk)
+        info            = "#{paint_string(slice(message), style[:message])} ... "
+        success_message = paint_string(rjust(t(code: 'status.success.default'), info), style[:success])
+        failed_message  = paint_string(rjust(t(code: 'status.failed.default'), info), style[:failed])
+        log_process_default(info, success_message, failed_message, inline: true, &blk)
+      end
+
+      def log_process_default(info, success_message, failed_message, inline: false)
+        log info, inline: inline
+        message = success_message
+        start = Time.now
+        yield
+      rescue Error::Base, SignalException, StandardError => _e
+        message = failed_message
+        raise
+      ensure
+        time = paint_string("#{(Time.now - start).round(2)} sec", DEFAULT_STYLE[:time])
+        log "#{message} #{time}", indent: !inline, time: !inline
+      end
+
+      def rjust(str, start_string)
+        str.rjust(free_space(start_string))
+      end
+
+      def slice(str)
+        if (index = free_space(t(code: 'state.using_cache'))) >= 0 # free space by longest status
+          str.slice(0..index)
+        else
+          str.slice(0)
+        end
+      end
+
+      def free_space(str)
+        base_time = log_time? ? log_time.length : 0
+        indent = log_indent.length
+        str = Paint.unpaint(str.to_s).length
+        time = 15
+        terminal_width - base_time - str - indent - time
+      end
+
+      def terminal_width
+        @terminal_width ||= `tput cols`.strip.to_i
+      end
+    end # Logging
+  end # Application
+end # Dapp

data/lib/dapp/application/path.rb

@@ -0,0 +1,31 @@
+module Dapp
+  # Application
+  class Application
+    # Path
+    module Path
+      def build_cache_path(*path)
+        make_path(@build_cache_path, *path).expand_path.tap do |p|
+          FileUtils.mkdir_p p.parent
+        end
+      end
+
+      def home_path(*path)
+        make_path(config._home_path, *path).expand_path
+      end
+
+      def build_path(*path)
+        make_path(@build_path, *path).expand_path.tap { |p| FileUtils.mkdir_p p.parent }
+      end
+
+      def container_build_path(*path)
+        make_path('/.build', *path)
+      end
+
+      private
+
+      def make_path(base, *path)
+        path.compact.map(&:to_s).inject(Pathname.new(base), &:+)
+      end
+    end # Path
+  end # Application
+end # Dapp

data/lib/dapp/application/tags.rb

@@ -0,0 +1,65 @@
+module Dapp
+  # Application
+  class Application
+    # Tags
+    module Tags
+      protected
+
+      def git_repo
+        @git_repo ||= GitRepo::Own.new(self)
+      end
+
+      def tags
+        tags = simple_tags + branch_tags + commit_tags + build_tags + ci_tags
+        tags << :latest if tags.empty?
+        tags
+      end
+
+      def simple_tags
+        cli_options[:tag]
+      end
+
+      def branch_tags
+        return [] unless cli_options[:tag_branch]
+        fail Error::Application, code: :git_branch_without_name if (branch = git_repo.branch) == 'HEAD'
+        [branch]
+      end
+
+      def commit_tags
+        return [] unless cli_options[:tag_commit]
+        commit = git_repo.latest_commit
+        [commit]
+      end
+
+      def build_tags
+        return [] unless cli_options[:tag_build_id]
+
+        if ENV['GITLAB_CI']
+          build_id = ENV['CI_BUILD_ID']
+        elsif ENV['TRAVIS']
+          build_id = ENV['TRAVIS_BUILD_NUMBER']
+        else
+          fail Error::Application, code: :ci_environment_required
+        end
+
+        [build_id]
+      end
+
+      def ci_tags
+        return [] unless cli_options[:tag_ci]
+
+        if ENV['GITLAB_CI']
+          branch = ENV['CI_BUILD_REF_NAME']
+          tag = ENV['CI_BUILD_TAG']
+        elsif ENV['TRAVIS']
+          branch = ENV['TRAVIS_BRANCH']
+          tag = ENV['TRAVIS_TAG']
+        else
+          fail Error::Application, code: :ci_environment_required
+        end
+
+        [branch, tag].compact
+      end
+    end # Tags
+  end # Application
+end # Dapp