nu 0.2.4 → 0.2.5

data/lib/nu/api.rb

@@ -39,6 +39,9 @@ module Nu
 				log YAML.dump(@project_settings).gsub('!ruby/object:OpenStruct','').gsub(/\s*table:/,'').gsub('---','')
 				log ""
 			end
+			
+			@lib_tools = Nu::LibTools.new
+			@gem_tools = Nu::GemTools.new
 		end
 	
 		def self.store_setting(name, value)
@@ -72,7 +75,7 @@ module Nu
 		end
 	
 		def self.version_string
-			nu_spec = Nu::GemTools.spec_for("nu")
+			nu_spec = @gem_tools.spec_for("nu")
 			"Nubular, version #{nu_spec.version}"
 		end
 		
@@ -88,7 +91,38 @@ module Nu
 		
 		def self.report()
 			log "Report called."
-			Nu::LibTools.read_specs_from_lib(@project_settings.lib.location)
+			@lib_tools.read_specs_from_lib(@project_settings.lib.location)
+		end
+		
+		def self.retrieve_specification_with_version(name, version, source = {:from => :lib})
+			log "Retrieve Specification With Version called. Name: #{name} Version: #{version} Source: #{source}"
+			
+			return case source[:from]
+			when :cache then
+				@gem_tools.spec_for(name, version)
+			when :remote then
+				@gem_tools.remote_spec_for(name, version)
+			else
+				raise "source can only be :cache, or :remote"
+			end
+		end
+		
+		def self.retrieve_specification(name, source = {:from => :lib})
+			log "Retrieve Specification called. Name: #{name} Source: #{source}"
+			
+			return case source[:from]
+			when :lib then
+				installed = @lib_tools.read_specs_from_lib(@project_settings.lib.location)
+				installed.select{|spec| spec.name == name}.first
+			when :cache then
+				@gem_tools.spec_for(name)
+			when :remote then
+				@gem_tools.remote_spec_for(name)
+			else
+				raise "source can only be :lib, :cache, or :remote"
+			end
+			
+
 		end
 		
 		private 

data/lib/nu/app.rb

@@ -23,15 +23,16 @@ class App
 
 		@arguments = arguments
 
+		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})
+		
 		#special case, they want to know our version
 		if arguments.length == 1 && (arguments[0] == '--version' || arguments[0] == '-v')
-			output_version
+			@commands << lambda {output_version}
+			execute_commands
 			exit 0
 		end
-
-		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})
 		
 		begin
 			OptionParser.new do |opts|
@@ -57,14 +58,13 @@ class App
 				end
 
 				# Specify options
+				@options.source = :lib
+				opts.on('--remote', 'Use package server for query operations.') {@options.source = :remote}
+				opts.on('--cache', 'Use local package cache for query operations.') {@options.source = :cache unless @options.source == :remote}
 				opts.on('-V', '--verbose')    { @options.verbose = true }  
 				opts.on('-q', '--quiet')      { @options.quiet = true }
 				opts.on('--json', 'Run in JSON mode. All outputs will be in JSON, status messages silenced.') do 
-					@options.json = true
-					@shim = JsonShim.new(lambda do |json|
-						 puts json
-						 log_to_file(json)
-						end, lambda {|msg| log msg})
+					set_json
 				end
 
 				opts.on_tail( '-h', '--help', 'Display this screen' ) do
@@ -75,7 +75,9 @@ class App
 	
 		end.parse!
 	rescue
-		@help_command.call
+		@commands << @help_command
+		execute_commands
+		exit 0
 	end
 	
 		post_process_options
@@ -87,29 +89,40 @@ class App
     if arguments_valid? 
       
       log "Start at #{DateTime.now}\n\n"
-      output_version if @options.verbose
       output_inputs if @options.verbose
       
-			Nu::Api.load_project_settings('nuniverse.yaml')
-			
-			@commands.reverse.each {|command| command.call}
+			execute_commands
 
       log "\nFinished at #{DateTime.now}"
       
     else
-      @help_command.call
+      @commands << @help_command
+			execute_commands
+			exit 0
     end
       
   end
   
   protected
 
+		def execute_commands
+			Nu::Api.load_project_settings('nuniverse.yaml')
+			@commands.reverse.each {|command| command.call}
+		end
+
 		def extract_commands
 			if @arguments.length > 0
 				@options.command = @arguments[0].downcase
 				case @options.command
 				when 'report'
 					@commands << lambda {@shim.report}
+				when 'specification'
+					if @options.source == :lib && @options.package_version
+						puts "The --version flag can not be used with the specification command unless either --cache or --remote is also specified." 
+						exit 1
+					end
+					set_json
+					@commands << lambda {@shim.specification(@arguments[1], @options.package_version, @options.source)}
 				when 'install'
 					assert_param_count(2)
 					@options.package = @arguments[1]
@@ -194,4 +207,12 @@ class App
 				@file_logger.debug("#{DateTime.now} - #{msg.strip}")
 			end
 		end
+		
+		def set_json
+			@options.json = true
+			@shim = JsonShim.new(lambda do |json|
+				 puts json
+				 log_to_file(json)
+				end, lambda {|msg| log msg})
+		end
 end

data/lib/nu/gem_tools.rb

@@ -4,29 +4,42 @@ require 'yaml'
 module Nu
 	class GemTools
 		
-		def self.spec_for(spec, requirement=nil)
+		def dependency_from_requirement(spec, requirement)
 			unless requirement.respond_to?('satisfied_by?') 
 				requirement = Gem::Requirement.create(requirement)
 			end
-			dependency = Gem::Dependency.new(spec,requirement)
+			Gem::Dependency.new(spec,requirement)
+		end
+		
+		def remote_spec_for(spec, requirement=nil)
+			dependency = dependency_from_requirement(spec, nil)
+			fetcher = Gem::SpecFetcher.new
+			specs = fetcher.fetch(dependency, true)
+			dependency = dependency_from_requirement(spec, requirement)
+			unless specs == nil
+				specs.map! do |item| 
+					item.first
+				end
+				specs.sort! {|a,b| b.version <=> a.version}
+				specs.detect {|spec| spec.satisfies_requirement?(dependency)}
+			end
+		end
+		
+		def spec_for(spec, requirement=nil)
+			dependency = dependency_from_requirement(spec, requirement)
 			searcher = Gem::GemPathSearcher.new()
 			all_installed_gems = searcher.init_gemspecs()
-			
+
       return all_installed_gems.detect {|spec| spec.satisfies_requirement?(dependency)}
     end
 
-		def self.lib_for(name, requirement=nil)
+		def lib_for(name, requirement=nil)
 			spec = spec_for(name, requirement)
 			gem_path = spec.full_gem_path
-			libdir = File.join(gem_path,"lib")
-			unless File.exist?(libdir)
-			  libdir = IO.readlines(File.join(gem_path, ".require_paths"))[0].strip 
-			  libdir = File.expand_path(File.join(gem_path,libdir))
-			end
-			libdir
+			File.expand_path(File.join(gem_path,spec.require_paths.first))
 		end
 
-		def self.write_spec(spec, dest)
+		def write_spec(spec, dest)
 			dest = File.expand_path(dest)
 			dest = File.join(dest,'nu_spec.yaml')
 			

data/lib/nu/json_shim.rb

@@ -17,4 +17,13 @@ class JsonShim < HasOutAndLog
 		out ({:name => name, :value => Nu::Api.get_setting(name) }.to_json)
 	end
 	
+	def specification(name, version, source)
+		log "Json Shim Specification called. name: #{name} version: #{version} source:#{source}"
+		if version == nil
+			out Nu::Api.retrieve_specification(name, :from => source).to_json
+		else
+			out Nu::Api.retrieve_specification_with_version(name, version, :from => source).to_json
+		end
+	end
+	
 end

data/lib/nu/lib_tools.rb

@@ -3,14 +3,15 @@ require 'rubygems'
 module Nu
 	class LibTools
 		
-		def self.folder_for(spec, lib, long_name=false)
+		def folder_for(spec, lib, long_name=false)
+			lib = File.expand_path(lib)
       if long_name
         name = spec.full_name
       else
         name = spec.name
       end
 
-      to = Dir.pwd + "/#{lib}/#{name}"
+      to = "#{lib}/#{name}"
 			if Dir[to] == [] #may need a smarter guy here
 	      FileUtils.mkpath to
       end
@@ -18,7 +19,7 @@ module Nu
 			return to
 		end
 		
-		def self.read_specs_from_lib(lib)
+		def read_specs_from_lib(lib)
 			lib = File.expand_path(lib)
 			glob = "#{lib}/**/nu_spec.yaml"
 			files = Dir.glob(glob)

data/lib/nu/loader.rb

@@ -17,6 +17,8 @@ module Nu
       @gem_name = name
       @location = location
       @version = version
+			@lib_tools = Nu::LibTools.new
+			@gem_tools = Nu::GemTools.new
 			super(out, log)
     end
 
@@ -47,13 +49,13 @@ module Nu
 			log "Copy To: #{to}"
 
 			FileUtils.copy_entry start_here, to
-			Nu::GemTools.write_spec(gemspec, to)
+			@gem_tools.write_spec(gemspec, to)
 
 			process_dependencies
 		end
 
 		def gemspec
-			Nu::GemTools.spec_for(@gem_name, @version)
+			@gem_tools.spec_for(@gem_name, @version)
 		end
 
 		def gem_available?
@@ -65,11 +67,11 @@ module Nu
 		end
 
     def copy_source
-      Nu::GemTools.lib_for(@gem_name, @version).gsub '{lib}','lib'
+      @gem_tools.lib_for(@gem_name, @version).gsub '{lib}','lib'
     end
 
     def copy_dest
-			Nu::LibTools.folder_for(gemspec, @location, @long_names)
+			@lib_tools.folder_for(gemspec, @location, @long_names)
     end
 
     def process_dependencies

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: nu
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 0
   - 2
-  - 4
-  version: 0.2.4
+  - 5
+  version: 0.2.5
 platform: ruby
 authors: 
 - Dru Sellers
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-02 00:00:00 -05:00
+date: 2010-09-10 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency