miniexec 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec080972e866dfa304be63c976aafbee1adf057d87e6b3db67d41f0da96fa8aa
-  data.tar.gz: 7062906cc91e078022d69fd47f3306ae05164e237db624328dd240d098f32ed5
+  metadata.gz: 8e5abfbd093e75a0bb48a481b1ce13cddaf849680faf63f02839d151847daf25
+  data.tar.gz: c759f6ec46d9bbe5812988cdd76706afb2aca6d9d7d7064294f848814ae26bb6
 SHA512:
-  metadata.gz: d669bfb19e7e2773e03d68fc1a5323e98042a1da88b55cd08d169beb9c6e572ad9fd30c3f0b67e5f6a59ee5ce3217f835774b0c91cf7d0ff3fb5c2ee08f530b4
-  data.tar.gz: 88556134ee2c8dd33e0bc9f754a92d7721867d425270cdc8981275e154fa56721f76f4a67f835f165839f235f141550854433b96c330bf5345de94d0a1709279
+  metadata.gz: a8d3604262b29677b356b0ddaffb581b3527183ce084bed754f286bff5c4cf3e9b980af47048796975cb040b974adb77c58f21ffa1fb54b9cf13bedde15f50f7
+  data.tar.gz: cd413fee962e6795592637a8c2278c6e9d24b9066a448c2b9c20a6b5b1542dce2007fd9960ad85b038edbb7ddb5d472ab4654104d3314fed66764d9dcaa15740

data/bin/miniexec

@@ -1,12 +1,17 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
+lib = File.expand_path('../lib', __dir__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'miniexec'
 require 'optparse'
+require 'pry'
 
 options = {
   binds: [],
-  env: {}
+  env: {},
+  path: '.',
+  docker: ENV['DOCKER_HOST'] || '/run/docker.sock'
 }
 
 OptionParser.new do |opts|
@@ -34,17 +39,15 @@ OptionParser.new do |opts|
   end
   opts.on('-d', '--docker-url URL',
           'Location of the docker socket') do |sock|
-    options[:docker] = sock || ENV['DOCKER_HOST'] || '/run/docker.sock'
+    options[:docker] = sock
   end
 end.parse!
 
 raise OptionParser::MissingArgument, 'Specify a job with -j' if options[:job].nil?
-raise OptionParser::MissingArgument, 'Specify a job with -p' if options[:path].nil?
 
 MiniExec.config(project_path: options[:path])
 exec = MiniExec.new options[:job],
                     docker_url: options[:docker],
                     binds: options[:binds],
                     env: options[:env]
-
 exec.run_job

data/lib/miniexec.rb

@@ -8,7 +8,6 @@ class MiniExec
   require 'tempfile'
   require 'yaml'
   require 'git'
-  require 'pry'
   # Class instance variables
   @project_path = '.'
   @workflow_file = '.gitlab-ci.yml'
@@ -43,16 +42,15 @@ class MiniExec
     configure_logger
     Docker.options[:read_timeout] = 6000
     Docker.url = docker_url if docker_url
-    binding.pry
   end
 
   def run_job
     script_path = "/tmp/#{@job['name']}.sh"
-    @logger.debug "Fetching image #{@image}"
+    @logger.info "Fetching image #{@image}"
     Docker::Image.create(fromImage: @image)
-    @logger.debug 'Image fetched'
+    @logger.info 'Image fetched'
     Dir.chdir(@project_path) do
-      @logger.debug 'Creating container'
+      @logger.info 'Creating container'
       container = Docker::Container.create(
         Cmd: ['/bin/bash', script_path],
         Image: @image,
@@ -61,7 +59,7 @@ class MiniExec
       )
       container.store_file(script_path, @script)
       container.start({ Binds: [@binds] })
-      container.tap(&:start).attach { |_, chunk| @logger.info chunk }
+      container.tap(&:start).attach { |_, chunk| puts chunk }
     end
   end
 
@@ -101,8 +99,8 @@ class MiniExec
   end
 
   def variables
-    globals = @workflow['variables']
-    job_locals = @job['variables']
+    globals = @workflow['variables'] || {}
+    job_locals = @job['variables'] || {}
     globals.merge job_locals
   end
 
@@ -111,13 +109,13 @@ class MiniExec
     @logger.formatter = proc do |severity, _, _, msg|
       "[#{severity}]: #{msg}\n"
     end
-    @logger.level = ENV['LOGLEVEL'] || Logger::WARN
+    @logger.level = ENV['LOGLEVEL'] || Logger::INFO
   end
 
   def compile_script
-    before_script = @job['before_script'] || []
-    script = @job['script'] || []
-    after_script = @job['after_script'] || []
-    (before_script + script + after_script).flatten.join("\n")
+    before_script = @job['before_script'] || ''
+    script = @job['script'] || ''
+    after_script = @job['after_script'] || ''
+    [before_script, script, after_script].flatten.join("\n").strip
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: miniexec
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Martin Pugh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-30 00:00:00.000000000 Z
+date: 2021-04-07 00:00:00.000000000 Z
 dependencies: []
 description: A minimal interpretor/executor for .gitlab-ci.yml
 email: pugh@s3kr.it