nu 0.1.10 → 0.1.11

data/bin/nu

@@ -1,6 +1,10 @@
 #!/usr/bin/env ruby
 
-require File.expand_path('../../lib/cli', __FILE__)
-require File.expand_path('../../lib/loader', __FILE__)
+require 'nu'
 
-Nu::CLI.start
+begin
+	Nu::CLI.start
+rescue Interrupt
+	puts 'quitting'
+	exit 1
+end

data/lib/nu.rb

@@ -0,0 +1,5 @@
+require 'nu/cli'
+require 'nu/loader'
+require 'nu/config'
+
+#other fancy stuff

data/lib/nu/cli.rb

@@ -0,0 +1,56 @@
+require 'FileUtils'
+require 'thor'
+require 'yaml'
+
+module Nu
+  class CLI < Thor
+	include Thor::Actions
+	
+	
+	def initialize(*)
+		super
+		@config_file = ".nu/options.yaml"
+	end
+	
+    desc "install GEMNAME", "installs a gem in the 'pwd'"
+	method_options :location => :string
+	
+	def install(name)
+		ensure_default_config
+		
+		loc = get_location
+		cl = options['location']
+		loc = cl unless cl.nil?
+		
+		Nu::Loader.load name, loc
+    end
+	
+	desc "lib FOLDER", "where do you want to store the gems"
+	def lib(folder)
+		File.delete @config_file if File.exist? @config_file
+		add_file @config_file
+		content = YAML::dump( { 'lib' => folder })
+		append_file @config_file, content
+	end
+	
+	def self.source_root
+		File.dirname(__FILE__)
+	end
+	
+private
+	def ensure_default_config
+		if File.exist? @config_file
+			return
+		end
+		add_file @config_file
+		content = YAML::dump( {'lib'=>'lib'} )
+		append_file @config_file, content
+	end
+	
+	def get_location
+		content = YAML.load_file @config_file
+		content['lib']
+	end
+	
+  end
+end

data/lib/nu/config.rb

@@ -0,0 +1,37 @@
+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/{cli.rb → nu/loader.rb}

@@ -1,24 +1,24 @@
-require 'FileUtils'
+require 'rubygems'
 
 module Nu
-  class CLI
+  class Loader
     
-    def self.start
-
+	def self.load(name)
+		load(name, 'lib')
+	end
+	def self.load(name, location)
       #improve the crap out of this
-      action = ARGV[0]
-      @gem_to_copy = ARGV[1]
+      @gem_to_copy = name
+	  @location = location
 
 
-      l = Nu::Loader.new
-      if !l.available? @gem_to_copy
+      if !Gem.available? @gem_to_copy
         puts "Gem unavailable - please install it"
         return
       else
         puts "Found Gem"
       end
       #TODO: better error handling flow control for above
-
       
       
       start_here = get_copy_from()
@@ -28,40 +28,43 @@ module Nu
       puts "Copy To: #{to}"
       
       FileUtils.copy_entry start_here, to
-      #files = get_files()
-      #files.each do |file|
-        #someone please show me how to do this better
-       # from = File.expand_path(file, start_here+"/..")
-        #puts "copy #{from} #{to}"
-        #FileUtils.copy(from, to)
-      #end
+	end
+	
+    def self.get_libdir(name)
+      g = get_gemspec name
+      l = Gem.searcher.lib_dirs_for g
+      #scrub and return?
+      l
     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
-      l = Nu::Loader.new
-      libdir = l.get_libdir @gem_to_copy
+      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
-      l = Nu::Loader.new
-      spec = l.get_gemspec @gem_to_copy
+      spec = get_gemspec @gem_to_copy
       files = spec.lib_files #get full path
       files
     end
     
     def self.get_copy_to
-      l = Nu::Loader.new
-      spec = l.get_gemspec @gem_to_copy
+      spec = get_gemspec @gem_to_copy
       #to be used in copying
       name =  spec.full_name
-      to = Dir.pwd + "/lib/#{name}"
+      to = Dir.pwd + "/#{@location}/#{name}"
       if Dir[to] == [] #may need a smarter guy here
         FileUtils.mkpath to
       end
       to
     end
+	
   end
-end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: nu
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: false
   segments: 
   - 0
   - 1
-  - 10
-  version: 0.1.10
+  - 11
+  version: 0.1.11
 platform: ruby
 authors: 
 - Dru Sellers
@@ -19,8 +19,23 @@ cert_chain: []
 
 date: 2010-07-16 00:00:00 -05:00
 default_executable: 
-dependencies: []
-
+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
 description: Nu manages an application's dependencies through its entire life, across many machines, systematically and repeatably
 email: 
 - nu-net@googlegroups.com
@@ -32,8 +47,10 @@ extra_rdoc_files: []
 
 files: 
 - bin/nu
-- lib/cli.rb
-- lib/loader.rb
+- lib/nu/cli.rb
+- lib/nu/config.rb
+- lib/nu/loader.rb
+- lib/nu.rb
 has_rdoc: true
 homepage: http://groups.google.com/group/nu-net
 licenses: []

data/lib/loader.rb

@@ -1,22 +0,0 @@
-require 'rubygems'
-
-module Nu
-  class Loader
-    
-    def get_libdir(name)
-      g = get_gemspec name
-      l = Gem.searcher.lib_dirs_for g
-      #scrub and return?
-      l
-    end
-    
-    def get_gemspec(name)
-	  gems = Gem.source_index.find_name name
-	  return gems.last if gems.length > 0
-    end
-    
-    def available? (name)
-      Gem.available? name
-    end
-  end
-end