dapp 0.5.13 → 0.6.0

data/lib/dapp/project/logging/process.rb

@@ -0,0 +1,104 @@
+module Dapp
+  # Project
+  class Project
+    # Logging
+    module Logging
+      # Process
+      module Process
+        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, **kwargs, &blk)
+          log_process(message, **kwargs.merge(style: { message: :secondary, success: :secondary }), &blk)
+        end
+
+        protected
+
+        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 Exception::Base, 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
+    end # Logging
+  end # Project
+end # Dapp

data/lib/dapp/project/paint.rb

@@ -0,0 +1,16 @@
+module Dapp
+  # Project
+  class Project
+    # Paint
+    module Paint
+      def paint_initialize
+        ::Paint.mode = case cli_options[:log_color]
+                       when 'auto' then STDOUT.tty? ? 8 : 0
+                       when 'on'   then 8
+                       when 'off'  then 0
+                       else raise
+                       end
+      end
+    end # Paint
+  end # Project
+end # Dapp

data/lib/dapp/project/ssh_agent.rb

@@ -0,0 +1,77 @@
+module Dapp
+  # Project
+  class Project
+    # SshAgent
+    module SshAgent
+      class << self
+        def included(_base)
+          ::Dapp::Helper::Shellout.default_env_keys << 'SSH_AUTH_SOCK'
+        end
+      end # << self
+
+      def run_ssh_agent
+        sock_name = "dapp-ssh-#{SecureRandom.uuid}"
+
+        "/tmp/#{sock_name}".tap do |sock_path|
+          Process.fork do
+            Prctl.call(Prctl::PR_SET_PDEATHSIG, Signal.list['TERM'], 0, 0, 0)
+
+            Process.setproctitle sock_name
+
+            @ssh_agent_pid = nil
+
+            Signal.trap('INT') {  }
+            Signal.trap('TERM') { Process.kill('TERM', @ssh_agent_pid) if @ssh_agent_pid }
+
+            @ssh_agent_pid =  Process.fork do
+              STDOUT.reopen '/dev/null', 'a'
+              STDERR.reopen '/dev/null', 'a'
+              exec 'ssh-agent', '-d', '-a', sock_path
+            end
+
+            Process.wait @ssh_agent_pid
+          end
+
+          begin
+            ::Timeout.timeout(10) do
+              until File.exist? sock_path
+                sleep 0.001
+              end
+            end
+          rescue ::Timeout::Error
+            raise ::Dapp::Error::Project, code: :cannot_run_ssh_agent
+          end
+        end # sock_path
+      end
+
+      def add_ssh_key(ssh_key_path)
+        shellout! "ssh-add #{ssh_key_path}", env: {SSH_AUTH_SOCK: ssh_auth_sock(force_run_agent: true)}
+      end
+
+      def ssh_auth_sock(force_run_agent: false)
+        @ssh_auth_sock ||= begin
+          system_ssh_auth_sock = nil
+          system_ssh_auth_sock = File.expand_path(ENV['SSH_AUTH_SOCK']) if ENV['SSH_AUTH_SOCK'] && File.exist?(ENV['SSH_AUTH_SOCK'])
+
+          if force_run_agent
+            run_ssh_agent.tap { |ssh_auth_sock| ENV['SSH_AUTH_SOCK'] = ssh_auth_sock }
+          else
+            system_ssh_auth_sock
+          end
+        end
+      end
+
+      def setup_ssh_agent
+        return unless cli_options[:ssh_key]
+
+        cli_options[:ssh_key].each do |ssh_key|
+          raise ::Dapp::Error::Project, code: :ssh_key_not_found,
+                                        data: { path: ssh_key } unless File.exist? ssh_key
+
+          File.chmod 0600, ssh_key
+          add_ssh_key ssh_key
+        end
+      end
+    end # SshAgent
+  end # Project
+end # Dapp

data/lib/dapp/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.5.13
+  version: 0.6.0
 platform: ruby
 authors:
 - Dmitry Stolyarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-14 00:00:00.000000000 Z
+date: 2016-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -314,6 +314,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.1
+- !ruby/object:Gem::Dependency
+  name: ruby-prof
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.15.9
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.15.9
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 description: Build docker packaged apps using chef or shell
 email:
 - dmitry.stolyarov@flant.com
@@ -327,36 +347,34 @@ files:
 - config/en/net_status.yml
 - lib/dapp.rb
 - lib/dapp/application.rb
-- lib/dapp/application/deps/gitartifact.rb
 - lib/dapp/application/git_artifact.rb
-- lib/dapp/application/logging.rb
 - lib/dapp/application/path.rb
-- lib/dapp/application/system_shellout.rb
 - lib/dapp/application/tags.rb
 - lib/dapp/build/stage/artifact.rb
 - lib/dapp/build/stage/base.rb
-- lib/dapp/build/stage/chef_cookbooks.rb
+- lib/dapp/build/stage/before_install.rb
+- lib/dapp/build/stage/before_setup.rb
 - lib/dapp/build/stage/docker_instructions.rb
 - lib/dapp/build/stage/from.rb
-- lib/dapp/build/stage/infra_install.rb
-- lib/dapp/build/stage/infra_setup.rb
-- lib/dapp/build/stage/install.rb
+- lib/dapp/build/stage/ga_archive.rb
+- lib/dapp/build/stage/ga_archive_dependencies.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/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.rb
-- lib/dapp/build/stage/source_1.rb
-- lib/dapp/build/stage/source_1_archive.rb
-- lib/dapp/build/stage/source_1_archive_dependencies.rb
-- lib/dapp/build/stage/source_1_dependencies.rb
-- lib/dapp/build/stage/source_2.rb
-- lib/dapp/build/stage/source_2_dependencies.rb
-- lib/dapp/build/stage/source_3.rb
-- lib/dapp/build/stage/source_3_dependencies.rb
-- lib/dapp/build/stage/source_4.rb
-- lib/dapp/build/stage/source_4_dependencies.rb
-- lib/dapp/build/stage/source_5.rb
-- lib/dapp/build/stage/source_base.rb
-- lib/dapp/build/stage/source_dependencies_base.rb
+- lib/dapp/build/stage/setup/chef_cookbooks.rb
+- lib/dapp/build/stage/setup/ga_post_setup_patch.rb
+- lib/dapp/build/stage/setup/ga_post_setup_patch_dependencies.rb
+- lib/dapp/build/stage/setup/ga_pre_setup_patch.rb
+- lib/dapp/build/stage/setup/ga_pre_setup_patch_dependencies.rb
+- lib/dapp/build/stage/setup/setup.rb
 - lib/dapp/builder/base.rb
 - lib/dapp/builder/chef.rb
 - lib/dapp/builder/chef/berksfile.rb
@@ -365,11 +383,13 @@ files:
 - lib/dapp/builder/shell.rb
 - lib/dapp/cli.rb
 - lib/dapp/cli/base.rb
+- lib/dapp/cli/bp.rb
 - lib/dapp/cli/build.rb
+- lib/dapp/cli/cleanup.rb
 - lib/dapp/cli/list.rb
 - lib/dapp/cli/push.rb
 - lib/dapp/cli/run.rb
-- lib/dapp/cli/smartpush.rb
+- lib/dapp/cli/spush.rb
 - lib/dapp/cli/stages.rb
 - lib/dapp/cli/stages/cleanup.rb
 - lib/dapp/cli/stages/flush.rb
@@ -380,16 +400,23 @@ files:
 - lib/dapp/config/git_artifact.rb
 - lib/dapp/config/main.rb
 - lib/dapp/config/shell.rb
-- lib/dapp/controller.rb
+- lib/dapp/docker_registry.rb
+- lib/dapp/docker_registry/base.rb
+- lib/dapp/docker_registry/default.rb
+- lib/dapp/docker_registry/mod/authorization.rb
+- lib/dapp/docker_registry/mod/request.rb
 - lib/dapp/error/application.rb
 - lib/dapp/error/base.rb
 - lib/dapp/error/build.rb
 - lib/dapp/error/config.rb
-- lib/dapp/error/controller.rb
 - lib/dapp/error/dappfile.rb
+- lib/dapp/error/image.rb
+- lib/dapp/error/project.rb
+- lib/dapp/error/registry.rb
 - lib/dapp/error/shellout.rb
 - lib/dapp/exception/base.rb
 - lib/dapp/exception/introspect_image.rb
+- lib/dapp/exception/registry.rb
 - lib/dapp/filelock.rb
 - lib/dapp/git_artifact.rb
 - lib/dapp/git_repo/base.rb
@@ -397,7 +424,6 @@ files:
 - lib/dapp/git_repo/remote.rb
 - lib/dapp/helper/cli.rb
 - lib/dapp/helper/i18n.rb
-- lib/dapp/helper/log.rb
 - lib/dapp/helper/net_status.rb
 - lib/dapp/helper/paint.rb
 - lib/dapp/helper/sha256.rb
@@ -407,6 +433,27 @@ files:
 - lib/dapp/image/argument.rb
 - lib/dapp/image/docker.rb
 - lib/dapp/image/stage.rb
+- lib/dapp/lock/base.rb
+- lib/dapp/lock/error.rb
+- lib/dapp/lock/file.rb
+- lib/dapp/prctl.rb
+- lib/dapp/project.rb
+- lib/dapp/project/command/bp.rb
+- lib/dapp/project/command/build.rb
+- lib/dapp/project/command/cleanup.rb
+- lib/dapp/project/command/common.rb
+- lib/dapp/project/command/list.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/dappfile.rb
+- lib/dapp/project/lock.rb
+- lib/dapp/project/logging/base.rb
+- lib/dapp/project/logging/process.rb
+- lib/dapp/project/paint.rb
+- lib/dapp/project/ssh_agent.rb
 - lib/dapp/version.rb
 homepage: https://github.com/flant/dapp
 licenses:

data/lib/dapp/application/deps/gitartifact.rb

@@ -1,39 +0,0 @@
-module Dapp
-  # Application
-  class Application
-    # Deps
-    module Deps
-      # Gitartifact
-      module Gitartifact
-        GITARTIFACT_IMAGE = 'dappdeps/gitartifact:0.1.5'.freeze
-
-        def gitartifact_container_name # FIXME: hashsum(image) or dockersafe()
-          GITARTIFACT_IMAGE.tr('/', '_').tr(':', '_')
-        end
-
-        def gitartifact_container
-          @gitartifact_container ||= begin
-            if shellout("docker inspect #{gitartifact_container_name}").exitstatus.nonzero?
-              log_secondary_process(t(code: 'process.gitartifact_container_loading'), short: true) do
-                shellout ['docker run',
-                          '--restart=no',
-                          "--name #{gitartifact_container_name}",
-                          "--volume /.dapp/deps/gitartifact #{GITARTIFACT_IMAGE}",
-                          '2>/dev/null'].join(' ')
-              end
-            end
-            gitartifact_container_name
-          end
-        end
-
-        def git_path
-          '/.dapp/deps/gitartifact/bin/git'
-        end
-
-        def sudo_path
-          '/.dapp/deps/gitartifact/bin/sudo'
-        end
-      end # Gitartifact
-    end # Deps
-  end # Application
-end # Dapp

data/lib/dapp/application/logging.rb

@@ -1,120 +0,0 @@
-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, **kwargs, &blk)
-        log_process(message, **kwargs.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 Exception::Base, 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