dapp 0.4.1 → 0.4.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NzRhNjZjMDBhZDgzNTlmYjA4M2U2ZTczM2NkODdiOWMwNTBlM2U1Yw==
+    Y2FmYzM3MDM3ZjJiYzA2NTBkZDlkZjQ3ZjcwODBiZDc3ZDQ3YmNhZQ==
   data.tar.gz: !binary |-
-    MzU5NzE3MDdjZGYzOGUxMDYxZWU2YjlhNDUzMDNiYWEyYWY1MDIyZQ==
+    NzUwNTk0YWM5Nzc2NjhkOTk0MzUwYjhlZTA5YjI4ZDhhY2EyODQ3OA==
 SHA512:
   metadata.gz: !binary |-
-    NmMyMzgwNDYxNmJiNTkxYzFmNTAzODU5ZjRhNWQ5YjJmMzU5YWMwN2FjMjAz
-    N2Q5NWQ3MjcxMTZkMDlmMTI5ODVkODM3YWQ1YjY2OGNkMGJiYmZjMjllODM5
-    M2Q3NjVjMWJhOTEzYTc1ZWNhM2UzZjhkZmNjNzc3Njk0OGU1Zjg=
+    MzljMjQ3ZTIwMWNmNDI3YTdkOWE1MzNkN2I0OTU1YjlkMDQ0OWMxMTkxOGJl
+    Y2QxNDJhZDM1NTc1OTMxMGVmNmM3OTE1NmJlODIwYWMzNWFmMzQxOTBiYTI0
+    NWY1NjVjYjNkZWQwZmJiMTA1OTk1MDhjMjFkYTNmZTUxMmU5Yzc=
   data.tar.gz: !binary |-
-    NWI1YTJmMTljOWM1MzhhN2ZhZGVmYmU0NmRiOTcwMzY5MTFkMWZkN2IxNTU5
-    MTcyNGQ3MzdlZTFlNWZiYmIyNDliZmNkZjRmZWY4MDI1MWFjZDVkZDkzODA0
-    MjYwMGY0NjkzMDFmZDc1YmI3NWVhMzNmYmRhNzI4MGQ2OGJmNTM=
+    NTcxODBkNTA5YTlkYTZiYTgzMDk4OTE5YTcxMmU2Y2FmZGMwZWMxNjdhOWNk
+    MTMwZGI0N2Q5ODRkOGFlMGY2N2Q1MThjZGI0NDQxZmNmMTdhN2EzZjk1YzY1
+    NmU3ODhiYTU1ZGM0NjFkMjQ1NDcyNmMyY2Y4YjkyNDkyMDkzNjg=

data/lib/dapp.rb

@@ -33,6 +33,7 @@ require 'dapp/cli/smartpush'
 require 'dapp/cli/list'
 require 'dapp/cli/metadata'
 require 'dapp/cli/metadata/flush'
+require 'dapp/cli/stages'
 require 'dapp/cli/stages/flush'
 require 'dapp/cli/stages/cleanup'
 require 'dapp/cli/run'

data/lib/dapp/build/stage/mod/artifact.rb

@@ -56,10 +56,10 @@ module Dapp
 
             docker_options = ['--rm',
                               "--volume #{application.tmp_path('artifact', artifact_name)}:#{app.container_tmp_path(artifact_name)}",
-                              '--entrypoint /bin/sh']
+                              '--entrypoint /bin/bash']
             commands = safe_cp(where_to_add, app.container_tmp_path(artifact_name), Process.uid, Process.gid)
             application.log_secondary_process(application.t(code: 'process.artifact_copy', data: { name: artifact_name }), short: true) do
-              app.run(docker_options, Array(application.shellout_pack(commands)))
+              app.run(docker_options, [%{-ec '#{application.shellout_pack(commands)}'}])
             end
 
             commands = safe_cp(application.container_tmp_path('artifact', artifact_name), where_to_add, owner, group, cwd, paths)

data/lib/dapp/builder/base.rb

@@ -39,6 +39,13 @@ module Dapp
       def setup_checksum
         raise
       end
+
+      def chef_cookbooks(_image)
+      end
+
+      def chef_cookbooks_checksum
+        []
+      end
     end # Base
   end # Builder
 end # Dapp

data/lib/dapp/builder/chef.rb

@@ -17,7 +17,8 @@ module Dapp
         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'
+            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',
@@ -42,6 +43,12 @@ module Dapp
 
       private
 
+      def enabled_modules
+        application.config._chef._modules.map do |mod|
+          mod.start_with?('mdapp-') ? mod.split('mdapp-')[1] : mod
+        end
+      end
+
       def project_name
         cookbook_metadata.name
       end
@@ -99,7 +106,7 @@ module Dapp
                      else
                        application.hashsum [
                          _paths_checksum(stage_cookbooks_paths_for_checksum(stage)),
-                         *application.config._chef._modules,
+                         *enabled_modules,
                          stage == :infra_install ? chefdk_image : nil
                        ].compact
                      end
@@ -113,7 +120,7 @@ module Dapp
         @cookbooks_checksum ||= application.hashsum [
           berksfile_lock_checksum,
           _paths_checksum(local_cookbook_paths_for_checksum),
-          *application.config._chef._modules
+          *enabled_modules
         ]
       end
 
