miniexec 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e03f7a3801afeabed8952f4813e0dc107053f6697052e0613be969a4853f0c0
-  data.tar.gz: 2d82ddc61ea8be64219e733d3704e56e9c30f703fe74b121ef24558a3f0f324a
+  metadata.gz: 7167acf5043ec6bf1dd58585100d89cc68704bcbcabd1d9dbb516aa264263bc5
+  data.tar.gz: 61077414a22ad766389a6b869fa776858955733cc32c667bf94d1d89bb0d5a49
 SHA512:
-  metadata.gz: 3b0b78c30b6cf9cb186f2a9531fd86ff8229d2a28793ded8149753c8bc64162fee95e28a9305bb1a8995a7d60e27dc06faeb002f4ee0f65213765c52b2b805b5
-  data.tar.gz: a0657ec2d0cbada87e8fa9d6bedc8c580b529c362ed1fd84a1fcec04e7d5248f72d615bf5523649f313bc304a1e6c34272754348900fb395a9a14391ea01773a
+  metadata.gz: 5cab8edace6a15d9c8e7bd7afb9efc46778fcf99821ff58ae34fd9c3c9fd7fb8387b1e98719c68c160fef5aab95a9f1c599d6be99f6215a253e9ef90a52be2f5
+  data.tar.gz: 4967266794a76314873f51aaef7d245327dbfcda0bccee453f3fa5c45bc4c903b45a9d3b37ca95c9cbc6d246dc32d1bf4c28b88274749a881e827c2b1fdba46c

data/bin/miniexec

@@ -6,7 +6,7 @@ require 'optparse'
 
 options = {
   binds: [],
-  env: []
+  env: {}
 }
 
 OptionParser.new do |opts|
@@ -29,7 +29,8 @@ 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|

data/lib/miniexec.rb

@@ -7,6 +7,8 @@ class MiniExec
   require 'json'
   require 'tempfile'
   require 'yaml'
+  require 'git'
+  require 'pry'
   # Class instance variables
   @project_path = '.'
   @workflow_file = '.gitlab-ci.yml'
@@ -17,7 +19,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,23 +27,20 @@ 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
@@ -57,7 +56,7 @@ class MiniExec
         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] })
@@ -73,6 +72,39 @@ 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|

metadata

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