dapp 0.6.17 → 0.7.1

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

@@ -0,0 +1,81 @@
+module Dapp
+  module Config
+    module Directive
+      module Docker
+        # Dimg
+        class Dimg < Base
+          attr_reader :_volume, :_expose, :_env, :_label, :_cmd, :_onbuild, :_workdir, :_user, :_entrypoint
+
+          def initialize
+            @_volume = []
+            @_expose = []
+            @_env = {}
+            @_label = {}
+            @_cmd = []
+            @_onbuild = []
+
+            super
+          end
+
+          def volume(*args)
+            @_volume.concat(args)
+          end
+
+          def expose(*args)
+            @_expose.concat(args)
+          end
+
+          def env(**options)
+            @_env.merge!(options)
+          end
+
+          def label(**options)
+            @_label.merge!(options)
+          end
+
+          def cmd(*args)
+            @_cmd.concat(args)
+          end
+
+          def onbuild(*args)
+            @_onbuild.concat(args)
+          end
+
+          def workdir(val)
+            @_workdir = val
+          end
+
+          def user(val)
+            @_user = val
+          end
+
+          def entrypoint(*cmd_with_args)
+            @_entrypoint = cmd_with_args.flatten
+          end
+
+          def _change_options
+            {
+              volume: _volume,
+              expose: _expose,
+              env: _env,
+              label: _label,
+              cmd: _cmd,
+              onbuild: _onbuild,
+              workdir: _workdir,
+              user: _user,
+              entrypoint: _entrypoint
+            }
+          end
+
+          protected
+
+          def clone_to_artifact
+            Artifact.new.tap do |docker|
+              docker.instance_variable_set('@_from', @_from)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/dapp/config/directive/git_artifact_local.rb

@@ -0,0 +1,13 @@
+module Dapp
+  module Config
+    module Directive
+      # GitArtifactLocal
+      class GitArtifactLocal < ArtifactBase
+        protected
+
+        alias add export
+        undef_method :export
+      end
+    end
+  end
+end

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

@@ -0,0 +1,55 @@
+module Dapp
+  module Config
+    module Directive
+      # GitArtifactRemote
+      class GitArtifactRemote < GitArtifactLocal
+        attr_reader :_url, :_name, :_branch, :_commit
+
+        def initialize(url)
+          @_url  = url
+          @_name = url.gsub(%r{.*?([^\/ ]+)\.git}, '\\1')
+
+          super()
+        end
+
+        def _export
+          super do |export|
+            export._url    = @_url
+            export._name   = @_name
+            export._branch ||= @_branch
+            export._commit ||= @_commit
+          end
+        end
+
+        # Export
+        class Export < GitArtifactLocal::Export
+          attr_accessor :_url, :_name, :_branch, :_commit
+
+          def _artifact_options
+            super.merge(name: _name, branch: _branch)
+          end
+
+          protected
+
+          def branch(value)
+            @_branch = value
+          end
+
+          def commit(value)
+            @_commit = value
+          end
+        end
+
+        protected
+
+        def branch(value)
+          @_branch = value
+        end
+
+        def commit(value)
+          @_commit = value
+        end
+      end
+    end
+  end
+end

data/lib/dapp/config/directive/mount.rb

@@ -0,0 +1,25 @@
+module Dapp
+  module Config
+    module Directive
+      # Mount
+      class Mount < Base
+        attr_reader :_from, :_to
+        attr_reader :_type
+
+        def initialize(to)
+          raise Error::Config, code: :mount_to_absolute_path_required unless Pathname((to = to.to_s)).absolute?
+          @_to = to
+          super()
+        end
+
+        protected
+
+        def from(path_or_type)
+          path_or_type = path_or_type.to_sym
+          raise Error::Config, code: :mount_from_type_required unless [:tmp_dir, :build_dir].include? path_or_type
+          @_type = path_or_type
+        end
+      end
+    end
+  end
+end

data/lib/dapp/config/directive/shell/artifact.rb

@@ -3,33 +3,12 @@ module Dapp
     module Directive
       module Shell
         # Artifact
-        class Artifact < Base
+        class Artifact < Dimg
           attr_reader :_build_artifact
