dapp 0.32.10 → 0.33.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6b6c8610f037fb2cf62988e4b190afbfa5abf1dcd8447103a30b74825f7d48f4
-  data.tar.gz: aceda4cfd8865260aadc83984352e04dae38650fb66f69587bfed24d02e052f8
+  metadata.gz: 7fc1909cdd095becba425a53927039f907538f09d0edcd3b218555d2baed57c6
+  data.tar.gz: eeee7455c2b3e82ed7b6feba45878880291afaf318a9943412b883cf63063272
 SHA512:
-  metadata.gz: '082f8f2f730992d15ef081ccd9e38969879c2c62ff0010507e93a98cb19a8585bd670b541a04c48998ae72f9451e46b649559aafc93f0a7c22091fd8ed9b711b'
-  data.tar.gz: 2a59e9cd5ae03c03f2cc8cf4a10b8d4dc665046810408b43b4512a74f6a9a3d41e65cbaa7cef75b3bf5e6c9945a3a648391821386ae353de58aa4fcc923f379c
+  metadata.gz: 52804dc919d1c0c634e387bfee8ad75d7177da13b7ee47ec831789cc15c90e34db58a789b34eb6fee71131f7b33133745cdf174bec6a9af113a263185bad51ee
+  data.tar.gz: 0380034c4898b6eeeed23426b321a90c54be38398bf985b6aacadfa7d16aae761a2077b483465e399a4632c87251ad3c8802b108102eee0a3ace756580568af1

data/bin/dapp

@@ -74,29 +74,7 @@ set_gitlab_cancel_handler if ENV["GITLAB_CI"]
 begin
   begin
     begin
-      begin
-        Dapp::CLI.new.run
-      ensure
-        if Time.now.to_date < Date.parse("2019-11-01")
-          STDERR.puts
-          STDERR.puts ::Paint["###################################################################", :red, :bold]
-          STDERR.puts ::Paint["###                   DEPRECATION WARNING!                      ###", :red, :bold]
-          STDERR.puts ::Paint["###  Dapp will be deprecated for use starting with 01.11.2019!  ###", :red, :bold]
-          STDERR.puts ::Paint["###            Please port your project to werf:                ###", :red, :bold]
-          STDERR.puts ::Paint["###                     https://werf.io                         ###", :red, :bold]
-          STDERR.puts ::Paint["###################################################################", :red, :bold]
-          STDERR.puts
-        else
-          STDERR.puts
-          STDERR.puts ::Paint["######################################################################", :red, :bold]
-          STDERR.puts ::Paint["###                     DEPRECATION WARNING!                       ###", :red, :bold]
-          STDERR.puts ::Paint["###  Dapp is deprecated for use and will not receive any support!  ###", :red, :bold]
-          STDERR.puts ::Paint["###               Please port your project to werf:                ###", :red, :bold]
-          STDERR.puts ::Paint["###                       https://werf.io                          ###", :red, :bold]
-          STDERR.puts ::Paint["######################################################################", :red, :bold]
-          STDERR.puts
-        end
-      end
+      Dapp::CLI.new.run
     rescue Dapp::Error::Base => e
       unless (message = Dapp::Helper::NetStatus.before_error_message(e)).empty?
         $stderr.puts(message)

data/config/en/net_status.yml

@@ -10,6 +10,10 @@ en:
     dappfile:
       incorrect: "Dappfile with `%{error}`:\n%{message}"
     build:
+      ruby2go_image_unexpected_exitstatus: 'ruby2go_image exited with unexpected code `%{status_code}`!'
+      ruby2go_image_command_failed: 'ruby2go_image command `%{command}` failed!'
+      ruby2go_image_command_failed_unexpected_error: 'ruby2go_image command `%{command}` failed: `%{message}`!'
+      ruby2go_builder_command_failed_unexpected_error: 'ruby2go_builder command `%{command}` failed: `%{message}`!'
       from_image_required: 'Missing from_image!'
       image_already_untagged: "Image `%{name}` untagged already!"
       image_not_exist: "Image `%{name}` doesn't exist!"
@@ -65,6 +69,9 @@ en:
       ci_environment_required: 'CI environment required (Travis or GitLab CI)!'
       git_branch_without_name: "Dimg has specific revision that isn't associated with a branch name!"
       download_failed_bad_dappfile_yml_checksum: "Cannot download dappfile-yml binary dependency from %{url}: checksum validation failed"
