dapp 0.2.4 → 0.2.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NWVjYjY0MmM4ZDBlYzIyMDJmNWM0YjkxNDY0ZmUxN2VhZDZhNzZjMw==
+    MTIyNTY4OTdmNjMxOGJjYzE1NmI2ZmRhNGQ5ZmQ1YzAyNzQ1YWU3ZA==
   data.tar.gz: !binary |-
-    MjBiNDMyMmQ1NmY5MTQxMTU0YWQ3NWI5OWEyNjNlMDM2OTc4YzhlYw==
+    YWViZjQ0NjA5ZWNlYzYwMGQ5MDU2MDZjOGE3NTc5MDczNDFjNGNiMg==
 SHA512:
   metadata.gz: !binary |-
-    ZjE4Y2ZlNDI1ZjU3MzczMTQ0NzJlNjI1NWYzMGNlZjI1ZTMyYTBlNjk0NDAw
-    OWE5OTExYjIxODU3Y2Q3YzMzMjRmN2FlYzJmMTYwMzcyYzdlMDc1NWQzNDcx
-    YWZmN2E4MTgwZjIxOTllYTU1Nzk5MDk4OWRhZTY0M2Y4YzYxZTI=
+    MDRiOTcwMDRiZDc1YzNhZTQ5NDM0NzFkNTRiMzZmM2YyNGQ2ZjdkMWUyMjc1
+    OTY1ZDBjMGY2Y2VhMTkyMjhiOTIwMGRhYjE4YzU4YzgzYTlmODNhMzdkZWQ5
+    MGIyYzQ2NDI4MmI3MGEyYzU5MThlNTM5OWNlZGY5NDk3NDA3YzI=
   data.tar.gz: !binary |-
-    NzVmY2ZlNjdmMzVjZmI0Y2FhNzdhZTY2OGM5NDljOGQ1NDZlMmFiYzNiYzk5
-    NWIyMWI1MWU3MDllMjY2YjUyOTRlZjAyM2JhZmMxZWI1YmQ2NWY2NmU5MjNi
-    ZjI4ZTNkYjE1ZTdkNWMzMzU5ODA2MTE4YmE0MjhmZTgzYTJlYzg=
+    Njc0ZTllM2NjMjA1YjI0ZTY4NDU2Mjk1M2JlYWQzNjM3NWY1OTcxZTU5ODAz
+    MmM2NTQwOWQwMjk2ZDAwODY0ODVmYTYxYmE5YWU2MWMzMmYwYWMzOTIyZjE3
+    ZTg5YmM3NjgyYmYzOGU3NDJkOGNmNDIwYmQ4NmFlMGQxZmM0Y2Q=

data/lib/dapp.rb

@@ -53,7 +53,6 @@ require 'dapp/build/stage/infra_install'
 require 'dapp/build/stage/infra_setup'
 require 'dapp/build/stage/app_install'
 require 'dapp/build/stage/app_setup'
-require 'dapp/build/stage/chef_cookbooks'
 require 'dapp/build/stage/source_1_archive'
 require 'dapp/build/stage/source_1'
 require 'dapp/build/stage/source_2'

data/lib/dapp/build/stage/source_4.rb

@@ -6,14 +6,10 @@ module Dapp
         MAX_PATCH_SIZE = 1024 * 1024
 
         def initialize(application, next_stage)
-          @prev_stage = ChefCookbooks.new(application, self)
+          @prev_stage = AppSetup.new(application, self)
           super
         end
 
-        def prev_source_stage
-          prev_stage.prev_stage.prev_stage
-        end
-
         def next_source_stage
           next_stage
         end

data/lib/dapp/builder/chef.rb

