metaractor 3.1.0 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 285b4aecd4d684716db6d574e443464ba4fecaca03f49417153d4eb2d49994e4
-  data.tar.gz: bea5769c3cb76692d1f1a1218fae8937500ae2cdec53dfda5d17066170a723b8
+  metadata.gz: 8a67b3860db00780ce1c03f5c551fdb7bbace32bdd7e16d6adabadb541516cb0
+  data.tar.gz: 2c24a4a91199c196eae047b09830891ff5ea3c0fd2e2d734acfe57059775fc74
 SHA512:
-  metadata.gz: 78226f45df08e38363d19cf03e3ec7867d0788700abf11daa08d5eca31ff62f3e9c43460d39be9d9422a686ee1a0da35de323df54d49ea06962876a809f3ad06
-  data.tar.gz: 76dee36d5fd30560f4bb7ebee50cf1e59d984e70bc219107e2d439024523ed2992056baacb17227e294466f4cff75b58cd96c7bb8fc0b680438ee8bf367e057c
+  metadata.gz: 40fdf35588580edf4b57e719958bad16f6dece4e74fd7a4c202c03a3aab47c6c7647fe90c2152a84eb6e8fd20a1bafd84e137efea9676cbd75966b39f22cacff
+  data.tar.gz: 30fdcf53265820b0e510823730ed027e64171316f757b4047b304ba7f9a1bcc9e95b63016114ee4f2807c2a7a1cb94fc8779ecbb9adca47fd4ea8c0a17fa5245

data/.buildkite/pipeline.yml

@@ -5,22 +5,23 @@ env:
   # BUILDKITE_PLUGIN_DOCKER_COMPOSE_UPLOAD_CONTAINER_LOGS: "always"
   BUILDKITE_PLUGIN_DOCKER_COMPOSE_PULL_RETRIES: 5
   BUILDKITE_PLUGIN_DOCKER_COMPOSE_PUSH_RETRIES: 5
-  PLUGIN_DOCKER_COMPOSE_VERSION: "17bac3aaee1360e39381b89bb45513b11838238e"
-  PLUGIN_DOCKER_CACHE_VERSION: "f3d8feb52a25c69c75565e9f0b80375eae51850a"
+  PLUGIN_DOCKER_COMPOSE_VERSION: "03d746fbf5171b217b732ff7d8a3e417d664df1c"
+  PLUGIN_DOCKER_CACHE_VERSION: "50ecc80f736a4a3a0ab1f5990e58ae8e536c85e1"
+  WORKSPACE_DIR: "${BUILDKITE_BUILD_CHECKOUT_PATH}"
 
 steps:
   - label: ":docker: Build"
-    command: ./docker/ci-prep.sh
     key: build
     plugins:
-      - seek-oss/aws-sm#v2.2.1:
+      - seek-oss/aws-sm#v2.3.1:
           env:
             DOCKER_LOGIN_PASSWORD: "/buildkite/docker_password"
 
-      - docker-login#v2.0.1:
+      - docker-login#v2.1.0:
           username: outstandci
+          retries: 2
 
-      - ecr#v2.1.1:
+      - ecr#v2.5.0:
           login: true
           region: "us-east-1"
 
@@ -28,21 +29,22 @@ steps:
           build: metaractor
           image-repository: 786715713882.dkr.ecr.us-east-1.amazonaws.com/ci-images
           config:
-            - docker-compose.yml
+            - compose.yml
 
   - label: ":bundler: :rubygems:"
     key: bundle_install
     command: bundle install
     depends_on: build
     plugins:
-      - seek-oss/aws-sm#v2.2.1:
+      - seek-oss/aws-sm#v2.3.1:
           env:
             DOCKER_LOGIN_PASSWORD: "/buildkite/docker_password"
 
-      - docker-login#v2.0.1:
+      - docker-login#v2.1.0:
           username: outstandci
+          retries: 2
 
-      - ecr#v2.1.1:
+      - ecr#v2.5.0:
           login: true
           region: "us-east-1"
 
@@ -50,13 +52,13 @@ steps:
           run: metaractor
           dependencies: false
           config:
-            - docker-compose.yml
+            - compose.yml
 
       - https://github.com/outstand/docker-cache-buildkite-plugin.git#${PLUGIN_DOCKER_CACHE_VERSION}:
           name: bundler-cache
           keys:
-            - v1-bundler-cache-{{ arch }}-{{ checksum "metaractor.gemspec" }}-{{ checksum "Gemfile" }}
-            - v1-bundler-cache-{{ arch }}-
+            - v2-bundler-cache-{{ arch }}-{{ checksum "metaractor.gemspec" }}-{{ checksum "Gemfile" }}
+            - v2-bundler-cache-{{ arch }}-
           save: true
           volumes:
             - bundler-data
@@ -65,28 +67,27 @@ steps:
     command: rspec spec
     depends_on: bundle_install
     plugins:
-      - seek-oss/aws-sm#v2.2.1:
+      - seek-oss/aws-sm#v2.3.1:
           env:
             DOCKER_LOGIN_PASSWORD: "/buildkite/docker_password"
-          json-to-env:
-            - secret-id: "/buildkite/rails/env_vars"
 
-      - docker-login#v2.0.1:
+      - docker-login#v2.1.0:
           username: outstandci
+          retries: 2
 
-      - ecr#v2.1.1:
+      - ecr#v2.5.0:
           login: true
           region: "us-east-1"
 
       - https://github.com/outstand/docker-compose-buildkite-plugin.git#${PLUGIN_DOCKER_COMPOSE_VERSION}:
           run: metaractor
           config:
-            - docker-compose.yml
+            - compose.yml
 
       - https://github.com/outstand/docker-cache-buildkite-plugin.git#${PLUGIN_DOCKER_CACHE_VERSION}:
           name: bundler-cache
           keys:
-            - v1-bundler-cache-{{ arch }}-{{ checksum "metaractor.gemspec" }}-{{ checksum "Gemfile" }}
-            - v1-bundler-cache-{{ arch }}-
+            - v2-bundler-cache-{{ arch }}-{{ checksum "metaractor.gemspec" }}-{{ checksum "Gemfile" }}
+            - v2-bundler-cache-{{ arch }}-
           volumes:
             - bundler-data

data/.gitignore

@@ -7,4 +7,3 @@
 /pkg/
 /spec/reports/
 /tmp/
-/Deskfile

data/Deskfile

@@ -0,0 +1,3 @@
+rspec() {
+  docker compose run --rm metaractor rspec "$@"
+}

data/Dockerfile

@@ -1,39 +1,78 @@
+FROM outstand/su-exec:latest as su-exec
 FROM outstand/fixuid as fixuid
 
-FROM ruby:2.7.3-alpine
+FROM ruby:3.1.2-bullseye
 LABEL maintainer="Ryan Schlesinger <ryan@outstand.com>"
 
-RUN addgroup -g 1000 -S metaractor && \
-    adduser -u 1000 -S -s /bin/ash -G metaractor metaractor && \
-    apk add --no-cache \
-      ca-certificates \
-      tini \
-      su-exec \
-      build-base \
-      git \
-      openssh
+SHELL ["/bin/bash", "-o", "pipefail", "-c"]
+ENV DEBIAN_FRONTEND=noninteractive
 
+RUN set -eux; \
+      \
+      groupadd -g 1000 metaractor && \
+      useradd -u 1000 -g metaractor -ms /bin/bash metaractor && \
+      \
+      apt-get update -y; \
+      apt-get install -y \
+        ca-certificates \
+        curl \
+        git \
+        build-essential \
+        tini \
+      ; \
+      apt-get clean; \
+      rm -f /var/lib/apt/lists/*_*
+
+# install su-exec
+COPY --from=su-exec /sbin/su-exec /sbin/su-exec
+
+# install fixuid
 COPY --from=fixuid /usr/local/bin/fixuid /usr/local/bin/fixuid
-RUN chmod 4755 /usr/local/bin/fixuid && \
-      USER=metaractor && \
-      GROUP=metaractor && \
-      mkdir -p /etc/fixuid && \
+RUN set -eux; \
+      \
+      chmod 4755 /usr/local/bin/fixuid; \
+      USER=metaractor; \
+      GROUP=metaractor; \
+      mkdir -p /etc/fixuid; \
       printf "user: $USER\ngroup: $GROUP\n" > /etc/fixuid/config.yml
 
-ENV BUNDLER_VERSION 2.2.16
-RUN gem install bundler -v ${BUNDLER_VERSION} -i /usr/local/lib/ruby/gems/$(ls /usr/local/lib/ruby/gems) --force
+ENV BUNDLER_VERSION 2.3.21
+ENV GITHUB_CLI_VERSION 2.14.4
+ENV GITHUB_CLI_CHECKSUM b0073fdcc07d1de5a19a1a782c7ad9f593f991da06a809ea39f0b6148869aa96
+RUN set -eux; \
+      \
+      mkdir -p /tmp/build; \
+      cd /tmp/build; \
+      \
+      gem install bundler -v ${BUNDLER_VERSION} -i /usr/local/lib/ruby/gems/$(ls /usr/local/lib/ruby/gems) --force; \
+      curl -fsSL https://github.com/cli/cli/releases/download/v${GITHUB_CLI_VERSION}/gh_${GITHUB_CLI_VERSION}_linux_amd64.deb -o gh_${GITHUB_CLI_VERSION}_linux_amd64.deb; \
+      echo "${GITHUB_CLI_CHECKSUM}  gh_${GITHUB_CLI_VERSION}_linux_amd64.deb" | sha256sum --check; \
+      apt-get update -y; \
+      apt-get install -y --no-install-recommends \
+        ./gh_${GITHUB_CLI_VERSION}_linux_amd64.deb \
+      ; \
+      apt-get clean; \
+      rm -f /var/lib/apt/lists/*_*; \
+      rm -rf /tmp/build
+
+COPY brew-shim /usr/bin/brew
 
 WORKDIR /metaractor
-RUN chown -R metaractor:metaractor /metaractor
+RUN set -eux; \
+      \
+      chown -R metaractor:metaractor /metaractor
+
 USER metaractor
 
 COPY --chown=metaractor:metaractor Gemfile metaractor.gemspec /metaractor/
 COPY --chown=metaractor:metaractor lib/metaractor/version.rb /metaractor/lib/metaractor/
-RUN git config --global push.default simple
+RUN set -eux; \
+      \
+      git config --global push.default simple
 COPY --chown=metaractor:metaractor . /metaractor/
 
 USER root
 COPY docker-entrypoint.sh /docker-entrypoint.sh
 
-ENTRYPOINT ["/sbin/tini", "-g", "--", "/docker-entrypoint.sh"]
+ENTRYPOINT ["/usr/bin/tini", "-g", "--", "/docker-entrypoint.sh"]
 CMD ["rspec", "spec"]

data/README.md

@@ -345,13 +345,16 @@ For more examples of all of the above approaches, please see the specs.
 
 ## Development
 
-- `docker-compose build --pull`
-- `docker-compose run --rm metaractor` to run specs
+- `docker compose build --pull`
+- `docker compose run --rm metaractor` to run specs
+
+or with the Deskfile loaded:
+- `rspec spec`
 
 To release a new version:
 - Update the version number in `version.rb` and commit the result.
-- `docker-compose build --pull`
-- `docker-compose run --rm release`
+- `docker compose build --pull`
+- `docker compose run --rm release`
 
 ## Contributing
 

data/brew-shim

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+set -euo pipefail
+
+# Docker host has the following git config:
+# helper = !$(brew --prefix)/bin/gh auth git-credential
+#
+# We're going to lie inside the container so we can find the local gh
+
+echo "/usr"

data/{docker-compose.yml → compose.yml}

@@ -1,4 +1,3 @@
-version: '3.6'
 services:
   metaractor:
     build: .
@@ -8,9 +7,14 @@ services:
     environment:
       FIXUID:
       FIXGID:
+      BUILDKITE:
+      BUILDKITE_BUILD_URL:
+      BUILDKITE_JOB_ID:
+      BUILDKITE_AGENT_ACCESS_TOKEN:
     volumes:
       - bundler-data:/usr/local/bundle
       - .:/metaractor
+
   release:
     image: outstand/metaractor:dev
     stdin_open: true
@@ -23,8 +27,9 @@ services:
       - bundler-data:/usr/local/bundle
       - ~/.gitconfig:/home/metaractor/.gitconfig
       - ~/.gitconfig.user:/home/metaractor/.gitconfig.user
-      - ~/.ssh/id_rsa:/home/metaractor/.ssh/id_rsa
-      - ~/.gem:/home/metaractor/.gem
+      - ~/.config/gh/hosts.yml:/home/metaractor/.config/gh/hosts.yml
+      - ~/.local/share/gem/credentials:/home/metaractor/.local/share/gem/credentials
+      - ~/.local/share/gem/credentials:/home/metaractor/.gem/credentials
 
 volumes:
   bundler-data:

data/docker-entrypoint.sh

@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/bash
 
-set -e
+set -euo pipefail
 
 su-exec ${FIXUID:?Missing FIXUID var}:${FIXGID:?Missing FIXGID var} fixuid
 
@@ -13,6 +13,8 @@ chown_dir() {
 }
 
 chown_dir /usr/local/bundle
+chown_dir /home/metaractor/.local/share/gem
+chown_dir /home/metaractor/.gem
 
 if [ "$(which "$1")" = '' ]; then
   if [ "$(ls -A /usr/local/bundle/bin)" = '' ]; then
@@ -24,10 +26,14 @@ fi
 
 if [ "$1" = 'bundle' ]; then
   set -- su-exec metaractor "$@"
+elif [ "$1" = 'rake' ]; then
+  set -- su-exec metaractor bundle exec "$@"
+
+  su-exec metaractor bash -c 'bundle check || bundle install'
 elif ls /usr/local/bundle/bin | grep -q "\b$1\b"; then
   set -- su-exec metaractor bundle exec "$@"
 
-  su-exec metaractor ash -c 'bundle check || bundle install'
+  su-exec metaractor bash -c 'bundle check || bundle install'
 fi
 
 exec "$@"

data/lib/metaractor/errors.rb

@@ -71,18 +71,19 @@ module Metaractor
 
     def add(error: {}, errors: {}, object: nil)
       trees = []
-      [error, errors].each do |h| 
+      [error, errors].each do |h|
         tree = nil
         if h.is_a? Metaractor::Errors
           tree = Sycamore::Tree.from(h.instance_variable_get(:@tree))
         else
-          tree = Sycamore::Tree.from(h)
+          tree = Sycamore::Tree.from(normalize_error_hash(h))
         end
 
         unless tree.empty?
-          if tree.nodes.any? {|node| tree.strict_leaf?(node) }
+          if tree.nodes.any? { |node| tree.strict_leaf?(node) }
             raise ArgumentError, "Invalid hash!"
           end
+
           trees << tree
         end
       end
@@ -220,5 +221,34 @@ module Metaractor
       end
     end
 
+    def normalize_error_hash(hash)
+      deep_transform_values_in_object(hash, &method(:transform_delegator))
+    end
+
+    def transform_delegator(value)
+      if value.is_a?(Delegator)
+        if value.respond_to?(:to_hash)
+          deep_transform_values_in_object(value.to_hash, &method(:transform_delegator))
+        elsif value.respond_to?(:to_a)
+          deep_transform_values_in_object(value.to_a, &method(:transform_delegator))
+        else
+          value
+        end
+      else
+        value
+      end
+    end
+
+    # Lifted from Rails
+    def deep_transform_values_in_object(object, &block)
+      case object
+      when Hash
+        object.transform_values { |value| deep_transform_values_in_object(value, &block) }
+      when Array
+        object.map { |e| deep_transform_values_in_object(e, &block) }
+      else
+        yield(object)
+      end
+    end
   end
 end

data/lib/metaractor/parameters.rb

@@ -38,6 +38,10 @@ module Metaractor
         @options[key]
       end
 
+      def has_key?(key)
+        @options.has_key?(key)
+      end
+
       def dig(name, *names)
         @options.dig(name, *names)
       end
@@ -143,7 +147,7 @@ module Metaractor
 
     def apply_defaults
       parameters.each do |name, parameter|
-        next unless parameter[:default]
+        next unless parameter.has_key?(:default)
 
         unless context.has_key?(name)
           context[name] = _parameter_default(name)

data/lib/metaractor/version.rb

@@ -1,3 +1,3 @@
 module Metaractor
-  VERSION = "3.1.0"
+  VERSION = "3.3.0"
 end

data/metaractor.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_runtime_dependency 'interactor', '~> 3.1'
-  spec.add_runtime_dependency 'sycamore', '~> 0.3'
+  spec.add_runtime_dependency 'outstand-sycamore', '0.4.0'
   spec.add_runtime_dependency 'i18n', '~> 1.8'
 
   spec.add_development_dependency 'bundler', '~> 2'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metaractor
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.3.0
 platform: ruby
 authors:
 - Ryan Schlesinger
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-04-29 00:00:00.000000000 Z
+date: 2022-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: interactor
@@ -25,19 +25,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
-  name: sycamore
+  name: outstand-sycamore
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
@@ -136,7 +136,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '6.1'
-description:
+description: 
 email:
 - ryan@outstand.com
 executables: []
@@ -146,12 +146,14 @@ files:
 - ".buildkite/pipeline.yml"
 - ".gitignore"
 - ".rspec"
+- Deskfile
 - Dockerfile
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
-- docker-compose.yml
+- brew-shim
+- compose.yml
 - docker-entrypoint.sh
 - lib/metaractor.rb
 - lib/metaractor/chain_failures.rb
@@ -168,13 +170,13 @@ files:
 - lib/metaractor/spec.rb
 - lib/metaractor/version.rb
 - metaractor.gemspec
-homepage:
+homepage: 
 licenses:
 - Apache-2.0
 metadata:
   homepage_uri: https://github.com/outstand/metaractor
   source_code_uri: https://github.com/outstand/metaractor
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -189,8 +191,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key:
+rubygems_version: 3.3.7
+signing_key: 
 specification_version: 4
 summary: Adds parameter validation and error control to interactor
 test_files: []