nu 0.1.19 → 0.2.0

data/bin/nu

@@ -3,7 +3,9 @@
 require 'nu'
 
 begin
-	Nu::CLI.start
+	# Create and run the application
+	app = App.new(ARGV, STDIN, STDOUT)
+	app.run
 rescue Interrupt
 	puts 'quitting'
 	exit 1

data/lib/nu.rb

@@ -2,9 +2,6 @@ here = File.expand_path(File.dirname(__FILE__))
 
 $LOAD_PATH << "#{here}"
 
-require 'nu/cli'
-require 'nu/loader'
-require 'nu/config'
-require 'nu/project'
+require 'nu/app'
 
 #other fancy stuff

data/lib/nu/api.rb

@@ -0,0 +1,114 @@
+require 'rubygems'
+require 'ostruct'
+
+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__) + "/settings.rb")
+
+module Nu
+	class Api
+		
+		def self.out(out)
+			@stdout = out
+		end
+		
+		def self.verbose(verbose)
+			@verbose = verbose
+		end
+	
+		def self.load_project_settings(settings_file)
+			log "Load Project Settings called: settings_file=#{settings_file}"
+			@settings_file = settings_file
+			@logger = lambda {|msg| log(msg)}
+			@platforms = 
+			['net1_0', 'net1_1', 'net2_0', 'net3_0', 'net3_5', 'net4_0',
+				'mono1_0', 'mono2_0', 
+				'silverlight_2_0', 'silverlight_3_0', 'silverlight_4_0']
+			
+			@project_settings = YAML.load_file(@settings_file) if File.exist?(@settings_file)
+			@project_settings = OpenStruct.new if @project_settings == nil
+			Nu::SettingsExtension.mix_in(@project_settings)
+			
+			#set defaults just in case they didn't load
+			@project_settings.lib = OpenStruct.new if @project_settings.lib == nil
+			@project_settings.lib.location = './lib' if @project_settings.lib.location == nil
+			@project_settings.lib.use_long_names = false if @project_settings.lib.use_long_names == nil
+
+			if @verbose
+				disp "Project Settings:"
+				disp YAML.dump(@project_settings).gsub('!ruby/object:OpenStruct','').gsub(/\s*table:/,'').gsub('---','')
+				disp ""
+			end
+		end
+	
+		def self.store_setting(name, value)
+			log "Store Setting called: name=#{name} value=#{value}"
+			log "Before:"
+			load_project_settings(@settings_file) if @verbose
+			
+			@project_settings.set_setting_by_path(name, value, @logger)
+			assert_project_settings
+			
+			File.open(@settings_file, 'w') do |out|
+	 			YAML.dump(@project_settings, out)
+		  end
+			log "After:"
+			load_project_settings(@settings_file)
+		end
+	
+		def self.assert_project_settings
+			if @project_settings.platform
+				@project_settings.platform = @project_settings.platform.gsub('.','_')
+				if !@platforms.index(@project_settings.platform)
+					disp "'#{@project_settings.platform}' is not a valid platform." 
+					disp "\nChoose one of these:"
+					@platforms.each {|p| disp "  #{p}"}
+					disp ""
+					exit 1
+				end
+			end
+		end
+	
+		def self.get_setting(name)
+			log "Get Setting called: name=#{name}"
+			@project_settings.get_setting_by_path(name, @logger)
+		end
+	
+		def self.version_string
+			nu_spec = Nu::GemTools.spec_for("nu")
+			"Nubular, version #{nu_spec.version}"
+		end
+		
+		def self.install_package(package_name, package_version)
+			log "Install called: package_name=#{package_name} package_version=#{package_version}."
+			
+			loader = Nu::Loader.new(package_name, package_version, @project_settings.lib.location, @project_settings.lib.use_long_names)
+			if loader.load_gem
+				 loader.copy_to_lib
+			end
+			
+		end
+		
+		def self.output_report()
+			log "Report called."
+			
+			disp "\n"
+			disp "The following packages are installed:"
+			disp "====================================="
+			Nu::LibTools.read_specs_from_lib(@project_settings.lib.location).each{|i| disp "    " + i.full_name}
+			disp "====================================="
+			disp ""
+		end
+		
+		private 
+		
+			def self.log(msg)
+				disp(msg) if @verbose
+			end
+		
+			def self.disp(msg)
+				@stdout << msg + "\n"
+			end
+			
+		end
+end

