harrison 0.8.0 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6afee83edbb748c4ee652e3272decd68030c971c94a253ac79961c35f74207b4
-  data.tar.gz: c2df93b7c6eb654e14654a3f644e73bc4b5fe42565b49463ff5f5726dce7fd04
+  metadata.gz: 9a145afbc3b9cbd07594d187e9152eb774003e8117587c2d016f7ed05fb16b4c
+  data.tar.gz: 486fb39b730ce546a2fd0721dfb846daf259f9fe04df950bb4882f634a4d7933
 SHA512:
-  metadata.gz: 32f722766b9d7e9ea232e76de095c38666ea3837cd7911895ab1ce947bd2346eb7eaec85b9832c164e9acc4efffbf62546ef88204c5b331315cb0dbcc5b222b6
-  data.tar.gz: 07fe4f8efb94892f6476be98ba44c602a32e1d17be927790bbe4f1749eb772c91c08eb564e02bdb623afeeb6eacd143d25643bf059dc6b6493c0b3b7cdb5ccee
+  metadata.gz: ca4e5c1faa31d7c11e12d0ac6c41ba409a5f6796dac19c91b86798ba0db0b34d10effecd724e74873049e9ceed312c055b17fec7a17bd42d481879bfb2be41dd
+  data.tar.gz: 5ade0469ba48eca21d5e2a863c1d554bcf48327996929ecf845a0d1348d0de2fd98b8a220e722ef6c415b7fd40a18c63672265e689147542e10cf0211a57ffd2

data/.github/workflows/ruby-spec.yml

@@ -0,0 +1,30 @@
+name: ruby-rspec
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - main
+
+jobs:
+  test:
+    name: Test with Ruby ${{ matrix.ruby_version }}
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby: [2.7, 2.6]
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Set up Ruby ${{ matrix.ruby }}
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+
+      - name: Build and test with Rspec
+        run: |
+          gem install bundler
+          bundle install --jobs 4 --retry 3
+          bundle exec rspec

data/.gitignore

@@ -4,7 +4,6 @@
 .bundle
 .config
 .yardoc
-Gemfile.lock
 InstalledFiles
 _yardoc
 coverage

data/CHANGELOG

@@ -1,3 +1,16 @@
+0.9.2
+-------------------
+- Bumped dependencies on highline and bundler to latest majors
+
+0.9.1
+-------------------
+- Bumped dependencies on net-ssh and net-scp to latest majors
+
+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/Gemfile.lock

@@ -0,0 +1,79 @@
+PATH
+  remote: .
+  specs:
+    harrison (0.9.2)
+      highline (~> 2.0.3)
+      net-scp (~> 3.0)
+      net-ssh (~> 6.1)
+      trollop (~> 2.1.2)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    byebug (11.1.3)
+    coderay (1.1.3)
+    diff-lcs (1.5.0)
+    docile (1.4.0)
+    file-tail (1.2.0)
+      tins (~> 1.0)
+    highline (2.0.3)
+    method_source (1.0.0)
+    net-scp (3.0.0)
+      net-ssh (>= 2.6.5, < 7.0.0)
+    net-ssh (6.1.0)
+    pry (0.13.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    pry-byebug (3.9.0)
+      byebug (~> 11.0)
+      pry (~> 0.13.0)
+    rake (13.0.6)
+    rspec (3.11.0)
+      rspec-core (~> 3.11.0)
+      rspec-expectations (~> 3.11.0)
+      rspec-mocks (~> 3.11.0)
+    rspec-core (3.11.0)
+      rspec-support (~> 3.11.0)
+    rspec-expectations (3.11.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.11.0)
+    rspec-mocks (3.11.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.11.0)
+    rspec-support (3.11.0)
+    ruby2ruby (2.4.4)
+      ruby_parser (~> 3.1)
+      sexp_processor (~> 4.6)
+    ruby_parser (3.18.1)
+      sexp_processor (~> 4.16)
+    sexp_processor (4.16.0)
+    simplecov (0.21.2)
+      docile (~> 1.1)
+      simplecov-html (~> 0.11)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-html (0.12.3)
+    simplecov_json_formatter (0.1.4)
+    sourcify (0.5.0)
+      file-tail (>= 1.0.5)
+      ruby2ruby (>= 1.2.5)
+      ruby_parser (>= 2.0.5)
+      sexp_processor (>= 3.0.5)
+    sync (0.5.0)
+    tins (1.31.0)
+      sync
+    trollop (2.1.3)
+
+PLATFORMS
+  x86_64-darwin-18
+
+DEPENDENCIES
+  bundler (~> 2.3)
+  harrison!
+  pry-byebug
+  rake
+  rspec (~> 3.0)
+  simplecov
+  sourcify
+
+BUNDLED WITH
+   2.3.7

data/README.md

@@ -2,8 +2,6 @@
 
 Simple artifact-based deployment for web applications.
 
-[![Build Status](https://travis-ci.org/puppetlabs/harrison.svg?branch=master)](https://travis-ci.org/puppetlabs/harrison)
-
 ## Installation
 
 Add this line to your application's Gemfile:

data/harrison.gemspec

@@ -20,11 +20,11 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 2.3.1'
 
   spec.add_runtime_dependency "trollop", "~> 2.1.2"
-  spec.add_runtime_dependency "net-ssh", "~> 5.2"
-  spec.add_runtime_dependency "net-scp", "~> 2.0"
-  spec.add_runtime_dependency "highline", "~> 1.7.8"
+  spec.add_runtime_dependency "net-ssh", "~> 6.1"
+  spec.add_runtime_dependency "net-scp", "~> 3.0"
+  spec.add_runtime_dependency "highline", "~> 2.0.3"
 
-  spec.add_development_dependency "bundler", "~> 1.6"
+  spec.add_development_dependency "bundler", "~> 2.3"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "simplecov"

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.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: harrison
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.2
 platform: ruby
 authors:
 - Jesse Scott
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-05 00:00:00.000000000 Z
+date: 2022-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop
@@ -30,56 +30,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: net-scp
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.8
+        version: 2.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.8
+        version: 2.0.3
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '2.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -158,11 +158,13 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ruby-spec.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - CHANGELOG
+- CODEOWNERS
 - Gemfile
+- Gemfile.lock
 - IDEAS
 - LICENSE.txt
 - README.md

data/.travis.yml

@@ -1,6 +0,0 @@
-language: ruby
-rvm:
-  - ruby-head
-  - 2.1.1
-  - 2.0.0
-  - 1.9.3