dapp 0.6.1 → 0.6.2

data/lib/dapp/version.rb

@@ -1,5 +1,5 @@
 # Version
 module Dapp
-  VERSION = '0.6.1'.freeze
+  VERSION = '0.6.2'.freeze
   BUILD_CACHE_VERSION = 3
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Dmitry Stolyarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-30 00:00:00.000000000 Z
+date: 2016-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -349,24 +349,33 @@ files:
 - lib/dapp/application.rb
 - lib/dapp/application/git_artifact.rb
 - lib/dapp/application/path.rb
+- lib/dapp/application/stages.rb
 - lib/dapp/application/tags.rb
-- lib/dapp/build/stage/artifact.rb
+- lib/dapp/artifact.rb
+- lib/dapp/build/stage/after_install_artifact.rb
+- lib/dapp/build/stage/after_setup_artifact.rb
+- lib/dapp/build/stage/artifact_base.rb
+- lib/dapp/build/stage/artifact_default.rb
 - lib/dapp/build/stage/base.rb
 - lib/dapp/build/stage/before_install.rb
+- lib/dapp/build/stage/before_install_artifact.rb
 - lib/dapp/build/stage/before_setup.rb
+- lib/dapp/build/stage/before_setup_artifact.rb
+- lib/dapp/build/stage/build_artifact.rb
 - lib/dapp/build/stage/docker_instructions.rb
 - lib/dapp/build/stage/from.rb
 - lib/dapp/build/stage/ga_archive.rb
 - lib/dapp/build/stage/ga_archive_dependencies.rb
+- lib/dapp/build/stage/ga_artifact_patch.rb
 - lib/dapp/build/stage/ga_base.rb
 - lib/dapp/build/stage/ga_dependencies_base.rb
 - lib/dapp/build/stage/ga_latest_patch.rb
+- lib/dapp/build/stage/import_artifact.rb
 - lib/dapp/build/stage/install/ga_post_install_patch.rb
 - lib/dapp/build/stage/install/ga_post_install_patch_dependencies.rb
 - lib/dapp/build/stage/install/ga_pre_install_patch.rb
 - lib/dapp/build/stage/install/ga_pre_install_patch_dependencies.rb
 - lib/dapp/build/stage/install/install.rb
-- lib/dapp/build/stage/mod/artifact.rb
 - lib/dapp/build/stage/mod/group.rb
 - lib/dapp/build/stage/mod/logging.rb
 - lib/dapp/build/stage/setup/chef_cookbooks.rb
@@ -387,19 +396,31 @@ files:
 - lib/dapp/cli/build.rb
 - lib/dapp/cli/cleanup.rb
 - lib/dapp/cli/list.rb
+- lib/dapp/cli/mrproper.rb
 - lib/dapp/cli/push.rb
 - lib/dapp/cli/run.rb
 - lib/dapp/cli/spush.rb
+- lib/dapp/cli/stage_image.rb
 - lib/dapp/cli/stages.rb
-- lib/dapp/cli/stages/cleanup.rb
-- lib/dapp/cli/stages/flush.rb
+- lib/dapp/cli/stages/cleanup_local.rb
+- lib/dapp/cli/stages/cleanup_repo.rb
+- lib/dapp/cli/stages/flush_local.rb
+- lib/dapp/cli/stages/flush_repo.rb
+- lib/dapp/cli/stages/pull.rb
+- lib/dapp/cli/stages/push.rb
 - lib/dapp/config/application.rb
 - lib/dapp/config/artifact.rb
-- lib/dapp/config/chef.rb
-- lib/dapp/config/docker.rb
-- lib/dapp/config/git_artifact.rb
+- lib/dapp/config/directive/artifact.rb
+- lib/dapp/config/directive/build_dir.rb
+- lib/dapp/config/directive/chef.rb
+- lib/dapp/config/directive/docker/artifact.rb
+- lib/dapp/config/directive/docker/base.rb
+- lib/dapp/config/directive/git_artifact.rb
+- lib/dapp/config/directive/shell/artifact.rb
+- lib/dapp/config/directive/shell/base.rb
+- lib/dapp/config/directive/tmp_dir.rb
 - lib/dapp/config/main.rb