-          attr_reader :_build_artifact_cache_version
-
-          def initialize
-            super
-            @_build_artifact = []
-          end
-
-          def build_artifact(*args, cache_version: nil)
-            @_build_artifact.concat(args)
-            @_build_artifact_cache_version = cache_version
-          end
-
-          def reset_build_artifact
-            @_build_artifact = []
-          end
-
-          def reset_all
-            super
-            reset_build_artifact
-          end
-
-          protected
+          stage_command_generator(:build_artifact)
 
           def empty?
-            super && @_build_artifact.empty?
+            super && _build_artifact_command.empty?
           end
         end
       end

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

@@ -0,0 +1,68 @@
+module Dapp
+  module Config
+    module Directive
+      module Shell
+        # Dimg
+        class Dimg < Directive::Base
+          attr_reader :_version
+          attr_reader :_before_install, :_before_setup, :_install, :_setup
+
+          def version(value)
+            @_version = value
+          end
+
+          def self.stage_command_generator(stage)
+            define_method stage do |&blk|
+              (variable = instance_variable_get("@_#{stage}") || StageCommand.new).instance_eval(&blk)
+              instance_variable_set("@_#{stage}", variable)
+            end
+
+            define_method "_#{stage}_command" do
+              return [] if (variable = instance_variable_get("@_#{stage}")).nil?
+              variable._run
+            end
+
+            define_method "_#{stage}_version" do
+              return [] if (variable = instance_variable_get("@_#{stage}")).nil?
+              variable._version || _version
+            end
+          end
+          [:before_install, :before_setup, :install, :setup].each(&method(:stage_command_generator))
+
+          # StageCommand
+          class StageCommand < Directive::Base
+            attr_reader :_version
+            attr_reader :_run
+
+            def initialize
+              @_run = []
+              super
+            end
+
+            def run(*args)
+              @_run.concat(args)
+            end
+
+            def version(value)
+              @_version = value
+            end
+          end
+
+          protected
+
+          def empty?
+            (_before_install_command + _before_setup_command + _install_command + _setup_command).empty?
+          end
+
+          def clone_to_artifact
+            Artifact.new.tap do |shell|
+              instance_variables.each do |variable|
+                shell.instance_variable_set(variable, instance_variable_get(marshal_dup(variable)))
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/dapp/{application.rb → dimg.rb}

@@ -1,6 +1,6 @@
 module Dapp
-  # Application
-  class Application
+  # Dimg
+  class Dimg
     include GitArtifact
     include Path
     include Tags
@@ -20,17 +20,17 @@ module Dapp
       @ignore_git_fetch = ignore_git_fetch
       @should_be_built = should_be_built
 
-      raise Error::Application, code: :application_not_built if should_be_built?
+      raise Error::Dimg, code: :dimg_not_built if should_be_built?
     end
 
     def build!
       with_introspection do
-        project.lock("#{config._basename}.images", readonly: true) do
+        project.lock("#{project.name}.images", readonly: true) do
           last_stage.build_lock! do
             begin
               last_stage.build!
             ensure
-              last_stage.save_in_cache! if last_stage.image.built? || dev_mode?
+              last_stage.save_in_cache! if last_stage.image.built? || project.dev_mode?
             end
           end
         end
@@ -39,30 +39,17 @@ module Dapp
       FileUtils.rm_rf(tmp_path)
     end
 
-    def tag!(tag)
-      project.lock("#{config._basename}.images", readonly: true) do
-        applicaion_name = config._name
-        if project.dry_run?
-          project.log_state(applicaion_name, state: project.t(code: 'state.tag'), styles: { status: :success })
-        else
-          project.log_process(applicaion_name, process: project.t(code: 'status.process.tagging')) do
-            last_stage.image.tag!(tag)
-          end
-        end
-      end
-    end
-
     def export!(repo, format:)
-      project.lock("#{config._basename}.images", readonly: true) do
+      project.lock("#{project.name}.images", readonly: true) do
         tags.each do |tag|
-          image_name = format % { repo: repo, application_name: config._name, tag: tag }
+          image_name = format % { repo: repo, dimg_name: config._name, tag: tag }
           export_base!(last_stage.image, image_name)
         end
       end
     end
 
     def export_stages!(repo, format:)
