dapp 0.4.8 → 0.5.0

data/lib/dapp/builder/base.rb

@@ -8,6 +8,10 @@ module Dapp
         @application = application
       end
 
+      def infra_install?
+        false
+      end
+
       def infra_install(_image)
         raise
       end
@@ -16,6 +20,10 @@ module Dapp
         raise
       end
 
+      def infra_setup?
+        false
+      end
+
       def infra_setup(_image)
         raise
       end
@@ -24,6 +32,10 @@ module Dapp
         raise
       end
 
+      def install?
+        false
+      end
+
       def install(_image)
         raise
       end
@@ -32,6 +44,10 @@ module Dapp
         raise
       end
 
+      def setup?
+        false
+      end
+
       def setup(_image)
         raise
       end

data/lib/dapp/builder/chef.rb

@@ -12,18 +12,21 @@ module Dapp
       DEFAULT_CHEFDK_IMAGE = 'dappdeps/chefdk:0.17.3-1'.freeze # TODO: config, DSL, DEFAULT_CHEFDK_IMAGE
 
       [:infra_install, :infra_setup, :install, :setup].each do |stage|
-        define_method(:"#{stage}_checksum") { stage_cookbooks_checksum(stage) }
+        define_method("#{stage}_checksum") { stage_cookbooks_checksum(stage) }
 
-        define_method(:"#{stage}") do |image|
+        define_method("#{stage}?") { !stage_empty?(stage) }
+
+        define_method("#{stage}") do |image|
           unless stage_empty?(stage)
             image.add_volumes_from(chefdk_container)
-            image.add_commands 'export PATH=/.dapp/deps/chefdk/bin:$PATH',
-                               "export DAPP_BUILD_STAGE=#{stage}"
-
-            image.add_volume "#{stage_tmp_path(stage)}:#{container_stage_tmp_path(stage)}"
-            image.add_commands ['chef-solo',
-                                "-c #{container_stage_config_path(stage)}",
-                                "-o #{stage_cookbooks_runlist(stage).join(',')}"].join(' ')
+            image.add_command 'export PATH=/.dapp/deps/chefdk/bin:$PATH',
+                              "export DAPP_BUILD_STAGE=#{stage}"
+
+            image.add_volume "#{stage_build_path(stage)}:#{container_stage_build_path(stage)}:ro"
+            image.add_command ['chef-solo',
+                               '--legacy-mode',
+                               "-c #{container_stage_config_path(stage)}",
+                               "-o #{stage_cookbooks_runlist(stage).join(',')}"].join(' ')
           end
         end
       end
@@ -34,7 +37,7 @@ module Dapp
 
       def chef_cookbooks(image)
         image.add_volume "#{cookbooks_vendor_path}:#{application.container_dapp_path('chef_vendored_cookbooks')}"
