dapp 0.0.4 → 0.0.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YTNlMjdkNDQxZTM1ZmMxZTA3NzU4MTIyMGRmZWUwMWFmZmE1MDgwOA==
+    N2E1Mzg3YzlmYzUyMDQ2ZDViNDZlMDU3ZDYxOGEyZWEwNzJlYTZhMA==
   data.tar.gz: !binary |-
-    ZDdmYmNhYjc4ZjQxMzBhZTE1MzBkN2Y2YjVjOTRlNmNmYTRmNWI2MA==
+    OTkzMzA3NzVlNmIyNTk4MjdkMzYxMmJjOWQ4Yjc4OTNjZmEyODljOQ==
 SHA512:
   metadata.gz: !binary |-
-    ZjM2ODRiZmRlNzM3NTQ2OGE0NjY0OGQzYjlkODIwNjBkNGI3MTYyYTQwZWUy
-    YTVmZWViZjVmNmVhNWFjOWU1ZWQwNGY1ZGJjNGZmNjA2OTc4NGVjYjcwMGUx
-    YmZjMTI3MDgwYmY2YzQ1YWJmODZkYThlNTZiMWE5NGIyYjNmMDM=
+    YWJhNWIyYTZlOWZkOGY2M2E3ZTA2MDc1NmNlYzhjZGNjNDY3ZmZjMzcxZTZh
+    NDZmOGMzMmE1NDllMjE3YTdmZGU1N2UwMzA5ZTI0OGI2MzcxYTMzNjA4Y2My
+    NDZiOTE3ODFkM2Y1MTUyYzE5ZmYxZGViNDZmMDljMzk0M2NhOTA=
   data.tar.gz: !binary |-
-    Y2VhMTRlYzg4MGY2ODJkYzU5YjIyNWNjOGIzN2NiMDhhMmUxZDA4MTBmNjI2
-    NGE0MzBhMDM1OWJlNTBmZTdjNDczZDdmODljZTkwMDdiNzE0NWM3YTQzMGMz
-    ZjA2ZTRlZjAzZjBmYTg2ZWQ3MTBmOGRiYmIzMWQ5ZDE1MWU1NDA=
+    Y2U4NWNjZmM5YmQ4MGY3MzJjOTEzZGQ3NGUxNTBhZWI1NzE3ZjVjYjA0MmFi
+    MzQzNjBmMDhhMDFlZmI1ZWI0ZDAwNDY4Yjc1MDY3ZTEwZDM5NDhlY2EzYTE0
+    NjdkOTlkMmNiZGI2NTg3NTJjM2YzNmI5ZDc4NGU0NDI2MzNlYmU=

data/lib/dapp/builder.rb

@@ -186,13 +186,6 @@ module Dapp
     end
     # rubocop:enable Metrics/AbcSize
 
-    def tag(image_id, name: nil, tag: nil, registry: nil)
-      return unless name && tag
-
-      new = { name: name, tag: tag, registry: registry }
-      docker.tag image_id, new
-    end
-
     def register_atomizer(atomizer)
       atomizers << atomizer
     end

data/lib/dapp/builder/cascade_tagging.rb

@@ -4,43 +4,43 @@ module Dapp
     module CascadeTagging
       # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
       def tag_cascade(image_id)
-        return unless opts[:cascade_tagging]
+        return unless opts[:tag_cascade]
 
         log 'Applying cascade tagging'
 
         opts[:build_history_length] ||= 10
 
-        i = {
+        spec = {
           name: name,
           tag: home_branch,
           registry: opts[:docker_registry]
         }
 
         # return if nothing changed
-        return if image_id == docker.image_id(i)
+        return if image_id == docker.image_id(spec)
 
         # remove excess tags
-        tags_to_remove = docker.images(name: i[:name], registry: i[:registry])
-                               .map { |image| image[:tag] }
-                               .select { |tag| tag.start_with?("#{i[:tag]}_") && tag.sub(/^#{i[:tag]}_/, '').to_i >= opts[:build_history_length] }
+        tags_to_remove = docker.images(name: spec[:name], registry: spec[:registry])
+        tags_to_remove.map! { |image| image[:tag] }
+        tags_to_remove.select! { |tag| tag.start_with?("#{spec[:tag]}_") && tag.sub(/^#{spec[:tag]}_/, '').to_i >= opts[:build_history_length] }
         tags_to_remove.each do |tag_to_remove|
-          docker.rmi i.merge(tag: tag_to_remove)
+          docker.rmi spec.merge(tag: tag_to_remove)
         end
 
         # shift old images: 1 -> 2, 2 -> 3, ..., n -> n+1
         (opts[:build_history_length] - 1).downto(1).each do |n|
-          origin = i.merge(tag: "#{i[:tag]}_#{n}")
+          origin = spec.merge(tag: "#{spec[:tag]}_#{n}")
 
           if docker.image_exist?(**origin)
-            docker.tag origin, i.merge(tag: "#{i[:tag]}_#{n + 1}")
+            docker.tag origin, spec.merge(tag: "#{spec[:tag]}_#{n + 1}")
           end
         end
 
         # shift top -> 1
-        docker.tag i, i.merge(tag: "#{i[:tag]}_1") if docker.image_exist?(**i)
+        docker.tag spec, spec.merge(tag: "#{spec[:tag]}_1") if docker.image_exist?(**spec)
 
         # tag top
-        docker.tag image_id, i
+        docker.tag image_id, spec
       end
       # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
     end

data/lib/dapp/builder/chefify.rb

@@ -12,16 +12,14 @@ module Dapp
           # run chef-solo for extra dapps
           extra_dapps.each do |extra_dapp|
             if dapp_chef_cookbooks_artifact.exist_in_step? "cookbooks/#{extra_dapp}/recipes/#{step}.rb", step
-              # FIXME: env ???
-              docker.run "chef-solo -c /usr/share/dapp/chef_solo.rb -o #{extra_dapp}::#{step},env-#{opts[:basename]}::void", step: step
+              docker.run "chef-solo -c /usr/share/dapp/chef_solo.rb -o mdapp-#{extra_dapp}::#{step},dapp-#{opts[:basename]}::void", step: step
             end
           end
 
           # run chef-solo for app
           recipe = [opts[:name], step].compact.join '-'
-          # FIXME: env ???
-          if dapp_chef_cookbooks_artifact.exist_in_step? "cookbooks/env-#{opts[:basename]}/recipes/#{recipe}.rb", step
-            docker.run "chef-solo -c /usr/share/dapp/chef_solo.rb -o env-#{opts[:basename]}::#{recipe}", step: step
+          if dapp_chef_cookbooks_artifact.exist_in_step? "cookbooks/dapp-#{opts[:basename]}/recipes/#{recipe}.rb", step
+            docker.run "chef-solo -c /usr/share/dapp/chef_solo.rb -o dapp-#{opts[:basename]}::#{recipe}", step: step
           end
         end
       end
@@ -41,12 +39,14 @@ module Dapp
           # init cronicler
           repo = GitRepo::Chronicler.new(self, 'dapp_cookbooks', build_path: home_branch)
 
+          # verify berks lock
+          shellout "berks verify --berksfile=#{home_path 'Berksfile'}"
+
           # vendor cookbooks
           shellout "berks vendor --berksfile=#{home_path 'Berksfile'} #{repo.chronodir_path 'cookbooks'}", log_verbose: true
 
           # create void receipt
-          # FIXME: env ???
-          FileUtils.touch repo.chronodir_path 'cookbooks', "env-#{opts[:basename]}", 'recipes', 'void.rb'
+          FileUtils.touch repo.chronodir_path 'cookbooks', "dapp-#{opts[:basename]}", 'recipes', 'void.rb'
 
           # commit (if smth changed)
           repo.commit!
@@ -72,8 +72,7 @@ module Dapp
       def run_chef_solo_for_dapp_common
         [:prepare, :build, :setup].each do |step|
           if dapp_chef_cookbooks_artifact.exist_in_step? "cookbooks/dapp-common/recipes/#{step}.rb", step
-            # FIXME: env ???
-            docker.run "chef-solo -c /usr/share/dapp/chef_solo.rb -o dapp-common::#{step},env-#{opts[:basename]}::void", step: step
+            docker.run "chef-solo -c /usr/share/dapp/chef_solo.rb -o mdapp-common::#{step},dapp-#{opts[:basename]}::void", step: step
           end
         end
       end

data/lib/dapp/builder/git_tagging.rb

@@ -8,16 +8,12 @@ module Dapp
           registry: opts[:docker_registry]
         }
 
-        if opts[:tag_commit]
-          log 'Applying git commit tag'
+        { commit: 'rev-parse HEAD', branch: 'rev-parse --abbrev-ref HEAD' }.each do |tag_type, git_command|
+          next unless opts[:"tag_#{tag_type}"]
 
-          docker.tag image_id, spec.merge(tag: shellout("git -C #{home_path} rev-parse HEAD").stdout.strip)
-        end
-
-        if opts[:tag_branch]
-          log 'Applying git branch tag'
+          log "Applying git #{tag_type} tag"
 
-          docker.tag image_id, spec.merge(tag: shellout("git -C #{home_path} rev-parse --abbrev-ref HEAD").stdout.strip)
+          docker.tag image_id, spec.merge(tag: shellout("git -C #{home_path} #{git_command}").stdout.strip)
         end
       end
     end

data/lib/dapp/cli/build.rb

@@ -20,11 +20,11 @@ BANNER
       class << self
         def option(name, args)
           if args.delete :builder_opt
-            args[:proc] ||= if args[:boolean]
-                              proc { Dapp::Builder.default_opts[name] = true }
-                            else
-                              proc { |v| Dapp::Builder.default_opts[name] = v }
-                            end
+            args[:proc] = if args[:boolean]
+                            proc { Dapp::Builder.default_opts[name] = true }
+                          else
+                            proc { |v| Dapp::Builder.default_opts[name] = v }
+                          end
           end
 
           super(name, args)
@@ -82,8 +82,8 @@ BANNER
              boolean: true,
              builder_opt: true
 
-      option :cascade_tagging,
-             long: '--cascade-tagging',
+      option :tag_cascade,
+             long: '--tag-cascade',
              description: 'Use cascade tagging',
              boolean: true,
              builder_opt: true
@@ -103,7 +103,6 @@ BANNER
       option :tag,
              long: '--tag TAG',
              description: 'Add tag (can be used one or more times)',
-             on: :tail,
              proc: proc { |v| (Dapp::Builder.default_opts[:tags] ||= []) << v }
 
       option :tag_commit,

data/lib/dapp/version.rb

@@ -1,3 +1,3 @@
 module Dapp
-  VERSION = '0.0.4'.freeze
+  VERSION = '0.0.5'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Dmitry Stolyarov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-03 00:00:00.000000000 Z
+date: 2016-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout