dapp 0.11.0 → 0.12.0

data/lib/dapp/dimg/image/docker.rb

@@ -72,15 +72,21 @@ module Dapp
 
         class << self
           def image_name_format
-            separator = '[_.]|__|[-]*'
-            tag = "[[:alnum:]][[[:alnum:]]#{separator}]{0,127}"
-            "#{DockerRegistry.repo_name_format}(:(?<tag>#{tag}))?"
+            "#{DockerRegistry.repo_name_format}(:(?<tag>#{tag_format}))?"
+          end
+
+          def tag_format
+            '(?![-.])[a-zA-Z0-9_.-]{1,127}'
           end
 
           def image_name?(name)
             !(/^#{image_name_format}$/ =~ name).nil?
           end
 
+          def tag?(name)
+            !(/^#{tag_format}$/ =~ name).nil?
+          end
+
           def tag!(id:, tag:)
             ::Dapp::Dapp.shellout!("docker tag #{id} #{tag}")
             cache_reset

data/lib/dapp/helper/cli.rb

@@ -16,8 +16,10 @@ module Dapp
         exit 1
       end
 
-      def required_argument(cli)
+      def required_argument(cli, argument)
         unless (arg = cli.cli_arguments.pop)
+          STDERR.puts "Error: required argument `#{argument.upcase}`"
+          puts
           puts cli.opt_parser
           exit 1
         end

data/lib/dapp/helper/net_status.rb

@@ -8,7 +8,11 @@ module Dapp
 
         def message(exception)
           net_status = net_status(exception)
-          net_status[:message] || [net_status[:error], net_status[:code]].compact.join(': ')
+          net_status[:message] || begin
+            data = net_status[:data].reject {|k, _| k == :backtrace}
+            data = nil if data.empty?
+            [net_status[:error], [net_status[:context], net_status[:code]].compact.join('.'), data].compact.join(': ')
+          end
         end
 
         def before_error_message(exception)

data/lib/dapp/helper/trivia.rb

@@ -24,7 +24,7 @@ module Dapp
         end
       end
 
-      def self.class_to_lowercase(class_name = self.class)
+      def self.class_to_lowercase(class_name = self)
         class_name.to_s.split('::').last.split(/(?=[[:upper:]]|[0-9])/).join('_').downcase.to_s
       end
     end # Trivia

data/lib/dapp/version.rb

@@ -1,4 +1,4 @@
 module Dapp
-  VERSION = '0.11.0'.freeze
-  BUILD_CACHE_VERSION = 7
+  VERSION = '0.12.0'.freeze
+  BUILD_CACHE_VERSION = 8
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
 platform: ruby
 authors:
 - Dmitry Stolyarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-10 00:00:00.000000000 Z
+date: 2017-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -403,8 +403,8 @@ files:
 - config/en/net_status.yml
 - lib/dapp.rb
 - lib/dapp/cli.rb
-- lib/dapp/cli/base.rb
-- lib/dapp/config/base.rb
+- lib/dapp/cli/command/base.rb
+- lib/dapp/config/config.rb
 - lib/dapp/config/directive/base.rb
 - lib/dapp/config/error/config.rb
 - lib/dapp/core_ext/hash.rb
@@ -423,6 +423,53 @@ files:
 - lib/dapp/dapp/shellout/base.rb
 - lib/dapp/dapp/shellout/streaming.rb
 - lib/dapp/dapp/ssh_agent.rb
+- lib/dapp/deployment.rb
+- lib/dapp/deployment/app.rb
+- lib/dapp/deployment/cli/cli.rb
+- lib/dapp/deployment/cli/command/base.rb
+- lib/dapp/deployment/cli/command/deployment.rb
+- lib/dapp/deployment/cli/command/deployment/apply.rb
+- lib/dapp/deployment/cli/command/deployment/minikube_setup.rb
+- lib/dapp/deployment/cli/command/deployment/mrproper.rb
+- lib/dapp/deployment/cli/command/deployment/secret_generate.rb
+- lib/dapp/deployment/cli/command/deployment/secret_key_generate.rb
+- lib/dapp/deployment/config/config.rb
+- lib/dapp/deployment/config/directive/app.rb
+- lib/dapp/deployment/config/directive/app/instance_methods.rb
+- lib/dapp/deployment/config/directive/base.rb
+- lib/dapp/deployment/config/directive/deployment.rb
+- lib/dapp/deployment/config/directive/expose.rb
+- lib/dapp/deployment/config/directive/group.rb
+- lib/dapp/deployment/config/directive/job.rb
+- lib/dapp/deployment/config/directive/mod/group.rb
+- lib/dapp/deployment/config/directive/mod/jobs.rb
+- lib/dapp/deployment/config/directive/namespace.rb
+- lib/dapp/deployment/config/directive/namespace/instance_methods.rb
+- lib/dapp/deployment/core_ext/hash.rb
+- lib/dapp/deployment/dapp/command/apply.rb
+- lib/dapp/deployment/dapp/command/common.rb
+- lib/dapp/deployment/dapp/command/minikube_setup.rb
+- lib/dapp/deployment/dapp/command/mrproper.rb
+- lib/dapp/deployment/dapp/command/secret_generate.rb
+- lib/dapp/deployment/dapp/command/secret_key_generate.rb
+- lib/dapp/deployment/dapp/dapp.rb
+- lib/dapp/deployment/dapp/dappfile.rb
+- lib/dapp/deployment/deployment.rb
+- lib/dapp/deployment/error/app.rb
+- lib/dapp/deployment/error/base.rb
+- lib/dapp/deployment/error/command.rb
+- lib/dapp/deployment/error/config.rb
+- lib/dapp/deployment/error/deployment.rb
+- lib/dapp/deployment/error/kubernetes.rb
+- lib/dapp/deployment/kube_app.rb
+- lib/dapp/deployment/kube_base.rb
+- lib/dapp/deployment/kube_deployment.rb
+- lib/dapp/deployment/kubernetes.rb
+- lib/dapp/deployment/kubernetes/error.rb
+- lib/dapp/deployment/mod/jobs.rb
+- lib/dapp/deployment/mod/namespace.rb
+- lib/dapp/deployment/mod/system_environments.rb
+- lib/dapp/deployment/secret.rb
 - lib/dapp/dimg.rb
 - lib/dapp/dimg/artifact.rb
 - lib/dapp/dimg/build/stage/after_install_artifact.rb
@@ -449,7 +496,6 @@ files:
 - lib/dapp/dimg/build/stage/install/ga_pre_install_patch.rb
 - lib/dapp/dimg/build/stage/install/ga_pre_install_patch_dependencies.rb
 - lib/dapp/dimg/build/stage/install/install.rb
-- lib/dapp/dimg/build/stage/mod/git_artifact_dependencies.rb
 - lib/dapp/dimg/build/stage/mod/group.rb
 - lib/dapp/dimg/build/stage/mod/logging.rb
 - lib/dapp/dimg/build/stage/setup/ga_post_setup_patch.rb
@@ -465,42 +511,41 @@ files:
 - lib/dapp/dimg/builder/chef/cookbook_metadata.rb
 - lib/dapp/dimg/builder/none.rb
 - lib/dapp/dimg/builder/shell.rb
-- lib/dapp/dimg/cli/base.rb
-- lib/dapp/dimg/cli/bp.rb
-- lib/dapp/dimg/cli/build.rb
-- lib/dapp/dimg/cli/build_context.rb
-- lib/dapp/dimg/cli/build_context/export.rb
-- lib/dapp/dimg/cli/build_context/import.rb
-- lib/dapp/dimg/cli/cleanup.rb
 - lib/dapp/dimg/cli/cli.rb
-- lib/dapp/dimg/cli/dimg.rb
-- lib/dapp/dimg/cli/list.rb
-- lib/dapp/dimg/cli/mrproper.rb
-- lib/dapp/dimg/cli/push.rb
-- lib/dapp/dimg/cli/run.rb
-- lib/dapp/dimg/cli/spush.rb
-- lib/dapp/dimg/cli/stage_image.rb
-- lib/dapp/dimg/cli/stages.rb
-- lib/dapp/dimg/cli/stages/cleanup_local.rb
-- lib/dapp/dimg/cli/stages/cleanup_repo.rb
-- lib/dapp/dimg/cli/stages/flush_local.rb
-- lib/dapp/dimg/cli/stages/flush_repo.rb
-- lib/dapp/dimg/cli/stages/pull.rb
-- lib/dapp/dimg/cli/stages/push.rb
-- lib/dapp/dimg/cli/tag.rb
-- lib/dapp/dimg/config/artifact_dimg.rb
-- lib/dapp/dimg/config/artifact_group.rb
-- lib/dapp/dimg/config/base.rb
-- lib/dapp/dimg/config/dimg.rb
-- lib/dapp/dimg/config/dimg/instance_methods.rb
-- lib/dapp/dimg/config/dimg/validation.rb
-- lib/dapp/dimg/config/dimg_group.rb
-- lib/dapp/dimg/config/dimg_group_base.rb
-- lib/dapp/dimg/config/dimg_group_main.rb
+- lib/dapp/dimg/cli/command/base.rb
+- lib/dapp/dimg/cli/command/dimg.rb
+- lib/dapp/dimg/cli/command/dimg/bp.rb
+- lib/dapp/dimg/cli/command/dimg/build.rb
+- lib/dapp/dimg/cli/command/dimg/build_context.rb
+- lib/dapp/dimg/cli/command/dimg/build_context/export.rb
+- lib/dapp/dimg/cli/command/dimg/build_context/import.rb
+- lib/dapp/dimg/cli/command/dimg/cleanup.rb
+- lib/dapp/dimg/cli/command/dimg/list.rb
+- lib/dapp/dimg/cli/command/dimg/mrproper.rb
+- lib/dapp/dimg/cli/command/dimg/push.rb
+- lib/dapp/dimg/cli/command/dimg/run.rb
+- lib/dapp/dimg/cli/command/dimg/spush.rb
+- lib/dapp/dimg/cli/command/dimg/stage_image.rb
+- lib/dapp/dimg/cli/command/dimg/stages.rb
+- lib/dapp/dimg/cli/command/dimg/stages/cleanup_local.rb
+- lib/dapp/dimg/cli/command/dimg/stages/cleanup_repo.rb
+- lib/dapp/dimg/cli/command/dimg/stages/flush_local.rb
+- lib/dapp/dimg/cli/command/dimg/stages/flush_repo.rb
+- lib/dapp/dimg/cli/command/dimg/stages/pull.rb
+- lib/dapp/dimg/cli/command/dimg/stages/push.rb
+- lib/dapp/dimg/cli/command/dimg/tag.rb
+- lib/dapp/dimg/config/config.rb
 - lib/dapp/dimg/config/directive/artifact.rb
 - lib/dapp/dimg/config/directive/artifact_base.rb
+- lib/dapp/dimg/config/directive/artifact_dimg.rb
+- lib/dapp/dimg/config/directive/artifact_group.rb
 - lib/dapp/dimg/config/directive/base.rb
 - lib/dapp/dimg/config/directive/chef.rb
+- lib/dapp/dimg/config/directive/dimg.rb
+- lib/dapp/dimg/config/directive/dimg/instance_methods.rb
+- lib/dapp/dimg/config/directive/dimg/validation.rb
+- lib/dapp/dimg/config/directive/dimg_group.rb
+- lib/dapp/dimg/config/directive/dimg_group_base.rb
 - lib/dapp/dimg/config/directive/docker/artifact.rb
 - lib/dapp/dimg/config/directive/docker/base.rb
 - lib/dapp/dimg/config/directive/docker/dimg.rb
@@ -509,7 +554,6 @@ files:
 - lib/dapp/dimg/config/directive/mount.rb
 - lib/dapp/dimg/config/directive/shell/artifact.rb
 - lib/dapp/dimg/config/directive/shell/dimg.rb
-- lib/dapp/dimg/dapp/command.rb
 - lib/dapp/dimg/dapp/command/bp.rb
 - lib/dapp/dimg/dapp/command/build.rb
 - lib/dapp/dimg/dapp/command/build_context/common.rb
@@ -531,6 +575,8 @@ files:
 - lib/dapp/dimg/dapp/command/stages/pull.rb
 - lib/dapp/dimg/dapp/command/stages/push.rb
 - lib/dapp/dimg/dapp/command/tag.rb
+- lib/dapp/dimg/dapp/dapp.rb
+- lib/dapp/dimg/dapp/dappfile.rb
 - lib/dapp/dimg/dimg.rb
 - lib/dapp/dimg/dimg/git_artifact.rb
 - lib/dapp/dimg/dimg/path.rb
@@ -593,7 +639,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.5.0
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.8

data/lib/dapp/cli/base.rb

@@ -1,63 +0,0 @@
-module Dapp
-  class CLI
-    class Base < ::Dapp::CLI
-      option :dir,
-             long: '--dir PATH',
-             description: 'Change to directory',
-             on: :head
-
-      option :build_dir,
-             long: '--build-dir PATH',
-             description: 'Directory where build cache stored (DIR/.dapp_build by default)'
-
-      option :log_quiet,
-             short: '-q',
-             long: '--quiet',
-             description: 'Suppress logging',
-             default: false,
-             boolean: true
-
-      option :log_verbose,
-             long: '--verbose',
-             description: 'Enable verbose output',
-             default: false,
-             boolean: true
-
-      option :log_time,
-             long: '--time',
-             description: 'Enable output with time',
-             default: false,
-             boolean: true
-
-      option :ignore_config_warning,
-             long: '--ignore-config-sequential-processing-warnings',
-             default: false,
-             boolean: true
-
-      option :log_color,
-             long: '--color MODE',
-             description: 'Display output in color on the terminal',
-             in: %w(auto on off),
-             default: 'auto'
-
-      option :dry_run,
-             long: '--dry-run',
-             default: false,
-             boolean: true
-
-      option :dev,
-             long: '--dev',
-             default: false,
-             boolean: true
-
-      def initialize
-        self.class.options.merge!(Base.options)
-        super()
-      end
-
-      def run(_argv = ARGV)
-        raise
-      end
-    end
-  end
-end

data/lib/dapp/config/base.rb

@@ -1,54 +0,0 @@
-module Dapp
-  module Config
-    class Base
-      def initialize(dapp:, &blk)
-        @dapp = dapp
-        instance_eval(&blk) if block_given?
-      end
-
-      protected
-
-      attr_reader :dapp
-
-      def directive_eval(directive, &blk)
-        directive.instance_eval(&blk) if block_given?
-        directive
-      end
-
-      def ref_variables
-        [:@dapp]
-      end
-
-      def marshal_dump
-        instance_variables
-          .reject {|variable| ref_variables.include? variable}
-          .map {|variable| [variable, instance_variable_get(variable)]}
-      end
-
-      def marshal_load(variable_values)
-        variable_values.each do |variable, value|
-          instance_variable_set(variable, value)
-        end
-
-        self
-      end
-
-      def _clone
-        Marshal.load(Marshal.dump(self)).tap do |obj|
-          _set_ref_variables_to(obj)
-        end
-      end
-
-      def _clone_to(obj)
-        obj.marshal_load(marshal_dump)
-        _set_ref_variables_to(obj)
-      end
-
-      def _set_ref_variables_to(obj)
-        ref_variables.each do |ref_variable|
-          obj.instance_variable_set(ref_variable, instance_variable_get(ref_variable))
-        end
-      end
-    end
-  end
-end

data/lib/dapp/dimg/build/stage/mod/git_artifact_dependencies.rb

@@ -1,23 +0,0 @@
-module Dapp
-  module Dimg
-    module Build
-      module Stage
-        module Mod
-          module GitArtifactsDependencies
-            def local_git_artifacts_dependencies
-              dimg.local_git_artifacts.map do |git_artifact|
-                args = []
-                args << self
-                if dimg.dev_mode?
-                  args << git_artifact.latest_commit
-                  args << nil
-                end
-                git_artifact.stage_dependencies_checksums(*args)
-              end
-            end
-          end
-        end # Mod
-      end # Stage
-    end # Build
-  end # Dimg
-end # Dapp

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

@@ -1,16 +0,0 @@
-module Dapp
-  module Dimg
-    module CLI
-      class Base < ::Dapp::CLI::Base
-        def run(argv = ARGV)
-          self.class.parse_options(self, argv)
-          ::Dapp::Dapp.new(cli_options: config, dimgs_patterns: cli_arguments).public_send(run_method)
-        end
-
-        def run_method
-          class_to_lowercase
-        end
-      end
-    end
-  end
-end

data/lib/dapp/dimg/config/artifact_dimg.rb

@@ -1,17 +0,0 @@
-module Dapp
-  module Dimg
-    module Config
-      class ArtifactDimg < Dimg
-        def validate_scratch!
-        end
-
-        def validate_artifacts_artifacts!
-        end
-
-        def validated_artifacts
-          _git_artifact._local + _git_artifact._remote
-        end
-      end
-    end
-  end
-end

data/lib/dapp/dimg/config/artifact_group.rb

@@ -1,43 +0,0 @@
-module Dapp
-  module Dimg
-    module Config
-      class ArtifactGroup < DimgGroup
-        def export(*args, &blk)
-          artifact_config = pass_to_default(ArtifactDimg.new("artifact-#{SecureRandom.hex(2)}", dapp: dapp))
-          artifact = Directive::Artifact.new(dapp: dapp, config: artifact_config)
-          artifact.export(*args, &blk).tap do
-            _export.concat artifact._export
-          end
-        end
-
-        def _shell(&blk)
-          @_shell ||= Directive::Shell::Artifact.new(dapp: dapp, &blk)
-        end
-
-        def _docker(&blk)
-          @_docker ||= Directive::Docker::Artifact.new(dapp: dapp, &blk)
-        end
-
-        def _export
-          @_export ||= []
-        end
-
-        def validate!
-          _export.each(&:validate!)
-        end
-
-        undef :artifact
-        undef :dimg
-        undef :dimg_group
-
-        protected
-
-        def check_dimg_directive_order(_directive)
-        end
-
-        def check_dimg_group_directive_order(_directive)
-        end
-      end
-    end
-  end
-end