nu 0.2.6 → 0.2.6.1

data/lib/nu/app.rb

@@ -24,7 +24,8 @@ class App
 		@commands = []    
 
 		@arguments = arguments
-
+		@help_command = lambda{output_help}
+		
 		Nu::Api.set_log(lambda {|msg| log msg})
 		Nu::Api.set_out(lambda {|msg| disp msg})
 		@shim = CliShim.new(lambda {|msg| disp msg}, lambda {|msg| log msg})
@@ -59,8 +60,6 @@ class App
 					output_help
 				end
 	
-				@help_command = lambda{output_help}
-	
 		end.parse!
 	rescue
 		@commands << @help_command
@@ -141,7 +140,8 @@ class App
 
 		def assert_param_count(count)
 			unless @arguments.length == count
-				@help_command.call
+				@commands << @help_command
+				execute_commands
 			end
 		end
 

data/lib/nu/dependency_leveling/package_conflict_finder.rb

@@ -2,7 +2,9 @@ require 'rubygems'
 require File.expand_path(File.dirname(__FILE__) + "/analysis_results.rb")
 
 class PackageConflictFinder
-	def initialize(installed_packages)
+	def initialize(installed_packages, package_lister)
+		raise "package_lister must respond to find(name, version)" unless package_lister.respond_to?("find")
+		@package_lister = package_lister
 		@installed_packages = installed_packages
 	end
 	
@@ -34,12 +36,18 @@ class PackageConflictFinder
 			suggested_packages.reject! {|i| i[:name] == proposed_package.name}
 			suggested_packages << {:name=>proposed_package.name, :version=> req(proposed_package.version)}  
 
-			proposed_package.dependencies.each do |dep|
+			extract_dependencies(proposed_package, suggested_packages)
+			
+			return suggested_packages
+		end
+	
+		def extract_dependencies(package, suggested_packages)
+			package.dependencies.each do |dep|
 				unless suggested_packages.any?{|i| i[:name] == dep.name}
 					suggested_packages << {:name=>dep.name, :version=>dep.requirement}
+					extract_dependencies(@package_lister.find(dep.name, dep.requirement), suggested_packages)
 				end
 			end
-			return suggested_packages
 		end
 	
 		def find_conflicts(proposed_spec)

data/lib/nu/dependency_leveling/package_conflict_overlap_resolver.rb

@@ -3,10 +3,9 @@ require File.expand_path(File.dirname(__FILE__) + "/package_conflict_finder.rb")
 
 class PackageConflictOverlapResolver
 	def initialize(installed_packages, package_lister)
+		@conflict_finder = PackageConflictFinder.new(installed_packages, package_lister)
 		@installed_packages = installed_packages
-		raise "package_lister must respond to find(name)" unless package_lister.respond_to?("find")
 		@package_lister = package_lister
-		@conflict_finder = PackageConflictFinder.new(installed_packages)
 	end
 	
 	def analyze_proposal(proposed_package)

data/lib/nu/gem_tools.rb

@@ -11,7 +11,7 @@ module Nu
 			Gem::Dependency.new(spec,requirement)
 		end
 		
-		def find(package_name)
+		def find(package_name, requirement=nil)
 			dependency = dependency_from_requirement(package_name, nil)
 			fetcher = Gem::SpecFetcher.new
 			specs = fetcher.fetch(dependency, true)
@@ -21,7 +21,8 @@ module Nu
 				end
 				specs.sort! {|a,b| b.version <=> a.version}
 			end
-			specs
+			return specs unless requirement
+			return specs.detect {|spec| spec.satisfies_requirement?(dependency)} if requirement
 		end
 		
 		def remote_spec_for(spec, requirement=nil)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: nu
 version: !ruby/object:Gem::Version 
-  hash: 27
   prerelease: false
   segments: 
   - 0
   - 2
   - 6
-  version: 0.2.6
+  - 1
+  version: 0.2.6.1
 platform: ruby
 authors: 
 - Dru Sellers
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-25 00:00:00 -04:00
+date: 2010-10-01 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -29,7 +29,6 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 9
         segments: 
         - 2
         - 3
@@ -83,7 +82,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -92,7 +90,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 17
       segments: 
       - 1
       - 3