nu 0.1.17 → 0.1.18

data/lib/nu/cli.rb

@@ -4,46 +4,54 @@ require 'yaml'
 
 module Nu
   class CLI < Thor
-	  include Thor::Actions
-	
-  	def initialize(*)
-  		super
-  		
-  		@proj = Nu::Project.new
-  	end
-	
+    include Thor::Actions
+
+    def initialize(*)
+      super
+
+      @proj = Nu::Project.new
+    end
+
     desc "install GEMNAME", "installs a gem in the 'pwd'"
-	  method_options :location => :string
-	
-  	def install(*names)
-	
-  		loc = @proj.location
-  		cl = options['location']
-  		loc = cl unless cl.nil?
-		
-		names.each do |n|
-			Nu::Loader.load n, loc
-		end
+	  method_options :location => :string, :version => :string
+
+    def install(*names)
+
+      loc = @proj.location
+      cl = options['location']
+  		ver = options['version']
+  		
+      loc = cl unless cl.nil?
+
+      names.each do |n|
+				loader = Nu::Loader.new(n, loc, ver)
+				loader.copy_to_lib
       end
-	
-  	desc "lib FOLDER", "where do you want to store the gems"
-  	def lib(folder)
-  		@proj.location= folder
-  	end
-	
-	desc "uselongnames", "turn the option of name + version number on"
-	def uselongnames
-		@proj.use_long_names
-	end
-	
-	desc "useshortnames", "turn the option of name + version number off"
-	def useshortnames
-		@proj.use_short_names
-	end
-	
-  	def self.source_root
-  		File.dirname(__FILE__)
-  	end
-	
+    end
+
+		desc "uninstall GEM", "remove the specified gem from the lib folder"
+		def uninstall(gem)
+			
+		end
+
+    desc "lib FOLDER", "where do you want to store the gems"
+    def lib(folder)
+      @proj.location= folder
+    end
+
+    desc "uselongnames", "turn the option of name + version number on"
+    def uselongnames
+      @proj.use_long_names
+    end
+
+    desc "useshortnames", "turn the option of name + version number off"
+    def useshortnames
+      @proj.use_short_names
+    end
+
+    def self.source_root
+      File.dirname(__FILE__)
+    end
+
   end
 end

data/lib/nu/gem_tools.rb

@@ -0,0 +1,29 @@
+require 'rubygems'
+
+module Nu
+	class GemTools
+		
+		def self.spec_for(name, requirement=nil)
+			unless requirement.respond_to?('satisfied_by?') 
+				requirement = Gem::Requirement.create(requirement)
+			end
+			dependency = Gem::Dependency.new(name,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)
+			gem = spec_for(name, requirement)
+			gem_path = gem.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
+		end
+
+	end
+end

data/lib/nu/lib_tools.rb

@@ -0,0 +1,22 @@
+require 'rubygems'
+
+module Nu
+	class LibTools
+		
+		def self.gemspec_for(name)
+      gems = Gem.source_index.find_name name
+      return gems.last if gems.length > 0
+    end
+
+		def self.folder_name_for(gem_name, lib, long_name=false)
+			  spec = gemspec_for(gem_name)
+
+	      if long_name
+	        name = spec.full_name
+	      else
+	        name = spec.name
+	      end
+	      Dir.pwd + "/#{lib}/#{name}"
+		end
+	end
+end

data/lib/nu/loader.rb

@@ -1,103 +1,92 @@
 require 'rubygems'
 require 'rubygems/dependency_installer'
+require File.expand_path(File.dirname(__FILE__) + "/lib_tools.rb")
+require File.expand_path(File.dirname(__FILE__) + "/gem_tools.rb")
+require File.expand_path(File.dirname(__FILE__) + "/project.rb")
 
 module Nu
   class Loader
     
-	def self.load(name)
-		load(name, 'lib')
-	end
-	
-	def self.load(name, location)
+		attr :gem_name
+		attr :location
+		attr :version
+		
+    def initialize(name, location, version)
       #improve the crap out of this