-      project.lock("#{config._basename}.images", readonly: true) do
+      project.lock("#{project.name}.images", readonly: true) do
         export_images.each do |image|
           image_name = format % { repo: repo, signature: image.name.split(':').last }
           export_base!(image, image_name)
@@ -86,7 +73,7 @@ module Dapp
     end
 
     def import_stages!(repo, format:)
-      project.lock("#{config._basename}.images", readonly: true) do
+      project.lock("#{project.name}.images", readonly: true) do
         import_images.each do |image|
           begin
             image_name = format % { repo: repo, signature: image.name.split(':').last }
@@ -119,7 +106,7 @@ module Dapp
       if project.dry_run?
         project.log(cmd)
       else
-        system(cmd) || raise(Error::Application, code: :application_not_run)
+        system(cmd) || raise(Error::Dimg, code: :dimg_not_run)
       end
     end
 
@@ -139,19 +126,11 @@ module Dapp
       config._docker._from.nil?
     end
 
-    def dev_mode?
-      config._dev_mode || project.dev_mode?
-    end
-
-    def build_cache_version
-      [Dapp::BUILD_CACHE_VERSION, dev_mode? ? 1 : 0]
-    end
-
     protected
 
     def should_be_built?
       should_be_built && begin
-        builder.before_application_should_be_built_check
+        builder.before_dimg_should_be_built_check
         !last_stage.image.tagged?
       end
     end
@@ -165,5 +144,5 @@ module Dapp
       project.shellout!("docker rmi #{data[:built_id]}") if data[:rmi]
       raise data[:error]
     end
-  end # Application
+  end # Dimg
 end # Dapp

data/lib/dapp/{application → dimg}/git_artifact.rb

@@ -1,6 +1,6 @@
 module Dapp
-  # Application
-  class Application
+  # Dimg
+  class Dimg
     # GitArtifact
     module GitArtifact
       def git_artifacts
@@ -22,5 +22,5 @@ module Dapp
         end
       end
     end # GitArtifact
-  end # Application
+  end # Dimg
 end # Dapp

data/lib/dapp/{application → dimg}/path.rb

@@ -1,10 +1,14 @@
 module Dapp
-  # Application
-  class Application
+  # Dimg
+  class Dimg
     # Path
     module Path
       def home_path(*path)
-        make_path(config._home_path, *path).expand_path
+        make_path(project.path, *path).expand_path
+      end
+
+      def chef_path(*path)
+        home_path('.dapp_chef', *path)
       end
 
       def tmp_path(*path)
@@ -13,7 +17,7 @@ module Dapp
       end
 
       def build_path(*path)
-        make_path(project.build_path.join(config._basename), *path).expand_path.tap { |p| p.parent.mkpath }
+        make_path(project.build_path, *path).expand_path.tap { |p| p.parent.mkpath }
       end
 
       def container_dapp_path(*path)
@@ -30,5 +34,5 @@ module Dapp
         path.compact.map(&:to_s).inject(Pathname.new(base), &:+)
       end
     end # Path
-  end # Application
+  end # Dimg
 end # Dapp

data/lib/dapp/{application → dimg}/stages.rb

@@ -1,6 +1,6 @@
 module Dapp
-  # Application
-  class Application
+  # Dimg
+  class Dimg
     # Stages
     module Stages
       def signature
@@ -8,23 +8,23 @@ module Dapp
       end
 
       def stage_cache_format
-        "#{project.cache_format % { application_name: config._basename }}:%{signature}"
+        "#{project.stage_cache}:%{signature}"
       end
 
       def stage_dapp_label
-        project.stage_dapp_label_format % { application_name: config._basename }
+        project.stage_dapp_label
       end
 
       def images
         (@images ||= []).tap do |images|
-          stages.each do |stage|
+          stages.map do |stage|
             if stage.respond_to?(:images)
               images.concat(stage.images)
             else
               images << stage.image
             end
-          end
-        end.uniq!(&:name)
+          end.uniq(&:name)
+        end
       end
 
       protected
@@ -55,5 +55,5 @@ module Dapp
         end
       end
     end # Stages
-  end # Application
+  end # Dimg
 end # Dapp