remove_bg 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ef5b34e46cd2739b86ea655145faa5984a5a3ceae1767e9a6ea4a8d5ad950182
-  data.tar.gz: 95146d0326251ec59a60843a4cecc2b0b8ebbdbfdb047b33b3b1684db62b2506
+  metadata.gz: d98c7854629bfaf9f54f3bfdc1da555a74e824644b14ce959af79c1fdc002cb7
+  data.tar.gz: f39fb1824c889096aea5581cc1c31eb775c94fa2ffbc2fb474720aeb07d5e2c4
 SHA512:
-  metadata.gz: 6ece195e014cc84b8fc6843d31f6a311499fd267da4e6e8c70c5b1d5b8c08521fa665d7347b5f4a6c55a74daa2dfbbc1cf99c59c6bdf5bd6d8001839371b7d9a
-  data.tar.gz: 68cdac8ec969b29b842955e24a14b160b3e5b33b766e1835dce9ddb49e05f0b61beedd7471a2dd395166823b9709fee580185bdb0a451c810b32b2b0626e2102
+  metadata.gz: 6e71d886ea81021acd12f9ae51bed5b31a7eb68a82873914770ccd8f3ed93a35d05353b3413983a59bf8fcafab9a27b42ecb61537b5228b95e5ddb2b95a17773
+  data.tar.gz: 8974ee1e97ee15e53497c9bbe06537257306c279d1d4121f7307041318a11d350e243cbf4c6f33638167046927f570c33294909d6277ecbce253e74601b9d877

data/.circleci/config.yml

@@ -4,10 +4,10 @@ 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
-  gcr: circleci/gcp-gcr@0.16
   github: circleci/github-cli@2.3
 
 # Pipeline parameters
@@ -18,7 +18,7 @@ parameters:
     default: main
   default-ruby:
     type: string
-    default: "3.3.3"
+    default: "3.3.4"
 
 # Define common YAML anchors
 x-common-auth: &common-auth
@@ -43,7 +43,7 @@ jobs:
     docker:
       - image: cimg/base:stable
         <<: *common-auth
-    resource_class: small
+    resource_class: medium
     steps:
       # Check out code
       - checkout
@@ -78,7 +78,6 @@ jobs:
       # The OS to run the jobs on
       ruby-version:
         type: string
-        default: "3.3.3"
     executor: << parameters.os >>
     environment:
       RUBY_VERSION: << parameters.ruby-version >>
@@ -92,8 +91,9 @@ jobs:
                 name: Install ImageMagick, libvips and libffi
                 command: |
                   sudo apt-get update
-                  sudo apt-get -y --no-install-recommends install openssl imagemagick \
-                    libvips42 libffi-dev libreadline-dev libtool libyaml-dev
+                  sudo apt-get -y --no-install-recommends install \
+                    imagemagick libvips42 libffi-dev libreadline-dev \
+                    libyaml-dev openssl libtool
             - asdf/install
       - when:
           condition:
@@ -136,8 +136,12 @@ jobs:
       - when:
           condition:
             and:
-              - equal: ["docker", "<< parameters.os >>"]
-              - equal: ["<< pipeline.parameters.default-ruby >>", "<< parameters.ruby-version >>"]
+              - equal:
+                  - "docker"
+                  - "<< parameters.os >>"
+              - equal:
+                  - "<< pipeline.parameters.default-ruby >>"
+                  - "<< parameters.ruby-version >>"
           steps:
             - persist_to_workspace:
                 root: .
@@ -181,19 +185,34 @@ jobs:
     docker:
       - image: cimg/base:stable
         <<: *common-auth
-    resource_class: small
+    resource_class: medium+
     environment:
       GIT_MAIN_BRANCH: << pipeline.parameters.main-branch >>
       CHANGELOG_FILENAME: CHANGELOG.md
     steps:
-      - setup_remote_docker
+      - 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
-      - attach_workspace:
-          at: .
-      - github/install:
-          version: 2.47.0
-      - ruby/install:
-          version: "<< pipeline.parameters.default-ruby >>"
+      - run:
+          name: Check out main branch
+          command: git checkout --force "${GIT_MAIN_BRANCH}"
       # Install dependencies using bundler
       - ruby/install-deps:
           pre-install-steps:
@@ -211,47 +230,58 @@ jobs:
             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}"]
-      - gcr/gcr-auth
-      - run:
-          name: Edit Release
-          command: |
-            # Update release
-            docker run --rm -it --name=gren -v $(pwd)/.grenrc.json:/.grenrc.json \
-              eu.gcr.io/removebg-226919/github-release-notes:latest \
-              release --tags "${CIRCLE_TAG}" --override --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-body.txt
-
-            # Append to release description
-            echo "Updating release description"
-            gh release edit ${CIRCLE_TAG} --repo ${CIRCLE_PROJECT_USERNAME}/${CIRCLE_PROJECT_REPONAME} --notes-file release-body.txt --latest --title ${CIRCLE_TAG}
+            bundle install
       - run:
-          name: Generate CHANGELOG.md
+          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}"
 
-            # Check out main branch
-            git checkout --force "${GIT_MAIN_BRANCH}"
+            # Install GitHub Release Notes
+            npm install github-release-notes -g
 
-            # Generate changelog
-            docker run -it --name=gren -v $(pwd)/.grenrc.json:/.grenrc.json \
-              eu.gcr.io/removebg-226919/github-release-notes:latest \
-              changelog --override --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-body.txt
 