-      @gem_to_copy = name
-	  @location = location
+      @gem_name = name
+      @location = location
+      @version = version
 
-
-      if !Gem.available? @gem_to_copy
-        puts "Gem unavailable - trying to install"
-		begin
-			inst = Gem::DependencyInstaller.new
-			inst.install @gem_to_copy
-			inst.installed_gems.each do |spec|
-				puts "Successfully installed #{spec.full_name}"
-			end
-		rescue Gem::GemNotFoundException => e
-			puts "ERROR: #{e.message}"
-			return #GTFO
-		end
+      if !gem_available?
+        puts "Gem #{@gem_name} #{@version} is not installed locally - I am now going to try and install it"
+        begin
+          inst = Gem::DependencyInstaller.new
+          inst.install @gem_name, @version
+          inst.installed_gems.each do |spec|
+            puts "Successfully installed #{spec.full_name}"
+          end
+        rescue Gem::GemNotFoundException => e
+          puts "ERROR: #{e.message}"
+          return #GTFO
+        end
       else
         puts "Found Gem"
       end
       #TODO: better error handling flow control for above
-      
-      
-      start_here = get_copy_from()
-      puts "Copy From: #{start_here}"
-      
-      to = get_copy_to()
-      puts "Copy To: #{to}"
-      
-      FileUtils.copy_entry start_here, to
-	  
-	  process_dependencies
-	end
-	
-    def self.get_libdir(name)
-      g = get_gemspec name
-      #puts "GemSpec #{g.full_gem_path}"
-      l = g.full_gem_path
-      d = File.join(l,"lib")
-      #puts d
-      d
-    end
-    
-    def self.get_gemspec(name)
-	  gems = Gem.source_index.find_name name
-	  return gems.last if gems.length > 0
     end
-	    
-    def self.get_copy_from
-      libdir = get_libdir @gem_to_copy
-      #puts File.expand_path libdir
-	  #try Dir.glob("{bin,lib}/**/*")
-      libdir.gsub '{lib}','lib'
-    end
-    
-    def self.get_files
-      spec = get_gemspec @gem_to_copy
-      files = spec.lib_files #get full path
-      files
+
+		def copy_to_lib
+			start_here = copy_source
+			puts "Copy From: #{start_here}"
+
+			to = copy_dest
+			puts "Copy To: #{to}"
+
+			FileUtils.copy_entry start_here, to
+
+			process_dependencies
+		end
+
+		def gemspec
+			Nu::GemTools.spec_for(@gem_name, @version)
+		end
+
+		def gem_available?
+			Gem.available? @gem_name, @version
+		end
+
+    def copy_source
+      Nu::GemTools.lib_for(@gem_name, @version).gsub '{lib}','lib'
     end
-    
-    def self.get_copy_to
-	  proj = Nu::Project.new
-	  
-      spec = get_gemspec @gem_to_copy
+
+    def copy_dest
+      proj = Nu::Project.new
+
       #to be used in copying
-	  if proj.should_use_long_names?
-		name = spec.full_name
-	  else
-		name = spec.name
-	  end
+      if proj.should_use_long_names?
+        name = gemspec.full_name
+      else
+        name = gemspec.name
+      end
       to = Dir.pwd + "/#{@location}/#{name}"
       if Dir[to] == [] #may need a smarter guy here
         FileUtils.mkpath to
       end
       to
     end
-	
-	def self.process_dependencies
-		spec = get_gemspec @gem_to_copy
-		spec.dependencies.each do |d|
-			if Gem.available? d.name
-				puts "loading #{d.name}"
-				load d.name, @location
-			else
-				puts "#{d.name} is not installed locally"
-				puts "please run 'gem install #{d.name}"
-			end
-		end
-	end
+
+    def process_dependencies
+      gemspec.dependencies.each do |d|
+        if Gem.available? d.name
+          puts "Loading dependency: #{d.name} #{d.requirement}"
+					loader = Loader.new(d.name, @location, d.requirement)
+					loader.copy_to_lib
+        else
+          puts "#{d.name} is not installed locally"
+          puts "please run 'gem install #{d.name}"
+        end
+      end
+    end
+
   end
 end

