dapp 0.7.7 → 0.7.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ef27281b1af7bbf5ba8f3d263cea3e5a701a2ba
-  data.tar.gz: 0303f66f712951a1d2f82033f9a2e368bacc9b72
+  metadata.gz: 709b971c2b888a73d2837821872216f036e2fa99
+  data.tar.gz: a18c53002d974242830a9b76450a56ba1f6c21f5
 SHA512:
-  metadata.gz: 82d1dc965ca175d1ca89df7ed555dcadadd1f148ba00da307c5182f1519af42f6f894fe90c2383c86677a2c7bea417d63d6ede0d1adda446307c14d121b62e86
-  data.tar.gz: 30416cab1cd47e0395b95d202bd764655ae54838e021ff4a64fefb5a393cc1f2b817eec6ab8c12ece56eed95790654002fd074a8453a730e0e979566681ebeb4
+  metadata.gz: b142d811cc38199046e90babe262c8f32b7a5dcccd543d0e5c4e41ff5041ef87543a6310f4fef15c19250ac7ba4c1a8c88e4160dcb58c3cc1a09bf91970e6a88
+  data.tar.gz: 580f2b3b2ec5fc28a2042ea635a7b325bfc035f4940477fa3d3e5224b985208252f55326ac6117b174b7a3dd79aeec37c1779240f7e7e3b624d0f44bd7a99a51

data/bin/dapp

@@ -15,7 +15,7 @@ begin
       ::File.open(filename, 'w') do |dapp_stacktrace|
         dapp_stacktrace.write "#{e.backtrace.join("\n")}\n"
       end
-      $stderr.puts "\033[1m\033[31mStacktrace dumped to #{filename}\033[0m"
+      $stderr.puts "\033[1m\033[90mStacktrace dumped to #{filename}\033[0m"
     end
 
     raise

data/config/en/net_status.yml

@@ -52,6 +52,10 @@ en:
     chef:
       stage_path_overlap: "Cannot install '%{cookbook}' cookbook's path %{from} into %{to}: already exists"
       mdapp_dependency_in_metadata_forbidden: "Using mdapp as dependency in metadata.rb forbidden: detected '%{dependency}'"
+      cookbook_path_not_found: "Dapp cookbook directory not found at %{path}"
+      cookbook_berksfile_not_found: "Dapp cookbook Berksfile not found at %{path}"
+      cookbook_metadata_not_found: "Dapp cookbook metadata.rb file not found at %{path}"
+      cookbook_not_specified_in_berksfile: "Dapp cookbook '%{name}' not specified in Berksfile at %{path}"
     registry:
       incorrect_repo: 'Incorrect repository!'
       no_such_dimg: 'No such dimg in registry!'

data/lib/dapp.rb

@@ -146,7 +146,7 @@ require 'dapp/project/deps/base'
 require 'dapp/project/deps/gitartifact'
 require 'dapp/project/shellout/streaming'
 require 'dapp/project/shellout/base'
-require 'dapp/project/shellout/system'
+require 'dapp/project/system_shellout'
 require 'dapp/project'
 require 'dapp/docker_registry'
 require 'dapp/docker_registry/mod/request'

data/lib/dapp/builder/chef.rb

@@ -79,27 +79,61 @@ module Dapp
         cookbook_metadata.name
       end
 
+      def cookbook_path(*path)
+        dimg.cookbook_path.tap do |cookbook_path|
+          unless cookbook_path.exist?
+            raise Error, code: :cookbook_path_not_found,
+                         data: { path: cookbook_path }
+          end
+        end.join(*path)
+      end
+
       def berksfile_path
-        dimg.chef_path('Berksfile')
+        cookbook_path('Berksfile')
       end
 
       def berksfile_lock_path
-        dimg.chef_path('Berksfile.lock')
+        cookbook_path('Berksfile.lock')
       end
 
       def berksfile
-        @berksfile ||= Berksfile.new(dimg.chef_path, berksfile_path)
+        @berksfile ||= begin
+          unless berksfile_path.exist?
+            raise Error, code: :cookbook_berksfile_not_found,
+                         data: { path: berksfile_path.to_s }
+          end
+
+          Berksfile.new(cookbook_path, berksfile_path).tap do |berksfile|
+            unless berksfile.local_cookbook? project_name
+              raise Error, code: :cookbook_not_specified_in_berksfile,
+                           data: { name: project_name, path: berksfile_path.to_s }
+            end
+          end
+        end
       end
 
       def cookbook_metadata_path
