dapp 0.5.13 → 0.6.0

data/lib/dapp/builder/chef/berksfile.rb

@@ -38,6 +38,9 @@ module Dapp
         end
 
         def add_local_cookbook_path(name, path)
+          raise(::Dapp::Builder::Chef::Error, code: :berksfile_absolute_path_forbidden,
+                                              data: { cookbook: name, path: path }) if path.start_with? '/'
+
           @local_cookbooks[name] = {
             name: name,
             path: home_path.join(path)

data/lib/dapp/builder/shell.rb

@@ -2,14 +2,15 @@ module Dapp
   module Builder
     # Shell
     class Shell < Base
-      [:infra_install, :infra_setup, :install, :setup].each do |stage|
+      [:before_install, :before_setup, :install, :setup].each do |stage|
         define_method("#{stage}_checksum") do
           [application.config._shell.public_send("_#{stage}"),
            application.config._shell.public_send("_#{stage}_cache_version")].flatten
         end
         define_method("#{stage}?") { !stage_empty?(stage) }
-        define_method("#{stage}") do |image|
-          image.add_command(*stage_commands(stage)) unless stage_empty?(stage)
+        define_method(stage.to_s) do |image|
+          image.add_command("export DAPP_BUILD_STAGE=#{stage}",
+                            *stage_commands(stage)) unless stage_empty?(stage)
         end
       end
 

data/lib/dapp/cli.rb

@@ -7,18 +7,20 @@ module Dapp
     include Mixlib::CLI
     include Helper::Trivia
 
-    SUBCOMMANDS = %w(build smartpush push list run stages).freeze
+    SUBCOMMANDS = %w(build push spush list run stages cleanup bp).freeze
 
     banner <<BANNER.freeze
 Usage: dapp [options] sub-command [sub-command options]
 
 Available subcommands: (for details, dapp SUB-COMMAND --help)
 
-dapp build [options] [PATTERN ...]
-dapp push [options] [PATTERN...] REPO
-dapp smartpush [options] [PATTERN ...] REPOPREFIX
-dapp list [options] [PATTERN ...]
-dapp run [options] [PATTERN...] [DOCKER ARGS]
+dapp build [options] [APPS PATTERN ...]
+dapp bp [options] [APPS PATTERN ...] REPO
+dapp push [options] [APP PATTERN] REPO
+dapp spush [options] [APPS PATTERN ...] REPO
+dapp list [options] [APPS PATTERN ...]
+dapp run [options] [APP PATTERN] [DOCKER ARGS]
+dapp cleanup [options] [APPS PATTERN ...]
 dapp stages
 
 Options:

data/lib/dapp/cli/base.rb

@@ -43,6 +43,11 @@ module Dapp
              default: false,
              boolean: true
 
+      option :dev,
+             long: '--dev',
+             default: false,
+             boolean: true
+
       def initialize
         self.class.options.merge!(Base.options)
         super()
@@ -50,7 +55,7 @@ module Dapp
 
       def run(argv = ARGV)
         self.class.parse_options(self, argv)
-        Controller.new(cli_options: config, patterns: cli_arguments).public_send(class_to_lowercase)
+        Project.new(cli_options: config, apps_patterns: cli_arguments).public_send(class_to_lowercase)
       end
     end
   end

data/lib/dapp/cli/bp.rb

@@ -0,0 +1,41 @@
+require 'mixlib/cli'
+
+module Dapp
+  class CLI
+    # CLI bp subcommand
+    class Bp < Push
+      include Dapp::Helper::Shellout
+
+      banner <<BANNER.freeze
+Version: #{Dapp::VERSION}
+
+Usage:
+  dapp bp [options] [APPS PATTERNS] REPO
+
+    APPS PATTERN                Applications to process [default: *].
+    REPO                        Pushed image name.
+
+Options:
+BANNER
+      option :tmp_dir_prefix,
+             long: '--tmp-dir-prefix PREFIX',
+             description: 'Tmp directory prefix'
+
+      option :lock_timeout,
+             long: '--lock-timeout TIMEOUT',
+             description: 'Redefine resource locking timeout (in seconds)',
+             proc: ->(v) { v.to_i }
+
+      option :git_artifact_branch,
+             long: '--git-artifact-branch BRANCH',
+             description: 'Default branch to archive artifacts from'
+
+      option :ssh_key,
+             long: '--ssh-key SSH_KEY',
+             description: ['Enable only specified ssh keys ',
+                           '(use system ssh-agent by default)'].join,
+             default: nil,
+             proc: ->(v) { composite_options(:ssh_key) << v }
+    end
+  end
+end

data/lib/dapp/cli/build.rb

@@ -10,9 +10,9 @@ module Dapp
 Version: #{Dapp::VERSION}
 
 Usage:
-  dapp build [options] [PATTERN ...]
+  dapp build [options] [APPS PATTERN ...]
 
-    PATTERN                     Applications to process [default: *].
+    APPS PATTERN                Applications to process [default: *].
 
 Options:
 BANNER
@@ -20,6 +20,11 @@ BANNER
              long: '--tmp-dir-prefix PREFIX',
              description: 'Tmp directory prefix'
 
+      option :lock_timeout,
+             long: '--lock-timeout TIMEOUT',
+             description: 'Redefine resource locking timeout (in seconds)',
+             proc: ->(v) { v.to_i }
+
       option :git_artifact_branch,
              long: '--git-artifact-branch BRANCH',
              description: 'Default branch to archive artifacts from'
@@ -37,8 +42,16 @@ BANNER
       option :introspect_stage,
              long: '--introspect-stage STAGE',
              proc: proc { |v| v.to_sym },
-             in: [nil, :from, :infra_install, :source_1_archive, :source_1, :install, :artifact, :source_2,
-                  :infra_setup, :source_3, :chef_cookbooks, :setup, :source_4, :source_5, :docker_instructions]
+             in: [nil, :from, :before_install, :g_a_archive, :g_a_pre_install_patch, :install, :g_a_post_install_patch,
+                  :artifact, :before_setup, :g_a_pre_setup_patch, :chef_cookbooks, :setup, :g_a_post_setup_patch,
+                  :g_a_latest_patch, :docker_instructions]
+
+      option :ssh_key,
+             long: '--ssh-key SSH_KEY',
+             description: ['Enable only specified ssh keys ',
+                           '(use system ssh-agent by default)'].join,
+             default: nil,
+             proc: ->(v) { composite_options(:ssh_key) << v }
     end
   end
 end

data/lib/dapp/cli/cleanup.rb

@@ -0,0 +1,24 @@
+require 'mixlib/cli'
+
+module Dapp
+  class CLI
+    # Cleanup subcommand
+    class Cleanup < Base
+      banner <<BANNER.freeze
+Version: #{Dapp::VERSION}
+
+Usage:
+  dapp cleanup [options] [APPS PATTERN ...]
+
+    APPS PATTERN                Applications to process [default: *].
+
+Options:
+BANNER
+
+      option :lock_timeout,
+             long: '--lock-timeout TIMEOUT',
+             description: 'Redefine resource locking timeout (in seconds)',
+             proc: ->(v) { v.to_i }
+    end
+  end
+end

data/lib/dapp/cli/list.rb

@@ -8,9 +8,9 @@ module Dapp
 Version: #{Dapp::VERSION}
 
 Usage:
-  dapp list [options] [PATTERN ...]
+  dapp list [options] [APPS PATTERN ...]
 
-    PATTERN                     Applications to process [default: *].
+    APPS PATTERN                Applications to process [default: *].
 
 Options:
 BANNER

data/lib/dapp/cli/push.rb

@@ -8,12 +8,17 @@ module Dapp
 Version: #{Dapp::VERSION}
 
 Usage:
-  dapp push [options] [PATTERN ...] REPO
+  dapp push [options] [APP PATTERN] REPO
 
-    PATTERN                     Applications to process [default: *].
+    APP PATTERN                 Applications to process [default: *].
     REPO                        Pushed image name.
+
 Options:
 BANNER
+      option :lock_timeout,
+             long: '--lock-timeout TIMEOUT',
+             description: 'Redefine resource locking timeout (in seconds)',
+             proc: ->(v) { v.to_i }
 
       option :git_artifact_branch,
              long: '--git-artifact-branch BRANCH',
@@ -45,16 +50,10 @@ BANNER
              description: 'Tag by git commit',
              boolean: true
 
-      option :force,
-             long: '--force',
-             description: 'Override existing image',
-             default: false,
-             boolean: true
-
       def run(argv = ARGV)
         self.class.parse_options(self, argv)
         repo = self.class.required_argument(self)
-        Controller.new(cli_options: config, patterns: cli_arguments).public_send(class_to_lowercase, repo)
+        Project.new(cli_options: config, apps_patterns: cli_arguments).public_send(class_to_lowercase, repo)
       end
     end
   end

data/lib/dapp/cli/run.rb

@@ -8,12 +8,11 @@ module Dapp
 Version: #{Dapp::VERSION}
 
 Usage:
-  dapp run [options] [PATTERN...] [DOCKER ARGS]
+  dapp run [options] [APP PATTERN] [DOCKER ARGS]
 
-    PATTERN                     Applications to process [default: *].
+    APP PATTERN                 Application to process [default: *].
     DOCKER ARGS                 Docker run options and command separated by '--'
 
-
 Options:
 BANNER
 
@@ -49,7 +48,7 @@ BANNER
         index = filtered_args.index('--') || filtered_args.count
         docker_options = index.nonzero? ? filtered_args.slice(0..index - 1) : []
         command = filtered_args.slice(index + 1..-1) || []
-        Controller.new(cli_options: config, patterns: pattern).run(docker_options, command)
+        Project.new(cli_options: config, apps_patterns: pattern).run(docker_options, command)
       end
     end
   end

data/lib/dapp/cli/spush.rb

@@ -0,0 +1,20 @@
+require 'mixlib/cli'
+
+module Dapp
+  class CLI
+    # CLI spush subcommand
+    class Spush < Push
+      banner <<BANNER.freeze
+Version: #{Dapp::VERSION}
+
+Usage:
+  dapp spush [options] [APPS PATTERN ...] REPO
+
+    APPS PATTERN                Applications to process [default: *].
+    REPO                        Pushed image name.
+
+Options:
+BANNER
+    end
+  end
+end

data/lib/dapp/cli/stages.rb

@@ -13,6 +13,8 @@ Available subcommands: (for details, dapp SUB-COMMAND --help)
 
 dapp stages flush
 dapp stages cleanup
+
+Options:
 BANNER
     end
   end

data/lib/dapp/cli/stages/cleanup.rb

@@ -3,18 +3,22 @@ require 'mixlib/cli'
 module Dapp
   class CLI
     class Stages
-      # Flush stages subcommand
+      # stages cleanup subcommand
       class Cleanup < Base
         banner <<BANNER.freeze
 Version: #{Dapp::VERSION}
 
 Usage:
-  dapp stages cleanup [options] [PATTERN ...]
+  dapp stages cleanup [options] [APPS PATTERN ...] [REPO]
+
+    APPS PATTERN                Applications to process [default: *].
+
 Options:
 BANNER
         def run(argv = ARGV)
           self.class.parse_options(self, argv)
-          Controller.new(cli_options: config, patterns: cli_arguments).stages_cleanup
+          repo = self.class.required_argument(self)
+          Project.new(cli_options: config, apps_patterns: cli_arguments).stages_cleanup(repo)
         end
       end
     end

data/lib/dapp/cli/stages/flush.rb

@@ -3,18 +3,21 @@ require 'mixlib/cli'
 module Dapp
   class CLI
     class Stages
-      # Flush stages subcommand
+      # stages flush subcommand
       class Flush < Base
         banner <<BANNER.freeze
 Version: #{Dapp::VERSION}
 
 Usage:
-  dapp stages flush [options] [PATTERN ...]
+  dapp stages flush [options] [APPS PATTERN ...]
+
+    APPS PATTERN                Applications to process [default: *].
+
 Options:
 BANNER
         def run(argv = ARGV)
           self.class.parse_options(self, argv)
-          Controller.new(cli_options: config, patterns: cli_arguments).stages_flush
+          Project.new(cli_options: config, apps_patterns: cli_arguments).stages_flush
         end
       end
     end

data/lib/dapp/config/application.rb

@@ -34,6 +34,14 @@ module Dapp
         @_setup_dependencies.concat(args)
       end
 
+      def builder(type)
+        project.log_warning(desc: { code: 'excess_builder_instruction', context: 'warning' }) if @_chef.empty? && @_shell.empty?
+        raise Error::Config, code: :builder_type_unsupported, data: { type: type } unless [:chef, :shell].include?((type = type.to_sym))
+        another_builder = [:chef, :shell].find { |t| t != type }
+        instance_variable_set(:"@_#{another_builder}", Config.const_get(another_builder.capitalize).new)
+        @_builder = type
+      end
+
       def chef
         raise Error::Config, code: :builder_type_conflict unless _builder == :chef
         @_chef ||= Chef.new
@@ -44,6 +52,10 @@ module Dapp
         @_shell ||= Shell.new
       end
 
+      def docker
+        @_docker ||= Docker.new
+      end
+
       def artifact(where_to_add, **options, &blk)
         @_artifact << begin
           config = clone.tap do |app|
@@ -59,17 +71,6 @@ module Dapp
         @_git_artifact ||= GitArtifact.new
       end
 
-      def docker
-        @_docker ||= Docker.new
-      end
-
-      def builder(type)
-        raise Error::Config, code: :builder_type_unsupported, data: { type: type } unless [:chef, :shell].include?((type = type.to_sym))
-        another_builder = [:chef, :shell].find { |t| t != type }
-        instance_variable_set(:"@_#{another_builder}", Config.const_get(another_builder.capitalize).new)
-        @_builder = type
-      end
-
       def _name
         (@_name || @_basename).tap do |name|
           reg = '^[[[:alnum:]]_.-]*$'
@@ -98,11 +99,16 @@ module Dapp
         _app_chain.first
       end
 
+      protected
+
+      attr_accessor :project
+
       private
 
       # rubocop:disable Metrics/AbcSize
       def clone
         Application.new(self).tap do |app|
+          app.instance_variable_set(:'@project', project)
           app.instance_variable_set(:'@_builder', _builder)
           app.instance_variable_set(:'@_home_path', _home_path)
           app.instance_variable_set(:'@_basename', _basename)

data/lib/dapp/config/chef.rb

@@ -39,6 +39,10 @@ module Dapp
         reset_recipes
       end
 
+      def empty?
+        @_modules.empty? && @_recipes.empty?
+      end
+
       def clone
         Marshal.load(Marshal.dump(self))
       end

data/lib/dapp/config/docker.rb

@@ -14,8 +14,9 @@ module Dapp
         @_onbuild = []
       end
 
-      def from(image_name, cache_version: nil)
-        @_from = image_name
+      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
 

data/lib/dapp/config/git_artifact.rb

@@ -33,13 +33,12 @@ module Dapp
 
       # Remote
       class Remote < Local
-        attr_accessor :_url, :_name, :_branch, :_ssh_key_path
+        attr_accessor :_url, :_name, :_branch
 
         def initialize(url, where_to_add, **options)
           @_url          = url
           @_name         = url.gsub(%r{.*?([^\/ ]+)\.git}, '\\1')
           @_branch       = options.delete(:branch)
-          @_ssg_key_path = options.delete(:ssg_key_path)
           super(where_to_add, **options)
         end