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.

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

Jump to bottom

Fix crash when gemspec is missing for a named gem #95

Merged
merged 2 commits into from Feb 24, 2013
Merged

Fix crash when gemspec is missing for a named gem #95

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e636bc6
Relocate gem_dependencies to helpers block
jfoy Feb 5, 2013
5939e48
Filter gems with nil specs out of the dependency report -- fixes crash
jfoy Feb 5, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
40 changes: 25 additions & 15 deletions lib/geminabox.rb
View file
Open in desktop
Expand Up @@ -54,21 +54,6 @@ def fixup_bundler_rubygems!
erb :atom, :layout => false erb :atom, :layout => false
end end


# Return a list of versions of gem 'gem_name' with the dependencies of each version.
def gem_dependencies(gem_name)
dependency_cache.marshal_cache(gem_name) do
load_gems.select {|gem| gem_name == gem.name }.map do |gem|
spec = spec_for(gem.name, gem.number)
{
:name => gem.name,
:number => gem.number.version,
:platform => gem.platform,
:dependencies => spec.dependencies.select {|dep| dep.type == :runtime}.map {|dep| [dep.name, dep.requirement.to_s] }
}
end
end
end

get '/api/v1/dependencies' do get '/api/v1/dependencies' do
query_gems = params[:gems].split(',') query_gems = params[:gems].split(',')
deps = query_gems.inject([]){|memo, query_gem| memo + gem_dependencies(query_gem) } deps = query_gems.inject([]){|memo, query_gem| memo + gem_dependencies(query_gem) }
Expand Down Expand Up @@ -253,5 +238,30 @@ def spec_for(gem_name, version)
spec_file = File.join(settings.data, "quick", "Marshal.#{Gem.marshal_version}", "#{gem_name}-#{version}.gemspec.rz") spec_file = File.join(settings.data, "quick", "Marshal.#{Gem.marshal_version}", "#{gem_name}-#{version}.gemspec.rz")
Marshal.load(Gem.inflate(File.read(spec_file))) if File.exists? spec_file Marshal.load(Gem.inflate(File.read(spec_file))) if File.exists? spec_file
end end

# Return a list of versions of gem 'gem_name' with the dependencies of each version.
def gem_dependencies(gem_name)
dependency_cache.marshal_cache(gem_name) do
load_gems.
select { |gem| gem_name == gem.name }.
map { |gem| [gem, spec_for(gem.name, gem.number)] }.
reject { |(_, spec)| spec.nil? }.
map do |(gem, spec)|
{
:name => gem.name,
:number => gem.number.version,
:platform => gem.platform,
:dependencies => runtime_dependencies(spec)
}
end
end
end

def runtime_dependencies(spec)
spec.
dependencies.
select { |dep| dep.type == :runtime }.
map { |dep| [dep.name, dep.requirement.to_s] }
end
end end
end end