build-labels 0.0.54 → 0.0.55

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e57ef2ce78d3fea8e0549d6abbf7c5d3d36e924a0c9c046e290edbcd64467fa1
-  data.tar.gz: ea822c830cc12c47fd778cdfd1ece7046c41f56241f97b8c3e3354b872ce2885
+  metadata.gz: d8df2dc3a1002c350f7b526131e7deb36deb429b80af3edf6c1c76b383e88066
+  data.tar.gz: ed08a82c9bb16704a61dfe9b484783b44a63f6ec73b7692fb4ed74e2af6c39f4
 SHA512:
-  metadata.gz: d7211e41a2d7a13025e24577fa35aab821269a80e542f2ac8691f1a3953af91ccde6d800fad1f8da097e9650ef914929a4d837c7ef51974a96972a00040b60e6
-  data.tar.gz: ce2b6c48e72ae08b9206aa070211b0b6bbb3991380f5ad6c09068007dd406ff737d957f39b73483864bb11f34db8ec8bbd5a42736b050d0a2871b37f6bb65fa3
+  metadata.gz: 0fe5464f0cca9ae34adae28892557f9c70359a452120f469e3e5a953bd83bb5a669a227738f743ecf616cdde9c50527bc2a4a998574d80767efa0e7a81645b56
+  data.tar.gz: 434628d3ed46a5d74a95144695ec63f7688fdefe2d13bcb30a684778ee811465b443a8e41d57219a784acf5b1fd1841d1d017cfa93e2a4abf6fb1f7fdde49b1a

data/examples/common-compose.yml

@@ -7,7 +7,7 @@ x-common-build: &common-build
     - CI_COMMIT_TIMESTAMP=${CI_COMMIT_TIMESTAMP}
     - CI_PROJECT_PATH_SLUG=${CI_PROJECT_PATH_SLUG}
     - CI_COMMIT_BRANCH=${CI_COMMIT_BRANCH}
-  context: ../src_mobile_app
+  context: ./src_app
   dockerfile: ../docker/flutter/Dockerfile
 
 services:

data/lib/build-labels/command_line.rb

@@ -51,6 +51,7 @@ module BuildLabels
           o.on('-h', '--help') { puts o; exit }
           rest = o.parse! args, into: params
 
+          params.transform_keys!{_1.to_s.gsub('-','_').to_sym}
 
           compose_text = File.read(params[:compose]) if params[:compose]
           compose_text ||= STDIN.read unless $stdin.tty?

data/lib/build-labels/command_set_version.rb

@@ -1,6 +1,9 @@
 require_relative 'command_line'
 
 BuildLabels::CommandLine::COMMANDS[:set_version] = Class.new do
+  def options(parser)
+    parser.on('', '--full-version', 'Push full version tag')
+  end
 
   def run(builder, params, compose)
     raise 'Compose file not defined' unless compose
@@ -30,6 +33,11 @@ BuildLabels::CommandLine::COMMANDS[:set_version] = Class.new do
       end
 
       build_id = ENV['GITHUB_RUN_NUMBER'] || ENV['CI_PIPELINE_IID']
+      unless build_id
+        puts "Build ID not found. Please set GITHUB_RUN_NUMBER or CI_PIPELINE_IID environment variable"
+        exit 1
+      end
+
       full_version = "#{current_version}.#{build_id}"
       builder.oc.version = full_version
 
@@ -40,12 +48,12 @@ BuildLabels::CommandLine::COMMANDS[:set_version] = Class.new do
         [image, full_tag].compact.join ':'
       end
 
-      if ENV['CI_COMMIT_MESSAGE'].to_s =~ /#push/mi
+      if ENV['CI_COMMIT_MESSAGE'].to_s =~ /#push/mi || params[:full_version]
         push_tag = ENV['CI_COMMIT_MESSAGE'].to_s[/#push:(\S+)/mi, 1]
 
         svc['build']['tags'] += svc['build']['tags'].map do |t|
-          image, tag = t.split(':')
-          full_tag = [full_version, push_tag || tag].compact.join('-')
+          image, _tag = t.split(':')
+          full_tag = [full_version, push_tag].compact.join('-')
 
           [image, full_tag].compact.join ':'
         end

data/lib/build-labels/command_to_compose.rb

@@ -1,6 +1,10 @@
 require_relative 'command_line'
 
 BuildLabels::CommandLine::COMMANDS[:to_compose] = Class.new do
+  def options(parser)
+    parser.on('', '--except FILTER', 'filter services ')
+  end
+
   def run(builder, params, compose)
     raise 'Compose file not defined' unless compose
 

data/lib/version.rb

@@ -1,5 +1,5 @@
 module BuildLabels
   class Builder
-    VERSION = '0.0.54'
+    VERSION = '0.0.55'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: build-labels
 version: !ruby/object:Gem::Version
-  version: 0.0.54
+  version: 0.0.55
 platform: ruby
 authors:
 - Artyom B