remove_bg 1.5.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 47f8cd273ddfe8639badf0fd59050342af16e542a508162f77fbec7b7a2a5dd4
-  data.tar.gz: 5adcc396f765f7a4858e7c7c4d82d7610b5d42e2200401be29b5ea543f5fdc88
+  metadata.gz: d98c7854629bfaf9f54f3bfdc1da555a74e824644b14ce959af79c1fdc002cb7
+  data.tar.gz: f39fb1824c889096aea5581cc1c31eb775c94fa2ffbc2fb474720aeb07d5e2c4
 SHA512:
-  metadata.gz: 4ad4065335850911ee8b45604ed0de465742bdf183078d0ae4e9de52fb1f77519d4d9bd5aa7a042d04e9c0960a8af4f3d0e84cfdb49c6ae48e773626c6ad9639
-  data.tar.gz: a265d257a9e77bd9d87b9ef42c2aff4b0d7b8b7b3482a8717a44b4d3192c5064b0e4e67e62b9d513ecbb67e317c8b470db19194b350ade66d73b602b6ec9a7c8
+  metadata.gz: 6e71d886ea81021acd12f9ae51bed5b31a7eb68a82873914770ccd8f3ed93a35d05353b3413983a59bf8fcafab9a27b42ecb61537b5228b95e5ddb2b95a17773
+  data.tar.gz: 8974ee1e97ee15e53497c9bbe06537257306c279d1d4121f7307041318a11d350e243cbf4c6f33638167046927f570c33294909d6277ecbce253e74601b9d877

data/.circleci/config.yml

@@ -1,72 +1,342 @@
 ---
-version: 2
-
-base_job: &base_job
-  steps:
-    - checkout
-
-    - restore_cache:
-        keys:
-          - v1-dependencies-{{ checksum "Gemfile.lock" }}
-
-    - run:
-        name: install dependencies
-        command: |
-          gem install bundler --version '~> 2.0'
-          bundle config set path vendor/bundle
-          bundle install --jobs=4 --retry=3
-
-    - run:
-        name: install image processsing dependencies
-        command: |
-          sudo apt-get update
-          sudo apt install imagemagick libvips
-
-    - save_cache:
-        paths:
-          - ./vendor/bundle
-        key: v1-dependencies-{{ checksum "Gemfile.lock" }}
-
-    - run:
-        name: run tests
-        command: |
-          bundle exec rspec --format progress \
-                            --format RspecJunitFormatter \
-                            --out test-results/rspec.xml
-
-    - run:
-        name: run appraisals
-        command: |
-          bundle exec appraisal install --jobs 4 --retry 3
-          bundle exec appraisal rspec
-
-    - store_test_results:
-        path: test-results
+version: 2.1
 
-################################################################################
+# Used Orbs (https://circleci.com/docs/2.0/using-orbs/)
+orbs:
+  ruby: circleci/ruby@2.1
+  node: circleci/node@5.2
+  sonarcloud: sonarsource/sonarcloud@2.0
+  asdf: rynkowsg/asdf@0.1
+  codecov: codecov/codecov@4.1
+  github: circleci/github-cli@2.3
 
-jobs:
-  ruby-2.5:
-    <<: *base_job
+# Pipeline parameters
+parameters:
+  # The main branch of the repository (e.g. main)
+  main-branch:
+    type: string
+    default: main
+  default-ruby:
+    type: string
+    default: "3.3.4"
+
+# Define common YAML anchors
+x-common-auth: &common-auth
+  auth:
+    username: ${DOCKERHUB_USER}
+    password: ${DOCKERHUB_PASSWORD}
+
+# Define executors
+executors:
+  docker:  # Docker using the Base Convenience Image
     docker:
-      - image: circleci/ruby:2.5
-  ruby-2.6:
-    <<: *base_job
+      - image: cimg/base:stable
+        <<: *common-auth
+  macos:  # macOS executor running Xcode
+    macos:
+      # https://circleci.com/developer/machine/image/xcode
+      xcode: 15.4.0
+
+jobs:
+  # Lint Job
+  lint:
     docker:
-      - image: circleci/ruby:2.6
-  ruby-2.7:
-    <<: *base_job
+      - image: cimg/base:stable
+        <<: *common-auth
+    resource_class: medium
+    steps:
+      # Check out code
+      - checkout
+      # Install requested Ruby version
+      - ruby/install:
+          version: "<< pipeline.parameters.default-ruby >>"
+      # Install dependencies using bundler
+      - ruby/install-deps:
+          pre-install-steps:
+            - run: bundle config set jobs $(nproc)
+          key: gems-v{{ .Environment.CACHE_VERSION }}
+      # Run Rubocop
+      - run:
+          name: Run Rubocop
+          command: |
+            bash -c "bundle exec rubocop --format=json --out=rubocop-result.json; [[ \$? -ne 2 ]]"
+      - store_artifacts:
+          path: rubocop-result.json
+          destination: rubocop-result.json
+      - persist_to_workspace:
+          root: .
+          paths:
+            - rubocop-result.json
+
+  # Test Job
+  test:
+    parameters:
+      # The OS to run the jobs on
+      os:
+        type: string
+        default: docker
+      # The OS to run the jobs on
+      ruby-version:
+        type: string
+    executor: << parameters.os >>
     environment:
-      UPLOAD_COVERAGE: 1
+      RUBY_VERSION: << parameters.ruby-version >>
+    steps:
+      # Install dependencies based on the OS
+      - when:
+          condition:
+            equal: ["docker", "<< parameters.os >>"]
+          steps:
+            - run:
+                name: Install ImageMagick, libvips and libffi
+                command: |
+                  sudo apt-get update
+                  sudo apt-get -y --no-install-recommends install \
+                    imagemagick libvips42 libffi-dev libreadline-dev \
+                    libyaml-dev openssl libtool
+            - asdf/install
+      - when:
+          condition:
+            equal: ["macos", "<< parameters.os >>"]
+          steps:
+            - run:
+                name: Install ImageMagick, libvips and libffi
+                command: |
+                  brew install openssl@3 imagemagick vips asdf libffi
+      # Install requested Ruby version
+      - run:
+          name: Install Ruby << parameters.ruby-version >>
+          command: |
+            asdf plugin-add ruby
+            asdf install ruby << parameters.ruby-version >>
+            asdf global ruby << parameters.ruby-version >>
+            gem install --user-install executable-hooks
+      # Check out code
+      - checkout
+      # Install dependencies using bundler
+      - ruby/install-deps:
+          pre-install-steps:
+            - run: bundle config set jobs $(nproc)
+          key: gems-v{{ .Environment.CACHE_VERSION }}
+      # Run RSpec tests
+      - run:
+          name: Run tests
+          command: |
+            bundle exec rspec spec
+      # Run appraisals
+      - run:
+          name: Run appraisals
+          command: |
+            bundle exec appraisal install --jobs=$(nproc) --retry 3
+            bundle exec appraisal rspec
+      # Store test results
+      - store_test_results:
+          path: rspec/rspec.xml
+      # Persist test results to workspace and upload to CodeCov for default Ruby
+      - when:
+          condition:
+            and:
+              - equal:
+                  - "docker"
+                  - "<< parameters.os >>"
+              - equal:
+                  - "<< pipeline.parameters.default-ruby >>"
+                  - "<< parameters.ruby-version >>"
+          steps:
+            - persist_to_workspace:
+                root: .
+                paths:
+                  - rspec
+                  - coverage
+            - when:
+                condition:
+                  equal: ["<< pipeline.git.tag >>", ""]
+                steps:
+                  - codecov/upload:
+                      cli_args: --verbose
+                      validate: true
+
+  # Sonarcloud Job
+  sonarcloud:
+    docker:
+      - image: cimg/openjdk:21.0-node
+        <<: *common-auth
+    resource_class: small
+    steps:
+      - checkout
+      - attach_workspace:
+          at: .
+      - run:
+          name: Replace Version
+          command: |
+            if [ -n "${CIRCLE_TAG}" ] && [ ! -z "${CIRCLE_TAG}" ] ; then
+              export APP_VERSION="${CIRCLE_TAG}"
+            elif [ -n "${CIRCLE_BRANCH}" ] && [ ! -z "${CIRCLE_BRANCH}" ] ; then
+              export APP_VERSION="${CIRCLE_BRANCH}"
+            else
+              export APP_VERSION="${CIRCLE_SHA1:0:7}"
+            fi
+            echo "Setting version to ${APP_VERSION}"
+            sed -i -e "s\\sonar.projectVersion=.*$\\sonar.projectVersion=${APP_VERSION}\\g" sonar-project.properties
+      - sonarcloud/scan
+
+  # Release Job
+  release:
     docker:
-      - image: circleci/ruby:2.7
+      - image: cimg/base:stable
+        <<: *common-auth
+    resource_class: medium+
+    environment:
+      GIT_MAIN_BRANCH: << pipeline.parameters.main-branch >>
+      CHANGELOG_FILENAME: CHANGELOG.md
+    steps:
+      - github/install
+      - node/install:
+          node-version: latest
+      - run:
+          name: Install ImageMagick, libvips and libffi
+          command: |
+            sudo apt-get update
+            sudo apt-get -y --no-install-recommends install \
+              imagemagick libvips42 libffi-dev libreadline-dev \
+              libyaml-dev openssl libtool
+      - asdf/install
+      # Install requested Ruby version
+      - run:
+          name: Install Ruby << pipeline.parameters.default-ruby >>
+          command: |
+            asdf plugin-add ruby
+            asdf install ruby << pipeline.parameters.default-ruby >>
+            asdf global ruby << pipeline.parameters.default-ruby >>
+            gem install --user-install executable-hooks
+      - checkout
+      - run:
+          name: Check out main branch
+          command: git checkout --force "${GIT_MAIN_BRANCH}"
+      # Install dependencies using bundler
+      - ruby/install-deps:
+          pre-install-steps:
+            - run: bundle config set jobs $(nproc)
+          key: gems-v{{ .Environment.CACHE_VERSION }}
+      - run:
+          name: Build and push gem
+          command: |
+            bundle config set frozen false
+            bundle exec rake version["${CIRCLE_TAG}"]
+            bundle exec gem build --strict
+            GEM_HOST_API_KEY="${REMOVE_BG_GEM_PUSH_KEY}" gem push "remove_bg-${CIRCLE_TAG}.gem"
+
+            # Update version to next beta version
+            NEXT_PATCH_TAG=$(echo "${CIRCLE_TAG:-0.0.0}" | awk 'BEGIN{FS=OFS="."} {$3+=1} 1')
+            BETA_TAG="${NEXT_PATCH_TAG}.pre"
+            bundle exec rake version["${BETA_TAG}"]
+            bundle install
+      - run:
+          name: Edit Release and generate CHANGELOG.md
+          command: |
+            # Configure git
+            git config --global credential.helper cache
+            git config --global user.email "${GITHUB_USER_EMAIL}"
+            git config --global user.name "${GITHUB_USER_NAME}"
+
+            # Install GitHub Release Notes
+            npm install github-release-notes -g
+
+            # Get current release description
+            gh release view ${CIRCLE_TAG} \
+              --repo ${CIRCLE_PROJECT_USERNAME}/${CIRCLE_PROJECT_REPONAME} \
+              --json body --jq '.body' > release-body.txt
+
+            # Create release notes
+            gren release \
+              --override \
+              --tags "${CIRCLE_TAG}" \
+              --token ${GITHUB_AUTH_TOKEN} \
+              --username ${CIRCLE_PROJECT_USERNAME} \
+              --repo ${CIRCLE_PROJECT_REPONAME}
+
+            # Get current release description
+            gh release view ${CIRCLE_TAG} \
+              --repo ${CIRCLE_PROJECT_USERNAME}/${CIRCLE_PROJECT_REPONAME} \
+              --json body --jq '.body' > release-append.txt
+
+            echo -e "$(cat release-body.txt)\n\n---\n\n$(cat release-append.txt)" > release.txt
+
+            # Append to release description
+            echo "Updating release description"
+            gh release edit ${CIRCLE_TAG} \
+              --repo ${CIRCLE_PROJECT_USERNAME}/${CIRCLE_PROJECT_REPONAME} \
+              --notes-file release.txt --latest --title ${CIRCLE_TAG}
+
+            # Generate CHANGELOG.md
+            gren changelog \
+              --override \
+              --token ${GITHUB_AUTH_TOKEN} \
+              --username ${CIRCLE_PROJECT_USERNAME} \
+              --repo ${CIRCLE_PROJECT_REPONAME}
+
+            # Remove Windows line endings
+            sed -i $'s/\r$//' "${CHANGELOG_FILENAME}"
+
+            # Commit changelog and bumped version to git
+            git add "${CHANGELOG_FILENAME}" lib/remove_bg/version.rb Gemfile.lock
+            git diff --name-only --cached
+
+            git commit -m "📝 Update ${CHANGELOG_FILENAME} for ${CIRCLE_TAG}" -m "[skip ci]"
+            git push -q --set-upstream origin ${GIT_MAIN_BRANCH}
 
 ################################################################################
 
 workflows:
-  version: 2
   multiple-rubies:
     jobs:
-      - ruby-2.5
-      - ruby-2.6
-      - ruby-2.7
+      # Test Job
+      - test:
+          context:
+            - DockerHub
+          matrix:
+            parameters:
+              os: ["docker", "macos"]
+              ruby-version: ["3.1.6", "3.2.3", "3.3.4"]
+          filters:
+            tags:
+              only: /^\d+\.\d+\.\d+$/
+
+      # Lint Job
+      - lint:
+          context:
+            - DockerHub
+          requires:
+            - test
+          filters:
+            tags:
+              only: /^\d+\.\d+\.\d+$/
+
+      # Sonarcloud Job
+      - sonarcloud:
+          context:
+            - DockerHub
+            - SonarCloud
+          requires:
+            - lint
+            - test
+          filters:
+            tags:
+              only: /^\d+\.\d+\.\d+$/
+
+      # Release Job
+      - release:
+          context:
+            - DockerHub
+            - GitHub
+            - rubygems.org
+            - Google Cloud kaleido
+          requires:
+            - lint
+            - test
+            - sonarcloud
+          filters:
+            tags:
+              only: /^\d+\.\d+\.\d+$/
+            branches:
+              ignore: /^.*$/

data/.depfu.yml

@@ -0,0 +1,21 @@
+---
+update_strategy: security
+
+bundler:
+  update_strategy: grouped
+  update_out_of_spec: false
+  reasonably_up_to_date: true
+  automerge_method: squash
+  engine_update_strategy: minor
+  commit_message: ⬆️ Update {{dependency}} to version {{version}}
+  commit_message_grouped: ⬆️ Update {{update_type}} {{project_type}} dependencies ({{date}})
+  labels:
+    - dependencies
+    - depfu
+  security_labels:
+    - 🚨 security
+  auto_assign: otherguy
+  auto_review_team_assign: platform
+  grouped_update_schedule: biweekly
+  grouped_update_start_date: '2022-01-05'  # First wednesday of the year
+  grouped_update_time: '6:00'

data/.editorconfig

@@ -0,0 +1,19 @@
+# EditorConfig is awesome: http://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+# Unix-style newlines with a newline ending every file
+[*]
+indent_style = space
+indent_size = 2
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+charset = utf-8
+
+[*.rb]
+quote_type = double
+
+[*.md]
+indent_size = 4

data/.gitignore

@@ -7,16 +7,16 @@
 /spec/reports/
 /tmp/
 
-# rspec failure tracking
-spec/examples.txt
-
-.env.*.local
+# Rubocop
+.rubocop-*
+rubocop-result.json
 
-# CircleCI / RSpec JUnit formatter
-test-results
+# RSpec
+rspec/
+spec/examples.txt
 
