dapp 0.12.8 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: abb0b46dd26ada57b287c0fb49aec41ce51b5519
-  data.tar.gz: 45e624bd7960c59a03dfdf85969b66af9007ab2a
+  metadata.gz: fc7114fd303ed284e6a00e4e35047b43577d346d
+  data.tar.gz: 4a5e24ab8bcbf23b781a97988be0a975188d75db
 SHA512:
-  metadata.gz: becc23aa741a453d0fc3cae98b1ec0aad96e6de24c0db7e835bd4e82c3e0e5be6f5a8fc3f4d9a9b05c43220ddb89d9fc530d2ecf8fc1fc76b5fd7a3bfa25f85a
-  data.tar.gz: 11fdcb6e12957eb737c3cf68479ff1044264de3d9ddf275a1a770412ad3e00e7c55ca99fb803b3eb98ecdfa29f41332af3413b480736e8e4503d05b50e11f51f
+  metadata.gz: 6581f92f31676b7e98707f2774ca3afed77ba3420cb8ebb5617d40c11a203077f5750c71607d7767e5c94d3b9551ee5413b2ad8a540bc2a71de670b7e9fd9cf4
+  data.tar.gz: bb0284c586d5d24679a55e97c4eeb23e2bf23a847ad5365f595876bca37ecf85ea9e959a79668fbc95fd1ed2f6345645a834a71d0dcc2e4cf277158127fae7f1

data/bin/dapp

@@ -27,10 +27,6 @@ begin
         $stderr.puts(message)
       end
 
-      if Dapp::CLI.dapp_object
-        Dapp::CLI.dapp_object.sentry_exception(e)
-      end
-
       raise
     end
   rescue ::SystemExit

data/config/en/common.yml

@@ -54,6 +54,7 @@ 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`!"
     group:
       install: 'Install group'
       setup: 'Setup group'

data/config/en/net_status.yml

@@ -30,6 +30,11 @@ en:
       secret_key_not_found: "Secret key `DAPP_SECRET_KEY` not found!"
       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!"
+      helm_not_found: "Helm not found: install helm (https://github.com/kubernetes/helm/blob/master/docs/install.md)"
+      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!"
     dapp:
       no_such_dimg: "No such dimg: `%{dimgs_patterns}`!"
       no_such_app: "No such app: `%{apps_patterns}`!"

data/lib/dapp.rb

@@ -22,8 +22,6 @@ require 'net_status'
 require 'yaml'
 require 'openssl'
 require 'etc'
-require 'sentry-raven'
-require 'toml-rb'
 
 require 'dapp/version'
 require 'dapp/core_ext/hash'
@@ -32,7 +30,6 @@ require 'dapp/helper/cli'
 require 'dapp/helper/trivia'
 require 'dapp/helper/sha256'
 require 'dapp/helper/net_status'
-require 'dapp/helper/url'
 require 'dapp/prctl'
 require 'dapp/error/base'
 require 'dapp/error/dapp'
@@ -46,7 +43,6 @@ require 'dapp/config/config'
 require 'dapp/config/error/config'
 require 'dapp/dapp/lock'
 require 'dapp/dapp/ssh_agent'
-require 'dapp/dapp/sentry'
 require 'dapp/dapp/git_artifact'
 require 'dapp/dapp/dappfile'
 require 'dapp/dapp/chef'
@@ -93,19 +89,35 @@ 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/secret_key_generate'
-require 'dapp/deployment/cli/command/deployment/secret_generate'
 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/secret_key_generate'
-require 'dapp/deployment/dapp/command/secret_generate'
 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/kubernetes'
+require 'dapp/kube/cli/command/base'
+require 'dapp/kube/cli/command/kube'
+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/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/dapp'
+require 'dapp/kube/error/base'
+require 'dapp/kube/error/command'
+require 'dapp/kube/secret'
 require 'dapp/dimg'
 require 'dapp/dimg/builder'
 require 'dapp/dimg/builder/base'

data/lib/dapp/cli.rb

@@ -5,7 +5,7 @@ module Dapp
     extend Helper::Cli
     include Helper::Trivia
 
-    SUBCOMMANDS = ['dimg', 'deployment'].freeze
+    SUBCOMMANDS = ['dimg', 'deployment', 'kube'].freeze
 
     banner <<BANNER.freeze
 Usage: dapp sub-command [sub-command options]
@@ -14,6 +14,7 @@ Available subcommands: (for details, dapp SUB-COMMAND --help)
 
 dapp dimg
 dapp deployment
+dapp kube
 
 Options:
 BANNER
@@ -35,10 +36,6 @@ BANNER
            show_options: true,
            exit: 0
 
-    class << self
-      attr_accessor :dapp_object
-    end
-
     def initialize(*args)
       super(*args)
 

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

@@ -56,16 +56,12 @@ module Dapp
           super()
         end
 
-        def run_method
-          class_to_lowercase
-        end
-
         def run(_argv = ARGV)
           raise
         end
 
         def cli_options(**kvargs)
-          config.merge(dapp_command: run_method, **kvargs)
+          config.merge(**kvargs)
         end
       end
     end

data/lib/dapp/dapp.rb

@@ -11,12 +11,8 @@ module Dapp
     include Logging::Paint
 
     include SshAgent
-    include Sentry
-
     include Helper::Sha256
-    extend  Helper::Trivia
     include Helper::Trivia
-    include Helper::Url
 
     include Deps::Gitartifact
     include Deps::Base
@@ -29,20 +25,6 @@ module Dapp
       @options = options
       Logging::Paint.initialize(options[:log_color])
       Logging::I18n.initialize
-      ::Dapp::CLI.dapp_object = self
-      sentry_message("Manual usage: `#{options[:dapp_command]}` command") unless ENV['CI']
-    end
-
-    def settings
-      @settings ||= begin
-        settings_path = File.join(self.class.home_dir, "settings.toml")
-
-        if File.exists? settings_path
-          TomlRB.load_file(settings_path)
-        else
-          {}
-        end
-      end
     end
 
     def name
@@ -106,9 +88,5 @@ module Dapp
     def stage_dapp_label
       name
     end
-
-    def self.home_dir
-      File.join(Dir.home, ".dapp")
-    end
   end # Dapp
 end # Dapp

data/lib/dapp/dapp/shellout/streaming.rb

@@ -28,13 +28,13 @@ module Dapp
             end
 
             def format_string(str)
-              str.lines.map { |l| "#{Dapp.log_time if @with_time}#{l.strip}\n" }.join
+              str.lines.map { |l| "#{Dapp.log_time if @with_time}#{l.chomp}\n" }.join
             end
           end
 
           class Error < Base
             def format_string(str)
-              "#{Dapp.paint_string(super.strip, :warning)}\n"
+              "#{Dapp.paint_string(super.chomp, :warning)}\n"
             end
           end
         end

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

@@ -1,7 +1,7 @@
 module Dapp::Deployment::CLI
   module Command
     class Deployment < ::Dapp::CLI
-      SUBCOMMANDS = ['apply', 'mrproper', 'secret generate', 'secret key generate', 'minikube setup'].freeze
+      SUBCOMMANDS = ['apply', 'mrproper', 'minikube setup'].freeze
 
       banner <<BANNER.freeze
 Usage: dapp deployment sub-command [sub-command options]
@@ -9,8 +9,6 @@ Usage: dapp deployment sub-command [sub-command options]
 Available subcommands: (for details, dapp deployment SUB-COMMAND --help)
 
   dapp deployment apply [options] [APP ...] REPO
-  dapp deployment secret key generate
-  dapp deployment secret generate
   dapp deployment minikube setup
   dapp deployment mrproper [options]
 

data/lib/dapp/deployment/cli/command/deployment/apply.rb

@@ -4,7 +4,7 @@ module Dapp::Deployment::CLI::Command
       banner <<BANNER.freeze
 Usage:
 
-  dapp deploy apply [options] [APP ...] REPO
+  dapp deployment apply [options] [APP ...] REPO
 
 Options:
 BANNER

data/lib/dapp/deployment/dapp/dapp.rb

@@ -3,8 +3,6 @@ module Dapp
     module Dapp
       module Dapp
         include Command::Apply
-        include Command::SecretKeyGenerate
-        include Command::SecretGenerate
         include Command::MinikubeSetup
         include Command::Mrproper
         include Command::Common

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

@@ -5,6 +5,10 @@ module Dapp::Dimg::CLI
         self.class.parse_options(self, argv)
         ::Dapp::Dapp.new(options: cli_options(dimgs_patterns: cli_arguments)).public_send(run_method)
       end
+
+      def run_method
+        class_to_lowercase
+      end
     end
   end
 end

data/lib/dapp/dimg/config/directive/git_artifact_remote.rb

@@ -3,13 +3,11 @@ module Dapp
     module Config
       module Directive
         class GitArtifactRemote < GitArtifactLocal
-          include ::Dapp::Helper::Url
-
           attr_reader :_url, :_name, :_branch, :_commit
 
           def initialize(url, **kwargs, &blk)
             @_url  = url
-            @_name = git_url_to_name(url)
+            @_name = url.gsub(%r{.*?([^\/ ]+)\.git}, '\\1')
 
             super(**kwargs, &blk)
           end

data/lib/dapp/dimg/dimg.rb

@@ -7,6 +7,7 @@ module Dapp
       include Stages
 
       include Helper::Sha256
+      include Helper::Trivia
 
       attr_reader :config
       attr_reader :ignore_git_fetch

data/lib/dapp/dimg/dimg/path.rb

@@ -29,12 +29,6 @@ module Dapp
 
         alias build_dir build_path
         alias tmp_dir tmp_path
-
-        private
-
-        def make_path(base, *path)
-          path.compact.map(&:to_s).inject(Pathname.new(base), &:+)
-        end
       end # Path
     end
   end # Dimg

data/lib/dapp/helper/trivia.rb

@@ -24,6 +24,10 @@ module Dapp
         end
       end
 
+      def make_path(base, *path)
+        path.compact.map(&:to_s).inject(Pathname.new(base), &:+)
+      end
+
       def self.class_to_lowercase(class_name = self)
         class_name.to_s.split('::').last.split(/(?=[[:upper:]]|[0-9])/).join('_').downcase.to_s
       end

data/lib/dapp/kube.rb

@@ -0,0 +1 @@
+module Dapp::Kube; end

data/lib/dapp/kube/cli/cli.rb

@@ -0,0 +1 @@
+::Dapp::CLI.send(:include, ::Dapp::Kube::CLI::Command)

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

@@ -0,0 +1,14 @@
+module Dapp::Kube::CLI
+  module Command
+    class Base < ::Dapp::CLI::Command::Base
+      def run(argv = ARGV)
+        self.class.parse_options(self, argv)
+        ::Dapp::Dapp.new(options: cli_options).public_send(run_method)
+      end
+
+      def run_method
+        :"kube_#{class_to_lowercase}"
+      end
+    end
+  end
+end

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

@@ -0,0 +1,21 @@
+module Dapp::Kube::CLI
+  module Command
+    class Kube < ::Dapp::CLI
+      SUBCOMMANDS = ['secret generate', 'secret key generate', 'secret file encrypt', 'deploy', 'dismiss'].freeze
+
+      banner <<BANNER.freeze
+Usage: dapp kube sub-command [sub-command options]
+
+Available subcommands: (for details, dapp kube SUB-COMMAND --help)
+
+  dapp kube deploy [options] REPO
+  dapp kube dismiss [options]
+  dapp kube secret generate [options]
+  dapp kube secret key generate [options]
+  dapp kube secret file encrypt FILE_PATH [options]
+
+Options:
+BANNER
+    end
+  end
+end

data/lib/dapp/kube/cli/command/kube/deploy.rb

@@ -0,0 +1,30 @@
+module Dapp::Kube::CLI::Command
+  class Kube < ::Dapp::CLI
+    class Deploy < Base
+      banner <<BANNER.freeze
+Usage:
+
+  dapp deployment deploy [options] REPO
+
+Options:
+BANNER
+      option :namespace,
+             long: '--namespace NAME',
+             required: true
+
+      option :image_version,
+             long: '--image-version IMAGE_VERSION',
+             default: 'latest'
+
+      option :tmp_dir_prefix,
+             long: '--tmp-dir-prefix PREFIX',
+             description: 'Tmp directory prefix (/tmp by default). Used for build process service directories.'
+
+      def run(argv = ARGV)
+        self.class.parse_options(self, argv)
+        repo = self.class.required_argument(self, 'repo')
+        ::Dapp::Dapp.new(options: cli_options(apps_patterns: cli_arguments, repo: repo)).public_send(run_method)
+      end
+    end
+  end
+end

data/lib/dapp/kube/cli/command/kube/dismiss.rb

@@ -0,0 +1,21 @@
+module Dapp::Kube::CLI::Command
+  class Kube < ::Dapp::CLI
+    class Dismiss < Base
+      banner <<BANNER.freeze
+Usage:
+
+  dapp kube dismiss [options]
+
+Options:
+BANNER
+
+      option :namespace,
+             long: '--namespace NAME',
+             required: true
+
+      option :with_namespace,
+             long: '--with-namespace',
+             default: false
+    end
+  end
+end

data/lib/dapp/kube/cli/command/kube/secret_file_encrypt.rb

@@ -0,0 +1,23 @@
+module Dapp::Kube::CLI::Command
+  class Kube < ::Dapp::CLI
+    class SecretFileEncrypt < Base
+      banner <<BANNER.freeze
+Usage:
+
+  dapp kube secret file encrypt FILE [options]
+
+Options:
+BANNER
+
+      option :output_file_path,
+             short: '-o OUTPUt_FILE_PATH',
+             required: false
+
+      def run(argv = ARGV)
+        self.class.parse_options(self, argv)
+        file_path = self.class.required_argument(self, 'file')
+        ::Dapp::Dapp.new(options: cli_options).public_send(run_method, file_path)
+      end
+    end
+  end
+end

data/lib/dapp/kube/cli/command/kube/secret_generate.rb

@@ -0,0 +1,13 @@
+module Dapp::Kube::CLI::Command
+  class Kube < ::Dapp::CLI
+    class SecretGenerate < Base
+      banner <<BANNER.freeze
+Usage:
+
+  dapp kube secret generate
+
+Options:
+BANNER
+    end
+  end
+end