dapp 0.6.10 → 0.6.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 40169e89d8925c041d21e62f299117ae75974a75
-  data.tar.gz: 7967139ea2e4433fe4328e3567640fdf4bf2c4d4
+  metadata.gz: bfc6a68fd3d125233e595953664e147e4a209091
+  data.tar.gz: 369287b73a66da2d400db0ce1db3602e1d395f55
 SHA512:
-  metadata.gz: ad73a8b4e86664bb5b3751a0cb0e347c71ca3a0467621120dcd3ce55a01c70b1181fd8cfbc26cb8dec2307963e9a07e211d29aaf58351d0f443ab417385cad95
-  data.tar.gz: 9826816cb89d9d6b913f7e345f4f0d96cce6301eb0021954570230a6f7ff621f246d8e64ea92fdbc364fe659d5246544f8d7bbaf0e36e3ad08b1d1203b6d2b20
+  metadata.gz: 01ae25ee3031a89f7dff9990307286acb747f08f469eba7524c5ec558b3fe06a5dd96ed0d9b628a14217dba0a00634b533ea18bac56d00141a847912b1997af3
+  data.tar.gz: bb3d48378904ff32abecd2efbbefe05c1e3143ee2bcc49698d398b313e59489e01a46fafa7166b1c25bcaa1e930dc515785ebcbe79ea153f804ac7e1f27721a0

data/config/en/common.yml

@@ -45,6 +45,7 @@ en:
       excess_name_instruction: "WARNING: Excessive use of the 'name' instruction. Given name corresponds to default name."
       another_image_already_tagged: 'WARNING: image with other id already exist.'
       tag_ignored: "WARNING: tag '%{tag}' ignored."
+      dimg_not_found_in_registry: "WARNING: Dimg not found in registry."
     group:
       install_group: 'Install group'
       setup_group: 'Setup group'

data/lib/dapp/builder/chef.rb

@@ -229,9 +229,15 @@ module Dapp
             "#{application.project.mkdir_path} -p ~/.ssh",
             "echo \"Host *\" >> ~/.ssh/config",
             "echo \"    StrictHostKeyChecking no\" >> ~/.ssh/config",
-            *berksfile.local_cookbooks
-                      .values
-                      .map { |cookbook| "#{application.project.rsync_path} --archive --relative #{cookbook[:path]} /tmp/local_cookbooks" },
+            *berksfile
+              .local_cookbooks
+              .values
+              .map {|cookbook|
+                ["#{application.project.rsync_path} --archive",
+                 *cookbook[:chefignore].map {|path| "--exclude #{path}"},
+                 "--relative #{cookbook[:path]} /tmp/local_cookbooks",
+                ].join(' ')
+              },
             "cd /tmp/local_cookbooks/#{berksfile_path.parent}",
             *before_vendor_commands,
             '/.dapp/deps/chefdk/bin/berks vendor /tmp/cookbooks',

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

@@ -41,10 +41,19 @@ module Dapp
           raise(::Dapp::Builder::Chef::Error, code: :berksfile_absolute_path_forbidden,
                                               data: { cookbook: name, path: path }) if path.start_with? '/'
 
-          @local_cookbooks[name] = {
+          desc = {
             name: name,
-            path: home_path.join(path)
+            path: home_path.join(path),
+            chefignore: [],
           }
+
+          if desc[:path].join('chefignore').exist?
+            chefignore_patterns = desc[:path].join('chefignore').read.split("\n").map(&:strip)
+            desc[:chefignore] = Dir[*chefignore_patterns.map {|pattern| desc[:path].join(pattern)}]
+              .map(&Pathname.method(:new))
+          end
+
+          @local_cookbooks[name] = desc
         end
 
         def local_cookbook?(name)

data/lib/dapp/config/application.rb

@@ -45,7 +45,7 @@ module Dapp
       end
 
       def builder(type)
-        project.log_warning(desc: { code: 'excess_builder_instruction', context: 'warning' }) if @_chef.send(:empty?) && @_shell.send(:empty?)
+        project.log_warning(desc: { code: 'excess_builder_instruction' }) if @_chef.send(:empty?) && @_shell.send(:empty?)
         raise Error::Config, code: :builder_type_unsupported, data: { type: type } unless [:chef, :shell].include?((type = type.to_sym))
         another_builder = [:chef, :shell].find { |t| t != type }
         instance_variable_set(:"@_#{another_builder}", instance_variable_get(:"@_#{another_builder}").class.new)

data/lib/dapp/config/main.rb

@@ -12,7 +12,7 @@ module Dapp
       end
 
       def name(value)
-        project.log_warning(desc: { code: 'excess_name_instruction', context: 'warning' }) if @_basename == value.to_s
+        project.log_warning(desc: { code: 'excess_name_instruction' }) if @_basename == value.to_s
         @_basename = value
       end
     end

data/lib/dapp/docker_registry/base.rb

@@ -24,6 +24,9 @@ module Dapp
 
       def tags
         @tags ||= api_request(repo_suffix, 'tags/list')['tags'] || []
+      rescue Error::Registry => e
+        raise Exception::Registry, code: :dimg_not_found_in_registry if e.net_status[:code] == :page_not_found
+        raise
       end
 
       def image_id(tag)

data/lib/dapp/docker_registry/mod/authorization.rb

@@ -9,6 +9,7 @@ module Dapp
             case authenticate_header = raw_request(url).headers['Www-Authenticate']
             when /Bearer/ then { headers: { Authorization: "Bearer #{authorization_token(authenticate_header)}" } }
             when /Basic/ then { headers: { Authorization: "Basic #{authorization_auth}" } }
+            when nil then {}
             else raise Error::Registry, code: :authenticate_type_not_supported
             end
           end

data/lib/dapp/image/stage.rb

@@ -44,7 +44,7 @@ module Dapp
       end
 
       def tag!
-        project.log_warning(desc: { code: :another_image_already_tagged, context: 'warning' }) if !(existed_id = id).nil? && built_id != existed_id
+        project.log_warning(desc: { code: :another_image_already_tagged }) if !(existed_id = id).nil? && built_id != existed_id
         project.shellout!("docker tag #{built_id} #{name}")
         cache_reset
       end

data/lib/dapp/project/command/stages/common.rb

@@ -16,16 +16,24 @@ module Dapp
             format = proc do |arr|
               arr.map do |tag|
                 if (id = registry.image_id(tag)).nil?
-                  log_warning(desc: { code: 'tag_ignored', context: 'warning', data: { tag: tag } })
+                  log_warning(desc: { code: 'tag_ignored', data: { tag: tag } })
                 else
                   [tag, id]
                 end
               end.compact.to_h
             end
-            applications, stages = registry.tags.partition { |tag| !tag.start_with?('dappstage') }
+            applications, stages = registry_tags(registry).partition { |tag| !tag.start_with?('dappstage') }
             [format.call(applications), format.call(stages)]
           end
 
+          def registry_tags(registry)
+            registry.tags
+          rescue Exception::Registry => e
+            raise unless e.net_status[:code] == :dimg_not_found_in_registry
+            log_warning(desc: { code: 'dimg_not_found_in_registry' })
+            []
+          end
+
           def delete_repo_image(registry, image_tag)
             if dry_run?
               log(image_tag)

data/lib/dapp/project/logging/base.rb

@@ -53,6 +53,8 @@ module Dapp
 
         def log_warning(*args, **kwargs)
           kwargs[:style] = :warning
+          kwargs[:desc] ||= {}
+          kwargs[:desc][:context] ||= :warning
           log(*args, **kwargs)
         end
 

data/lib/dapp/project/shellout/system.rb

@@ -5,7 +5,7 @@ module Dapp
       # System
       module System
         SYSTEM_SHELLOUT_IMAGE = 'ubuntu:14.04'.freeze
-        SYSTEM_SHELLOUT_VERSION = 2
+        SYSTEM_SHELLOUT_VERSION = 3
 
         def system_shellout_container_name
           "dapp_system_shellout_#{hashsum [SYSTEM_SHELLOUT_VERSION,
@@ -19,10 +19,20 @@ module Dapp
 
           @system_shellout_container ||= begin
             lock(system_shellout_container_name) do
-              if shellout("docker inspect #{system_shellout_container_name}").exitstatus.nonzero?
+              cmd = shellout("docker inspect -f {{.State.Running}} #{system_shellout_container_name}")
+              if cmd.exitstatus.nonzero?
+                start_container = true
+              elsif cmd.stdout.strip == 'false'
+                shellout!("docker rm -f #{system_shellout_container_name}")
+                start_container = true
+              else
+                start_container = false
+              end
+
+              if start_container
                 volumes_from = [base_container, gitartifact_container]
                 log_secondary_process(t(code: 'process.system_shellout_container_loading'), short: true) do
-                  shellout! ['docker run --detach --privileged', '--restart always',
+                  shellout! ['docker run --detach --privileged',
                              "--name #{system_shellout_container_name}",
                              *volumes_from.map { |container| "--volumes-from #{container}" },
                              '--volume /:/.system_shellout_root',

data/lib/dapp/version.rb

@@ -1,5 +1,5 @@
 # Version
 module Dapp
-  VERSION = '0.6.10'.freeze
+  VERSION = '0.6.11'.freeze
   BUILD_CACHE_VERSION = 4
 end

metadata

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