foreman_envsync 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e24a84a49de5dd8e5e547b63e05ce952fc348e34d670898b468642e8c058a6ee
-  data.tar.gz: 230d4a1832eca3c43a98bc0ac7e67cc9e82195c14810ab5c0f564c7e279d0549
+  metadata.gz: 9a1b0dd3d8f5949db44605891c54f2d4a937b2b194b182ef0dd5887b8632d6d1
+  data.tar.gz: a576b9c27487cba2a37fe9be7bcf6fd96e92cd7fc71a476cccbbe2e210b04b6c
 SHA512:
-  metadata.gz: d2c94787e431273cc84f2a57cb72f257130cd3918e25dba5ef99a53e817185d3a8a483528e75c0ac7d1639718a611fff227edc54eef6c33188d31c1da6e225fb
-  data.tar.gz: 7032245360fe4ab1db78a830e8a75091c41be1bc569ac5b4abc4ccf432a5b2872dec4648cf13d74864fb880eedd85dfdb6ab8cb40af45161f0cfb3f70027aeac
+  metadata.gz: ca9ac65592854fadd6601e66167dd999d42205334973a14af4d3105b40c8a4b9b345d4517b5c82f922a51959eaae70aeeb9ff38893395e7d03b866150493a3c8
+  data.tar.gz: eede0daddd896ba75db5b30325c1222982abd7e095e2c3e329c4c9538106cd238cee5c92e2f6c118ef28533a0f297d7a318856528da774e88928f6ac8e254c01

data/.github/workflows/ci.yaml

@@ -0,0 +1,61 @@
+# based on https://github.com/docker/build-push-action/blob/master/docs/advanced/tags-labels.md
+
+name: ci
+
+on:
+  schedule:
+    - cron: '0 10 * * 1'
+  push:
+    branches:
+      - '**'
+    tags:
+      - 'v*.*.*'
+  pull_request:
+    branches:
+      - 'main'
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    if: github.repository == 'lsst-it/foreman_envsync'
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 3.0
+          bundler-cache: true
+      - name: Run the default task
+        run: bundle exec rake
+      - name: Build gem
+        run: gem build *.gemspec
+      - name: Publish gem to rubygems.org
+        if: startsWith(github.ref, 'refs/tags/v')
+        run: gem push *.gem
+        env:
+          GEM_HOST_API_KEY: '${{ secrets.RUBYGEMS_AUTH_TOKEN }}'
+
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v4
+        with:
+          images: |
+            lsstit/foreman_envsync
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+      - name: Login to DockerHub
+        if: github.event_name != 'pull_request'
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_LSSTIT_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_LSSTIT_PASSWORD }}
+      - name: Build and push
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}

data/.gitignore

@@ -7,6 +7,7 @@
 /spec/reports/
 /tmp/
 Gemfile.lock
+*.gem
 
 # rspec failure tracking
 .rspec_status

data/Dockerfile

@@ -0,0 +1,6 @@
+FROM ruby:3.0
+
+COPY *.gem .
+RUN gem install --no-document *.gem
+
+ENTRYPOINT ["/usr/local/bundle/bin/foreman_envsync"]

data/README.md

@@ -4,6 +4,11 @@ A highly opinionated utility to sync foreman puppet environments with the set
 of environments known to a `puppetserver` instance *without* also importing the
 classes within those puppet environments.
 
+## OCI Image
+
+An OCI image containing this gem is published to docker hub as
+[`lsstit/foreman_envsync`](https://hub.docker.com/repository/docker/lsstit/foreman_envsync).
+
 
 ## The Problem
 

data/exe/foreman_envsync

@@ -30,7 +30,7 @@ def verbose_list(msg, items)
 
   printf(msg, items.count)
   puts
-  puts "#{YAML.dump(items)}\n" unless items.empty?
+  puts "#{YAML.dump(items.sort)}\n" unless items.empty?
 end
 
 def cert_file(file)
@@ -41,12 +41,12 @@ def key_file(file)
   OpenSSL::PKey::RSA.new(File.read(file))
 end
 
-def hammer_cmd(cmd, ignore_exitstatus: false)
+def hammer_cmd(cmd, opt = { ignore_exitstatus: false })
   stdout, stderr, s = Open3.capture3(cmd)
   unless s.success?
     puts "command #{cmd} failed"
     puts stderr
-    exit s.exitstatus unless ignore_exitstatus
+    exit s.exitstatus unless opt[:ignore_exitstatus]
   end
 
   stdout

data/foreman_envsync.gemspec

@@ -28,10 +28,12 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency "hammer_cli"
   spec.add_runtime_dependency "hammer_cli_foreman"
+  spec.add_runtime_dependency "hammer_cli_foreman_puppet"
   spec.add_runtime_dependency "rest-client", "~> 2.0"
   spec.add_development_dependency "rubocop-rake"
   spec.add_development_dependency "rubocop-rspec"
 
   # For more information and examples about making a new gem, checkout our
   # guide at: https://bundler.io/guides/creating_gem.html
+  spec.metadata["rubygems_mfa_required"] = "true"
 end

data/lib/foreman_envsync/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ForemanEnvsync
-  VERSION = "1.1.1"
+  VERSION = "1.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_envsync
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Joshua Hoblitt
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-11-02 00:00:00.000000000 Z
+date: 2022-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hammer_cli
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: hammer_cli_foreman_puppet
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
@@ -88,11 +102,12 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/workflows/main.yml"
+- ".github/workflows/ci.yaml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
 - CHANGELOG.md
+- Dockerfile
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -110,6 +125,7 @@ metadata:
   homepage_uri: https://github.com/lsst-it/foreman_envsync
   source_code_uri: https://github.com/lsst-it/foreman_envsync
   changelog_uri: https://github.com/lsst-it/foreman_envsync/blob/master/CHANGELOG.md
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -125,7 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Sync pupperserver envs with foreman

data/.github/workflows/main.yml

@@ -1,16 +0,0 @@
-name: Ruby
-
-on: [push,pull_request]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Ruby
-      uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: 2.7.2
-        bundler-cache: true
-    - name: Run the default task
-      run: bundle exec rake