From 02785b2eba966f1ea521d6af7d04c14cdb7bd514 Mon Sep 17 00:00:00 2001 From: Felipe <41008398+StrawberryMaster@users.noreply.github.com> Date: Thu, 5 Dec 2024 12:00:44 +0000 Subject: [PATCH] Workflow fixes, pt. 1 --- .github/workflows/ruby.yml | 8 ++++++-- lib/wayback_machine_downloader.rb | 3 ++- wayback_machine_downloader.gemspec | 1 + 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml index ab09123..be27572 100644 --- a/.github/workflows/ruby.yml +++ b/.github/workflows/ruby.yml @@ -18,7 +18,6 @@ permissions: jobs: test: - runs-on: ubuntu-latest strategy: matrix: @@ -31,5 +30,10 @@ jobs: with: ruby-version: ${{ matrix.ruby-version }} bundler-cache: true # runs 'bundle install' and caches installed gems automatically + - name: Install correct Bundler version + run: | + if [[ "${{ matrix.ruby-version }}" == "2.7" ]]; then + gem install bundler -v "~> 2.4.0" + fi - name: Run tests - run: bundle exec rake + run: bundle exec rake \ No newline at end of file diff --git a/lib/wayback_machine_downloader.rb b/lib/wayback_machine_downloader.rb index 20b4630..c7d2e2d 100644 --- a/lib/wayback_machine_downloader.rb +++ b/lib/wayback_machine_downloader.rb @@ -42,7 +42,7 @@ class WaybackMachineDownloader @exclude_filter = params[:exclude_filter] @all = params[:all] @maximum_pages = params[:maximum_pages] ? params[:maximum_pages].to_i : 100 - @threads_count = [params[:threads_count].to_i, 1].max # at least 1 thread + @threads_count = [params[:threads_count].to_i, 1].max # Garante mínimo de 1 thread @timeout = params[:timeout] || DEFAULT_TIMEOUT @logger = setup_logger @http_cache = Concurrent::Map.new @@ -339,6 +339,7 @@ class WaybackMachineDownloader def validate_params(params) raise ArgumentError, "Base URL is required" unless params[:base_url] raise ArgumentError, "Maximum pages must be positive" if params[:maximum_pages] && params[:maximum_pages].to_i <= 0 + # Removida validação de threads_count pois agora é forçado a ser positivo end def setup_logger diff --git a/wayback_machine_downloader.gemspec b/wayback_machine_downloader.gemspec index 67ea8f2..e751877 100644 --- a/wayback_machine_downloader.gemspec +++ b/wayback_machine_downloader.gemspec @@ -12,6 +12,7 @@ Gem::Specification.new do |s| s.homepage = "https://github.com/hartator/wayback-machine-downloader" s.license = "MIT" s.required_ruby_version = '>= 1.9.2' + s.add_runtime_dependency 'concurrent-ruby', '~> 1.2' s.add_development_dependency 'rake', '~> 12.2' s.add_development_dependency 'minitest', '~> 5.2' end