data/lib/nu/app.rb

@@ -0,0 +1,151 @@
+#!/usr/bin/env ruby 
+
+require 'optparse' 
+require 'ostruct'
+require 'date'
+require File.expand_path(File.dirname(__FILE__) + "/api.rb")
+require File.expand_path(File.dirname(__FILE__) + "/loader.rb")
+
+class App
+  
+  attr_reader :options
+
+  def initialize(arguments, stdin, stdout)
+    
+		#special case, they want to know our version
+		if arguments.count == 1 && arguments[0] == '--version'
+			output_version
+			exit 0
+		end
+		
+		Nu::Api.out(stdout)
+
+		@arguments = arguments
+    
+    # Set defaults
+    @options = OpenStruct.new
+    @options.verbose = false
+    @options.quiet = false
+		@commands = []
+
+	begin
+		OptionParser.new do |opts|
+
+			opts.banner = ["Usage: nu install PACKAGE [options]",
+										"\nConfig: nu config NAME VALUE",
+										"\nReport: nu report"]
+		
+			opts.on('-v', '--version VERSION','Specify version of package to install' ) do |ver|
+				 @options.package_version = ver
+			end
+		
+			opts.on('-r','--report', 'Report on the packages currently installed in the lib folder') do
+				@commands << lambda {Nu::Api.output_report}
+			end
+
+			# Specify options
+			opts.on('-V', '--verbose')    { @options.verbose = true }  
+			opts.on('-q', '--quiet')      { @options.quiet = true }
+
+			opts.on_tail( '-h', '--help', 'Display this screen' ) do
+				output_help(opts)
+			end
+			
+			@help_command = lambda{output_help(opts)}
+			
+		end.parse!
+	rescue
+		@help_command.call
+	end
+	
+		post_process_options
+		extract_commands
+  end
+
+  def run
+        
+    if arguments_valid? 
+      
+      puts "Start at #{DateTime.now}\n\n" if @options.verbose
+      output_version if @options.verbose
+      output_inputs if @options.verbose
+      
+			Nu::Api.verbose(@options.verbose)
+			Nu::Api.load_project_settings('nuniverse.yaml')
+			
+			@commands.reverse.each {|command| command.call}
+      
+      puts "\nFinished at #{DateTime.now}" if @options.verbose
+      
+    else
+      @help_command.call
+    end
+      
+  end
+  
+  protected
+
+		def extract_commands
+			if @arguments.count > 0
+				@options.command = @arguments[0].downcase
+				case @options.command
+				when 'report'
+					@commands << lambda {Nu::Api.output_report}
+				when 'install'
+					assert_param_count(2)
+					@options.package = @arguments[1]
+					@commands << lambda {Nu::Api.install_package(@options.package, @options.package_version)}
+				# when 'uninstall'
+				# 				assert_param_count(2)
+				# 				@options.package = @arguments[1]
+				# 				@commands << lambda {Nu::Api.uninstall_package(@options.package, @options.package_version)}
+				when 'config'
+					if @arguments.count == 2
+						@commands << lambda {puts "#{@arguments[1]} = #{Nu::Api.get_setting(@arguments[1])}"} 
+					else
+						assert_param_count(3)
+						@commands << lambda do
+							Nu::Api.store_setting(@arguments[1], @arguments[2])
+							puts "#{@arguments[1]} = #{Nu::Api.get_setting(@arguments[1])}"
+						end if @arguments.count == 3
+					end
+				end
+			end
+		end
+
+		def assert_param_count(count)
+			unless @arguments.count == count
+				@help_command.call
+			end
+		end
+
+    def post_process_options
+		  @options.verbose = false if !@options.verbose
+      @options.verbose = false if @options.quiet
+    end
+    
+    # True if required arguments were provided
+    def arguments_valid?
+      true if @commands.count > 0
+    end
+
+    def output_inputs
+      puts "Inputs:\n"
+      
+      @options.marshal_dump.each do |name, val|        
+        puts "  #{name} = #{val}"
+      end
+			puts ""
+    end
+    
+		def output_help(opts)
+			output_version
+			puts opts
+      exit 0
+		end
+
+    def output_version
+			puts Nu::Api.version_string
+    end
+
+end

data/lib/nu/gem_tools.rb

@@ -1,13 +1,14 @@
 require 'rubygems'