+      ruby2go_download_failed_bad_checksum: "Cannot download `%{progname}` binary dependency from %{url}: checksum validation failed"
+      ruby2go_command_unexpected_exitstatus: 'ruby2go `%{progname}` exited with unexpected code `%{status_code}`!'
+      ruby2go_dappdeps_command_failed_unexpected_error: 'ruby2go_dappdeps command `%{dappdeps}`/`%{command}` failed: `%{message}`!'
     config:
       dimg_name_required: 'Dimg name required!'
       dimg_name_incorrect: "Dimg has incorrect name `%{value}`: doesn't match regex `%{pattern}`!"

data/lib/dapp.rb

@@ -73,10 +73,12 @@ require 'dapp/dapp/chef'
 require 'dapp/dapp/dapp_config'
 require 'dapp/dapp/option_tags'
 require 'dapp/dapp/slug'
+require 'dapp/dapp/ruby2go'
 require 'dapp/dapp/logging/base'
 require 'dapp/dapp/logging/process'
 require 'dapp/dapp/logging/paint'
 require 'dapp/dapp/logging/i18n'
+require 'dapp/dapp/deps/common'
 require 'dapp/dapp/deps/toolchain'
 require 'dapp/dapp/deps/base'
 require 'dapp/dapp/deps/gitartifact'
@@ -149,17 +151,16 @@ require 'dapp/dimg/error/registry'
 require 'dapp/dimg/error/chef'
 require 'dapp/dimg/error/lock'
 require 'dapp/dimg/exception/base'
-require 'dapp/dimg/exception/introspect_image'
 require 'dapp/dimg/exception/registry'
 require 'dapp/dimg/builder'
 require 'dapp/dimg/builder/base'
+require 'dapp/dimg/builder/ruby2go'
 require 'dapp/dimg/builder/chef'
 require 'dapp/dimg/builder/chef/cookbook_metadata'
 require 'dapp/dimg/builder/chef/berksfile'
 require 'dapp/dimg/builder/chef/cookbook'
 require 'dapp/dimg/builder/shell'
 require 'dapp/dimg/builder/ansible'
-require 'dapp/dimg/builder/ansible/assets'
 require 'dapp/dimg/builder/none'
 require 'dapp/dimg/build/stage/mod/logging'
 require 'dapp/dimg/build/stage/mod/group'
@@ -280,7 +281,6 @@ require 'dapp/dimg/git_repo/own'
 require 'dapp/dimg/git_repo/remote'
 require 'dapp/dimg/git_artifact'
 require 'dapp/dimg/image/argument'
-require 'dapp/dimg/image/docker'
 require 'dapp/dimg/image/stage'
 require 'dapp/dimg/image/dimg'
 require 'dapp/dimg/image/scratch'

data/lib/dapp/dapp.rb

@@ -21,6 +21,7 @@ module Dapp
 
     include SshAgent
     include Sentry
+    include Ruby2Go
 
     include Helper::Sha256
     extend  Helper::Trivia
@@ -28,6 +29,7 @@ module Dapp
     include Helper::Tar
     include Helper::Url
 
+    include Deps::Common
     include Deps::Toolchain
     include Deps::Gitartifact
     include Deps::Base
@@ -36,6 +38,13 @@ module Dapp
 
     attr_reader :options
 
+    def get_ruby2go_state_hash
+      {
+        "Name" => name.to_s,
+        "WorkDir" => work_dir.to_s,
+      }
+    end
+
     def initialize(options: {})
       self.class.options.merge!(options)
       Logging::I18n.initialize
@@ -43,6 +52,9 @@ module Dapp
       Logging::Paint.initialize(option_color)
 
       @_call_before_terminate = []
+      @_call_after_before_terminate = []
+
+      ruby2go_init
     end
 
     def options
@@ -148,6 +160,7 @@ module Dapp
 
     def terminate
       @_call_before_terminate.each {|on_terminate| on_terminate.call(self)}
+      @_call_after_before_terminate.each {|on_terminate| on_terminate.call(self)}
       FileUtils.rmtree(host_docker_tmp_config_dir)
     end
 

data/lib/dapp/dapp/dappfile.rb

