dapp 0.13.3 → 0.13.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b4e5c7613863b4e3513c88cb084d0b323c9edc54
-  data.tar.gz: 8f9c887894a7af4f10b903a4b384bc0476eef466
+  metadata.gz: 6570b7b1469e193e6f8ff6f6af3aa14b209859e7
+  data.tar.gz: d3c5e800a04f70a35ca60a5a91dd83c026c5862a
 SHA512:
-  metadata.gz: aaedc840723eade1037daa909219ad3b009ea44f19405f20dcc42f80afa9058d4d084eaed63738a6c98d60ac36da914fc0a9df6e8dd0de46eb9f6d06bfa52108
-  data.tar.gz: 553efb13630ccb41e2ba2c22d81b3af28b746651b13bd012aff21ff082cdf941d3082372d89a3eaa0335ae61ac5dd9660a0c4afc28e19cf4b3cf49aad50cf7c5
+  metadata.gz: b9ce968a3bb3bcb5ae8e41a1baa09a6f60b62600aca223887aa007a90ca3fbdf90ba2990c2b3e24c87a2ff0c77491d7a2a0d6e1e5ccb3e01eb88e352550be68f
+  data.tar.gz: 4fd1fae4d99bec6b86f818c0e43991d4d14354db0fa30a1e177820cbbba43e12f430128aa06594a4ec2ce5713eed695d97beea4d5407bead8923b678b790dd06

data/bin/dapp

@@ -5,20 +5,7 @@
 require 'rubygems'
 require 'dapp'
 
-def check_docker_version
-  required_docker_version = '1.10.0'
-  if Gem::Version.new(required_docker_version) >= Gem::Version.new(`docker --version`[/(\d+\.)+\d+/])
-    $stderr.puts(Dapp::Dapp.paint_string("Required docker version: >= #{required_docker_version}!", :warning))
-    exit 1
-  end
-rescue Errno::ENOENT => e
-  $stderr.puts(Dapp::Dapp.paint_string(e.message, :warning))
-  exit 1
-end
-
 begin
-  check_docker_version
-
   begin
     begin
       Dapp::CLI.new.run

data/config/en/common.yml

@@ -39,7 +39,6 @@ en:
       using_cache: '[USING CACHE]'
       not_present: '[NOT PRESENT]'
       build: '[BUILD]'
-      empty: '[EMPTY]'
       push: '[PUSH]'
       pull: '[PULL]'
       tag: '[TAG]'
@@ -54,7 +53,10 @@ en:
       stage_artifact_rewritten: "WARNING: Artifact stage rewritten from %{conflict_stage} to %{stage}."
       recipe_does_not_used: "WARNING: Recipe `%{recipe}` doesn't used in any stage."
       context_archive_not_found: "WARNING: context archive `%{path}` not found!"
-      dapp_secret_key_not_found: "Secrets haven't decoded: set `DAPP_SECRET_KEY`!"
+      dapp_secret_key_not_found: "WARNING: Secrets haven't decoded: secret key not found in %{not_found_in}!"
+      introspect_image_impossible: "WARNING: You can't introspect stage `%{name}`!"
+      stage_dependencies_not_found: "WARNING: Stage dependencies `%{dependencies}` haven't been found in repo `%{repo}`!"
+      unsupported_dapp_config_options: "WARNING: .dapp_config includes unsupported options [%{options}]: use only following options [%{supported_options}]"
     group:
       install: 'Install group'
       setup: 'Setup group'

data/config/en/net_status.yml

@@ -27,7 +27,7 @@ en:
       tag_name_incorrect: "Incorrect tag name `%{name}` given!"
       context_directory_not_found: "Context directory `%{path}` not found!"
       stored_build_dir_already_exist: "Cannot store current build_dir `%{path}`: restore or delete old build_dir!"
-      secret_key_not_found: "Secret key `DAPP_SECRET_KEY` not found!"
+      secret_key_not_found: "Secret key not found in %{not_found_in}!"
       minikube_not_found: "Minikube not found: install minikube (https://github.com/kubernetes/minikube/releases)!"
       minikube_not_started: "Minikube not started!"
       project_helm_chart_not_found: "Project helm chart `%{path}` not found!"