-            docker cp "gren:/${CHANGELOG_FILENAME}" "${CHANGELOG_FILENAME}"
-            docker rm gren
+            # 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}"
-            git add lib/remove_bg/version.rb
-            git add Gemfile.lock
+            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}
 
@@ -267,7 +297,7 @@ workflows:
           matrix:
             parameters:
               os: ["docker", "macos"]
-              ruby-version: ["3.1.6", "3.2.3", "3.3.3"]
+              ruby-version: ["3.1.6", "3.2.3", "3.3.4"]
           filters:
             tags:
               only: /^\d+\.\d+\.\d+$/
@@ -298,6 +328,7 @@ workflows:
       - release:
           context:
             - DockerHub
+            - GitHub
             - rubygems.org
             - Google Cloud kaleido
           requires:

data/.tool-versions

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

data/CHANGELOG.md

@@ -3,10 +3,22 @@
 ## 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
+- 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
 
 - Auto-detect any available image processing libraries
@@ -19,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.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    remove_bg (2.0.0)
+    remove_bg (2.0.1)
       faraday (>= 2, <= 3)
       faraday-multipart (~> 1.0)
       faraday-retry (~> 2.2)
@@ -25,8 +25,9 @@ GEM
       rexml
     diff-lcs (1.5.1)
     docile (1.4.0)
-    faraday (2.9.2)
+    faraday (2.10.0)
       faraday-net_http (>= 2.0, < 3.2)
+      logger
     faraday-multipart (1.0.4)
       multipart-post (~> 2)
     faraday-net_http (3.1.0)
@@ -43,13 +44,14 @@ GEM
       ruby-vips (>= 2.0.17, < 3)
     json (2.7.2)
     language_server-protocol (3.17.0.3)
+    logger (1.6.0)
     method_source (1.1.0)
-    mini_magick (4.13.1)
+    mini_magick (4.13.2)
     multipart-post (2.4.1)
     net-http (0.4.1)
       uri
     parallel (1.25.1)
-    parser (3.3.3.0)
+    parser (3.3.4.0)
       ast (~> 2.4.1)
       racc
     pry (0.14.2)
@@ -60,7 +62,7 @@ GEM
     rainbow (3.1.1)
     rake (13.2.1)
     regexp_parser (2.9.2)
-    rexml (3.3.1)
+    rexml (3.3.2)
       strscan
     rspec (3.13.0)
       rspec-core (~> 3.13.0)
@@ -82,13 +84,13 @@ GEM
       rspec (~> 3.0)
     rspec_junit_formatter (0.6.0)
       rspec-core (>= 2, < 4, != 2.12.0)
-    rubocop (1.64.1)
+    rubocop (1.65.0)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
+      regexp_parser (>= 2.4, < 3.0)
       rexml (>= 3.2.5, < 4.0)
       rubocop-ast (>= 1.31.1, < 2.0)
       ruby-progressbar (~> 1.7)
@@ -100,7 +102,7 @@ GEM
       rubocop-ast (>= 1.31.1, < 2.0)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (3.0.2)
+    rubocop-rspec (3.0.3)
       rubocop (~> 1.61)
     ruby-progressbar (1.13.0)
     ruby-vips (2.2.1)

data/README.md

@@ -11,7 +11,7 @@
 [![Codecov](https://img.shields.io/codecov/c/github/remove-bg/ruby?style=for-the-badge&logo=codecov&logoColor=aaa)](https://app.codecov.io/gh/remove-bg/ruby)
 [![Sonar Quality Gate](https://img.shields.io/sonar/quality_gate/remove-bg_ruby?server=https%3A%2F%2Fsonarcloud.io&style=for-the-badge&logo=sonarcloud&logoColor=aaa)](https://sonarcloud.io/summary/overall?id=remove-bg_ruby)
 [![Violations](https://img.shields.io/sonar/violations/remove-bg_ruby?server=https%3A%2F%2Fsonarcloud.io&format=short&style=for-the-badge&logo=sonarcloud&logoColor=aaa)](https://sonarcloud.io/summary/overall?id=remove-bg_ruby)
-![Depfu](https://img.shields.io/depfu/dependencies/github/remove-bg%2Fruby?style=for-the-badge&logo=dependabot&logoColor=aaa)
+[![Dependencies](https://img.shields.io/depfu/dependencies/github/remove-bg%2Fruby?style=for-the-badge&logo=dependabot&logoColor=aaa)](https://github.com/remove-bg/ruby/network/dependencies)
 
 </p>
 

data/lib/remove_bg/upload.rb

@@ -10,7 +10,7 @@ module RemoveBg
       raise RemoveBg::FileMissingError.new(file_path) unless File.exist?(file_path)
 
       content_type = determine_content_type(file_path)
-      FARADAY_FILE.new(file_path, content_type)
+      Faraday::Multipart::FilePart.new(file_path, content_type)
     end
 
     def self.determine_content_type(file_path)
@@ -23,10 +23,5 @@ module RemoveBg
     end
 
     private_class_method :determine_content_type
-
-    FARADAY_FILE = File
-    FARADAY_FILE = Faraday::Multipart::FilePart if defined?(Faraday::Multipart::FilePart)
-
-    private_constant :FARADAY_FILE
   end
 end

data/lib/remove_bg/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RemoveBg
-  VERSION = "2.0.0"
+  VERSION = "2.0.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: remove_bg
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Canva Austria GmbH
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-07-03 00:00:00.000000000 Z
+date: 2024-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -373,6 +373,7 @@ files:
 - ".grenrc.json"
 - ".rspec"
 - ".rubocop.yml"
+- ".tool-versions"
 - Appraisals
 - CHANGELOG.md
 - Gemfile