@@ -126,12 +126,12 @@ module Dapp
           return if File.exists? dappfile_yml_bin_path
 
           log_process("Downloading dappfile-yml dapp dependency") do
-            location = URI("https://dl.bintray.com/dapp/ruby2go/#{::Dapp::VERSION}/dappfile-yml")
+            location = URI("https://dl.bintray.com/flant/dapp/#{::Dapp::VERSION}/dappfile-yml")
 
             tmp_bin_path = File.join(self.class.tmp_base_dir, "dappfile-yml-#{SecureRandom.uuid}")
             ::Dapp::Downloader.download(location, tmp_bin_path, show_progress: true, progress_titile: dappfile_yml_bin_path)
 
-            checksum_location = URI("https://dl.bintray.com/dapp/ruby2go/#{::Dapp::VERSION}/dappfile-yml.sha")
+            checksum_location = URI("https://dl.bintray.com/flant/dapp/#{::Dapp::VERSION}/dappfile-yml.sha")
             tmp_bin_checksum_path = tmp_bin_path + ".checksum"
             ::Dapp::Downloader.download(checksum_location, tmp_bin_checksum_path)
 

data/lib/dapp/dapp/deps/base.rb

@@ -2,55 +2,23 @@ module Dapp
   class Dapp
     module Deps
       module Base
-        BASE_VERSION = "0.2.3"
-
-        def base_container_name # FIXME: hashsum(image) or dockersafe()
-          "dappdeps_base_#{BASE_VERSION}"
-        end
-
         def base_container
-          @base_container ||= begin
-            is_container_exist = proc{shellout("#{host_docker} inspect #{base_container_name}").exitstatus.zero?}
-            if !is_container_exist.call
-              lock("dappdeps.container.#{base_container_name}", default_timeout: 600) do
-                if !is_container_exist.call
-                  log_secondary_process(t(code: 'process.base_container_creating', data: {name: base_container_name}), short: true) do
-                    shellout!(
-                      ["#{host_docker} create",
-                      "--name #{base_container_name}",
-                      "--volume /.dapp/deps/base/#{BASE_VERSION} dappdeps/base:#{BASE_VERSION}"].join(' ')
-                    )
-                  end
-                end
-              end
-            end
-            base_container_name
-          end
+          dappdeps_container(:base)
         end
 
         def dappdeps_base_path
-          "/.dapp/deps/base/#{BASE_VERSION}/embedded/bin:/.dapp/deps/base/#{BASE_VERSION}/embedded/sbin"
+          ruby2go_dappdeps_command(dappdeps: :base, command: :path)
         end
 
         %w(rm rsync diff date cat
            stat readlink test sleep mkdir
            install sed cp true find
-           bash tar sudo base64).each do |cmd|
-          define_method("#{cmd}_bin") { "/.dapp/deps/base/#{BASE_VERSION}/embedded/bin/#{cmd}" }
+           bash tar sudo base64).each do |bin|
+          define_method("#{bin}_bin") { ruby2go_dappdeps_command(dappdeps: :base, command: :bin, options: { bin: bin }) }
         end
 
         def sudo_command(owner: nil, group: nil)
-          sudo = ''
-          if owner || group
-            sudo = "#{sudo_bin} -E "
-            sudo += "-u #{sudo_format_user(owner)} " if owner
-            sudo += "-g #{sudo_format_user(group)} " if group
-          end
-          sudo
-        end
-
-        def sudo_format_user(user)
-          user.to_s.to_i.to_s == user.to_s ? "\\\##{user}" : user
+          ruby2go_dappdeps_command(dappdeps: :base, command: :sudo_command, options: { owner: owner, group: group })
         end
       end # Base
     end # Deps

data/lib/dapp/dapp/deps/common.rb

@@ -0,0 +1,25 @@
+module Dapp
+  class Dapp
+    module Deps
+      module Common
+        def dappdeps_container(dappdeps)
+          dappdeps_containers[dappdeps] ||= ruby2go_dappdeps_command(dappdeps: dappdeps, command: :container)
+        end
+
+        def dappdeps_containers
+          @dappdeps_containers ||= {}
+        end
+
+        def ruby2go_dappdeps_command(dappdeps:, command:, **options)
+          ruby2go_dappdeps(dappdeps: dappdeps, command: command, **options).tap do |res|
+            unless res["error"].nil?
+              raise Error::Dapp, code: :ruby2go_dappdeps_command_failed_unexpected_error,
+                                 data: { dappdeps: dappdeps, command: command, message: res["error"] }
+            end
+            break res['data']
+          end
+        end
+      end # Base
+    end # Deps
+  end # Dapp
+end # Dapp

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

@@ -2,35 +2,12 @@ module Dapp
   class Dapp
     module Deps
       module Gitartifact
-        GITARTIFACT_VERSION = "0.2.1"
-
-        def gitartifact_container_name # FIXME: hashsum(image) or dockersafe()
-          "dappdeps_gitartifact_#{GITARTIFACT_VERSION}"
-        end
-
         def gitartifact_container
-          @gitartifact_container ||= begin
-            is_container_exist = proc{shellout("#{host_docker} inspect #{gitartifact_container_name}").exitstatus.zero?}
-            if !is_container_exist.call
-              lock("dappdeps.container.#{gitartifact_container_name}", default_timeout: 600) do
-                if !is_container_exist.call
-                  log_secondary_process(t(code: 'process.gitartifact_container_creating', data: {name: gitartifact_container_name}), short: true) do
-                    shellout!(
-                      ["#{host_docker} create",
-                      "--name #{gitartifact_container_name}",
-                      "--volume /.dapp/deps/gitartifact/#{GITARTIFACT_VERSION}",
-                      "dappdeps/gitartifact:#{GITARTIFACT_VERSION}"].join(' ')
-                    )
-                  end
-                end
-              end
-            end
-            gitartifact_container_name
-          end
+          dappdeps_container(:gitartifact)
         end
 
         def git_bin
-          "/.dapp/deps/gitartifact/#{GITARTIFACT_VERSION}/bin/git"
+          ruby2go_dappdeps_command(dappdeps: :gitartifact, command: :bin)
         end
       end # Gitartifact
     end # Deps

data/lib/dapp/dapp/deps/toolchain.rb

@@ -2,30 +2,8 @@ module Dapp
   class Dapp
     module Deps
       module Toolchain
-        TOOLCHAIN_VERSION = "0.1.1"
-
-        def toolchain_container_name # FIXME: hashsum(image) or dockersafe()
-          "dappdeps_toolchain_#{TOOLCHAIN_VERSION}"
-        end
-
         def toolchain_container
-          @toolchain_container ||= begin
-            is_container_exist = proc {shellout("#{host_docker} inspect #{toolchain_container_name}").exitstatus.zero?}
-            if !is_container_exist.call
-              lock("dappdeps.container.#{toolchain_container_name}", default_timeout: 600) do
-                if !is_container_exist.call
-                  log_secondary_process(t(code: 'process.toolchain_container_creating', data: {name: toolchain_container_name}), short: true) do
-                    shellout!(
-                      ["#{host_docker} create",
-                      "--name #{toolchain_container_name}",
-                      "--volume /.dapp/deps/toolchain/#{TOOLCHAIN_VERSION} dappdeps/toolchain:#{TOOLCHAIN_VERSION}"].join(' ')
-                    )
-                  end
-                end
-              end
-            end
-            toolchain_container_name
-          end
+          dappdeps_container(:toolchain)
         end
       end # Toolchain
     end # Deps

data/lib/dapp/dapp/logging/base.rb

@@ -27,15 +27,15 @@ module Dapp
         end
 
         def ignore_config_warning?
-          options[:ignore_config_warning]
+          !!options[:ignore_config_warning]
         end
 
         def introspect_error?
-          options[:introspect_error]
+          !!options[:introspect_error]
         end
 
         def introspect_before_error?
-          options[:introspect_before_error]
+          !!options[:introspect_before_error]
         end
 
         def dry_run?

data/lib/dapp/dapp/ruby2go.rb

