Skip to content
This repository has been archived by the owner on Sep 11, 2020. It is now read-only.

Commit

Permalink
Merge branch 'release/0.2.6'
Browse files Browse the repository at this point in the history
  • Loading branch information
brendanjerwin committed Sep 25, 2010
2 parents b2d167d + a772640 commit ae067d5
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 7 deletions.
5 changes: 3 additions & 2 deletions lib/nu/dependency_leveling/package_conflict_finder.rb
Expand Up @@ -35,8 +35,9 @@ def initialized_suggested_packages(proposed_package)
suggested_packages << {:name=>proposed_package.name, :version=> req(proposed_package.version)}

proposed_package.dependencies.each do |dep|
suggested_packages.reject! {|i| i[:name] == dep.name}
suggested_packages << {:name=>dep.name, :version=>dep.requirement}
unless suggested_packages.any?{|i| i[:name] == dep.name}
suggested_packages << {:name=>dep.name, :version=>dep.requirement}
end
end
return suggested_packages
end
Expand Down
2 changes: 1 addition & 1 deletion nu.gemspec
Expand Up @@ -4,7 +4,7 @@ $:.unshift lib unless $:.include?(lib)

Gem::Specification.new do |s|
s.name = "nu"
s.version = "0.2.6.pre1"
s.version = "0.2.6"
s.platform = Gem::Platform::RUBY
s.authors = ["Dru Sellers","Brendan Erwin", "Rob Reynold", "Travis Smith" ]
s.email = ["nu-net@googlegroups.com"]
Expand Down
4 changes: 0 additions & 4 deletions specs/loader.rspec
Expand Up @@ -12,10 +12,6 @@ describe Nu::Loader do
@loader.gemspec.name.should eql('rspec')
end

it 'should know if a gem is available' do
@loader.gem_available?.should eql(true)
end

it 'should know the source dir' do
spec = Nu::GemTools.new.spec_for('rspec')
@loader.copy_source.should eql(File.join(spec.full_gem_path,'lib'))
Expand Down

0 comments on commit ae067d5

Please sign in to comment.