-        dimg.chef_path('metadata.rb')
+        cookbook_path('metadata.rb')
+      end
+
+      def check_cookbook_metadata_path_exist!
+        unless cookbook_metadata_path.exist?
+          raise Error, code: :cookbook_metadata_not_found,
+                       data: { path: cookbook_metadata_path }
+        end
       end
 
       def cookbook_metadata
-        @cookbook_metadata ||= CookbookMetadata.new(cookbook_metadata_path).tap do |metadata|
-          metadata.depends.each do |dependency|
-            raise Error, code: :mdapp_dependency_in_metadata_forbidden,
-                         data: { dependency: dependency } if dependency.start_with? 'mdapp-'
+        @cookbook_metadata ||= begin
+          check_cookbook_metadata_path_exist!
+
+          CookbookMetadata.new(cookbook_metadata_path).tap do |metadata|
+            metadata.depends.each do |dependency|
+              if dependency.start_with? 'mdapp-'
+                raise Error, code: :mdapp_dependency_in_metadata_forbidden,
+                             data: { dependency: dependency }
+              end
+            end
           end
         end
       end
@@ -187,8 +221,17 @@ module Dapp
         end
       end
 
+      def _update_berksfile_lock_cmd
+        vendor_tmp = SecureRandom.uuid
+
+        ["berks vendor -b #{berksfile_path} /tmp/#{vendor_tmp}",
+         "rm -rf /tmp/#{vendor_tmp}"].join(' && ')
+      end
+
       # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
       def install_cookbooks(dest_path, chef_cookbooks_stage: false)
+        check_cookbook_metadata_path_exist!
+
         volumes_from = [dimg.project.base_container, chefdk_container]
         process_code = [
           'process',
@@ -200,7 +243,7 @@ module Dapp
             unless dimg.project.dev_mode? || chef_cookbooks_stage
               commands.push(
                 ['if [ ! -f Berksfile.lock ] ; then ',
-                 'echo "Berksfile.lock not found" 1>&2 ; ',
+                 "echo \"Berksfile.lock not found, to create run '#{_update_berksfile_lock_cmd}'\" 1>&2 ; ",
                  'exit 1 ; ',
                  'fi'].join
               )
@@ -216,9 +259,11 @@ module Dapp
               )
             elsif !chef_cookbooks_stage
               commands.push(
-                "export LOCKDIFF=$(#{dimg.project.diff_path} -u1 Berksfile.lock #{berksfile_lock_path})",
+                "export LOCKDIFF=$(#{dimg.project.diff_path} -u1 #{berksfile_lock_path} Berksfile.lock)",
                 ['if [ "$LOCKDIFF" != "" ] ; then ',
-                 "echo -e \"Bad Berksfile.lock\n$LOCKDIFF\" 1>&2 ; ",
+                 "echo -e \"",
+                 "Bad Berksfile.lock, run '#{_update_berksfile_lock_cmd}' ",
+                 "or manually apply change:\\n$LOCKDIFF\" 1>&2 ; ",
                  'exit 1 ; ',
                  'fi'].join
               )
@@ -234,7 +279,7 @@ module Dapp
               .values
               .map {|cookbook|
                 ["#{dimg.project.rsync_path} --archive",
-                 *cookbook[:chefignore].map {|path| "--exclude #{path}"},
+                 #*cookbook[:chefignore].map {|path| "--exclude #{path}"}, # FIXME
                  "--relative #{cookbook[:path]} /tmp/local_cookbooks",
                 ].join(' ')
               },