data/lib/nu/project.rb

@@ -2,74 +2,73 @@ require 'FileUtils'
 
 module Nu
   class Project
-  
+
     def initialize
       @config_file = ".nu/options.yaml"
-	  ensure_default_config
+      ensure_default_config
     end
 
-
-  
-	#need to meta awesome this
+    # need to meta awesome this
     def location
-  		opts = get_options
-  		opts['lib']
-  	end
-	#need to meta awesome this
-  	def location=(name)
-		opts = get_options
-		opts['lib']=name
-		save_file(opts)
-		nil
+      opts = get_options
+      opts['lib']
+    end
+
+    # need to meta awesome this
+    def location=(name)
+      opts = get_options
+      opts['lib']=name
+      save_file(opts)
+      nil
+    end
+
+    #need to meta awesome this
+    def should_use_long_names?
+      opts = get_options
+      opts['uselongnames']
+    end
+
+    #need to meta awesome this
+    def use_long_names
+      opts = get_options
+      opts['uselongnames']=true
+      save_file(opts)
+      nil
+    end
+
+    #need to meta awesome this
+    def use_short_names
+      opts = get_options
+      opts['uselongnames']=false
+      save_file(opts)
+      nil
     end
-	
-	#need to meta awesome this
-	def should_use_long_names?
-		opts = get_options
-		opts['uselongnames']
-	end
-	
-	#need to meta awesome this
-	def use_long_names
-		opts = get_options
-		opts['uselongnames']=true
-		save_file(opts)
-		nil
-	end
-	#need to meta awesome this
-	def use_short_names
-		opts = get_options
-		opts['uselongnames']=false
-		save_file(opts)
-		nil
-	end
-	
-    
+
     def add_file(name, content)
       FileUtils.mkdir_p(File.dirname(name))
       File.open(name, 'w'){|f| f.write(content)}
     end
-	
-	private
-	    def ensure_default_config
-			if File.exist? @config_file
-				return
-			end
-  		
-			save_file( {'lib'=>'lib','uselongnames'=>false} )
-		end
-		
-		def get_options
-			YAML.load_file @config_file
-		end
-		
-		def save_file(opts)
-			content = YAML::dump(opts)
-			File.delete @config_file if File.exist? @config_file
-			dir_name = File.dirname(@config_file)
-			FileUtils.mkdir_p(dir_name) unless File.exist? dir_name
-			File.open(@config_file, 'w') {|f| f.write(content) }
-		end
-    
+
+    private
+    def ensure_default_config
+      if File.exist? @config_file
+        return
+      end
+
+      save_file( {'lib'=>'lib','uselongnames'=>false} )
+    end
+
+    def get_options
+      YAML.load_file @config_file
+    end
+
+    def save_file(opts)
+      content = YAML::dump(opts)
+      File.delete @config_file if File.exist? @config_file
+      dir_name = File.dirname(@config_file)
+      FileUtils.mkdir_p(dir_name) unless File.exist? dir_name
+      File.open(@config_file, 'w') {|f| f.write(content) }
+    end
+
   end
-end
+end

metadata

@@ -1,23 +1,24 @@
 --- !ruby/object:Gem::Specification 
 name: nu
 version: !ruby/object:Gem::Version 
-  hash: 57
+  hash: 63
   prerelease: false
   segments: 
   - 0
   - 1
-  - 17
-  version: 0.1.17
+  - 18
+  version: 0.1.18
 platform: ruby
 authors: 
 - Dru Sellers
 - Chris Patterson
 - Rob Reynold
+- Travis Smith
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-07-22 00:00:00 -05:00
+date: 2010-08-25 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -49,6 +50,8 @@ files:
 - bin/nu
 - lib/nu/cli.rb
 - lib/nu/config.rb
+- lib/nu/gem_tools.rb
+- lib/nu/lib_tools.rb
 - lib/nu/loader.rb
 - lib/nu/project.rb
 - lib/nu.rb