@@ -35,16 +35,25 @@ en:
       helm_release_not_exist: "Helm release `%{name}` not exist!"
       file_not_exist: "File `%{path}` doesn't exist!"
       helm_directory_not_exist: "Helm directory doesn't exist in project!"
+      values_file_not_found: "Values file `%{path}` not found!"
+      secret_values_file_not_found: "Secret values file `%{path}` not found!"
+      user_containers_detected: "User containers have been using images!\n%{ids}"
     dapp:
       no_such_dimg: "No such dimg: `%{dimgs_patterns}`!"
       no_such_app: "No such app: `%{apps_patterns}`!"
       dappfile_not_found: "Dappfile not found!"
       cannot_run_ssh_agent: "Cannot run ssh-agent"
       ssh_key_not_found: "Ssh key `%{path}` not exist!"
+      docker_not_found: "Docker not found!"
+      docker_version: "Required docker version: >= %{version}!"
+      dapp_config_file_incorrect: "%{message}"
+      incorrect_dapp_config_option: ".dapp_config includes option `%{option}` with incorrect value `%{value}`: expected one of the following types [%{expected}]"
+      incorrect_dapp_config_option_color: ".dapp_config includes option `color` with incorrect value `%{value}`: expected one of the following values [%{expected}]"
     config:
       dimg_name_required: 'Dimg name required!'
       dimg_name_incorrect: "Dimg has incorrect name `%{value}`: doesn't match regex `%{pattern}`!"
-      mount_from_required: "Mount: `from` directive required!"
+      mount_from_or_from_path_required: "Mount: `from` or `from_path` directive required!"
+      mount_duplicate_to: "Duplicate mount point `%{path}`!"
       export_to_required: "Export: `to` directive required!"
       add_to_required: "Add: `to` directive required!"
       export_cwd_absolute_path_required: "Export: given cwd path must be absolute!"
@@ -56,7 +65,6 @@ en:
       mount_from_type_required: "Mount: `from` directive expect `build_dir` or `tmp_dir` type!"
       builder_type_conflict: 'Conflict between builder types!'
       docker_from_incorrect: "`docker.from` has incorrect value `%{name}`!"
-      docker_from_without_tag: "`docker.from`: image `%{name}` without tag!"
       stage_artifact_not_associated: "Artifact not associated with any stage: expected `before` or `after` attribute!"
       stage_artifact_double_associate: "Cannot use `%{stage}` stage for artifact, already used in `%{conflict_stage}` stage!"
       stage_artifact_not_supported_associated_stage: "Bad artifact stage `%{stage}`!"
@@ -99,6 +107,7 @@ en:
       commit_not_found_in_local_git_repository: "Local git repo: commit `%{commit}` not found!\nIf commit has been rebased: run command `dapp dimg stages cleanup local --improper-git-commit`!"
       commit_not_found_in_remote_git_repository: "Remote git repo `%{url}`: commit `%{commit}` not found!\nIf commit has been rebased: run command `dapp dimg stages cleanup local --improper-git-commit`!"
       branch_not_exist_in_remote_git_repository: "Remote git repo `%{url}`: branch `%{branch}` not exist!"
+      rugged_protocol_not_supported: "Rugged has been compiled without support for `%{protocol}`.\nGit repositories will not be reachable via `%{protocol}` (`%{url}`).\nRugged.features should include `%{protocol}`."
     lock:
       timeout: "Could not obtain lock for `%{name}` within %{timeout} seconds"
     app:
@@ -113,3 +122,6 @@ en:
     kubernetes:
       kube_config_not_found: "Kube config `%{path}` not found!"
       kube_server_connection_refused: "Kube server `%{url}` connection refused: %{error}"
+    secret:
+      bad_data: "Data `%{data}` can't be decrypted: check encryption key and data."
+      key_length_too_short: "Encryption key isn't valid (required size %{required_size} bytes)!"

data/lib/dapp.rb