@@ -254,9 +299,10 @@ module Dapp
           dimg.project.shellout!(
             ['docker run --rm',
              volumes_from.map { |container| "--volumes-from #{container}" }.join(' '),
-             *berksfile.local_cookbooks
-                       .values
-                       .map { |cookbook| "--volume #{cookbook[:path]}:#{cookbook[:path]}" },
+             *berksfile
+              .local_cookbooks
+              .values
+              .map { |desc| "--volume #{desc[:path]}:#{desc[:path]}" },
              ("--volume #{dimg.project.ssh_auth_sock}:/tmp/dapp-ssh-agent" if dimg.project.ssh_auth_sock),
              "--volume #{dest_path.tap(&:mkpath)}:#{dest_path}",
              ('--env SSH_AUTH_SOCK=/tmp/dapp-ssh-agent' if dimg.project.ssh_auth_sock),
@@ -308,8 +354,7 @@ module Dapp
           cookbook_name = File.basename cookbook_path
           is_project = (cookbook_name == project_name)
           is_mdapp = cookbook_name.start_with? 'mdapp-'
-          mdapp_name = (is_mdapp ? cookbook_name.split('mdapp-')[1] : nil)
-          mdapp_enabled = is_mdapp && enabled_modules.include?(mdapp_name)
+          mdapp_enabled = is_mdapp && enabled_modules.include?(cookbook_name)
 
           paths = if is_project
                     common_dapp_paths = select_existing_paths.call(cookbook_path, [
@@ -404,8 +449,7 @@ module Dapp
             "#{cookbook}::#{entrypoint}"
           end
 
-          enabled_modules.map do |mod|
-            cookbook = "mdapp-#{mod}"
+          enabled_modules.map do |cookbook|
             if does_entry_exist[cookbook, stage]
               [cookbook, stage]
             else

data/lib/dapp/cli/base.rb

@@ -9,7 +9,7 @@ module Dapp
 
       option :build_dir,
              long: '--build-dir PATH',
-             description: 'Directory where build cache stored (DIR/.dapp-build by default)'
+             description: 'Directory where build cache stored (DIR/.dapp_build by default)'
 
       option :log_quiet,
              short: '-q',

data/lib/dapp/config/dimg/instance_methods.rb

@@ -171,6 +171,7 @@ module Dapp
               when Directive::Base, GitArtifact then variable.send(clone_method)
               when Symbol then variable
               when Array then variable.dup
+              when TrueClass, FalseClass then variable
               else
                 raise
               end
@@ -180,7 +181,9 @@ module Dapp
         end
 
         def passed_directives
-          [:@_chef, :@_shell, :@_docker, :@_git_artifact, :@_mount, :@_artifact, :@_builder, :@_dev_mode]
+          [:@_chef, :@_shell, :@_docker,
+           :@_git_artifact, :@_mount,
+           :@_artifact, :@_builder, :@_dev_mode]
         end
       end
     end

data/lib/dapp/config/dimg_group.rb

@@ -40,6 +40,10 @@ module Dapp
         pass_to_default(dimg)
       end
 
+      def before_dimg_group_eval(dimg_group)
+        pass_to_default(dimg_group)
+      end
+
       def check_dimg_directive_order(directive)
         project.log_config_warning(desc: { code: 'wrong_using_base_directive',
                                            data: { directive: directive },

data/lib/dapp/config/dimg_group_base.rb

@@ -24,7 +24,11 @@ module Dapp
       end
 
       def dimg_group(&blk)
-        Config::DimgGroup.new(project: project, &blk).tap { |dimg_group| @_dimg_group << dimg_group }
+        Config::DimgGroup.new(project: project).tap do |dimg_group|
+          before_dimg_group_eval(dimg_group)
+          dimg_group.instance_eval(&blk) if block_given?
+          @_dimg_group << dimg_group
+        end
       end
 
       def _dimg
@@ -34,7 +38,15 @@ module Dapp
       protected
 
       def before_dimg_eval(dimg)
-        dimg.instance_variable_set(:@_dev_mode, @_dev_mode)
+        pass_to_default(dimg)
+      end
+
+      def before_dimg_group_eval(dimg_group)
+        pass_to_default(dimg_group)
+      end
+
+      def pass_to_default(obj)
+        obj.instance_variable_set(:@_dev_mode, @_dev_mode)
       end
     end
   end

data/lib/dapp/config/dimg_group_main.rb

@@ -2,12 +2,12 @@ module Dapp
   module Config
     # DimgGroupMain
     class DimgGroupMain < DimgGroupBase
-      def dimg(name = nil)
-        with_dimg_validation { super }
+      def dimg(name = nil, &blk)
+        with_dimg_validation { super(name, &blk) }
       end
 
-      def dimg_group
-        with_dimg_validation { super }
+      def dimg_group(&blk)
+        with_dimg_validation { super(&blk) }
       end
 
       protected

data/lib/dapp/dimg/path.rb

@@ -7,7 +7,7 @@ module Dapp
         make_path(project.path, *path).expand_path
       end
 
-      def chef_path(*path)
+      def cookbook_path(*path)
         home_path('.dapp_chef', *path)
       end
 

data/lib/dapp/project.rb

@@ -35,7 +35,7 @@ module Dapp
     include Deps::Base
 
     include Shellout::Base
-    include Shellout::System
+    include SystemShellout
 
     attr_reader :cli_options
     attr_reader :dimgs_patterns

data/lib/dapp/project/ssh_agent.rb

@@ -6,7 +6,7 @@ module Dapp
       class << self
         def included(_base)
           ::Dapp::Project::Shellout::Base.default_env_keys << 'SSH_AUTH_SOCK'
-          ::Dapp::Project::Shellout::System.default_env_keys << 'SSH_AUTH_SOCK'
+          ::Dapp::Project::SystemShellout.default_env_keys << 'SSH_AUTH_SOCK'
         end
       end # << self
 

data/lib/dapp/project/system_shellout.rb

@@ -0,0 +1,98 @@
+module Dapp
+  # Project
+  class Project
+    module SystemShellout
+      SYSTEM_SHELLOUT_IMAGE = 'ubuntu:14.04'.freeze
+      SYSTEM_SHELLOUT_VERSION = 3
+
+      def system_shellout_container_name
+        "dapp_system_shellout_#{hashsum [SYSTEM_SHELLOUT_VERSION,
+                                         SYSTEM_SHELLOUT_IMAGE,
+                                         Deps::Base::BASE_VERSION,
+                                         Deps::Gitartifact::GITARTIFACT_VERSION]}"
+      end
+
+      def system_shellout_container
+        do_livecheck = false
+
+        @system_shellout_container ||= begin
+          lock(system_shellout_container_name) do
+            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',
+                           "--name #{system_shellout_container_name}",
+                           *volumes_from.map { |container| "--volumes-from #{container}" },
+                           '--volume /:/.system_shellout_root',
+                           "#{SYSTEM_SHELLOUT_IMAGE} #{bash_path} -ec 'while true ; do sleep 1 ; done'"].join(' ')
+
+                shellout! ["docker exec #{system_shellout_container_name}",
+                           "bash -ec '#{[
+                             'mkdir -p /.system_shellout_root/.dapp',
+                             'mount --rbind /.dapp /.system_shellout_root/.dapp'
+                           ].join(' && ')}'"].join(' ')
+              end
+            end
+          end
+
+          do_livecheck = true
+          system_shellout_container_name
+        end
+
+        system_shellout_livecheck! if do_livecheck
+
+        @system_shellout_container
+      end
+
+      def system_shellout(command, raise_error: false, **kwargs)
+        if raise_error
+          shellout! _to_system_shellout_command(command), **kwargs
+        else
+          shellout _to_system_shellout_command(command), **kwargs
+        end
+      end
+
+      def system_shellout!(command, **kwargs)
+        system_shellout(command, raise_error: true, **kwargs)
+      end
+
+      private
+
+      def system_shellout_livecheck!
+        # This is stupid container "live check" for now
+        system_shellout! 'true'
+      rescue Error::Shellout
+        $stderr.puts "\033[1m\033[31mSystem shellout container failure, " \
+                     'try to remove if error persists: ' \
+                     "docker rm -f #{system_shellout_container_name}\033[0m"
+        raise
+      end
+
+      def _to_system_shellout_command(command)
+        cmd = shellout_pack ["cd #{Dir.pwd}", command].join(' && ')
+        "docker exec #{system_shellout_container} chroot /.system_shellout_root #{bash_path} -ec '#{[
+          *SystemShellout.default_env_keys.map do |env_key|
+            env_key = env_key.to_s.upcase
+            "export #{env_key}=#{ENV[env_key]}"
+          end, cmd
+        ].join(' && ')}'"
+      end
+
+      class << self
+        def default_env_keys
+          @default_env_keys ||= []
+        end
+      end # << self
+    end # SystemShellout
+  end # Project
+end # Dapp