+require 'yaml'
 
 module Nu
 	class GemTools
 		
-		def self.spec_for(name, requirement=nil)
+		def self.spec_for(spec, requirement=nil)
 			unless requirement.respond_to?('satisfied_by?') 
 				requirement = Gem::Requirement.create(requirement)
 			end
-			dependency = Gem::Dependency.new(name,requirement)
+			dependency = Gem::Dependency.new(spec,requirement)
 			searcher = Gem::GemPathSearcher.new()
 			all_installed_gems = searcher.init_gemspecs()
 			
@@ -15,8 +16,8 @@ module Nu
     end
 
 		def self.lib_for(name, requirement=nil)
-			gem = spec_for(name, requirement)
-			gem_path = gem.full_gem_path
+			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 
@@ -25,5 +26,18 @@ module Nu
 			libdir
 		end
 
+		def self.write_spec(spec, dest)
+			dest = File.expand_path(dest)
+			dest = File.join(dest,'nu_spec.yaml')
+			
+			unless spec.is_a?(Gem::Specification) 
+				spec = spec_for(spec)
+			end
+			
+			File.open( dest, 'w' ) do |out|
+	 			YAML.dump(spec, out)
+		  end
+		end
+
 	end
 end

data/lib/nu/lib_tools.rb

@@ -3,20 +3,27 @@ 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_for(spec, lib, long_name=false)
+      if long_name
+        name = spec.full_name
+      else
+        name = spec.name
+      end
 
-		def self.folder_name_for(gem_name, lib, long_name=false)
-			  spec = gemspec_for(gem_name)
+      to = Dir.pwd + "/#{lib}/#{name}"
+			if Dir[to] == [] #may need a smarter guy here
+	      FileUtils.mkpath to
+      end
 
-	      if long_name
-	        name = spec.full_name
-	      else
-	        name = spec.name
-	      end
-	      Dir.pwd + "/#{lib}/#{name}"
+			return to
 		end
+		
+		def self.read_specs_from_lib(lib)
+			lib = File.expand_path(lib)
+			glob = "#{lib}/**/nu_spec.yaml"
+			files = Dir.glob(glob)
+			files.map{|file| YAML::load_file(file)}
+		end
+		
 	end
 end

data/lib/nu/loader.rb

@@ -2,7 +2,6 @@ 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
@@ -11,14 +10,17 @@ module Nu
 		attr :location
 		attr :version
 		
-    def initialize(name, location, version)
+    def initialize(name, version, location, long_names)
       #improve the crap out of this
+			@long_names = long_names
       @gem_name = name
       @location = location
       @version = version
+    end
 
-      if !gem_available?
-        puts "Gem #{@gem_name} #{@version} is not installed locally - I am now going to try and install it"
+		def load_gem
+			if !gem_available?
+        puts "Gem #{(@gem_name + " #{@version}").strip} is not installed locally - I am now going to try and install it"
         begin
           inst = Gem::DependencyInstaller.new
           inst.install @gem_name, @version
@@ -27,13 +29,12 @@ module Nu
           end
         rescue Gem::GemNotFoundException => e
           puts "ERROR: #{e.message}"
-          return #GTFO
+          return false
         end
       else
-        puts "Found Gem"
+        return true
       end
-      #TODO: better error handling flow control for above
-    end
+		end
 
 		def copy_to_lib
 			start_here = copy_source
@@ -43,6 +44,7 @@ module Nu
 			puts "Copy To: #{to}"
 
 			FileUtils.copy_entry start_here, to
+			Nu::GemTools.write_spec(gemspec, to)
 
 			process_dependencies
 		end
@@ -64,26 +66,14 @@ module Nu
     end
 
     def copy_dest
-      proj = Nu::Project.new
-
-      #to be used in copying
-      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
+			Nu::LibTools.folder_for(gemspec, @location, @long_names)
     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 = Loader.new(d.name, d.requirement, @location, @long_names)
 					loader.copy_to_lib
         else
           puts "#{d.name} is not installed locally"

data/lib/nu/settings.rb