@@ -22,6 +22,7 @@ require 'net_status'
 require 'yaml'
 require 'openssl'
 require 'etc'
+require 'zlib'
 
 require 'dapp/version'
 require 'dapp/core_ext/hash'
@@ -30,6 +31,7 @@ require 'dapp/helper/cli'
 require 'dapp/helper/trivia'
 require 'dapp/helper/sha256'
 require 'dapp/helper/net_status'
+require 'dapp/helper/tar'
 require 'dapp/prctl'
 require 'dapp/error/base'
 require 'dapp/error/dapp'
@@ -46,6 +48,7 @@ require 'dapp/dapp/ssh_agent'
 require 'dapp/dapp/git_artifact'
 require 'dapp/dapp/dappfile'
 require 'dapp/dapp/chef'
+require 'dapp/dapp/dapp_config'
 require 'dapp/dapp/logging/base'
 require 'dapp/dapp/logging/process'
 require 'dapp/dapp/logging/paint'
@@ -89,16 +92,17 @@ require 'dapp/deployment/cli/command/base'
 require 'dapp/deployment/cli/command/deployment'
 require 'dapp/deployment/cli/command/deployment/apply'
 require 'dapp/deployment/cli/command/deployment/mrproper'
-require 'dapp/deployment/cli/command/deployment/minikube_setup'
 require 'dapp/deployment/cli/cli'
 require 'dapp/deployment/dapp/command/mrproper'
 require 'dapp/deployment/dapp/command/apply'
-require 'dapp/deployment/dapp/command/minikube_setup'
 require 'dapp/deployment/dapp/command/common'
 require 'dapp/deployment/dapp/dappfile'
 require 'dapp/deployment/dapp/dapp'
 require 'dapp/deployment/secret'
 require 'dapp/kube'
+require 'dapp/kube/error/base'
+require 'dapp/kube/error/command'
+require 'dapp/kube/error/kubernetes'
 require 'dapp/kube/client'
 require 'dapp/kube/client/error'
 require 'dapp/kube/cli/command/base'
@@ -107,17 +111,17 @@ require 'dapp/kube/cli/command/kube/deploy'
 require 'dapp/kube/cli/command/kube/dismiss'
 require 'dapp/kube/cli/command/kube/secret_key_generate'
 require 'dapp/kube/cli/command/kube/secret_generate'
-require 'dapp/kube/cli/command/kube/secret_file_encrypt'
+require 'dapp/kube/cli/command/kube/secret_extract'
+require 'dapp/kube/cli/command/kube/minikube_setup'
 require 'dapp/kube/cli/cli'
 require 'dapp/kube/dapp/command/common'
 require 'dapp/kube/dapp/command/deploy'
 require 'dapp/kube/dapp/command/dismiss'
 require 'dapp/kube/dapp/command/secret_key_generate'
 require 'dapp/kube/dapp/command/secret_generate'
-require 'dapp/kube/dapp/command/secret_file_encrypt'
+require 'dapp/kube/dapp/command/secret_extract'
+require 'dapp/kube/dapp/command/minikube_setup'
 require 'dapp/kube/dapp/dapp'
-require 'dapp/kube/error/base'
-require 'dapp/kube/error/command'
 require 'dapp/kube/secret'
 require 'dapp/dimg'
 require 'dapp/dimg/builder'
@@ -133,6 +137,7 @@ require 'dapp/dimg/build/stage/mod/group'
 require 'dapp/dimg/build/stage/base'
 require 'dapp/dimg/build/stage/ga_base'
 require 'dapp/dimg/build/stage/ga_dependencies_base'
+require 'dapp/dimg/build/stage/ga_related_dependencies_base'
 require 'dapp/dimg/build/stage/artifact_base'
 require 'dapp/dimg/build/stage/artifact_default'
 require 'dapp/dimg/build/stage/from'

data/lib/dapp/cli.rb

@@ -8,7 +8,7 @@ module Dapp
     SUBCOMMANDS = ['dimg', 'deployment', 'kube'].freeze
 
     banner <<BANNER.freeze
