miniexec 0.0.2 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e03f7a3801afeabed8952f4813e0dc107053f6697052e0613be969a4853f0c0
-  data.tar.gz: 2d82ddc61ea8be64219e733d3704e56e9c30f703fe74b121ef24558a3f0f324a
+  metadata.gz: e698920b225de9f23f4eb3822d1eec118aaed8a64c7a4b3b517d90866af47f46
+  data.tar.gz: 7b4b0b8a671528ac4872286aff9451988ab820fd11179a7750dde0f1648755af
 SHA512:
-  metadata.gz: 3b0b78c30b6cf9cb186f2a9531fd86ff8229d2a28793ded8149753c8bc64162fee95e28a9305bb1a8995a7d60e27dc06faeb002f4ee0f65213765c52b2b805b5
-  data.tar.gz: a0657ec2d0cbada87e8fa9d6bedc8c580b529c362ed1fd84a1fcec04e7d5248f72d615bf5523649f313bc304a1e6c34272754348900fb395a9a14391ea01773a
+  metadata.gz: f261c258a1c28e15ef19bae2a620e7301274c58c1f0672e3f45623e43a7f506572502ef6a4f4582aebe6047818e01220465710372d0e1d8bf51f94ba00dd90dd
+  data.tar.gz: ef7e02e019e1405be2baed577db4812e6ae828d20f2685f3903fdf8d6355e06722e8875ee92539bd664ea0763dcb94241fd35c5027af7e4b2a59316924707349

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|
@@ -29,21 +34,20 @@ OptionParser.new do |opts|
   opts.on('-e', '--environment VARIABLE',
           'Specify an environment variable to be passed to the container',
           'Example: SOMEVAR=thing') do |env|
-    options[:env].push env
+    k, v = env.split('=')
+    options[:env][k] = v
   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

@@ -7,6 +7,7 @@ class MiniExec
   require 'json'
   require 'tempfile'
   require 'yaml'
+  require 'git'
   # Class instance variables
   @project_path = '.'
   @workflow_file = '.gitlab-ci.yml'
@@ -17,7 +18,7 @@ class MiniExec
 
   def self.config(project_path: @project_path, workflow_file: @workflow_file)
     @project_path = project_path
-    @class = workflow_file
+    @workflow_file = workflow_file
     self
   end
 
@@ -25,43 +26,40 @@ class MiniExec
 
   def initialize(job,
                  project_path: self.class.project_path,
-                 workflow_file: self.class.workflow_file,
                  docker_url: nil,
                  binds: [],
-                 env: [])
+                 env: {})
     @job_name = job
     @project_path = project_path
-    workflow = YAML.load(File.read("#{@project_path}/#{workflow_file}"))
-    @job = workflow[job]
+    @workflow = YAML.load(File.read("#{@project_path}/#{MiniExec.workflow_file}"))
+    @job = @workflow[job]
     @job['name'] = job
-    @default_image = workflow['image'] || 'debian:buster-slim'
+    @default_image = @workflow['image'] || 'debian:buster-slim'
     @image = set_job_image
     @script = compile_script
     @binds = binds
-    @env = env
-
+    @env = env.merge gitlab_env, variables
     configure_logger
-
     Docker.options[:read_timeout] = 6000
     Docker.url = docker_url if docker_url
   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,
         Volumes: @binds.map { |b| { b => { path_parent: 'rw' } } }.inject(:merge),
-        Env: @env
+        Env: @env.map { |k, v| "#{k}=#{v}" }
       )
       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
 
@@ -73,18 +71,51 @@ class MiniExec
     @default_image
   end
 
+  # Set gitlab's predefined env vars as per
+  # https://docs.gitlab.com/ee/ci/variables/predefined_variables.html
+  def gitlab_env
+    g = Git.open(@project_path)
+    commit = g.gcommit 'HEAD'
+    tag = g.tags.find { |t| t.objectish == commit.sha }
+    commit_branch = g.branch.name
+    if tag.nil?
+      ref_name = g.branch.name
+      commit_tag = nil
+    else
+      ref_name = tag.name
+      commit_tag = ref_name
+    end
+    {
+      'CI': true,
+      'CI_COMMIT_REF_SHA': commit.sha,
+      'CI_COMMIT_SHORT_SHA': commit.sha[0, 8],
+      'CI_COMMIT_REF_NAME': ref_name,
+      'CI_COMMIT_BRANCH': commit_branch,
+      'CI_COMMIT_TAG': commit_tag,
+      'CI_COMMIT_MESSAGE': commit.message,
+      'CI_COMMIT_REF_PROTECTED': false,
+      'CI_COMMIT_TIMESTAMP': commit.date.strftime('%FT%T')
+    }.transform_keys(&:to_s)
+  end
+
+  def variables
+    globals = @workflow['variables'] || {}
+    job_locals = @job['variables'] || {}
+    globals.merge job_locals
+  end
+
   def configure_logger
     @logger = Logger.new($stdout)
     @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.2
+  version: 0.0.7
 platform: ruby
 authors:
 - Martin Pugh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-03 00:00:00.000000000 Z
+date: 2021-04-16 00:00:00.000000000 Z
 dependencies: []
 description: A minimal interpretor/executor for .gitlab-ci.yml
 email: pugh@s3kr.it