-- lib/dapp/config/shell.rb
+- lib/dapp/core_ext/hash.rb
 - lib/dapp/docker_registry.rb
 - lib/dapp/docker_registry/base.rb
 - lib/dapp/docker_registry/default.rb
@@ -423,15 +444,12 @@ files:
 - lib/dapp/git_repo/own.rb
 - lib/dapp/git_repo/remote.rb
 - lib/dapp/helper/cli.rb
-- lib/dapp/helper/i18n.rb
 - lib/dapp/helper/net_status.rb
-- lib/dapp/helper/paint.rb
 - lib/dapp/helper/sha256.rb
-- lib/dapp/helper/shellout.rb
-- lib/dapp/helper/streaming.rb
 - lib/dapp/helper/trivia.rb
 - lib/dapp/image/argument.rb
 - lib/dapp/image/docker.rb
+- lib/dapp/image/scratch.rb
 - lib/dapp/image/stage.rb
 - lib/dapp/lock/base.rb
 - lib/dapp/lock/error.rb
@@ -443,16 +461,29 @@ files:
 - lib/dapp/project/command/cleanup.rb
 - lib/dapp/project/command/common.rb
 - lib/dapp/project/command/list.rb
+- lib/dapp/project/command/mrproper.rb
 - lib/dapp/project/command/push.rb
 - lib/dapp/project/command/run.rb
 - lib/dapp/project/command/spush.rb
-- lib/dapp/project/command/stages_cleanup.rb
-- lib/dapp/project/command/stages_flush.rb
+- lib/dapp/project/command/stage_image.rb
+- lib/dapp/project/command/stages/cleanup_local.rb
+- lib/dapp/project/command/stages/cleanup_repo.rb
+- lib/dapp/project/command/stages/common.rb
+- lib/dapp/project/command/stages/flush_local.rb
+- lib/dapp/project/command/stages/flush_repo.rb
+- lib/dapp/project/command/stages/pull.rb
+- lib/dapp/project/command/stages/push.rb
 - lib/dapp/project/dappfile.rb
+- lib/dapp/project/deps/base.rb
+- lib/dapp/project/deps/gitartifact.rb
 - lib/dapp/project/lock.rb
 - lib/dapp/project/logging/base.rb
+- lib/dapp/project/logging/i18n.rb
+- lib/dapp/project/logging/paint.rb
 - lib/dapp/project/logging/process.rb
-- lib/dapp/project/paint.rb
+- lib/dapp/project/shellout/base.rb
+- lib/dapp/project/shellout/streaming.rb
+- lib/dapp/project/shellout/system.rb
 - lib/dapp/project/ssh_agent.rb
 - lib/dapp/version.rb
 homepage: https://github.com/flant/dapp

data/lib/dapp/build/stage/artifact.rb

@@ -1,40 +0,0 @@
-module Dapp
-  module Build
-    module Stage
-      # Artifact
-      class Artifact < Base
-        include Mod::Artifact
-
-        def initialize(application, next_stage)
-          @prev_stage = InstallGroup::GAPostInstallPatch.new(application, self)
-          super
-        end
-
-        def dependencies
-          artifacts_signatures
-        end
-
-        def image
-          super do |image|
-            artifacts_labels = {}
-            artifacts.each do |artifact|
-              apply_artifact(artifact, image)
-              artifacts_labels["dapp-artifact-#{artifact[:name]}".to_sym] = artifact[:app].send(:last_stage).image.built_id
-            end
-            image.add_service_change_label artifacts_labels
-          end
-        end
-
-        protected
-
-        def should_not_be_detailed?
-          true
-        end
-
-        def ignore_log_commands?
-          true
-        end
-      end # Artifact
-    end # Stage
-  end # Build
-end # Dapp

data/lib/dapp/build/stage/mod/artifact.rb

@@ -1,79 +0,0 @@
-module Dapp
-  module Build
-    module Stage
-      # Mod
-      module Mod
-        # Artifact
-        module Artifact
-          def artifacts
-            @artifacts ||= begin
-              application.config._artifact.map do |artifact|
-                process = application.project.t(code: 'process.artifact_building', data: { name: artifact._config._name })
-                application.project.log_secondary_process(process, short: !application.project.log_verbose?) do
-                  application.project.with_log_indent do
-                    {
-                      name: artifact._config._name,
-                      options: artifact._artifact_options,
-                      app: application.artifact(artifact._config).tap(&:build!)
-                    }
-                  end
-                end
-              end
-            end
-          end
-
-          def artifacts_signatures
-            artifacts.map { |artifact| hashsum [artifact[:app].signature, artifact[:options]] }
-          end
-
-          # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
-          def apply_artifact(artifact, image)
-            return if application.project.dry_run?
-
-            artifact_name = artifact[:name]
-            app = artifact[:app]
-            cwd = artifact[:options][:cwd]
-            paths = artifact[:options][:paths]
-            owner = artifact[:options][:owner]
-            group = artifact[:options][:group]
-            where_to_add = artifact[:options][:where_to_add]
-
-            docker_options = ['--rm',
-                              "--volume #{application.tmp_path('artifact', artifact_name)}:#{app.container_tmp_path(artifact_name)}",
-                              '--entrypoint /bin/bash']
-            commands = safe_cp(where_to_add, app.container_tmp_path(artifact_name), Process.uid, Process.gid)
-            application.project.log_secondary_process(application.project.t(code: 'process.artifact_copy',
-                                                                            data: { name: artifact_name }), short: true) do
-              app.run(docker_options, [%(-ec '#{application.project.shellout_pack(commands)}')])
-            end
-
-            commands = safe_cp(application.container_tmp_path('artifact', artifact_name), where_to_add, owner, group, cwd, paths)
-            image.add_command commands
-            image.add_volume "#{application.tmp_path('artifact', artifact_name)}:#{application.container_tmp_path('artifact', artifact_name)}:ro"
-          end
-          # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
-
-          # rubocop:disable Metrics/ParameterLists
-          def safe_cp(from, to, owner, group, cwd = '', paths = [])
-            credentials = ''
-            credentials += "-o #{owner} " if owner
-            credentials += "-g #{group} " if group
-
-            copy_files = lambda do |from_, cwd_, path_ = ''|
-              cwd_ = File.expand_path(File.join('/', cwd_))
-              "find #{File.join(from_, cwd_, path_)} -type f -exec bash -ec 'install -D #{credentials} {} " \
-            "#{File.join(to, "$(echo {} | sed -e \"s/#{File.join(from_, cwd_).gsub('/', '\\/')}//g\")")}' \\;"
-            end
-
-            commands = []
-            commands << ['install', credentials, '-d', to].join(' ')
-            commands.concat(paths.empty? ? Array(copy_files.call(from, cwd)) : paths.map { |path| copy_files.call(from, cwd, path) })
-            commands << "find #{to} -type d -exec bash -ec 'install -d #{credentials} {}' \\;"
-            commands.join(' && ')
-          end
-          # rubocop:enable Metrics/ParameterLists
-        end
-      end # Mod
-    end # Stage
-  end # Build
-end # Dapp

data/lib/dapp/config/chef.rb

