dapp 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 01ccef0d1d810b43eca5b590a2b2509eb66ef5f0
-  data.tar.gz: 6b78e52904754a66a6789d73e9db2a3ecd4e1fe9
+  metadata.gz: 4b6165113f304afaf820870c5c598fee4e1479bd
+  data.tar.gz: 88972466d5e6c65afe11935e7f942bb9277053da
 SHA512:
-  metadata.gz: 4a013f7409fc4a7a543d5cfc12d978dcc38d015b076e49f00161ab8e3012f58527c93d4cf22b44ff5d2401761afc4f5225be0812b4271acfc2cddb597c528aa8
-  data.tar.gz: c7e382cd7d9010cb78bfb380e4fab60b7392cca4fc53596979ab56749dfb765c8a00f28bd1993faffa6c16a5549892c7712bd6811cea01fd70894cbc8222ba1f
+  metadata.gz: a3f72d1c7e43506f02d5df57543652f1b1d6e33d04552c340cf67b28ae35a2bd5b3e244ae8985ac176d03fdec08c1fb509edf40f1f77880af2ce0e176ef5725b
+  data.tar.gz: 7b51f113c56a01579955a6fb554baa10c69f5a22f8267f0998cc0117a0d2aaff01036971777a2ae849a0b245894df485cf9f4279100c7f90e58e8d1fbec4368a

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

@@ -56,11 +56,9 @@ module Dapp
           @gitartifact_container ||= begin
             if application.project.shellout("docker inspect #{g_a_container_name}").exitstatus.nonzero?
               application.project.log_secondary_process(application.project.t(code: 'process.git_artifact_loading'), short: true) do
-                application.project.shellout ['docker run',
-                                              '--restart=no',
+                application.project.shellout ['docker create',
                                               "--name #{g_a_container_name}",
-                                              "--volume /.dapp/deps/gitartifact #{GITARTIFACT_IMAGE}",
-                                              '2>/dev/null'].join(' ')
+                                              "--volume /.dapp/deps/gitartifact #{GITARTIFACT_IMAGE}"].join(' ')
               end
             end
 

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

@@ -60,6 +60,7 @@ module Dapp
             credentials += "-g #{group} " if group
 
             copy_files = lambda do |from_, cwd_, path_ = ''|
+              cwd_ = File.expand_path(File.join('/', cwd_))
               "find #{File.join(from_, cwd_, path_)} -type f -exec bash -ec 'install -D #{credentials} {} " \
             "#{File.join(to, "$(echo {} | sed -e \"s/#{File.join(from_, cwd_).gsub('/', '\\/')}//g\")")}' \\;"
             end

data/lib/dapp/builder/chef.rb

@@ -141,6 +141,7 @@ module Dapp
             application.paths_content_hashsum(paths),
             *paths.map { |p| p.relative_path_from(berksfile.home_path).to_s }.sort,
             (berksfile_lock_checksum unless application.project.cli_options[:dev]),
+            *enabled_recipes,
             *enabled_modules
           ].compact
         end
@@ -159,11 +160,9 @@ module Dapp
           if application.project.shellout("docker inspect #{chefdk_container_name}").exitstatus.nonzero?
             application.project.log_secondary_process(application.project.t(code: 'process.chefdk_loading'), short: true) do
               application.project.shellout(
-                ['docker run',
-                 '--restart=no',
+                ['docker create',
                  "--name #{chefdk_container_name}",
-                 "--volume /.dapp/deps/chefdk #{chefdk_image}",
-                 '2>/dev/null'].join(' ')
+                 "--volume /.dapp/deps/chefdk #{chefdk_image}"].join(' ')
               )
             end
           end

data/lib/dapp/git_artifact.rb

@@ -92,7 +92,7 @@ module Dapp
     end
 
     def diff_command(from, to, quiet: false)
-      "diff --binary --full-index #{'--quiet' if quiet} #{from}..#{to} #{"--relative=#{cwd}" if cwd} -- #{paths(true)}"
+      "diff --binary #{'--quiet' if quiet} #{from}..#{to} #{"--relative=#{cwd}" if cwd} -- #{paths(true)}"
     end
   end
 end

data/lib/dapp/lock/file.rb

@@ -21,13 +21,23 @@ module Dapp
           raise Dapp::Lock::Error::Timeout, code: :timeout,
                                             data: { name: name, timeout: timeout }
         end
+
+        self.class.counter += 1
       end
 
       def unlock
-        @file.flock(::File::LOCK_UN)
         @file.close
         @file = nil
+        self.class.counter -= 1
       end
+
+      class << self
+        attr_writer :counter
+
+        def counter
+          @counter ||= 0
+        end
+      end # << self
     end # File
   end # Lock
 end # Dapp

data/lib/dapp/project/command/stages_cleanup.rb

@@ -8,12 +8,14 @@ module Dapp
         def stages_cleanup(repo)
           repo_applications = repo_applications(repo)
           build_configs.map(&:_basename).uniq.each do |basename|
-            log(basename)
-            containers_flush(basename)
-            apps, stages = project_images(basename).partition { |_, image_id| repo_applications.values.include?(image_id) }
-            apps, stages = apps.to_h, stages.to_h
-            apps.each { |_, aiid| stages = clear_stages(aiid, stages) }
-            run_command(%(docker rmi #{stages.keys.join(' ')})) unless stages.keys.empty?
+            lock("#{basename}.images") do
+              log(basename)
+              containers_flush(basename)
+              apps, stages = project_images(basename).partition { |_, image_id| repo_applications.values.include?(image_id) }
+              apps, stages = apps.to_h, stages.to_h
+              apps.each { |_, aiid| stages = clear_stages(aiid, stages) }
+              run_command(%(docker rmi #{stages.keys.join(' ')})) unless stages.keys.empty?
+            end
           end
         end
 
@@ -26,7 +28,7 @@ module Dapp
               break if (iid = image_parent(iid)).empty?
             end
           else
-            stages.delete_if { |_, siid| siid == iid }
+            stages.delete_if { |_, siid| siid == image_id }
           end
           stages
         end

data/lib/dapp/project/command/stages_flush.rb

@@ -7,9 +7,11 @@ module Dapp
       module StagesFlush
         def stages_flush
           build_configs.map(&:_basename).uniq.each do |basename|
-            log(basename)
-            containers_flush(basename)
-            remove_images(%(docker images --format="{{.Repository}}:{{.Tag}}" #{stage_cache(basename)}))
+            lock("#{basename}.images") do
+              log(basename)
+              containers_flush(basename)
+              remove_images(%(docker images --format="{{.Repository}}:{{.Tag}}" #{stage_cache(basename)}))
+            end
           end
         end
       end

data/lib/dapp/project/ssh_agent.rb

@@ -10,6 +10,8 @@ module Dapp
       end # << self
 
       def run_ssh_agent
+        raise "Cannot fork dapp process: there are active file locks" unless ::Dapp::Lock::File.counter == 0
+
         sock_name = "dapp-ssh-#{SecureRandom.uuid}"
 
         "/tmp/#{sock_name}".tap do |sock_path|

data/lib/dapp/version.rb

@@ -1,5 +1,5 @@
 # Version
 module Dapp
-  VERSION = '0.6.0'.freeze
+  VERSION = '0.6.1'.freeze
   BUILD_CACHE_VERSION = 3
 end

metadata

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