pinject 0.1.4 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6293b6a2f22310c72541366bf812eb455f22db3307afefba4ffb67e0a056a7fc
-  data.tar.gz: fec64406a61766a15878a45f6d5cf7acbc36a9e45760230370f3f9deaa8bb965
+  metadata.gz: 19ddcd032bf4c9affc73250e33d5ab22afea6c679b8cccb6011ad586b5c76d2a
+  data.tar.gz: 0566bbf5a3e3f9276f9c49d275286a194906f2471ec213539167d35673504b86
 SHA512:
-  metadata.gz: 994efa80463cb79dce5962677a2854a2ef2541576d3d95d86a32ad4353bb66673328416c6e701594051979aa573d07d4a2976c38bfcca4cd70613161fd5309be
-  data.tar.gz: b82c6361b15d71aa4c4e4f8a96d19d35653409309ae80f0c115cedbb5ee776f66143fd52152270b7b3dc0bb25d86b2767a2cb7ce6fbecf65fc786d00b6a16482
+  metadata.gz: a720988e622493ab9b31b715db9ffb2415ef4f909eae670eec7ac113cc7ac264ed7801e6d5d2d7a11040807a7874378f59fa92a874dd058c0d6710a5816f467f
+  data.tar.gz: 9e269983fc58c5e4771fbc9d49ecd3eb6027789d19f2733b3853d3ca9c2d7b00028e670882ea3db6d5dcb9cf5f552c9016cd3829109d2d7003550a66bf8a3849

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2021-12-22 01:50:28 UTC using RuboCop version 1.23.0.
+# on 2021-12-27 07:20:52 UTC using RuboCop version 1.23.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -23,17 +23,17 @@ Lint/AssignmentInCondition:
 # Offense count: 3
 # Configuration parameters: IgnoredMethods, CountRepeatedAttributes.
 Metrics/AbcSize:
-  Max: 21
+  Max: 19
 
 # Offense count: 1
 # Configuration parameters: CountComments, CountAsOne.
 Metrics/ClassLength:
-  Max: 112
+  Max: 122
 
 # Offense count: 4
 # Configuration parameters: CountComments, CountAsOne, ExcludedMethods, IgnoredMethods.
 Metrics/MethodLength:
-  Max: 21
+  Max: 20
 
 # Offense count: 2
 # Configuration parameters: ForbiddenDelimiters.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pinject (0.1.2)
+    pinject (0.1.6)
       docker-api
 
 GEM
@@ -11,7 +11,7 @@ GEM
     docker-api (2.2.0)
       excon (>= 0.47.0)
       multi_json
-    excon (0.89.0)
+    excon (0.92.4)
     multi_json (1.15.0)
     parallel (1.21.0)
     parser (3.0.3.2)
@@ -35,6 +35,7 @@ GEM
     unicode-display_width (2.1.0)
 
 PLATFORMS
+  arm64-darwin-21
   x86_64-darwin-20
   x86_64-linux
 

data/README.md

@@ -23,7 +23,7 @@ Or install it yourself as:
 you can inject os update command to some docker images.
 
 ```ruby
-image = Pinject.new("ubuntu:latest")
+image = Pinject::Docker.new("ubuntu:latest")
 inject_image = image.inject_build("pyama:ubuntu_inject") # run apt-get upgrade
 inject_image.push
 ```

data/example.rb

@@ -0,0 +1,4 @@
+require './lib/pinject'
+image = Pinject::Docker.new('mysql:8', log: true)
+inject_image = image.inject_build('pyama:test') # run apt-get upgrade
+# inject_image.push

data/lib/pinject/docker.rb

@@ -7,6 +7,14 @@ module Pinject
   class Docker
     attr_reader :log
 
+    if %w[DOCKER_USER DOCKER_PASSWORD DOCKER_REGISTRY].all? { |a| ENV[a] }
+      ::Docker.authenticate!(
+        'username' => ENV['DOCKER_USER'],
+        'password' => ENV['DOCKER_PASSWORD'],
+        'serveraddress' => ENV['DOCKER_REGISTRY']
+      )
+    end
+
     def initialize(image_name, log: false)
       @image_name = image_name
       @log = log
@@ -45,9 +53,8 @@ module Pinject
                                              })
 
       result = nil
-      t = Thread.new { container.attach { |stream, chunk| result = chunk.chomp if stream == :stdout } }
       container.start
-      t.join
+      container.streaming_logs(stdout: true) { |stream, chunk| result = chunk.chomp if stream == :stdout }
 
       if result
         dist, version, user = result.split(%r{:|/})
@@ -98,6 +105,13 @@ module Pinject
             ['apt-get update -qqy', 'apt-get upgrade -qqy', 'apt-get clean', 'rm -rf /var/lib/apt/lists/*']
           when 'alpine'
             ['apk update', 'apk upgrade --no-cache']
+          when 'oracle'
+            case version
+            when '7'
+              ['yum update -y']
+            when '8'
+              ['microdnf update -y']
+            end
           when 'centos'
             case version
             when '5', '6'
@@ -119,6 +133,9 @@ module Pinject
         elif [ -f /etc/debian_version ]; then
             OS=debian
             VER=`cat /etc/debian_version | awk -F. '{ print $1 }'`
+        elif [ -f /etc/oracle-release ]; then
+            OS=oracle
+            VER=`cat /etc/oracle-release | sed -e 's/.*\\s\\([0-9]\\)\\..*/\\1/'`
         elif [ -f /etc/redhat-release ]; then
             OS=centos
             VER=`cat /etc/redhat-release | sed -e 's/.*\\s\\([0-9]\\)\\..*/\\1/'`

data/lib/pinject/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Pinject
-  VERSION = '0.1.4'
+  VERSION = '0.1.7'
 end

data/pinject.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.metadata['source_code_uri'] = 'https://github.com/pyama86/pinject'
   spec.metadata['changelog_uri'] = 'https://github.com/pyama86/pinject/CHANGELOG.md'
 
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  spec.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.bindir = 'exe'
   spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pinject
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.7
 platform: ruby
 authors:
 - pyama
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-12-22 00:00:00.000000000 Z
+date: 2022-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docker-api
@@ -46,6 +46,7 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- example.rb
 - exe/pinject
 - lib/pinject.rb
 - lib/pinject/docker.rb
@@ -59,7 +60,7 @@ metadata:
   homepage_uri: https://github.com/pyama86/pinject
   source_code_uri: https://github.com/pyama86/pinject
   changelog_uri: https://github.com/pyama86/pinject/CHANGELOG.md
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -74,8 +75,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
-signing_key: 
+rubygems_version: 3.3.3
+signing_key:
 specification_version: 4
 summary: inject package update commands to your docker images
 test_files: []