miniexec 0.0.5 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec080972e866dfa304be63c976aafbee1adf057d87e6b3db67d41f0da96fa8aa
-  data.tar.gz: 7062906cc91e078022d69fd47f3306ae05164e237db624328dd240d098f32ed5
+  metadata.gz: 8678ef2aa21bd66fbe29563f4621c2a1656b2c6fbcf0a1a3e231b750d65f9707
+  data.tar.gz: a946564ca4922eb7b0d55432e83e5827d310753ca4ebae0d150852db8eb269ec
 SHA512:
-  metadata.gz: d669bfb19e7e2773e03d68fc1a5323e98042a1da88b55cd08d169beb9c6e572ad9fd30c3f0b67e5f6a59ee5ce3217f835774b0c91cf7d0ff3fb5c2ee08f530b4
-  data.tar.gz: 88556134ee2c8dd33e0bc9f754a92d7721867d425270cdc8981275e154fa56721f76f4a67f835f165839f235f141550854433b96c330bf5345de94d0a1709279
+  metadata.gz: 534199cfb3d7ff71b05d2a6bc55591e9a259090375bc0e120c55a93de6ffcaf14aed7f147672543442a250ba165abaa0a41925530008491fae4e831c524953df
+  data.tar.gz: 7ce0d9cb62a9c7f0241376c79cbaa393846afd7a8995f22790fe7bb1ed932170eaa555ac8547c8babf3d71306f1e07f9218e89e6e30466870dfc5022f389628f

data/bin/miniexec

@@ -1,12 +1,16 @@
 #!/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'
 
 options = {
   binds: [],
-  env: {}
+  env: {},
+  path: '.',
+  docker: ENV['DOCKER_HOST'] || '/run/docker.sock'
 }
 
 OptionParser.new do |opts|
@@ -34,17 +38,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]
 
+MiniExec::MiniExec.config(project_path: options[:path])
+exec = MiniExec::MiniExec.new options[:job],
+                              docker_url: options[:docker],
+                              binds: options[:binds],
+                              env: options[:env]
 exec.run_job

data/lib/miniexec.rb

@@ -1,123 +1,132 @@
 # frozen_string_literal: true
 
 # Main class
-class MiniExec
-  require 'logger'
-  require 'docker-api'
-  require 'json'
-  require 'tempfile'
-  require 'yaml'
-  require 'git'
-  require 'pry'
-  # Class instance variables
-  @project_path = '.'
-  @workflow_file = '.gitlab-ci.yml'
+module MiniExec
+  class MiniExec
+    require 'logger'
+    require 'docker-api'
+    require 'json'
+    require 'tempfile'
+    require 'yaml'
+    require 'git'
+    require_relative './util'
+    # Class instance variables
+    @project_path = '.'
+    @workflow_file = '.gitlab-ci.yml'
 
-  class << self
-    attr_accessor :project_path, :workflow_file
-  end
+    class << self
+      attr_accessor :project_path, :workflow_file
+    end
 
-  def self.config(project_path: @project_path, workflow_file: @workflow_file)
-    @project_path = project_path
-    @workflow_file = workflow_file
-    self
-  end
+    def self.config(project_path: @project_path, workflow_file: @workflow_file)
+      @project_path = project_path
+      @workflow_file = workflow_file
+      self
+    end
 
-  attr_accessor :script
+    attr_accessor :script
 
-  def initialize(job,
-                 project_path: self.class.project_path,
-                 docker_url: nil,
-                 binds: [],
-                 env: {})
-    @job_name = job
-    @project_path = project_path
-    @workflow = YAML.load(File.read("#{@project_path}/#{MiniExec.workflow_file}"))
-    @job = @workflow[job]
-    @job['name'] = job
-    @default_image = @workflow['image'] || 'debian:buster-slim'
-    @image = set_job_image
-    @script = compile_script
-    @binds = binds
-    @env = env.merge gitlab_env, variables
-    configure_logger
-    Docker.options[:read_timeout] = 6000
-    Docker.url = docker_url if docker_url
-    binding.pry
-  end
+    def initialize(job,
+                   project_path: self.class.project_path,
+                   docker_url: nil,
+                   binds: [],
+                   env: {})
+      @job_name = job
+      @project_path = project_path
+      @workflow = YAML.load(File.read("#{@project_path}/#{MiniExec.workflow_file}"))
+      @job = @workflow[job]
+      @job['name'] = job
+      @default_image = @workflow['image'] || 'debian:buster-slim'
+      @image = set_job_image
+      @binds = binds
+      @env = {}
+      [
+        env,
+        gitlab_env,
+        @workflow['variables'],
+        @job['variables']
+      ].each do |var_set|
+        @env.merge!(var_set.transform_values { |v| Util.expand_var(v.to_s, @env) }) if var_set
+      end
+      @script = compile_script
+      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}"
-    Docker::Image.create(fromImage: @image)
-    @logger.debug 'Image fetched'
-    Dir.chdir(@project_path) do
-      @logger.debug '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.map { |k, v| "#{k}=#{v}" }
-      )
-      container.store_file(script_path, @script)
-      container.start({ Binds: [@binds] })
-      container.tap(&:start).attach { |_, chunk| @logger.info chunk }
+    def run_job
+      script_path = "/tmp/#{@job['name']}.sh"
+      @logger.info "Fetching image #{@image}"
+      Docker::Image.create(fromImage: @image)
+      @logger.info 'Image fetched'
+      Dir.chdir(@project_path) do
+        @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.map { |k, v| "#{k}=#{v}" }
+        )
+        container.store_file(script_path, @script)
+        container.start({ Binds: [@binds] })
+        container.tap(&:start).attach { |_, chunk| puts chunk }
+      end
     end
-  end
 
-  private
+    private
 
-  def set_job_image
-    return @job['image'] if @job['image']
+    def set_job_image
+      return @job['image'] if @job['image']
 
-    @default_image
-  end
+      @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
+    # 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
-    {
-      '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 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"
+    def configure_logger
+      @logger = Logger.new($stdout)
+      @logger.formatter = proc do |severity, _, _, msg|
+        "[#{severity}]: #{msg}\n"
+      end
+      @logger.level = ENV['LOGLEVEL'] || Logger::INFO
     end
-    @logger.level = ENV['LOGLEVEL'] || Logger::WARN
-  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")
+    def compile_script
+      before_script = @job['before_script'] || ''
+      script = @job['script'] || ''
+      after_script = @job['after_script'] || ''
+      [before_script, script, after_script].flatten.join("\n").strip
+    end
   end
 end

metadata

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