Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update rake to 12.3.3 #267

Merged
merged 6 commits into from
Jan 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
source 'https://rubygems.org'

gem 'rake', '12.3.3'
gem 'httparty', '0.16.3'

gemspec
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
require 'json'
require 'open3'
require 'rugged'
require 'tmpdir'

describe OctocatalogDiff::CatalogUtil::CachedMasterDirectory do
before(:all) do
Expand Down
13 changes: 7 additions & 6 deletions spec/octocatalog-diff/tests/spec_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@
require 'logger'
require 'rspec'
require 'rspec/retry'
require 'rubygems/package'
require 'tempfile'
require 'tmpdir'

# Enable SimpleCov coverage testing?
if ENV['COVERAGE']
Expand Down Expand Up @@ -209,23 +211,22 @@ def self.test_command(command)
# Check out fixture repo. The repository is a tarball; this extracts it to a temporary directory and returns
# the path where it was checked out. If the checkout fails, returns nil. Note: Be sure to include code in the
# caller to clean up the temporary directory upon exit.
# @param repo [String] Name of repository (in fixtures/git-repos/{repo}.tar)
# @param repo [String] Name of repository (in fixtures/git-repos/{repo}.tgz)
# @return [String] Path to checkout
def self.extract_fixture_repo(repo)
# If tar isn't here, don't do this
has_tar = test_command('tar --version')
return nil unless has_tar.nil?

# Make sure tarball is there
repo_tarball = fixture_path("git-repos/#{repo}.tar")
repo_tarball = fixture_path("git-repos/#{repo}.tgz")
raise Errno::ENOENT, "Repo tarball for #{repo} not found in #{repo_tarball}" unless File.file?(repo_tarball)

# Extract to temporary directory
extract_dir = Dir.mktmpdir
cmd = "tar -xf #{Shellwords.escape(repo_tarball)}"
extract_result, extract_code = Open3.capture2e(cmd, chdir: extract_dir)
return extract_dir if extract_code.exitstatus.zero?
raise "Failed to extract #{repo_tarball}: #{extract_result} (#{extract_code.exitstatus})"
io = File.open(repo_tarball, 'rb')
Gem::Package.new("").extract_tar_gz(io, extract_dir)
return extract_dir
end

# Clean up a temporary directory. This does nothing if the directory doesn't exist, or if it's nil.
Expand Down
Binary file added vendor/cache/ast-2.4.2.gem
Binary file not shown.
Binary file added vendor/cache/diff-lcs-1.5.0.gem
Binary file not shown.
Binary file added vendor/cache/diffy-3.4.2.gem
Binary file not shown.
Binary file added vendor/cache/facter-2.5.7.gem
Binary file not shown.
Binary file added vendor/cache/hashdiff-1.1.0.gem
Binary file not shown.
Binary file added vendor/cache/hiera-3.12.0.gem
Binary file not shown.
Binary file added vendor/cache/httparty-0.21.0.gem
Binary file not shown.
Binary file added vendor/cache/json-2.7.1.gem
Binary file not shown.
Binary file added vendor/cache/locale-2.1.3.gem
Binary file not shown.
Binary file added vendor/cache/mini_mime-1.1.5.gem
Binary file not shown.
Binary file added vendor/cache/multi_json-1.15.0.gem
Binary file not shown.
Binary file added vendor/cache/parallel-1.24.0.gem
Binary file not shown.
Binary file added vendor/cache/parser-2.7.2.0.gem
Binary file not shown.
Binary file added vendor/cache/powerpack-0.1.3.gem
Binary file not shown.
Binary file added vendor/cache/puppet-5.5.22.gem
Binary file not shown.
Binary file added vendor/cache/rake-12.3.3.gem
Binary file not shown.
Binary file added vendor/cache/ruby-progressbar-1.13.0.gem
Binary file not shown.
Binary file added vendor/cache/rugged-1.7.1.gem
Binary file not shown.
Binary file added vendor/cache/unicode-display_width-1.8.0.gem
Binary file not shown.
Loading