miniexec 0.2.0 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6097e4b1de5d81d2e75d5817d9fd6a722ad40c9add96a1ff817cbbe64614f5e2
-  data.tar.gz: 9d639bc96b249926a411662b4a54027ebbb8381bcda243b56261eb5ed7530077
+  metadata.gz: 7d42d81b21704d53e71cec76c58b95d15a24efce4efba79b2f358a1dd2b36086
+  data.tar.gz: 3aecd26ce85507c06db8cac29e337679d433085aa40055f421bde2277331ae76
 SHA512:
-  metadata.gz: 042ac22614eedb274be50d0cbac5f13e1e8bc05bf8421559206dcf433365b205b892dab091aff64dd07ec7da2e782a9a0f4e63ecc0341424032d56a8070755a0
-  data.tar.gz: b62dd5d5dddd6e0abb6057052b25cdcef90f9167c068e7821de9f928a215e06b57593fdced5c3b92f686254afe95cf37fb320cec3aa88531b34e02988840937e
+  metadata.gz: 8c2073f300e8de6d25ae5ecd7fd5a6074c8ee547c3800a30f76ed751a0b36c60e2a5ebe2acd6a79587797674a39557dbe3299cc968f1d0899fe23bab514ea3c4
+  data.tar.gz: a6df904324c30967a49f41cac1ac5533df6612fe72fbd1b02cf6ba8c71b3302e5449de6a24476a24a08357e0bbd2fbcaf2b97ca9e3381a827160da607d399f8a

data/bin/miniexec

@@ -10,7 +10,9 @@ options = {
   binds: [],
   env: {},
   path: '.',
-  docker: ENV['DOCKER_HOST'] || '/run/docker.sock'
+  docker: ENV['DOCKER_HOST'] || '/run/docker.sock',
+  cwd: true,
+  file: nil
 }
 
 OptionParser.new do |opts|
@@ -40,6 +42,14 @@ OptionParser.new do |opts|
           'Location of the docker socket') do |sock|
     options[:docker] = sock
   end
+  opts.on('-f', '--file FILE',
+          'Manually specify a custom .gitlab-ci.yml file.') do |file|
+    options[:file] = file
+  end
+  opts.on('-n', '--no-mount-cwd',
+          'Don\'t mount the CWD in the container\'s WORKDIR by default.') do
+    options[:cwd] = false
+  end
 end.parse!
 
 raise OptionParser::MissingArgument, 'Specify a job with -j' if options[:job].nil?
@@ -48,5 +58,7 @@ MiniExec::MiniExec.config(project_path: options[:path])
 exec = MiniExec::MiniExec.new options[:job],
                               docker_url: options[:docker],
                               binds: options[:binds],
-                              env: options[:env]
+                              env: options[:env],
+                              mount_cwd: options[:cwd] || false,
+                              file: options[:file]
 exec.run_job

data/lib/miniexec.rb

@@ -32,26 +32,28 @@ module MiniExec
                    docker_url: nil,
                    binds: [],
                    env: {},
-                   mount_cwd: true)
+                   mount_cwd: true,
+                   file: nil)
       @job_name = job
       @project_path = project_path
-      @workflow = YAML.load(File.read("#{@project_path}/#{MiniExec.workflow_file}"))
+      file ||= "#{@project_path}/#{MiniExec.workflow_file}"
+      @workflow = YAML.load(File.read(file))
       @job = @workflow[job]
       @job['name'] = job
       @default_image = @workflow['image'] || 'debian:buster-slim'
-      @image = set_job_image
       @entrypoint = set_job_entrypoint
       @binds = binds
       @mount_cwd = mount_cwd
       @env = {}
       [
-        env,
-        gitlab_env,
         @workflow['variables'],
-        @job['variables']
+        @job['variables'],
+        gitlab_env,
+        env
       ].each do |var_set|
         @env.merge!(var_set.transform_values { |v| Util.expand_var(v.to_s, @env) }) if var_set
       end
+      @image = set_job_image
       @script = compile_script
       @runlog = []
       configure_logger
@@ -80,7 +82,7 @@ module MiniExec
           Cmd: ['/usr/bin/env', 'bash', script_path],
           WorkingDir: working_dir,
           Entrypoint: @entrypoint,
-          Volumes: @binds.map { |b| { b => { path_parent: 'rw' } } }.inject(:merge),
+          Volumes: binds.map { |b| { b => { path_parent: 'rw' } } }.inject(:merge),
           Env: @env.map { |k, v| "#{k}=#{v}" }
         )
         container.store_file(script_path, @script)
@@ -100,8 +102,7 @@ module MiniExec
         image = @job['image'] if @job['image'].instance_of?(String)
         image = @job['image']['name'] if @job['image'].instance_of?(Hash)
       end
-
-      image || @default_image
+      Util.expand_var(image, @env) || @default_image
     end
 
     def set_job_entrypoint

metadata

@@ -1,15 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: miniexec
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.5
 platform: ruby
 authors:
 - Martin Pugh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-07 00:00:00.000000000 Z
-dependencies: []
+date: 2021-09-23 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: docker-api
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+- !ruby/object:Gem::Dependency
+  name: git
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
 description: A minimal interpretor/executor for .gitlab-ci.yml
 email: pugh@s3kr.it
 executables: