Sutto-perennial 0.2.2.3 → 0.2.3.0

data/lib/perennial/application.rb

@@ -15,6 +15,29 @@ module Perennial
         klass.new.apply(*arguments)
       end
       
+      def yes?(question)
+        result = Readline.readline("#{question.to_s.strip} (y/n) ")
+        result.downcase[0] == ?y
+      end
+      
+      def ask(question, default)
+        result = Readline.readline("#{question.to_s.strip} (default: #{default}) ")
+        result.blank? ? default : result
+      end
+      
+      def ask_password(question)
+        system "stty -echo" 
+        line = Readline.readline("#{question.to_s.strip} ").strip
+        system "stty echo"
+        print "\n"
+        return line
+      end
+      
+      def die!(message)
+        $stderr.puts message
+        exit! 1
+      end
+      
     end
     
     attr_accessor :options, :banner, :command_env
@@ -44,19 +67,20 @@ module Perennial
       end
     end
     
-    def controller!(controller, description)
+    def controller!(controller, description, opts = {})
       return unless defined?(Loader)
       add_default_options!
       option :kill, "Kill any runninng instances"
       controller_name = controller.to_s.underscore
       controller = controller.to_sym
       command_name = controller_name.gsub("_", "-")
-      add("#{command_name} [PATH]", description) do |*args|
+      add("#{command_name} #{"[PATH]" if !opts[:skip_path]}".strip, description) do |*args|
         options = args.extract_options!
         path = File.expand_path(args[0] || ".")
         Settings.root = path
         if options.delete(:kill)
-          puts "Attempting to kill processess..."
+          attempt_showing_banner
+          puts "Attempting to kill processess for #{command_name}"
           Daemon.kill_all(controller)
         else
           Loader.run!(controller, options)
@@ -86,35 +110,32 @@ module Perennial
       if @commands.has_key?(command)
         execute_command(command, arguments)
       else
-        puts "Unknown command '#{command}', please try again."
-        return usage
+        show_error "Unknown command '#{command}', please try again."
+        usage(true)
       end
     end
     
-    def usage
-      if banner.present?
-        puts banner
-        puts ""
-      end
+    def usage(skip_banner = false)
+      attempt_showing_banner unless skip_banner
       puts "Usage:"
       max_width = @banners.values.map { |b| b.length }.max
       @commands.keys.sort.each do |command|
         next unless @descriptions.has_key?(command)
         formatted_command = "#{@banners[command]} [OPTIONS]".ljust(max_width + 10)
-        command = "%s - %s" % [formatted_command, @descriptions[command]]
+        command = "  %s - %s" % [formatted_command, @descriptions[command]]
         puts command
       end
+      puts ""
+      puts "Please note: you can pass -h / --help to any command for more specific help"
     end
     
-    def help_for(command)
-     if banner.present?
-        puts banner
-        puts ""
-      end
+    def help_for(command, skip_banner = false)
+      attempt_showing_banner unless skip_banner
       puts @descriptions[command]
+      puts ""
       puts "Usage: #{$0} #{@banners[command]} [options]"
       puts "Options:"
-      puts @option_parsers[command].summary
+      puts pad_left(@option_parsers[command].summary)
       exit
     end
     
@@ -128,6 +149,13 @@ module Perennial
       application.execute args
     end
     
+    def attempt_showing_banner
+      if banner.present?
+        puts banner
+        puts ""
+      end
+    end
+    
     protected
     
     def execute_command(command, arguments)
@@ -137,7 +165,7 @@ module Perennial
         args << opts
         @command_env.execute(command_proc, args)
       else
-        usage
+        help_for(command, true)
       end
     end
     
@@ -160,14 +188,28 @@ module Perennial
       needed_count   = blk.arity - 1
       provided_count = arguments.size
       if needed_count > 0 && needed_count != provided_count
-        puts "You didn't provide the correct number of arguments (needed #{needed_count}, provided #{provided_count})"
+        attempt_showing_banner
+        show_error "You didn't provide the correct number of arguments (needed #{needed_count}, provided #{provided_count})"
       elsif needed_count < 0 && (-needed_count - 2) > provided_count
-        puts "You didn't provide enough arguments - a minimum of #{-needed_count} are needed."
+        show_error "You didn't provide enough arguments - a minimum of #{-needed_count} are needed."
       else
         return true
       end
       
     end
     
+    def show_error(text)
+      attempt_showing_banner
+      text = "Error: #{text}".strip
+      puts "--#{"-" * text.length}"
+      puts " #{text} "
+      puts "--#{"-" * text.length}"
+      puts ""
+    end
+    
+    def pad_left(text, spacing = 2)
+      text.split("\n").map { |l| "#{" " * spacing}#{l}" }.join("\n")
+    end
+    
   end
 end

data/lib/perennial/generator.rb

@@ -1,6 +1,7 @@
 require 'open-uri'
 require 'fileutils'
 require 'erb'
+require 'readline'
 
 module Perennial
   class Generator
@@ -32,12 +33,46 @@ module Perennial
     def initialize(destination, opts = {})
       @destination_path = destination
       @template_path    = opts[:template_path] || File.join(Settings.library_root, "templates")
-      puts "Starting generator for #{destination}"
+      @silent = !!opts[:silent]
+      describe "Initializing generator in #{destination}"
     end
     
-    def download(from, to)
+    # Helpers for testing file state
+    
+    def fu
+      FileUtils
+    end
+    
+    def chmod(permissions, path)
+      describe "Changing permissions for #{path} to #{permissions}"
+      FileUtils.chmod(permissions, expand_destination_path(path))
+    end
+    
+    def file?(path)
+      describe "Checking if #{path} is a file"
+      File.file?(expand_destination_path(path))
+    end
+    
+    def executable?(path)
+      describe "Checking if #{path} is an executable"
+      File.executable?(expand_destination_path(path))
+    end
+    
+    def directory?(path)
+      describe "Checking if #{path} is a directory"
+      File.directory?(expand_destination_path(path))
+    end
+    
+    alias folder? directory?
+    
+    def exists?(path)
+      describe "Checking if #{path} exists"
+      File.exits?(expand_destination_path(path))
+    end
+    
+    def download(from, to, append = false)
       describe "Downloading #{from}"
-      file to, open(from).read
+      file to, open(from).read, append
     end
     
     def folders(*args)
@@ -47,20 +82,20 @@ module Perennial
       end
     end
     
-    def file(name, contents)
+    def file(name, contents, append = false)
       dest_folder = File.dirname(name)
       folders(dest_folder) unless File.directory?(expand_destination_path(dest_folder))
       describe "Creating file #{name}"
-      File.open(expand_destination_path(name), "w+") do |f|
+      File.open(expand_destination_path(name), "#{append ? "a" : "w"}+") do |f|
         f.write(contents)
       end
     end
     
-    def template(source, destination, environment = {})
+    def template(source, destination, environment = {}, append = false)
       describe "Processing template #{source}"
       raw_template = File.read(expand_template_path(source))
       processed_template = ERB.new(raw_template).result(binding_for(environment))
-      file destination, processed_template
+      file destination, processed_template, append
     end
     
     protected
@@ -82,7 +117,7 @@ module Perennial
     end
     
     def describe(action)
-      puts "- #{action}"
+      puts "[generator] #{action}" unless @silent
     end
     
   end

data/lib/perennial/loader.rb

@@ -53,7 +53,10 @@ module Perennial
     end
     
     def current_controller
-      @current_controller ||= @@controllers[@@current_type.to_sym]
+      @current_controller ||= begin
+        c = @@controllers[@@current_type.to_sym]
+        c.is_a?(String) ? eval(c) : c
+      end
     end
     
     protected

data/lib/perennial/logger.rb

@@ -19,9 +19,18 @@ module Perennial
         setup!
       end
       
+      def default_logger_path=(value)
+        @@default_logger_path = value
+        # Rereun setup if setup is already done.
+        setup! if setup?
+      end
+      
+      def default_logger_path
+        @@default_logger_path ||= (Settings.root / "log" / @@log_name.to_str)
+      end
+      
       def setup!
-        log_path = Settings.root / "log" / @@log_name.to_str
-        @@logger = new(log_path, Settings.log_level, Settings.verbose?)
+        @@logger = new(self.default_logger_path, Settings.log_level, Settings.verbose?)
         @@setup = true
       end
       

data/lib/perennial/settings.rb

@@ -39,16 +39,25 @@ module Perennial
         @@setup ||= false
       end
       
+      def default_settings_path
+        @@default_settings_path ||= (root / "config" / "settings.yml")
+      end
+      
+      def default_settings_path=(value)
+        @@default_settings_path = value
+        setup! if setup?
+      end
+      
       def setup(options = {})
         self.setup!(options) unless setup?
       end
       
       def setup!(options = {})
         @@configuration = {}
-        settings_file = root / "config" / "settings.yml"
+        settings_file = self.default_settings_path
         if File.exist?(settings_file)
           loaded_yaml = YAML.load(File.read(settings_file))
-          @@configuration.merge! loaded_yaml["default"]
+          @@configuration.merge!(loaded_yaml["default"] || {})
         end
         @@configuration.merge! options
         @@configuration.symbolize_keys!

data/lib/perennial.rb

@@ -9,7 +9,7 @@ require 'perennial/exceptions'
 
 module Perennial
   
-  VERSION = "0.2.2.3"
+  VERSION = "0.2.3.0"
   
   has_libary :dispatchable, :hookable, :loader, :logger,
              :loggable, :manifest, :settings, :argument_parser,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: Sutto-perennial
 version: !ruby/object:Gem::Version 
-  version: 0.2.2.3
+  version: 0.2.3.0
 platform: ruby
 authors: 
 - Darcy Laycock
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-04 00:00:00 -07:00
+date: 2009-09-06 00:00:00 -07:00
 default_executable: perennial
 dependencies: []