@@ -0,0 +1,55 @@
+require 'rubygems'
+require 'ostruct'
+
+module Nu
+	class SettingsExtension
+		
+		def self.mix_in(target)
+
+			def target.set_setting_by_path(path, value, logger)
+				path = path.split('.') if path.class == String
+				set_setting(self, path, value, logger)
+			end
+		
+			def target.get_setting_by_path(path, logger)
+				path = path.split('.') if path.class == String
+				obj = self
+				path.count.times do 
+					if path.count == 1
+						return obj.send(path.to_s)
+					else
+						part = path.shift
+						obj = obj.send(part.to_s)
+						return nil if obj == nil
+					end
+				end
+				send(name)
+			end
+		
+			def target.set_setting(settings_object, path, value, logger)
+				if path.count == 1
+					logger.call("Assigning value: #{value.to_s}")
+					begin
+						if value.match(/^\d*\.\d*$/)
+							value = Float(value.to_s)
+						else
+							value = Integer(value.to_s)
+						end
+					rescue
+						logger.call("Could not coerce into a number.")
+						value = true if value.to_s.match(/(^true$|^t$|^yes$|^y$)/i) != nil
+						value = false if value.to_s.match(/(^false$|^f$|^no$|^n$)/i) != nil
+					end
+
+					settings_object.send(path.to_s + "=", value) 
+				else
+					prop = path.shift
+					settings_object.send(prop + "=", OpenStruct.new) if settings_object.send(prop) == nil
+					set_setting(settings_object.send(prop), path, value, logger)
+				end
+			end
+			
+		end
+	
+	end
+end

metadata

@@ -1,42 +1,27 @@
 --- !ruby/object:Gem::Specification 
 name: nu
 version: !ruby/object:Gem::Version 
-  hash: 61
+  hash: 23
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 19
-  version: 0.1.19
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Dru Sellers
-- Chris Patterson
+- Brendan Erwin
 - Rob Reynold
 - Travis Smith
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-08-25 00:00:00 -05:00
+date: 2010-08-29 00:00:00 -05:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: thor
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 59
-        segments: 
-        - 0
-        - 13
-        - 8
-        version: 0.13.8
-  type: :runtime
-  version_requirements: *id001
+dependencies: []
+
 description: Nu manages an application's dependencies through its entire life, across many machines, systematically and repeatably
 email: 
 - nu-net@googlegroups.com
@@ -48,12 +33,12 @@ extra_rdoc_files: []
 
 files: 
 - bin/nu
-- lib/nu/cli.rb
-- lib/nu/config.rb
+- lib/nu/api.rb
+- lib/nu/app.rb
 - lib/nu/gem_tools.rb
 - lib/nu/lib_tools.rb
 - lib/nu/loader.rb
-- lib/nu/project.rb
+- lib/nu/settings.rb
 - lib/nu.rb
 has_rdoc: true
 homepage: http://groups.google.com/group/nu-net

data/lib/nu/cli.rb

@@ -1,57 +0,0 @@
-require 'FileUtils'
-require 'thor'
-require 'yaml'
-
-module Nu
-  class CLI < Thor
-    include Thor::Actions
-
-    def initialize(*)
-      super
-
-      @proj = Nu::Project.new
-    end
-
-    desc "install GEMNAME", "installs a gem in the 'pwd'"
-	  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
-    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/config.rb

@@ -1,37 +0,0 @@
-require 'yaml'
-require 'thor'
-require 'FileUtils'
-
-module Nu
-	#class Config < Thor::Group
-		#include Thor::Actions
-		
-		#@config_file = ".nu/options.yaml"
-		
-		#def self.get_config
-		#	unless File.exists? @config_file
-		#		FileUtils.touch @config_file
-		#		append_file @config_file, YAML::dump({})	
-		#	end
-		#	cd = YAML.load_file @config_file
-		#	cd = ask_about_libdir cd
-		#	
-		#	save_file cd
-		#	cd
-		#end
-		
-		#def self.ask_about_libdir(config)
-		#	if config['lib'].nil?
-		#		loc = ask "Where do you want me to copy things to?"
-		#		config = {'lib'=>loc}
-		#	end
-		#	config
-		#end
-		
-		#def self.save_file(config)
-		#	File.open(@config_file, 'w') do |out|
-		#		YAML.dump( config, out)
-		#	end
-		#end
-	#end
-end

data/lib/nu/project.rb

@@ -1,74 +0,0 @@
-require 'FileUtils'
-
-module Nu
-  class Project
-
-    def initialize
-      @config_file = ".nu/options.yaml"
-      ensure_default_config
-    end
-
-    # 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
-    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
-
-  end
-end