dapp 0.4.3 → 0.4.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MTU3NmEyYmMxYjg4M2FjNDY0YzEwMmY2YzFkZjJhMmMyZmEwN2Y0Ng==
+    YzBkNWZkYTQ0ZTdmNjJhZmFiMDQ0YjAxYTFjZWVmM2M2NTVkMjM1Zg==
   data.tar.gz: !binary |-
-    OWJhNjNiMDUxODkwZWQ5MDdjMjA4YmRmOTk5M2Y4ZjJhMjhkMzUxYw==
+    MTA4ZDU1ZGY3MmM3ZTNmMTMxNzFmMjZlYThmNzgzMWZlZTkxMzY3OA==
 SHA512:
   metadata.gz: !binary |-
-    OTdiN2YzOTZmYzE3YzA0MzA1OWNiNTYyMjI2NWJmODU2NDIzM2ZkNzBjMTJh
-    MTc4YzNiNGFiMzJiM2VjYTY5MGFiYzNiMDA4ZWE4ODQ3MDQ1YWNhM2M0ZTNl
-    OWY0MDk3ODIxMzk1NzhhMDExMTIxMGM1ZjgyMGM0NWRiMTQzNDA=
+    MDI4NjAwMGM3OGRmM2RkOTE4MzhiYjBiZDViOWJjYTYyOGQ1YWE1M2Q2Mzcy
+    Y2M5MTY5NjExOWVjMDQ5ZTQ4ZmU2MjIwMzE4YTU1YzMxNjMxMTA3NTU4MTAz
+    YTc2NzNjYWMxODljODJhNWRjOTU4MWE4MGJlOGZmMjM1ODg5OGM=
   data.tar.gz: !binary |-
-    MzgzMDZiMTk5MjAzMjExMDRiZTc2MmFjNTFiNzhjNGI3YTBlNTdjOTE1ZWU4
-    NjE5OGU4NjNlM2I4NzNiODRjNTg2MDA4MDhkZDA2YzdmOWFkY2FhZDMwZGRh
-    YWRlZjU4YzM2YmVmYWRjNjdmNDY2NzY4ZGM3Nzg0ZDViZGJmZmI=
+    YTdiODUzYjljYjg5NDY2MTBjN2RjNDgzMzkyY2Q4MDkxODZmNmUwNjIxZDIx
+    YWRhMzgxOTRiMzZiNjJhMzM2NzJjYjNlY2QyZmU3OTQyM2JlZjk4ODk1ZDQ3
+    YmIzMjNlZWFjN2U1MTdiZDkwYWY3MjQxY2ZkYWY3ZDFlZmRhODA=

data/lib/dapp/builder/chef.rb

@@ -234,11 +234,18 @@ module Dapp
                   .map { |recipe| ["recipes/#{stage}/#{recipe}.rb", "recipes/#{recipe}.rb"] }
                   .select { |from, _| cookbook_path.join(from).exist? }
 
-                (recipe_paths + common_paths[cookbook_path]) if recipe_paths.any?
+                if recipe_paths.any?
+                  [*recipe_paths, *common_paths[cookbook_path]]
+                else
+                  [nil, *common_paths[cookbook_path]]
+                end
               elsif is_mdapp && mdapp_enabled
                 recipe_path = "recipes/#{stage}.rb"
+
                 if cookbook_path.join(recipe_path).exist?
-                  [[recipe_path, recipe_path]] + common_paths[cookbook_path]
+                  [[recipe_path, recipe_path], *common_paths[cookbook_path]]
+                else
+                  [nil, *common_paths[cookbook_path]]
                 end
               else
                 [['.', '.']]
@@ -251,10 +258,16 @@ module Dapp
           stage_cookbooks_path(stage).mkpath
           install_paths.each do |cookbook_path, paths|
             paths.each do |from, to|