@@ -0,0 +1,96 @@
+module Dapp
+  class Dapp
+    module Ruby2Go
+      def ruby2go_image(args_hash)
+        _ruby2go("image", args_hash)
+      end
+
+      def ruby2go_builder(args_hash)
+        _ruby2go("builder", args_hash)
+      end
+
+      def ruby2go_git_artifact(args_hash)
+        _ruby2go("git-artifact", args_hash)
+      end
+
+      def ruby2go_dappdeps(args_hash)
+        _ruby2go("dappdeps", args_hash)
+      end
+
+      def ruby2go_git_repo(args_hash)
+        _ruby2go("git-repo", args_hash)
+      end
+
+      def ruby2go_init
+        @_call_after_before_terminate << proc {
+          FileUtils.rmtree(@_ruby2go_tmp_dir) if @_ruby2go_tmp_dir
+        }
+      end
+
+      def _ruby2go_bin_path_env_var_name(progname)
+        "DAPP_BIN_#{progname.gsub("-", "_").upcase}"
+      end
+
+      def _ruby2go(progname, args_hash)
+        call_id = SecureRandom.uuid
+
+        args_file = File.join(_ruby2go_tmp_dir, "args.#{call_id}.json")
+        File.open(args_file, "w") {|f| f.write JSON.dump(args_hash)}
+
+        res_file = File.join(_ruby2go_tmp_dir, "res.#{call_id}.json")
+
+        if bin_path = ENV[_ruby2go_bin_path_env_var_name(progname)]
+          unless File.exists? bin_path
+            raise ::Dapp::Error::Dapp,
+              code: :ruby2go_bin_path_not_found,
+              data: {env_var_name: _ruby2go_bin_path_env_var_name(progname), path: bin_path}
+          end
+        else
+          bin_path = File.join(::Dapp::Dapp.home_dir, "bin", progname, ::Dapp::VERSION, progname)
+          unless File.exists? bin_path
+            _download_ruby2go_bin(progname, bin_path)
+          end
+        end
+
+        system("#{bin_path} -args-from-file #{args_file} -result-to-file #{res_file}")
+        status_code = $?.exitstatus
+        if [0, 16].include?(status_code)
+          res = nil
+          File.open(res_file, "r") {|f| res = JSON.load(f.read)}
+          res
+        else
+          raise ::Dapp::Error::Base, code: :ruby2go_command_unexpected_exitstatus, data: { progname: progname, status_code: status_code }
+        end
+      end
+
+      def _ruby2go_tmp_dir
+        @_ruby2go_tmp_dir ||= Dir.mktmpdir('dapp-ruby2go-', tmp_base_dir)
+      end
+
+      def _download_ruby2go_bin(progname, bin_path)
+        lock("downloader.bin.#{progname}", default_timeout: 1800) do
+          return if File.exists? bin_path
+
+          log_process("Downloading #{progname} dapp dependency") do
+            location = URI("https://dl.bintray.com/flant/dapp/#{::Dapp::VERSION}/#{progname}")
+
+            tmp_bin_path = File.join(self.class.tmp_base_dir, "#{progname}-#{SecureRandom.uuid}")
+            ::Dapp::Downloader.download(location, tmp_bin_path, show_progress: true, progress_titile: bin_path)
+
+            checksum_location = URI("https://dl.bintray.com/flant/dapp/#{::Dapp::VERSION}/#{progname}.sha")
+            tmp_bin_checksum_path = tmp_bin_path + ".checksum"
+            ::Dapp::Downloader.download(checksum_location, tmp_bin_checksum_path)
+
+            if Digest::SHA256.hexdigest(File.read(tmp_bin_path)) != File.read(tmp_bin_checksum_path).strip
+              raise ::Dapp::Error::Dapp, code: :ruby2go_download_failed_bad_checksum, data: {url: location.to_s, checksum_url: checksum_location.to_s, progname: progname}
+            end
+
+            File.chmod(0755, tmp_bin_path)
+            FileUtils.mkdir_p File.dirname(bin_path)
+            FileUtils.mv tmp_bin_path, bin_path
+          end # log_process
+        end # lock
+      end
+    end # Ruby2Go
+  end # Dapp
+end # Dapp

data/lib/dapp/dapp/sentry.rb

@@ -50,7 +50,6 @@ module Dapp
           "build-dir" => self.build_dir,
           "options" => self.options,
           "env-options" => {
-            "DAPP_FORCE_SAVE_CACHE" => ENV["DAPP_FORCE_SAVE_CACHE"],
             "DAPP_BIN_DAPPFILE_YML" => ENV["DAPP_BIN_DAPPFILE_YML"],
             "ANSIBLE_ARGS" => ENV["ANSIBLE_ARGS"],
             "DAPP_CHEF_DEBUG" => ENV["DAPP_CHEF_DEBUG"],