dapp 0.1.4 → 0.1.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MmRiODBmZjM2MTk5NWQ5YmYwZjk4Yjg3OGEzOTVmNjc1M2VkOGQ4YQ==
+    NTQ5NzZmNDM5NTE5OWU5ZDcyMmRkZWE4YzU1MDZhNDVkYzI0ZmFlNA==
   data.tar.gz: !binary |-
-    Zjg3MjhhMWRmOTUyZjYwNjNjODBkOWFiZGU3NjRhM2JiNDFlYTU3YQ==
+    ZjFlYjI4ZTNmZWY4ODU1ZTcxZTYxYWRlNDhjNTc5ZGQzMzk2NGE1Yw==
 SHA512:
   metadata.gz: !binary |-
-    ZjE2ODY2MDIyM2UxMGE5OGY4ZmYxNWI2ODk0ZWRjYTA2ODAzYmUzMjc2MDRl
-    MmI0NzM4MTZlNjk5ZTkwNjgxYjE0NjZiNDZkYzUxYTc3OTgzOGRkM2RiYzRl
-    MzJhNDU4ZmZmMzExZWJhMzdlMWJlZWEyZDNhNzU0ZTg5NmI5OGQ=
+    MDEzNmU1NDY0MmIyZGVkYzViNjg5ZGM0YzYyYTU0N2U3NGNiYjA1NmQyNzIy
+    Zjg0NGQyN2Y3ODdlY2RjNTdmNDA4ODdiMDUzZmJkMzEyMTM0MjQ0ZDY4N2Q0
+    MTZmOTkzMDQxMTA5OWQ1ZWNlOWFhY2Y1MjI1MWE5N2VlNDA5ZTI=
   data.tar.gz: !binary |-
-    NjRjYzk5MzExOTY3ZGNhYzJiNmI0NTg2ZGFlMDM2MWUwMWFkMTViNDFhZjI4
-    YWFlZmI2NDc2MzM3ZDMwMGNjYjIwNmM5MDk5ZmNlMjk1NTY2ZWMwMjhiYWVl
-    OTQ1ZWYwYTE1Mjc4NDc1ZjgzZDdmNDk3OTgwZTU4OWVmNWRiNjE=
+    Yjc0ZDI5NDhmNDRlMTU2ZjMwZmFiODYzZDk3NjBjYzRkYjMwNTQ0MGRiYTIx
+    MDZlZTcwZDYxMDZmMGI0ZjEzMzQzZTNlM2IwOTFmNWIwNmEyOTE2MzI3YWQ3
+    Y2VhMmI5NzdmN2JkZDA2MjczYjQ4NTJkY2JjNDE5NWRjZmZhNmI=

data/lib/dapp.rb

@@ -52,6 +52,7 @@ 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/chef_cookbooks.rb

@@ -0,0 +1,23 @@
+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

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

@@ -6,10 +6,14 @@ module Dapp
         MAX_PATCH_SIZE = 1024 * 1024
 
         def initialize(application, next_stage)
-          @prev_stage = AppSetup.new(application, self)
+          @prev_stage = ChefCookbooks.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

@@ -37,6 +37,17 @@ 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
@@ -125,11 +136,18 @@ module Dapp
         else
           install_cookbooks
 
-          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"
+          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
           end
+
+          stage_cookbooks_checksum_path(stage).write "#{checksum}\n"
+          checksum
         end
       end
 
@@ -179,6 +197,7 @@ 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),
@@ -225,6 +244,10 @@ 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,6 +11,13 @@ 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/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.inspect }
+                               data: { stream: stream.show }
       end
 
       def self.included(base)

data/lib/dapp/helper/streaming.rb

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

data/lib/dapp/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Dmitry Stolyarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-27 00:00:00.000000000 Z
+date: 2016-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -334,6 +334,7 @@ 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