data/lib/dapp/version.rb

@@ -1,5 +1,5 @@
 # Version
 module Dapp
-  VERSION = '0.7.7'.freeze
+  VERSION = '0.7.8'.freeze
   BUILD_CACHE_VERSION = 6
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.7.7
+  version: 0.7.8
 platform: ruby
 authors:
 - Dmitry Stolyarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-16 00:00:00.000000000 Z
+date: 2016-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -495,8 +495,8 @@ files:
 - lib/dapp/project/logging/process.rb
 - lib/dapp/project/shellout/base.rb
 - lib/dapp/project/shellout/streaming.rb
-- lib/dapp/project/shellout/system.rb
 - lib/dapp/project/ssh_agent.rb
+- lib/dapp/project/system_shellout.rb
 - lib/dapp/version.rb
 homepage: https://github.com/flant/dapp
 licenses:

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

@@ -1,101 +0,0 @@
-module Dapp
-  # Project
-  class Project
-    module Shellout
-      # System
-      module System
-        SYSTEM_SHELLOUT_IMAGE = 'ubuntu:14.04'.freeze
-        SYSTEM_SHELLOUT_VERSION = 3
-
-        def system_shellout_container_name
-          "dapp_system_shellout_#{hashsum [SYSTEM_SHELLOUT_VERSION,
-                                           SYSTEM_SHELLOUT_IMAGE,
-                                           Deps::Base::BASE_VERSION,
-                                           Deps::Gitartifact::GITARTIFACT_VERSION]}"
-        end
-
-        def system_shellout_container
-          do_livecheck = false
-
-          @system_shellout_container ||= begin
-            lock(system_shellout_container_name) do
-              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',
-                             "--name #{system_shellout_container_name}",
-                             *volumes_from.map { |container| "--volumes-from #{container}" },
-                             '--volume /:/.system_shellout_root',
-                             "#{SYSTEM_SHELLOUT_IMAGE} #{bash_path} -ec 'while true ; do sleep 1 ; done'"].join(' ')
-
-                  shellout! ["docker exec #{system_shellout_container_name}",
-                             "bash -ec '#{[
-                               'mkdir -p /.system_shellout_root/.dapp',
-                               'mount --rbind /.dapp /.system_shellout_root/.dapp'
-                             ].join(' && ')}'"].join(' ')
-                end
-              end
-            end
-
-            do_livecheck = true
-            system_shellout_container_name
-          end
-
-          system_shellout_livecheck! if do_livecheck
-
-          @system_shellout_container
-        end
-
-        def system_shellout(command, raise_error: false, **kwargs)
-          if raise_error
-            shellout! _to_system_shellout_command(command), **kwargs
-          else
-            shellout _to_system_shellout_command(command), **kwargs
-          end
-        end
-
-        def system_shellout!(command, **kwargs)
-          system_shellout(command, raise_error: true, **kwargs)
-        end
-
-        private
-
-        def system_shellout_livecheck!
-          # This is stupid container "live check" for now
-          system_shellout! 'true'
-        rescue Error::Shellout
-          $stderr.puts "\033[1m\033[31mSystem shellout container failure, " \
-                       'try to remove if error persists: ' \
-                       "docker rm -f #{system_shellout_container_name}\033[0m"
-          raise
-        end
-
-        def _to_system_shellout_command(command)
-          cmd = shellout_pack ["cd #{Dir.pwd}", command].join(' && ')
-          "docker exec #{system_shellout_container} chroot /.system_shellout_root #{bash_path} -ec '#{[
-            *System.default_env_keys.map do |env_key|
-              env_key = env_key.to_s.upcase
-              "export #{env_key}=#{ENV[env_key]}"
-            end, cmd
-          ].join(' && ')}'"
-        end
-
-        class << self
-          def default_env_keys
-            @default_env_keys ||= []
-          end
-        end # << self
-      end # System
-    end
-  end # Project
-end # Dapp