@@ -178,7 +185,7 @@ module Dapp
              "--volumes-from #{volumes_from}",
              "--workdir #{berksfile_path.parent}",
              ("--env SSH_AUTH_SOCK=#{ssh_auth_socket_path}" if ssh_auth_socket_path),
-             "dappdeps/berksdeps:0.1.0 bash #{application.shellout_pack(vendor_commands.join(' && '))}"].compact.join(' '),
+             "dappdeps/berksdeps:0.1.0 bash -ec '#{application.shellout_pack(vendor_commands.join(' && '))}'"].compact.join(' '),
             log_verbose: application.log_verbose?
           )
 
@@ -215,7 +222,8 @@ module Dapp
               cookbook_name = File.basename cookbook_path
               is_project = (cookbook_name == project_name)
               is_mdapp = cookbook_name.start_with? 'mdapp-'
-              mdapp_enabled = is_mdapp && application.config._chef._modules.include?(cookbook_name)
+              mdapp_name = (is_mdapp ? cookbook_name.split('mdapp-')[1] : nil)
+              mdapp_enabled = is_mdapp && enabled_modules.include?(mdapp_name)
 
               paths = if is_project
                 recipe_paths = application.config._chef._recipes
@@ -227,8 +235,6 @@ module Dapp
                 recipe_path = "recipes/#{stage}.rb"
                 if cookbook_path.join(recipe_path).exist?
                   [[recipe_path, recipe_path]] + common_paths[cookbook_path]
-                elsif cookbook_metadata.depends.include? cookbook_name
-                  [['metadata.json', 'metadata.json']]
                 end
               else
                 [['.', '.']]
@@ -267,8 +273,8 @@ module Dapp
             to_runlist_entrypoint[project_name, recipe]
           end.flatten.compact)
 
-          res.concat(application.config._chef._modules.map do |mod|
-            to_runlist_entrypoint[mod, stage]
+          res.concat(enabled_modules.map do |mod|
+            to_runlist_entrypoint["mdapp-#{mod}", stage]
           end.flatten.compact)
         end
       end

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

@@ -18,7 +18,7 @@ module Dapp
             @cookbook_metadata.version = version
           end
 
-          def depends(dependency)
+          def depends(dependency, *_a, &_blk)
             @cookbook_metadata.depends << dependency
           end
 

data/lib/dapp/builder/shell.rb

@@ -2,22 +2,16 @@ module Dapp
   module Builder
     # Shell
     class Shell < Base
-      [:infra_install, :infra_setup, :install, :setup].each do |m|
-        define_method(:"#{m}_checksum") do
-          [application.config._shell.public_send("_#{m}"),
-           application.config._shell.public_send("_#{m}_cache_version")].flatten
+      [:infra_install, :infra_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(:"#{m}") do |image|
-          image.add_commands(*application.config._shell.public_send("_#{m}"))
+        define_method(:"#{stage}") do |image|
+          commands = application.config._shell.public_send("_#{stage}")
+          image.add_commands("export DAPP_BUILD_STAGE=#{stage}", *commands) if commands
         end
       end
-
-      def chef_cookbooks_checksum
-        []
-      end
-
-      def chef_cookbooks(_image)
-      end
     end
   end
 end

data/lib/dapp/controller.rb

@@ -49,11 +49,17 @@ module Dapp
     end
 
     def stages_flush
-      shellout(%{docker rmi $(docker images --format="{{.Repository}}:{{.Tag}}" #{build_configs.first._basename}-dappstage)})
+      build_configs.map(&:_basename).uniq.each do |basename|
+        log(basename)
+        shellout(%{docker rmi $(docker images --format="{{.Repository}}:{{.Tag}}" #{basename}-dappstage)})
+      end
     end
 
     def stages_cleanup
-      shellout(%{docker rmi $(docker images -f "dangling=true" -f "label=dapp=#{build_configs.first._basename}" -q)})
+      build_configs.map(&:_basename).uniq.each do |basename|
+        log(basename)
+        shellout(%{docker rmi $(docker images -f "dangling=true" -f "label=dapp=#{basename}" -q)})
+      end
     end
 
     def metadata_flush

data/lib/dapp/helper/shellout.rb

@@ -34,7 +34,7 @@ module Dapp
       end
 
       def shellout_pack(command)
-        "-ec 'eval $(echo #{Base64.strict_encode64(command)} | base64 --decode)'"
+        "eval $(echo #{Base64.strict_encode64(command)} | base64 --decode)"
       end
 
       def self.included(base)

data/lib/dapp/image/stage.rb

@@ -47,7 +47,7 @@ module Dapp
 
       def run!(log_verbose: false, log_time: false, introspect_error: false, introspect_before_error: false)
         raise Error::Build, code: :built_id_not_defined if from.built_id.nil?
-        shellout!("docker run #{prepared_options} --entrypoint /bin/sh --name=#{container_name} #{from.built_id} #{prepared_bash_command}",
+        shellout!("docker run #{prepared_options} --entrypoint /bin/bash --name=#{container_name} #{from.built_id} -ec '#{prepared_bash_command}'",
                   log_verbose: log_verbose, log_time: log_time)
       rescue Error::Shellout => e
         raise unless introspect_error || introspect_before_error

data/lib/dapp/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Dmitry Stolyarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-05 00:00:00.000000000 Z
+date: 2016-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout