retag 0.1.0.73710 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 21c93d3dc99eeea3246460f4dfa166d52eabd222e26c834fb70e01efa67a9b76
-  data.tar.gz: df60a6f712e511f377dfdf6f9d30d9023f4c805716c2bb5ba059b788adcbc83f
+  metadata.gz: 91558c109a6f2bf1cc988a0bf375404ca035c229d0abd031fd52cbe084cc1d23
+  data.tar.gz: be5c10c2e9d85588f412b81c92fb22dfcac5117360e47c9bd20eb02d8219f992
 SHA512:
-  metadata.gz: eb34a11116989b740c3befb0b3707df6d81bffda5712740eaa4a7fdad83f8aa7f580f280a1ecbfa82690df5331b845db0ed7462285606fe8c29e09d44209b24e
-  data.tar.gz: e400dcf1c51a19ba40b7139e88b26dfeffc1914e7c2bdc8f851401f8c97cb1fc7fefae1330c2135869c700ee313048a0cf280cde6089b35cc6e7fb48763eaaaa
+  metadata.gz: 3093e65db866569cc3a28ffc09ce9b97241d6fb7c3e4793ff880e24a521b83bc4861ee172a27ef8d7e99d71c639da30fbbff7614574712bc5804525f48d5bd68
+  data.tar.gz: 7381e35cc1934e8a78e9a4514a8f6dd3863e3744c5f516c083ccd88255dbe2b25b4eba111f69430fc1b91d8d80e98923d19c3cb298379404f7f268555efd3419

data/lib/retag/image.rb

@@ -10,8 +10,8 @@ module Retag
     def initialize(image, tag, suffix: nil)
       @image = image
       @tag = tag
-      @tag = "#{tag}-#{suffix}" if suffix.present?
-      @full = "#{image}:#{tag}"
+      @tag = "#{@tag}-#{suffix}" if suffix.present?
+      @full = "#{@image}:#{@tag}"
     end
 
     def retag!(newtag = tag)
@@ -24,13 +24,15 @@ module Retag
 
       Tempfile.create('manifest') do |file|
         manifest = JSON.parse(cmd!("curl -s -u '#{dockerauth(uri.host)}' -H 'Accept: #{content_type}' '#{uri}/v2/#{repo}/manifests/#{tag}' -o -", capture: true).strip)
-        raise manifest unless manifest.dig('layers') || manifest.dig('config')
+        raise manifest.inspect unless manifest.dig('layers') || manifest.dig('config')
 
         file.write(manifest.to_json)
         file.flush
         result = cmd!("curl -s -u '#{dockerauth(uri.host)}' -H 'Content-Type: #{content_type}' -H 'Accept: #{content_type}' -X PUT --data-binary @#{file.path} '#{uri}/v2/#{repo}/manifests/#{newtag}' -o -", capture: true).strip
         raise result unless result.empty?
       end
+
+      Image.new(image, newtag)
     end
 
     def pull(img = full)

data/lib/retag/service.rb

@@ -3,18 +3,19 @@ module Retag
 
     include Retag::Utils
 
-    attr_reader :name, :config, :repo, :branch, :release
+    attr_reader :name, :config, :repo, :branch, :release, :suffix
 
-    def initialize(name, config, release)
+    def initialize(name, config, release, suffix: )
       @name = name
       @config = config
       @repo = config['repo']
       @branch = config['branch']
       @release = release
+      @suffix = suffix
     end
 
     def images
-      @images ||= config['images'].map{|img| Retag::Image.new(img, revision, suffix: 'stable') }
+      @images ||= config['images'].map{|img| Retag::Image.new(img, revision, suffix: @suffix) }
     end
 
     def pull

data/lib/retag/utils.rb

@@ -10,7 +10,7 @@ module Retag
       tag = $cmdnum.to_s.rjust(3, '0')
       output = ''
 
-      logger.tagged("CMD#{tag}") { logger.debug cmd }
+      logger.tagged("CMD#{tag}".colorize(:light_black)) { logger.debug cmd.colorize(:light_black) }
 
       code = Open3.popen3(cmd) do |stdin, stdout, stderr, thr|
         stdin.close_write

data/lib/retag/version.rb

@@ -2,7 +2,7 @@
 
 module Retag
 
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 
 end
 

metadata

@@ -1,11 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: retag
 version: !ruby/object:Gem::Version
-  version: 0.1.0.73710
+  version: 0.1.1
 platform: ruby
 authors:
 - Samoilenko Yuri
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
 date: 2022-01-20 00:00:00.000000000 Z
@@ -142,6 +142,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '6.0'
+- !ruby/object:Gem::Dependency
+  name: colorize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -219,7 +233,7 @@ licenses:
 metadata:
   homepage_uri: https://github.com/RnD-Soft/retag
   source_code_uri: https://github.com/RnD-Soft/retag
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -234,8 +248,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.2.28
+signing_key:
 specification_version: 4
 summary: Retag is cli to manipulate docker images in handy way
 test_files: []