@@ -1,51 +0,0 @@
-module Dapp
-  module Config
-    # Chef
-    class Chef
-      attr_reader :_modules
-      attr_reader :_recipes
-
-      def initialize
-        @_modules = []
-        @_recipes = []
-      end
-
-      def module(*args)
-        @_modules.concat(args)
-      end
-
-      def reset_modules
-        @_modules.clear
-      end
-
-      def skip_module(*args)
-        @_modules.reject! { |mod| args.include? mod }
-      end
-
-      def recipe(*args)
-        @_recipes.concat(args)
-      end
-
-      def remove_recipe(*args)
-        @_recipes.reject! { |recipe| args.include? recipe }
-      end
-
-      def reset_recipes
-        @_recipes.clear
-      end
-
-      def reset_all
-        reset_modules
-        reset_recipes
-      end
-
-      def empty?
-        @_modules.empty? && @_recipes.empty?
-      end
-
-      def clone
-        Marshal.load(Marshal.dump(self))
-      end
-    end
-  end
-end

data/lib/dapp/config/docker.rb

@@ -1,82 +0,0 @@
-module Dapp
-  module Config
-    # Docker
-    class Docker
-      attr_reader :_volume, :_expose, :_env, :_label, :_cmd, :_onbuild, :_workdir, :_user, :_entrypoint
-      attr_reader :_from_cache_version
-
-      def initialize
-        @_volume = []
-        @_expose = []
-        @_env = {}
-        @_label = {}
-        @_cmd = []
-        @_onbuild = []
-      end
-
-      def from(image, cache_version: nil)
-        raise(Error::Config, code: :docker_from_incorrect, data: { name: image }) unless image =~ /^[[^ ].]+:[[^ ].]+$/
-        @_from = image
-        @_from_cache_version = cache_version
-      end
-
-      def volume(*args)
-        @_volume.concat(args)
-      end
-
-      def expose(*args)
-        @_expose.concat(args)
-      end
-
-      def env(**options)
-        @_env.merge!(options)
-      end
-
-      def label(**options)
-        @_label.merge!(options)
-      end
-
-      def cmd(*args)
-        @_cmd.concat(args)
-      end
-
-      def onbuild(*args)
-        @_onbuild.concat(args)
-      end
-
-      def workdir(val)
-        @_workdir = val
-      end
-
-      def user(val)
-        @_user = val
-      end
-
-      def entrypoint(*cmd_with_args)
-        @_entrypoint = cmd_with_args.flatten
-      end
-
-      def _from
-        @_from || raise(Error::Config, code: :docker_from_not_defined)
-      end
-
-      def _change_options
-        {
-          volume: _volume,
-          expose: _expose,
-          env: _env,
-          label: _label,
-          cmd: _cmd,
-          onbuild: _onbuild,
-          workdir: _workdir,
-          user: _user,
-          entrypoint: _entrypoint
-        }
-      end
-
-      def clone
-        Marshal.load(Marshal.dump(self))
-      end
-    end
-  end
-end

data/lib/dapp/config/git_artifact.rb

@@ -1,51 +0,0 @@
-module Dapp
-  module Config
-    # GitArtifact
-    class GitArtifact
-      attr_reader :_local
-      attr_reader :_remote
-
-      def initialize
-        @_local  = []
-        @_remote = []
-      end
-
-      def local(*args)
-        @_local.tap { |local| local << Local.new(*args) unless args.empty? }
-      end
-
-      def remote(*args)
-        @_remote.tap { |remote| remote << Remote.new(*args) unless args.empty? }
-      end
-
-      def clone
-        Marshal.load(Marshal.dump(self))
-      end
-
-      # Local
-      class Local < Artifact::Base
-        protected
-
-        def code
-          :git_artifact_unexpected_attribute
-        end
-      end
-
-      # Remote
-      class Remote < Local
-        attr_accessor :_url, :_name, :_branch
-
-        def initialize(url, where_to_add, **options)
-          @_url          = url
-          @_name         = url.gsub(%r{.*?([^\/ ]+)\.git}, '\\1')
-          @_branch       = options.delete(:branch)
-          super(where_to_add, **options)
-        end
-
-        def _artifact_options
-          super.merge(name: _name, branch: _branch)
-        end
-      end
-    end
-  end
-end