dapp 0.0.3 → 0.0.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OWI0MGM4MWU0MjU2MWUxZWY0NWNkMTczNzEyNzJmMWQ2NDhjMzlkYQ==
+    YTNlMjdkNDQxZTM1ZmMxZTA3NzU4MTIyMGRmZWUwMWFmZmE1MDgwOA==
   data.tar.gz: !binary |-
-    MDdmMzhiNTE1ZTM0MjcyMDFmNGEzMzYyNjI2ZmNiNjZlYjA2ZGU0MA==
+    ZDdmYmNhYjc4ZjQxMzBhZTE1MzBkN2Y2YjVjOTRlNmNmYTRmNWI2MA==
 SHA512:
   metadata.gz: !binary |-
-    ZDlmZDU3NDYzYTA5YzgwZDRkOGI0MmJmMjU3ZTc1ZGEyOGRkYWQyM2I3NTI3
-    MmI2YzRmNmNhM2JjZjZmMzQxNzk1YjZmNGNiZjJhODI0YjU1MWMzODE5YjJi
-    ZDcwMGNiNmQ5Y2M3NTU0ZGNjZTg5OTRiZjE4M2I0YTAwMWE1ZDg=
+    ZjM2ODRiZmRlNzM3NTQ2OGE0NjY0OGQzYjlkODIwNjBkNGI3MTYyYTQwZWUy
+    YTVmZWViZjVmNmVhNWFjOWU1ZWQwNGY1ZGJjNGZmNjA2OTc4NGVjYjcwMGUx
+    YmZjMTI3MDgwYmY2YzQ1YWJmODZkYThlNTZiMWE5NGIyYjNmMDM=
   data.tar.gz: !binary |-
-    NTQ5OGJhMjRkZjI2MTU0ZDEzNzE5ZTdlMjVmYzI2MzcyODkxMThmM2NiMDMx
-    NTE0MTM2YTc4MzhjOWJmMmI2OGRjNDA5ZmU2NmU0ZTcwZjNmOTMxZDhiNjVl
-    MTk2MmRiODU1YjRkN2U0M2I3ZDIzMjAyM2M4ZDkyMGE5NTJhN2Q=
+    Y2VhMTRlYzg4MGY2ODJkYzU5YjIyNWNjOGIzN2NiMDhhMmUxZDA4MTBmNjI2
+    NGE0MzBhMDM1OWJlNTBmZTdjNDczZDdmODljZTkwMDdiNzE0NWM3YTQzMGMz
+    ZjA2ZTRlZjAzZjBmYTg2ZWQ3MTBmOGRiYmIzMWQ5ZDE1MWU1NDA=

data/lib/dapp.rb

@@ -11,6 +11,9 @@ require 'dapp/cli'
 require 'dapp/cli/build'
 require 'dapp/builder/chefify'
 require 'dapp/builder/centos7'
+require 'dapp/builder/ci_tagging'
+require 'dapp/builder/manual_tagging'
+require 'dapp/builder/git_tagging'
 require 'dapp/builder/cascade_tagging'
 require 'dapp/filelock'
 require 'dapp/builder'

data/lib/dapp/builder.rb

@@ -3,6 +3,9 @@ module Dapp
   class Builder
     include Chefify
     include Centos7
+    include CiTagging
+    include ManualTagging
+    include GitTagging
     include CascadeTagging
     include Filelock
 
@@ -153,6 +156,7 @@ module Dapp
       artifact.add_multilayer!
     end
 
+    # rubocop:disable Metrics/AbcSize
     def build(**_kwargs)
       # check app name
       unless !opts[:app_filter] || File.fnmatch("#{opts[:app_filter]}*", name)
@@ -164,8 +168,10 @@ module Dapp
       log 'Building'
       image_id = docker.build
 
-      # apply cascade tagging
-      tag_cascade image_id
+      # apply tagging
+      %w(ci manual git cascade).each do |strategy|
+        send "tag_#{strategy}", image_id
+      end
 
       # push to registry
       if opts[:docker_registry]
@@ -178,6 +184,7 @@ module Dapp
 
       image_id
     end
+    # rubocop:enable Metrics/AbcSize
 
     def tag(image_id, name: nil, tag: nil, registry: nil)
       return unless name && tag

data/lib/dapp/builder/ci_tagging.rb

