0
@@ -1,10 +1,5 @@
0
 #!/usr/bin/env ruby
0
 
0
-require 'rubygems'
0
-require 'rubigen'
0
-
0
-require 'rubigen/scripts/generate'
0
-RubiGen::Base.use_application_sources!
0
-RubiGen::Base.sources << RubiGen::PathSource.new(:custom, File.expand_path(File.join(File.dirname(__FILE__), '..', "support/generators")))
0
-RubiGen::Scripts::Generate.new.run(ARGV, :generator => 'halcyon')
0
+require File.join(File.dirname(__FILE__), '..', 'lib', 'halcyon')
0
+Halcyon::Runner.run! ARGV

0
@@ -1,16 +1,30 @@
0
 # Partly modeled after Thin's Runner, found at
0
 # http://github.com/macournoyer/thin/tree/master/lib/thin/runner.rb
0
 
0
+require 'optparse'
0
+
0
 module Halcyon
0
   
0
   # = CLI Runner
0
   # Parse options and start serving the app
0
   class Runner
0
     
0
+    autoload :Commands, 'halcyon/runner/commands'
0
+    
0
     # Make sure that the Halcyon.config hash is setup
0
     Halcyon.config ||= Mash.new(Halcyon::Application::DEFAULT_OPTIONS)
0
     
0
-    def initialize(argv=ARGV)
0
+    class << self
0
+      
0
+      # Runs commands from the CLI; foregoes actually running the app
0
+      def run!(argv=ARGV)
0
+        Commands.send(argv.shift, argv)
0
+      end
0
+      
0
+    end
0
+    
0
+    # Sets up the application to run
0
+    def initialize
0
       if Halcyon.config[:logger]
0
         Halcyon.logger = Halcyon.config[:logger]
0
       else

0
@@ -1 +1,76 @@
0
+module Halcyon
0
+  class Runner
0
+    class Commands
0
+      class << self
0
+        
0
+        # Run the Halcyon application
0
+        def start(argv)
0
+          options = {
0
+            :port => 4647,
0
+            :server => (Gem.searcher.find('thin').nil? ? 'mongrel' : 'thin')
0
+          }
0
+          
0
+          OptionParser.new do |opts|
0
+            opts.banner = "Usage: halcyon start [options]"
0
+            
0
+            opts.separator ""
0
+            opts.separator "Start options:"
0
+            opts.on("-s", "--server SERVER", "") { |server| options[:server] = server }
0
+            
0
+            begin
0
+              opts.parse! argv
0
+            rescue OptionParser::InvalidOption => e
0
+              # the other options can be used elsewhere, like in RubiGen
0
+              argv = e.recover(argv)
0
+            end
0
+          end
0
+          
0
+          if options[:server] == 'thin'
0
+            # Thin is installed
0
+            command = "thin start -r runner.ru #{argv.join(' ')}"
0
+          else
0
+            # Thin is not installed
0
+            command = "rackup runner.ru -s #{options[:server]} #{argv.join(' ')}"
0
+          end
0
+          
0
+          # run command
0
+          exec command
0
+        end
0
+        
0
+        # Generate a new Halcyon application
0
+        def init(argv)
0
+          options = {
0
+            :generator => 'halcyon',
0
+            :git => false
0
+          }
0
+          
0
+          OptionParser.new do |opts|
0
+            opts.banner = "Usage: halcyon init [options]"
0
+            
0
+            opts.separator ""
0
+            opts.separator "Generator options:"
0
+            opts.on("-f", "--flat", "") { options[:generator] = 'halcyon_flat' }
0
+            
0
+            opts.separator ""
0
+            opts.separator "Additional options:"
0
+            opts.on("-g", "--git", "Initialize a Git repository when finished generating") { options[:git] = true }
0
+            
0
+            begin
0
+              opts.parse! argv
0
+            rescue OptionParser::InvalidOption => e
0
+              # the other options can be used elsewhere, like in RubiGen
0
+            end
0
+          end
0
+          
0
+          require 'rubigen'
0
+          require 'rubigen/scripts/generate'
0
+          RubiGen::Base.use_application_sources!
0
+          RubiGen::Base.sources << RubiGen::PathSource.new(:custom, File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '..', "support/generators")))
0
+          RubiGen::Scripts::Generate.new.run(argv, :generator => options[:generator])
0
+        end
0
+        
0
+      end
0
+    end
0
+  end
0
+end