Skip to content

Allow solr_wrapper to download the code from an arbitrary URL. #123

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.

Sign up for GitHub

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

Open
eddierubeiz wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Allow solr_wrapper to download the code from an arbitrary URL. #123

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 12 additions & 1 deletion lib/solr_wrapper/instance.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,9 +256,11 @@ def extract
return config.instance_dir if extracted?

zip_path = download
top_level_dir = nil

begin
Zip::File.open(zip_path) do |zip_file|
top_level_dir = guess_top_dir(zip_file)
# Handle entries one by one
zip_file.each do |entry|
dest_file = File.join(config.tmp_save_dir, entry.name)
Expand All @@ -273,7 +275,7 @@ def extract

begin
FileUtils.remove_dir(config.instance_dir, true)
FileUtils.cp_r File.join(config.tmp_save_dir, File.basename(config.download_url, ".zip")), config.instance_dir
FileUtils.cp_r File.join(config.tmp_save_dir, top_level_dir), config.instance_dir
self.extracted_version = config.version
FileUtils.chmod 0755, config.solr_binary
rescue Exception => e
Expand All @@ -292,6 +294,15 @@ def extracted?
File.exist?(config.solr_binary) && extracted_version == config.version
end

# Guess the name of the top level
# directory within the downloaded zip file
# (e.g. "solr-1.2.3").
# Assumes there's only one such directory.
def guess_top_dir(zip_file)
dir = zip_file.entries.find { |e| e.name[/^[^\/]+[\/]?$/] }
dir.name.tr('/', '')
end

def download
unless File.exist?(config.solr_zip_path) && checksum_validator.validate?(config.solr_zip_path)
Downloader.fetch_with_progressbar config.download_url, config.solr_zip_path
Expand Down