@@ -0,0 +1,53 @@
+module Dapp
+  class Builder
+    # CI tagging strategy
+    module CiTagging
+      def tag_ci(image_id)
+        return unless opts[:tag_ci] || opts[:tag_build_id]
+
+        raise 'CI environment required (Travis or GitLab CI)' unless ENV['GITLAB_CI'] || ENV['TRAVIS']
+
+        spec = {
+          name: name,
+          registry: opts[:docker_registry]
+        }
+
+        tag_ci_branch_and_tag image_id, spec
+        tag_ci_build_id image_id, spec
+      end
+
+      private
+
+      def tag_ci_branch_and_tag(image_id, spec)
+        return unless opts[:tag_ci]
+
+        log 'Applying CI tagging strategy'
+
+        if ENV['GITLAB_CI']
+          branch = ENV['CI_BUILD_REF_NAME']
+          tag = ENV['CI_BUILD_TAG']
+        elsif ENV['TRAVIS']
+          branch = ENV['TRAVIS_BRANCH']
+          tag = ENV['TRAVIS_TAG']
+        end
+
+        docker.tag image_id, spec.merge(tag: tag) if tag
+        docker.tag image_id, spec.merge(tag: branch) if branch
+      end
+
+      def tag_ci_build_id(image_id, spec)
+        return unless opts[:tag_build_id]
+
+        log 'Applying CI build id tag'
+
+        if ENV['GITLAB_CI']
+          build_id = ENV['CI_BUILD_ID']
+        elsif ENV['TRAVIS']
+          build_id = ENV['TRAVIS_BUILD_NUMBER']
+        end
+
+        docker.tag image_id, spec.merge(tag: build_id) if build_id
+      end
+    end
+  end
+end

data/lib/dapp/builder/git_tagging.rb

@@ -0,0 +1,25 @@
+module Dapp
+  class Builder
+    # Git tagging strategy
+    module GitTagging
+      def tag_git(image_id)
+        spec = {
+          name: name,
+          registry: opts[:docker_registry]
+        }
+
+        if opts[:tag_commit]
+          log 'Applying git commit tag'
+
+          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'
+
+          docker.tag image_id, spec.merge(tag: shellout("git -C #{home_path} rev-parse --abbrev-ref HEAD").stdout.strip)
+        end
+      end
+    end
+  end
+end

data/lib/dapp/builder/manual_tagging.rb

@@ -0,0 +1,22 @@
+module Dapp
+  class Builder
+    # Manual tagging strategy
+    module ManualTagging
+      def tag_manual(image_id)
+        return unless opts[:tags]
+
+        log 'Applying manual tags'
+
+        opts[:tags].each do |tag|
+          spec = {
+            name: name,
+            tag: tag,
+            registry: opts[:docker_registry]
+          }
+
+          docker.tag image_id, spec
+        end
+      end
+    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)
@@ -83,11 +83,41 @@ BANNER
              builder_opt: true
 
       option :cascade_tagging,
-             long: '--cascade_tagging',
+             long: '--cascade-tagging',
              description: 'Use cascade tagging',
              boolean: true,
              builder_opt: true
 
+      option :tag_ci,
+             long: '--tag-ci',
+             description: 'Tag by CI branch and tag',
+             boolean: true,
+             builder_opt: true
+
+      option :tag_build_id,
+             long: '--tag-build-id',
+             description: 'Tag by CI build id',
+             boolean: true,
+             builder_opt: true
+
+      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,
+             long: '--tag-commit',
+             description: 'Tag by git commit',
+             boolean: true,
+             builder_opt: true
+
+      option :tag_branch,
+             long: '--tag-branch',
+             description: 'Tag by git branch',
+             boolean: true,
+             builder_opt: true
+
       option :git_artifact_branch,
              long: '--git-artifact-branch BRANCH',
              description: 'Default branch to archive artifacts from',

data/lib/dapp/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Dmitry Stolyarov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-02 00:00:00.000000000 Z
+date: 2016-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -217,6 +217,9 @@ files:
 - lib/dapp/builder/cascade_tagging.rb
 - lib/dapp/builder/centos7.rb
 - lib/dapp/builder/chefify.rb
+- lib/dapp/builder/ci_tagging.rb
+- lib/dapp/builder/git_tagging.rb
+- lib/dapp/builder/manual_tagging.rb
 - lib/dapp/cli.rb
 - lib/dapp/cli/build.rb
 - lib/dapp/docker.rb