@@ -12,8 +12,8 @@ module Dapp
         metadata.json
         recipes/%{stage}.rb
         recipes/*_%{stage}.rb
-        files/default/%{stage}/*
-        templates/default/%{stage}/*
+        files/%{stage}/*
+        templates/%{stage}/*
       ).freeze
 
       DEFAULT_CHEFDK_IMAGE = 'dappdeps/chefdk:0.15.16-3'.freeze # TODO: config, DSL, DEFAULT_CHEFDK_IMAGE
@@ -37,17 +37,6 @@ module Dapp
         end
       end
 
-      def chef_cookbooks_checksum
-        stage_cookbooks_checksum(:chef_cookbooks)
-      end
-
-      def chef_cookbooks(image)
-        image.add_commands(
-          "mkdir -p /usr/share/dapp/chef_repo",
-          "cp -a #{container_cookbooks_vendor_path} /usr/share/dapp/chef_repo/cookbooks"
-        )
-      end
-
       private
 
       def project_name
@@ -89,11 +78,9 @@ module Dapp
             to_runlist_entrypoint[name, stage]
           end.compact)
 
-          project_main_entry = to_runlist_entrypoint[project_name, stage]
-          res << project_main_entry if project_main_entry
-
-          res.concat(application.config._app_runlist.map do |app_component|
-            to_runlist_entrypoint[project_name, [app_component, stage].join('_')]
+          res.concat(application.config._app_runlist.map(&:_name).map do |name|
+            subname_parts = name.split(project_name, 2)[1].split('-')
+            to_runlist_entrypoint[project_name, [*subname_parts, stage].join('_')]
           end.compact)
         end
       end
@@ -136,18 +123,11 @@ module Dapp
         else
           install_cookbooks
 
-          if stage == :chef_cookbooks
-            checksum = cookbooks_checksum
-          else
-            checksum = application.hashsum [
-              _paths_checksum(stage_cookbooks_vendored_paths(stage, with_files: true)),
-              *application.config._chef._modules,
-              stage == :infra_install ? chefdk_image : nil
-            ].compact
+          application.hashsum([_paths_checksum(stage_cookbooks_vendored_paths(stage, with_files: true)),
+                               *application.config._chef._modules,
+                               stage == :infra_install ? chefdk_image : nil].compact).tap do |checksum|
+            stage_cookbooks_checksum_path(stage).write "#{checksum}\n"
           end
-
-          stage_cookbooks_checksum_path(stage).write "#{checksum}\n"
-          checksum
         end
       end
 
@@ -197,7 +177,6 @@ module Dapp
                '--volume /etc:/etc:ro',
                '--volume /usr:/usr:ro',
                '--volume /lib:/lib:ro',
-               '--volume /lib64:/lib64:ro',
                '--volume /home:/home',
                '--volume /tmp:/tmp',
                ("--volume #{ssh_auth_socket_path.dirname}:#{ssh_auth_socket_path.dirname}" if ssh_auth_socket_path),
@@ -244,10 +223,6 @@ module Dapp
         application.build_path('chef', 'vendored_cookbooks').join(*path)
       end
 
-      def container_cookbooks_vendor_path(*path)
-        application.container_build_path('chef', 'vendored_cookbooks').join(*path)
-      end
-
       def stage_build_path(stage, *path)
         application.build_path(application.config._name, stage).join(*path)
       end

data/lib/dapp/builder/shell.rb

@@ -11,13 +11,6 @@ module Dapp
           image.add_commands(*application.config._shell.public_send("_#{m}"))
         end
       end
-
-      def chef_cookbooks_checksum
-        []
-      end
-
-      def chef_cookbooks(_image)
-      end
     end
   end
 end

data/lib/dapp/config/application.rb

@@ -61,21 +61,12 @@ module Dapp
         @_apps.empty? ? [self] : @_apps.flatten
       end
 
-      def _app_chain
-        @_app_chain ||= (_parent ? _parent._app_chain : []) + [self]
-      end
-
       def _app_runlist
-        _app_chain.map(&:_name).map do |name|
-          if subname = name.split("#{_root_app._name}-", 2)[1]
-            subname_parts = subname.split('-')
-            subname_parts.join('_') if subname_parts.any?
-          end
-        end.compact
+        @_app_runlist ||= (_parent ? _parent._app_runlist : []) + [self]
       end
 
       def _root_app
-        _app_chain.first
+        _app_runlist.first
       end
 
       private

data/lib/dapp/config/docker.rb

@@ -2,7 +2,7 @@ module Dapp
   module Config
     # Docker
     class Docker
-      attr_reader :_volume, :_expose, :_env, :_label, :_cmd, :_onbuild, :_workdir, :_user, :_entrypoint
+      attr_reader :_volume, :_expose, :_env, :_label, :_cmd, :_onbuild, :_workdir, :_user
       attr_reader :_from_cache_version
 
       def initialize
@@ -27,12 +27,12 @@ module Dapp
         @_expose.concat(args)
       end
 
-      def env(*args)
-        @_env.concat(args)
+      def env(**options)
+        @_env.concat(options_to_args(options))
       end
 
-      def label(*args)
-        @_label.concat(args)
+      def label(**options)
+        @_label.concat(options_to_args(options))
       end
 
       def cmd(*args)
@@ -51,10 +51,6 @@ module Dapp
         @_user = val
       end
 
-      def entrypoint(*cmd_with_args)
-        @_entrypoint = cmd_with_args.flatten
-      end
-
       def _from
         @_from || raise(Error::Config, code: :docker_from_not_defined)
       end
@@ -68,14 +64,19 @@ module Dapp
           cmd: _cmd,
           onbuild: _onbuild,
           workdir: _workdir,
-          user: _user,
-          entrypoint: _entrypoint
+          user: _user
         }
       end
 
       def clone
         Marshal.load(Marshal.dump(self))
       end
+
+      private
+
+      def options_to_args(options)
+        options.map {|key, value| "#{key.upcase}=#{value}" }
+      end
     end
   end
 end

data/lib/dapp/helper/shellout.rb

@@ -30,7 +30,7 @@ module Dapp
         shellout(*args, **kwargs).tap(&:error!)
       rescue ::Mixlib::ShellOut::ShellCommandFailed => e
         raise Error::Shellout, code: Trivia.class_to_lowercase(e.class),
-                               data: { stream: stream.show }
+                               data: { stream: stream.inspect }
       end
 
       def self.included(base)

data/lib/dapp/helper/streaming.rb

@@ -12,8 +12,8 @@ module Dapp
           buffer << string
         end
 
-        def show
-          buffer.join.strip
+        def inspect
+          buffer.join
         end
       end
 
@@ -40,7 +40,7 @@ module Dapp
         # Error
         class Error < Base
           def format_string(str)
-            "#{Paint.paint_string(super.strip, :warning)}\n"
+            Paint.paint_string(super, :warning)
           end
         end
       end

data/lib/dapp/stage_image.rb

@@ -38,10 +38,6 @@ module Dapp
       add_change_option(:workdir, value)
     end
 
-    def add_change_entrypoint(value)
-      add_change_option(:entrypoint, value)
-    end
-
     def add_change_user(value)
       add_change_option(:user, value)
     end
@@ -133,7 +129,7 @@ module Dapp
 
     def prepared_change
       prepared_options_default(change_options) do |k, vals|
-        if [:cmd, :entrypoint].include? k
+        if k == :cmd
           %(-c '#{k.to_s.upcase} #{Array(vals)}')
         else
           Array(vals).map { |v| %(-c "#{k.to_s.upcase} #{v}") }.join(' ')

data/lib/dapp/version.rb

@@ -1,5 +1,5 @@
 # Version
 module Dapp
-  VERSION = '0.2.4'.freeze
+  VERSION = '0.2.6'.freeze
   BUILD_CACHE_VERSION = 1
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.6
 platform: ruby
 authors:
 - Dmitry Stolyarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-29 00:00:00.000000000 Z
+date: 2016-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -334,7 +334,6 @@ files:
 - lib/dapp/build/stage/app_install.rb
 - lib/dapp/build/stage/app_setup.rb
 - lib/dapp/build/stage/base.rb
-- lib/dapp/build/stage/chef_cookbooks.rb
 - lib/dapp/build/stage/from.rb
 - lib/dapp/build/stage/infra_install.rb
 - lib/dapp/build/stage/infra_setup.rb

data/lib/dapp/build/stage/chef_cookbooks.rb

@@ -1,23 +0,0 @@
-module Dapp
-  module Build
-    module Stage
-      # ChefCookbooks
-      class ChefCookbooks < Base
-        def initialize(application, next_stage)
-          @prev_stage = AppSetup.new(application, self)
-          super
-        end
-
-        def signature
-          hashsum [prev_stage.signature, *application.builder.chef_cookbooks_checksum]
-        end
-
-        def image
-          super do |image|
-            application.builder.chef_cookbooks(image)
-          end
-        end
-      end # ChefCookbooks
-    end # Stage
-  end # Build
-end # Dapp