-Usage: dapp sub-command [sub-command options]
+Usage: dapp subcommand [subcommand options]
 
 Available subcommands: (for details, dapp SUB-COMMAND --help)
 

data/lib/dapp/cli/command/base.rb

@@ -11,20 +11,20 @@ module Dapp
                long: '--build-dir PATH',
                description: 'Directory where build cache stored (DIR/.dapp_build by default)'
 
-        option :log_quiet,
+        option :quiet,
                short: '-q',
                long: '--quiet',
                description: 'Suppress logging',
                default: false,
                boolean: true
 
-        option :log_verbose,
+        option :verbose,
                long: '--verbose',
                description: 'Enable verbose output',
                default: false,
                boolean: true
 
-        option :log_time,
+        option :time,
                long: '--time',
                description: 'Enable output with time',
                default: false,
@@ -35,7 +35,7 @@ module Dapp
                default: false,
                boolean: true
 
-        option :log_color,
+        option :color,
                long: '--color MODE',
                description: 'Display output in color on the terminal',
                in: %w(auto on off),

data/lib/dapp/config/directive/base.rb

@@ -92,8 +92,10 @@ module Dapp
         end
 
         def _clone_to(obj)
-          obj.marshal_load(marshal_dump)
-          _set_ref_variables_to(obj)
+          obj.tap do
+            obj.marshal_load(marshal_dump)
+            _set_ref_variables_to(obj)
+          end
         end
 
         def _set_ref_variables_to(obj)

data/lib/dapp/core_ext/hash.rb

@@ -12,6 +12,20 @@ module Dapp
           end
         end
       end
+
+      def symbolize_keys
+        transform_keys { |key| key.to_sym rescue key }
+      end
+
+      private
+
+      def transform_keys
+        result = {}
+        each_key do |key|
+          result[yield(key)] = self[key]
+        end
+        result
+      end
     end
   end
 end

data/lib/dapp/dapp.rb

@@ -4,6 +4,7 @@ module Dapp
     include GitArtifact
     include Dappfile
     include Chef
+    include DappConfig
 
     include Logging::Base
     include Logging::Process
@@ -13,6 +14,7 @@ module Dapp
     include SshAgent
     include Helper::Sha256
     include Helper::Trivia
+    include Helper::Tar
 
     include Deps::Gitartifact
     include Deps::Base
@@ -23,8 +25,9 @@ module Dapp
 
     def initialize(options: {})
       @options = options
-      Logging::Paint.initialize(options[:log_color])
       Logging::I18n.initialize
+      validate_config_options!
+      Logging::Paint.initialize(option_color)
     end
 
     def name
@@ -34,9 +37,9 @@ module Dapp
           repo_name = repo_name[/.*(?=\.git)/] if repo_name.end_with? '.git'
           repo_name
         elsif git_path
-          File.basename(File.dirname(git_path))
+          File.basename(File.dirname(git_path)).to_s
         else
-          path.basename
+          path.basename.to_s
         end
       end
     end
@@ -63,14 +66,19 @@ module Dapp
       make_path(@path, *path)
     end
 
-    def build_path
+    def tmp_base_dir
+      File.expand_path(options[:tmp_dir_prefix] || '/tmp')
+    end
+
+    def build_path(*path)
       @build_path ||= begin
-        if options[:build_dir]
-          Pathname.new(options[:build_dir])
+        if option_build_dir
+          Pathname.new(option_build_dir)
         else
           path('.dapp_build')
         end.expand_path.tap(&:mkpath)
       end
+      make_path(@build_path, *path)
     end
 
     def local_git_artifact_exclude_paths(&blk)
@@ -89,5 +97,23 @@ module Dapp
     def stage_dapp_label
       name
     end
