harrison 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6afee83edbb748c4ee652e3272decd68030c971c94a253ac79961c35f74207b4
-  data.tar.gz: c2df93b7c6eb654e14654a3f644e73bc4b5fe42565b49463ff5f5726dce7fd04
+  metadata.gz: b60de7c33711d7eccb830dd2ec634b8308faef02b0a4d354a77a2e2a447b602e
+  data.tar.gz: ff2cfa0de43ac1516ee4c5d8d74aa0ec4ceb532bfaa90d9908fcca1411433681
 SHA512:
-  metadata.gz: 32f722766b9d7e9ea232e76de095c38666ea3837cd7911895ab1ce947bd2346eb7eaec85b9832c164e9acc4efffbf62546ef88204c5b331315cb0dbcc5b222b6
-  data.tar.gz: 07fe4f8efb94892f6476be98ba44c602a32e1d17be927790bbe4f1749eb772c91c08eb564e02bdb623afeeb6eacd143d25643bf059dc6b6493c0b3b7cdb5ccee
+  metadata.gz: 046fb16d47e23332d04106344081617a145f6261ef5749ededb59c350e00b0f10662215ece743c4f057941a8b1c8660d4186829f0d272e84abc050c1508f9bee
+  data.tar.gz: af86396f0a6717be9b4dd16d0885d9595f292efd1ba5db42060ccb4b109e57cb65b8a344b4aa443f682716991546560892b16bee6e4f111e9045ace0cfbc45cf

data/CHANGELOG

@@ -1,3 +1,8 @@
+0.9.0
+-------------------
+- Added ability to package via Docker
+- Added ability to generate multiple builds from a single invocation (when building via Docker)
+
 0.8.0
 -------------------
 - BREAKING: Bumped required Ruby version to >= 2.3.1

data/CODEOWNERS

@@ -0,0 +1 @@
+* @puppetlabs/forge-team

data/lib/harrison/package.rb

@@ -2,6 +2,8 @@ module Harrison
   class Package < Base
     def initialize(opts={})
       # Config helpers for Harrisonfile.
+      self.class.option_helper(:via)
+      self.class.option_helper(:dockerfiles)
       self.class.option_helper(:host)
       self.class.option_helper(:commit)
       self.class.option_helper(:purge)
@@ -39,6 +41,8 @@ module Harrison
       # Resolve commit ref to an actual short SHA.
       resolve_commit!
 
+      return run_docker if self.via == :docker
+
       if self.host.respond_to?(:call)
         resolved_host = self.host.call(self)
         self.host = resolved_host
@@ -122,6 +126,130 @@ module Harrison
 
     protected
 
+    def run_docker
+      require 'open3'
+
+      packages = []
+
+      git_worktree_prune_argv = [
+        "git",
+        "worktree",
+        "prune",
+      ].join(' ')
+
+      if Harrison::DEBUG
+        system(git_worktree_prune_argv) || (throw :failure)
+      else
+        _, gwtp_err, gwtp_status = Open3.capture3(git_worktree_prune_argv)
+
+        if gwtp_status != 0
+          puts gwtp_err
+          throw :failure
+        end
+      end
+
+      begin
+        tmp_dir = Dir.mktmpdir("harrison-#{project}", "/tmp")
+        tmp_src_dir = File.join(tmp_dir, 'src')
+
+        git_worktree_add_argv = [
+          "git",
+          "worktree",
+          "add",
+          "--force", # allow new worktree to check out duplicate branch
+          tmp_src_dir,
+          commit,
+        ].join(' ')
+
+        git_worktree_add_env = {
+          "OVERCOMMIT_DISABLE" => "1",
+        }
+
+        if Harrison::DEBUG
+          system(git_worktree_add_env, git_worktree_add_argv) || (throw :failure)
+        else
+          _, gwta_err, gwta_status = Open3.capture3(git_worktree_add_env, git_worktree_add_argv)
+
+          if gwta_status != 0
+            puts gwta_err
+            throw :failure
+          end
+        end
+
+        self.dockerfiles.each do |df|
+          df_basename = File.basename(df, '.Dockerfile')
+          docker_image_tag = "#{project}-harrison-#{df_basename}:latest"
+
+          docker_build_argv = [
+            'docker', 'build',
+            '--file', df,
+            '--tag', docker_image_tag,
+            '.',
+          ].join(' ')
+
+          puts "Running: #{docker_build_argv}"
+
+          if Harrison::DEBUG
+            system(docker_build_argv) || (throw :failure)
+          else
+            _, build_err, build_status = Open3.capture3(docker_build_argv)
+
+            if build_status != 0
+              puts build_err
+              throw :failure
+            end
+          end
+
+          docker_run_argv = [
+            "docker", "run",
+            "--mount", "type=bind,source=#{tmp_src_dir},target=/src,readonly",
+            "--mount", "type=bind,source=\"$(pwd)/pkg\",target=/pkg",
+            docker_image_tag,
+            commit,
+          ].join(' ')
+
+          puts "Running: #{docker_run_argv}"
+
+          if Harrison::DEBUG
+            system(docker_run_argv) || (throw :failure)
+          else
+            pkg_out, pkg_err, pkg_status = Open3.capture3(docker_run_argv)
+
+            if pkg_status != 0
+              puts pkg_err
+              throw :failure
+            end
+            pkg_out_lines = pkg_out.split("\n")
+
+            packages << pkg_out_lines[-1]
+          end
+        end
+
+        git_worktree_remove_argv = [
+          "git",
+          "worktree",
+          "remove",
+          "--force", # don't care if worktree is unclean
+          tmp_src_dir,
+        ].join(' ')
+
+        if Harrison::DEBUG
+          system(git_worktree_remove_argv) || (throw :failure)
+        else
+          _, gwtr_err, gwtr_status = Open3.capture3(git_worktree_remove_argv)
+
+          if gwtr_status != 0
+            puts gwtr_err
+            throw :failure
+          end
+        end
+      ensure
+        FileUtils.rm_rf(tmp_dir, secure: true)
+      end
+
+      puts "\n#{packages.join("\n")}"
+    end
+
     def remote_project_dir
       "#{remote_dir}/#{project}"
     end

data/lib/harrison/version.rb

@@ -1,3 +1,3 @@
 module Harrison
-  VERSION = "0.8.0"
+  VERSION = "0.9.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: harrison
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Jesse Scott
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-05 00:00:00.000000000 Z
+date: 2020-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop
@@ -162,6 +162,7 @@ files:
 - ".rspec"
 - ".travis.yml"
 - CHANGELOG
+- CODEOWNERS
 - Gemfile
 - IDEAS
 - LICENSE.txt