+# Appraisals
 gemfiles/*.gemfile.lock
 
+# Examples
 examples/output
-
-.ruby-version

data/.grenrc.json

@@ -0,0 +1,20 @@
+{
+    "dataSource": "prs",
+    "prefix": "v",
+    "onlyMilestones": false,
+    "groupBy": {
+      "🚀 Enhancements:": ["enhancement", "feature", "internal"],
+      "🐞 Bugfixes:": ["bug", "fix"],
+      "🔧 Changes:": ["closed", "documentation"],
+      "🚨 Security": ["🚨 security", "security"],
+      "🔀 Dependencies": ["dependencies", "depfu"]
+    },
+    "template": {
+      "noLabel": "closed",
+      "changelogTitle": "# Changelog\n\n",
+      "release": "## {{release}}\n\n{{body}}\n",
+      "releaseSeparator": "\n",
+      "issue": "- {{name}} [{{text}}]({{url}})"
+    },
+    "changelogFilename": "CHANGELOG.md"
+}

data/.rspec

@@ -1,2 +1,7 @@
 --require spec_helper
 --color
+--format documentation
+--format RspecJunitFormatter
+--out rspec/rspec.xml
+--format RspecSonarqubeFormatter
+--out rspec/test-report.xml

data/.rubocop.yml

@@ -0,0 +1,43 @@
+---
+inherit_from: https://raw.githubusercontent.com/remove-bg/code-style/main/ruby/.rubocop.yml
+
+require:
+  - rubocop-performance
+  - rubocop-rspec
+  - rubocop-rake
+
+inherit_mode:
+  merge:
+    - Exclude
+
+AllCops:
+  NewCops: enable
+  TargetRubyVersion: 3.1
+  Exclude:
+    - gemfiles/**/*
+    - vendor/bundle/**/*
+
+Layout/LineLength:
+  Max: 180
+
+Gemspec/DevelopmentDependencies:
+  EnforcedStyle: gemspec
+
+Metrics/BlockLength:
+  Enabled: false
+
+Metrics/MethodLength:
+  Enabled: false
+
+Bundler/OrderedGems:
+  Enabled: true
+
+RSpec/DescribeClass:
+  Exclude:
+    - spec/integration/*
+
+RSpec/ExampleLength:
+  Max: 25
+
+RSpec/MultipleExpectations:
+  Max: 10

data/.tool-versions

@@ -0,0 +1 @@
+ruby 3.1.6 3.2.3 3.3.4

data/Appraisals

@@ -1,17 +1,56 @@
-# Oldest supported Faraday version
-appraise "faraday-0-15" do
-  gem "faraday", "~> 0.15.0"
+# frozen_string_literal: true
+
+# Faraday 2.0
+appraise "faraday-2-0" do
+  gem "faraday", "~> 2.0.0"
+end
+
+# Faraday 2.1
+appraise "faraday-2-1" do
+  gem "faraday", "~> 2.1.0"
+end
+
+# Faraday 2.2
+appraise "faraday-2-2" do
+  gem "faraday", "~> 2.2.0"
+end
+
+# Faraday 2.3
+appraise "faraday-2-3" do
+  gem "faraday", "~> 2.3.0"
+end
+
+# Faraday 2.4
+appraise "faraday-2-4" do
+  gem "faraday", "~> 2.4.0"
+end
+
+# Faraday 2.5
+appraise "faraday-2-5" do
+  gem "faraday", "~> 2.5.0"
+end
+
+# Faraday 2.6
+appraise "faraday-2-6" do
+  gem "faraday", "~> 2.6.0"
+end
+
+# Faraday 2.7
+appraise "faraday-2-7" do
+  gem "faraday", "~> 2.7.0"
 end
 
-appraise "faraday-0-16" do
-  gem "faraday", "~> 0.16.0"
+# Faraday 2.8
+appraise "faraday-2-8" do
+  gem "faraday", "~> 2.8.0"
 end
 
-appraise "faraday-0-17" do
-  gem "faraday", "~> 0.17.0"
+# Faraday 2.9
+appraise "faraday-2-9" do
+  gem "faraday", "~> 2.9.0"
 end
 
-# Latest in Faraday 1.x series
-appraise "faraday-1-x" do
-  gem "faraday", "~> 1.0"
+# Latest in Faraday 2.x series
+appraise "faraday-2-x" do
+  gem "faraday", "~> 2", "< 3"
 end

data/CHANGELOG.md

@@ -1,6 +1,23 @@
 # Changelog
 
-## Unreleased
+## 2.0.0
+
+- Deprecate `overwrite: true` in favour of `save!` and `save_zip!`
+- Remove support for Ruby 2.5, 2.6, 2.7 and 3.0 [which are EOL](https://www.ruby-lang.org/en/downloads/branches/)
+- Deprecate Faraday < 2, add support for all Faraday 2.x versions
+- Increase default timeout to 20 seconds
+
+---
+
+
+#### 🚀 Enhancements:
+
+- Add support for Faraday 2.x [#31](https://github.com/remove-bg/ruby/pull/31)
+
+#### 🚨 Security
+
+- 🚨 [security] Update rexml 3.2.6 → 3.2.8 (patch) [#27](https://github.com/remove-bg/ruby/pull/27)
+
 
 ## 1.5.0
 
@@ -14,7 +31,7 @@
 ## 1.4.0
 
 - Adds support for images up to 25 megapixels ([documentation](https://github.com/remove-bg/ruby#processing-images-over-10-megapixels))
-  - Requires an image processing library to be configured (ImageMagick, GraphicsMagick or libvips)
+- Requires an image processing library to be configured (ImageMagick, GraphicsMagick or libvips)
 
 ## 1.3.0
 

data/Gemfile

@@ -1,7 +1,4 @@
-source "https://rubygems.org"
+# frozen_string_literal: true
 
+source "https://rubygems.org"
 gemspec
-
-group :development do
-  gem "appraisal", git: "https://github.com/thoughtbot/appraisal.git", ref: "5868643"
-end