+
+    def host_docker_bin
+      self.class.host_docker_bin
+    end
+
+    def self.host_docker_bin
+      @host_docker_bin ||= begin
+        raise Error::Dapp, code: :docker_not_found if (res = shellout('which docker')).exitstatus.nonzero?
+        res.stdout.strip.tap do |docker_bin|
+          current_docker_version = shellout!("#{docker_bin} --version").stdout.strip
+          required_docker_version = '1.10.0'
+
+          if Gem::Version.new(required_docker_version) >= Gem::Version.new(current_docker_version[/(\d+\.)+\d+/])
+            raise Error::Dapp, code: :docker_version, data: { version: required_docker_version }
+          end
+        end
+      end
+    end
   end # Dapp
 end # Dapp

data/lib/dapp/dapp/dapp_config.rb

@@ -0,0 +1,85 @@
+module Dapp
+  class Dapp
+    module DappConfig
+      SUPPORTED_CONFIG_OPTIONS = {
+        verbose:   [FalseClass, TrueClass],
+        quiet:     [FalseClass, TrueClass],
+        dev:       [FalseClass, TrueClass],
+        time:      [FalseClass, TrueClass],
+        dry_run:   [FalseClass, TrueClass],
+        build_dir: [String],
+        color:     [String]
+      }
+
+      SUPPORTED_CONFIG_OPTIONS.keys.each do |opt|
+        define_method "option_#{opt}" do
+          options[opt] || config_options[opt]
+        end
+      end
+
+      def option_color
+        if options[:color] == 'auto'
+          config_options[:color] || 'auto'
+        else
+          options[:color]
+        end
+      end
+
+      def option_dev
+        if options[:dev].nil?
+          config._dev_mode || config_options[:dev]
+        else
+          options[:dev]
+        end
+      end
+
+      def config_options
+        @config_options ||= begin
+          config_search_paths = []
+          config_search_paths << File.join(Dir.home)
+          config_search_paths << path if dappfile_exists?
+
+          config_search_paths.reduce({}) do |options, dir|
+            if (config_options_path = make_path(dir, '.dapp_config')).file?
+              config_options = begin
+                YAML.load_file(config_options_path).tap do |c_options|
+                  c_options.merge!(c_options.in_depth_merge(c_options['ci'] || {})) if ENV['GITLAB_CI'] || ENV['TRAVIS']
+                  c_options.delete('ci')
+                end
+              rescue Psych::SyntaxError => e
+                raise Error::Dapp, code: :dapp_config_file_incorrect, data: { message: e.message }
+              end
+              options.in_depth_merge(config_options)
+            else
+              options
+            end
+          end.symbolize_keys
+        end
+      end
+
+      def validate_config_options!
+        data_list_format = proc { |list| list.map { |e| "'#{e}'" }.join(', ') }
+
+        unless (unsupported_keys = config_options.select { |k, _| !SUPPORTED_CONFIG_OPTIONS.keys.include?(k) }.keys).empty?
+          log_warning(desc: { code: :unsupported_dapp_config_options,
+                              data: { options: data_list_format.call(unsupported_keys),
+                                      supported_options: data_list_format.call(SUPPORTED_CONFIG_OPTIONS.keys) } })
+        end
+
+        config_options.each do |k, v|
+          next unless SUPPORTED_CONFIG_OPTIONS.keys.include?(k)
+
+          if k == :color
+            raise Error::Dapp,
+                  code: :incorrect_dapp_config_option_color,
+                  data: { value: v, expected: data_list_format.call(%w(auto on off)) } unless %w(auto on off).member?(v)
+          elsif !SUPPORTED_CONFIG_OPTIONS[k].member? v.class
+            raise Error::Dapp,
+                  code: :incorrect_dapp_config_option,
+                  data: { option: k, value: v, expected: data_list_format.call(SUPPORTED_CONFIG_OPTIONS[k]) }
+          end
+        end
+      end
+    end # DappConfig
+  end # Dapp
+end # Dapp

data/lib/dapp/dapp/dappfile.rb

@@ -9,6 +9,10 @@ module Dapp
         end
       end
 
+      def dappfile_exists?
+        !!search_file_upward('Dappfile')
+      end
+
       def dappfile_path
         raise Error::Dapp, code: :dappfile_not_found unless (dappfile_path = search_file_upward('Dappfile'))
         dappfile_path