-              from_path = cookbook_path.join(from)
-              to_path = stage_cookbooks_path(stage, cookbook_path.basename, to)
-              to_path.parent.mkpath
-              FileUtils.cp_r from_path, to_path
+              if from.nil?
+                to_path = stage_cookbooks_path(stage, cookbook_path.basename, 'recipes/void.rb')
+                to_path.parent.mkpath
+                FileUtils.touch to_path
+              else
+                from_path = cookbook_path.join(from)
+                to_path = stage_cookbooks_path(stage, cookbook_path.basename, to)
+                to_path.parent.mkpath
+                FileUtils.cp_r from_path, to_path
+              end
             end
           end
         end

data/lib/dapp/cli.rb

@@ -15,10 +15,10 @@ Usage: dapp [options] sub-command [sub-command options]
 Available subcommands: (for details, dapp SUB-COMMAND --help)
 
 dapp build [options] [PATTERN ...]
-dapp push [options] [PATTERN] REPO
+dapp push [options] [PATTERN...] REPO
 dapp smartpush [options] [PATTERN ...] REPOPREFIX
 dapp list [options] [PATTERN ...]
-dapp run [options] [PATTERN] [DOCKER ARGS]
+dapp run [options] [PATTERN...] [DOCKER ARGS]
 dapp stages
 dapp metadata
 

data/lib/dapp/cli/base.rb

@@ -13,14 +13,12 @@ module Dapp
              short: '-q',
              long: '--quiet',
              description: 'Suppress logging',
-             on: :tail,
              default: false,
              boolean: true
 
       option :log_verbose,
              long: '--verbose',
              description: 'Enable verbose output',
-             on: :tail,
              default: false,
              boolean: true
 

data/lib/dapp/cli/build.rb

@@ -49,7 +49,7 @@ BANNER
       rescue Exception::IntrospectImage => e
         $stderr.puts(e.net_status[:message])
         data = e.net_status[:data]
-        system("docker run -ti --rm #{data[:options]} #{data[:built_id]} bash").tap do |res|
+        system("docker run -ti --rm --entrypoint /bin/bash #{data[:options]} #{data[:built_id]}").tap do |res|
           shellout("docker rmi #{data[:built_id]}") if data[:rmi]
           res || raise(Dapp::Error::Application, code: :application_not_run)
         end

data/lib/dapp/cli/metadata/flush.rb

@@ -9,7 +9,7 @@ module Dapp
 Version: #{Dapp::VERSION}
 
 Usage:
-  dapp metadata flush
+  dapp metadata flush [options] [PATTERN ...]
 Options:
 BANNER
         def run(argv = ARGV)

data/lib/dapp/cli/push.rb

@@ -11,7 +11,7 @@ Usage:
   dapp push [options] [PATTERN ...] REPO
 
     PATTERN                     Applications to process [default: *].
-
+    REPO                        Pushed image name.
 Options:
 BANNER
 

data/lib/dapp/cli/run.rb

@@ -8,7 +8,7 @@ module Dapp
 Version: #{Dapp::VERSION}
 
 Usage:
-  dapp run [options] [PATTERN] [DOCKER ARGS]
+  dapp run [options] [PATTERN...] [DOCKER ARGS]
 
     PATTERN                     Applications to process [default: *].
     DOCKER ARGS                 Docker run options and command separated by '--'

data/lib/dapp/cli/smartpush.rb

@@ -11,7 +11,7 @@ Usage:
   dapp smartpush [options] [PATTERN ...] REPOPREFIX
 
     PATTERN                     Applications to process [default: *].
-
+    REPOPREFIX                  Pushed image name prefix.
 Options:
 BANNER
     end

data/lib/dapp/cli/stages/cleanup.rb

@@ -9,7 +9,7 @@ module Dapp
 Version: #{Dapp::VERSION}
 
 Usage:
-  dapp stages cleanup
+  dapp stages cleanup [options] [PATTERN ...]
 Options:
 BANNER
         def run(argv = ARGV)

data/lib/dapp/cli/stages/flush.rb

@@ -9,7 +9,7 @@ module Dapp
 Version: #{Dapp::VERSION}
 
 Usage:
-  dapp stages flush
+  dapp stages flush [options] [PATTERN ...]
 Options:
 BANNER
         def run(argv = ARGV)

data/lib/dapp/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - Dmitry Stolyarov