-        image.add_commands(
+        image.add_command(
           'mkdir -p /usr/share/dapp/chef_repo',
           ["cp -a #{application.container_dapp_path('chef_vendored_cookbooks')} ",
            '/usr/share/dapp/chef_repo/cookbooks'].join
@@ -96,7 +99,7 @@ module Dapp
       end
 
       def stage_cookbooks_checksum_path(stage)
-        application.metadata_path("#{cookbooks_checksum}.#{stage}.checksum")
+        application.build_path("#{cookbooks_checksum}.#{stage}.checksum")
       end
 
       def stage_cookbooks_checksum(stage)
@@ -294,28 +297,45 @@ module Dapp
         install_stage_cookbooks(stage)
 
         @stage_cookbooks_runlist ||= {}
-        @stage_cookbooks_runlist[stage] ||= [].tap do |res|
-          to_entry = proc { |cookbook, entrypoint| "#{cookbook}::#{entrypoint}" }
-          to_recipe_entry = proc do |cookbook, entrypoint|
-            entrypoint_file = stage_cookbooks_path(stage, cookbook, 'recipes', "#{entrypoint}.rb")
-            next unless entrypoint_file.exist?
-            to_entry[cookbook, entrypoint]
+        @stage_cookbooks_runlist[stage] ||= begin
+          res = []
+
+          does_entry_exist = ->(cookbook, entrypoint) do
+            stage_cookbooks_path(stage, cookbook, 'recipes', "#{entrypoint}.rb").exist?
+          end
+
+          format_entry = ->(cookbook, entrypoint) do
+            entrypoint = 'void' if entrypoint.nil?
+            "#{cookbook}::#{entrypoint}"
           end
 
           enabled_modules
-            .map { |mod| to_recipe_entry["mdapp-#{mod}", stage] || to_entry["mdapp-#{mod}", 'void'] }
+            .map do |mod|
+              cookbook = "mdapp-#{mod}"
+              if does_entry_exist[cookbook, stage]
+                [cookbook, stage]
+              else
+                [cookbook, nil]
+              end
+            end
             .tap { |entries| res.concat entries }
 
           enabled_recipes
-            .map { |recipe| to_recipe_entry[project_name, recipe] }
-            .compact
+            .map { |recipe| [project_name, recipe] }
+            .select { |entry| does_entry_exist[*entry] }
             .tap do |entries|
               if entries.any?
                 res.concat entries
               else
-                res << to_entry[project_name, 'void']
+                res << [project_name, nil]
               end
             end
+
+          if res.all? { |_, entrypoint| entrypoint.nil? }
+            []
+          else
+            res.map &format_entry
+          end
         end
       end
       # rubocop:enable Metrics/AbcSize
@@ -325,30 +345,30 @@ module Dapp
       end
 
       def stage_cookbooks_path(stage, *path)
-        stage_tmp_path(stage, 'cookbooks', *path)
+        stage_build_path(stage, 'cookbooks', *path)
       end
 
       def install_chef_solo_stage_config(stage)
         @install_chef_solo_stage_config ||= {}
         @install_chef_solo_stage_config[stage] ||= true.tap do
-          stage_tmp_path(stage, 'config.rb').write [
-            "file_cache_path \"/var/cache/dapp/chef\"\n",
-            "cookbook_path \"#{container_stage_tmp_path(stage, 'cookbooks')}\"\n"
+          stage_build_path(stage, 'config.rb').write [
+            "file_cache_path \"/.dapp/chef/cache\"\n",
+            "cookbook_path \"#{container_stage_build_path(stage, 'cookbooks')}\"\n"
           ].join
         end
       end
 
       def container_stage_config_path(stage, *path)
         install_chef_solo_stage_config(stage)
-        container_stage_tmp_path(stage, 'config.rb', *path)
+        container_stage_build_path(stage, 'config.rb', *path)
       end
 
-      def stage_tmp_path(stage, *path)
+      def stage_build_path(stage, *path)
         application.tmp_path(application.config._name, stage).join(*path)
       end
 
-      def container_stage_tmp_path(_stage, *path)
-        path.compact.map(&:to_s).inject(Pathname.new('/chef_build'), &:+)
+      def container_stage_build_path(_stage, *path)
+        path.compact.map(&:to_s).inject(Pathname.new('/.dapp/chef/build'), &:+)
       end
 
       def _paths_checksum(paths)

data/lib/dapp/builder/shell.rb

@@ -3,15 +3,24 @@ module Dapp
     # Shell
     class Shell < Base
       [:infra_install, :infra_setup, :install, :setup].each do |stage|
-        define_method(:"#{stage}_checksum") do
+        define_method("#{stage}_checksum") do
           [application.config._shell.public_send("_#{stage}"),
            application.config._shell.public_send("_#{stage}_cache_version")].flatten
         end
-        define_method(:"#{stage}") do |image|
-          commands = application.config._shell.public_send("_#{stage}")
-          image.add_commands("export DAPP_BUILD_STAGE=#{stage}", *commands) if commands
+        define_method("#{stage}?") { !stage_empty?(stage) }
+        define_method("#{stage}") do |image|
+          image.add_command("export DAPP_BUILD_STAGE=#{stage}",
+                            *stage_commands(stage)) unless stage_empty?(stage)
         end
       end
+
+      def stage_empty?(stage)
+        stage_commands(stage).empty?
+      end
+
+      def stage_commands(stage)
+        application.config._shell.public_send("_#{stage}")
+      end
     end
   end
 end

data/lib/dapp/cli.rb

@@ -7,7 +7,7 @@ module Dapp
     include Mixlib::CLI
     include Helper::Trivia
 
-    SUBCOMMANDS = %w(build smartpush push list run stages metadata).freeze
+    SUBCOMMANDS = %w(build smartpush push list run stages).freeze
 
     banner <<BANNER.freeze
 Usage: dapp [options] sub-command [sub-command options]
@@ -20,7 +20,6 @@ dapp smartpush [options] [PATTERN ...] REPOPREFIX
 dapp list [options] [PATTERN ...]
 dapp run [options] [PATTERN...] [DOCKER ARGS]
 dapp stages
-dapp metadata
 
 Options:
 BANNER

data/lib/dapp/cli/build.rb

@@ -20,9 +20,9 @@ BANNER
              long: '--tmp-dir-prefix PREFIX',
              description: 'Tmp directory prefix'
 
-      option :metadata_dir,
-             long: '--metadata-dir PATH',
-             description: 'Metadata directory'
+      option :build_dir,
+             long: '--build-dir PATH',
+             description: 'Directory where build cache stored (DIR/.dapps-build by default)'
 
       option :git_artifact_branch,
              long: '--git-artifact-branch BRANCH',
@@ -41,8 +41,8 @@ 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, :source_2,
-                  :infra_setup, :source_3, :chef_cookbooks, :setup, :source_4, :source_5]
+             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]
     end
   end
 end

data/lib/dapp/cli/push.rb

@@ -15,10 +15,6 @@ Usage:
 Options:
 BANNER
 
-      option :metadata_dir,
-             long: '--metadata-dir PATH',
-             description: 'Metadata directory'
-
       option :git_artifact_branch,
              long: '--git-artifact-branch BRANCH',
              description: 'Default branch to archive artifacts from'

data/lib/dapp/cli/run.rb

@@ -16,9 +16,6 @@ Usage:
 
 Options:
 BANNER
-      option :metadata_dir,
-             long: '--metadata-dir PATH',
-             description: 'Metadata directory'
 
       def read_cli_options(args)
         self.class.cli_wrapper(self) do

data/lib/dapp/config/artifact.rb

@@ -48,35 +48,12 @@ module Dapp
       # Stage
       class Stage < Base
         attr_accessor :_config
-        attr_accessor :_before, :_after
-
-        def initialize(*args)
-          super
-          raise Error::Config, code: :stage_artifact_not_associated if _before.nil? && _after.nil?
-        end
-
-        def _before=(stage)
-          @_before = stage.to_sym
-          validate_associated_option(option: :before, value: @_before)
-        end
-
-        def _after=(stage)
-          @_after = stage.to_sym
-          validate_associated_option(option: :after, value: @_after)
-        end
 
         protected
 
         def code
           :artifact_unexpected_attribute
         end
-
-        private
-
-        def validate_associated_option(option:, value:)
-          return if Dapp::Application::STAGES.include? value
-          raise Error::Config, code: :stage_artifact_incorrect_associated_value, data: { option: option, value: value }
-        end
       end
     end
   end

data/lib/dapp/controller.rb

@@ -62,14 +62,6 @@ module Dapp
       end
     end
 
-    def metadata_flush
-      build_configs.each do |config|
-        log(config._name)
-        app = Application.new(config: config, cli_options: cli_options, ignore_git_fetch: true)
-        FileUtils.rm_rf app.metadata_path
-      end
-    end
-
     private
 
     def build_configs
@@ -87,7 +79,15 @@ module Dapp
 
     def apps(dappfile_path, app_filters:)
       config = Config::Main.new(dappfile_path: dappfile_path) do |conf|
-        conf.instance_eval File.read(dappfile_path), dappfile_path
+        begin
+          conf.instance_eval File.read(dappfile_path), dappfile_path
+        rescue SyntaxError, StandardError => e
+          message = case e
+                    when ArgumentError then "#{e.backtrace.first[/`.*'$/]}: #{e.message}"
+                    else e.message
+                    end
+          raise Error::Dappfile, code: :incorrect, data: { error: e.class.name, path: dappfile_path, message: message }
+        end
       end
       config._apps.select { |app| app_filters.any? { |pattern| File.fnmatch(pattern, app._name) } }
     end

data/lib/dapp/error/dappfile.rb

@@ -0,0 +1,6 @@
+module Dapp
+  module Error
+    # Dappfile
+    class Dappfile < Base; end
+  end
+end

data/lib/dapp/git_artifact.rb

@@ -63,8 +63,8 @@ module Dapp
       [@paths].flatten.compact.map { |path| (with_cwd && cwd ? "#{cwd}/#{path}" : path).gsub(%r{^\/*|\/*$}, '') }.join(' ') if @paths
     end
 
-    def filename(ending)
-      "#{repo.name}#{name ? "_#{name}" : nil}#{ending}"
+    def full_name
+      "#{repo.name}#{name ? "_#{name}" : nil}"
     end
 
     protected

data/lib/dapp/image/argument.rb

@@ -54,7 +54,7 @@ module Dapp
         add_option(:entrypoint, value)
       end
 
-      def add_commands(*commands)
+      def add_command(*commands)
         @bash_commands.concat(commands.flatten)
       end
 
@@ -78,9 +78,7 @@ module Dapp
       def from_options
         return {} if from.nil?
         [:entrypoint, :cmd].each_with_object({}) do |option, options|
-          output = shellout!("docker inspect --format='{{json .Config.#{option.to_s.capitalize}}}' #{from.built_id}").stdout.strip
-          options[option] = output == 'null' ? [] : JSON.parse(output)
-          options
+          options[option] = self.class.image_config_option(image_id: from.built_id, option: option)
         end
       end
 

data/lib/dapp/image/docker.rb

@@ -48,6 +48,11 @@ module Dapp
         [cache[:created_at], cache[:size]]
       end
 
+      def self.image_config_option(image_id:, option:)
+        output = shellout!("docker inspect --format='{{json .Config.#{option.to_s.capitalize}}}' #{image_id}").stdout.strip
+        output == 'null' ? [] : JSON.parse(output)
+      end
+
       protected
 
       def cache

data/lib/dapp/image/stage.rb

@@ -14,6 +14,10 @@ module Dapp
         super(name: name, from: from)
       end
 
+      def labels
+        self.class.image_config_option(image_id: built_id, option: 'labels')
+      end
+
       def built_id
         @built_id ||= id
       end

data/lib/dapp/version.rb

@@ -1,5 +1,5 @@
 # Version
 module Dapp
-  VERSION = '0.4.8'.freeze
-  BUILD_CACHE_VERSION = 1
+  VERSION = '0.5.0'.freeze
+  BUILD_CACHE_VERSION = 2
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.4.8
+  version: 0.5.0
 platform: ruby
 authors:
 - Dmitry Stolyarov
@@ -331,8 +331,10 @@ files:
 - lib/dapp/application/logging.rb
 - lib/dapp/application/path.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/docker_instructions.rb
 - lib/dapp/build/stage/from.rb
 - lib/dapp/build/stage/infra_install.rb
 - lib/dapp/build/stage/infra_setup.rb
@@ -342,11 +344,17 @@ files:
 - 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/builder/base.rb
 - lib/dapp/builder/chef.rb
 - lib/dapp/builder/chef/berksfile.rb
@@ -357,8 +365,6 @@ files:
 - lib/dapp/cli/base.rb
 - lib/dapp/cli/build.rb
 - lib/dapp/cli/list.rb
-- lib/dapp/cli/metadata.rb
-- lib/dapp/cli/metadata/flush.rb
 - lib/dapp/cli/push.rb
 - lib/dapp/cli/run.rb
 - lib/dapp/cli/smartpush.rb
@@ -378,6 +384,7 @@ files:
 - lib/dapp/error/build.rb
 - lib/dapp/error/config.rb
 - lib/dapp/error/controller.rb
+- lib/dapp/error/dappfile.rb
 - lib/dapp/error/shellout.rb
 - lib/dapp/exception/base.rb
 - lib/dapp/exception/introspect_image.rb