strelka 0.0.1pre4 → 0.0.1.pre129

data/bin/leash

@@ -1,14 +1,6 @@
 #!/usr/bin/env ruby
 
-require 'mongrel2'
-require 'mongrel2/config'
 require 'strelka'
-
-require 'pp'
-require 'fileutils'
-require 'shellwords'
-require 'tnetstring'
-
 require 'trollop'
 require 'highline'
 
@@ -26,74 +18,21 @@ class Strelka::LeashCommand
 
 	# Make a HighLine color scheme
 	COLOR_SCHEME = HighLine::ColorScheme.new do |scheme|
-		scheme[:header]	   = [ :bold, :yellow ]
+		scheme[:header]    = [ :bold, :yellow ]
 		scheme[:subheader] = [ :bold, :white ]
-		scheme[:key]	   = [ :white ]
-		scheme[:value]	   = [ :bold, :white ]
-		scheme[:error]	   = [ :red ]
+		scheme[:key]       = [ :white ]
+		scheme[:value]     = [ :bold, :white ]
+		scheme[:error]     = [ :red ]
 		scheme[:warning]   = [ :yellow ]
 		scheme[:message]   = [ :reset ]
 	end
 
 
-	# Path to the default history file for 'shell' mode
-	HISTORY_FILE = Pathname( "~/.leash.history" )
-
-	# Number of items to store in history by default
-	DEFAULT_HISTORY_SIZE = 100
-
-	# The prompt the 'shell' mode should show
-	PROMPT = 'leash> '
-
-	# The data directory in the project if that exists, otherwise the gem datadir
-	DATADIR = if File.directory?( 'data/strelka' )
-		Pathname( 'data/strelka' )
-	elsif path = Gem.datadir('strelka')
-		Pathname( path )
-	else
-		raise ScriptError, "can't find the data directory!"
-	end
-
-
 	# Class instance variables
 	@command_help = Hash.new {|h,k| h[k] = { :desc => nil, :usage => ''} }
 	@prompt = @option_parser = nil
 
 
-	### Add a help string for the given +command+.
-	def self::help( command, helpstring=nil )
-		if helpstring
-			@command_help[ command.to_sym ][:desc] = helpstring
-		end
-
-		return @command_help[ command.to_sym ][:desc]
-	end
-
-
-	### Add/fetch the +usagestring+ for +command+.
-	def self::usage( command, usagestring=nil )
-		if usagestring
-			prefix = usagestring[ /\A(\s+)/, 1 ]
-			usagestring.gsub!( /^#{prefix}/m, '' ) if prefix
-
-			@command_help[ command.to_sym ][:usage] = usagestring
-		end
-
-		return @command_help[ command.to_sym ][:usage]
-	end
-
-
-	### Return the global Highline prompt object, creating it if necessary.
-	def self::prompt
-		unless @prompt
-			@prompt = HighLine.new
-			@prompt.wrap_at = @prompt.output_cols - 10
-		end
-
-		return @prompt
-	end
-
-
 	### Run the utility with the given +args+.
 	def self::run( args )
 		HighLine.color_scheme = COLOR_SCHEME
@@ -147,7 +86,6 @@ class Strelka::LeashCommand
 	def self::make_option_parser
 		unless @option_parser
 			progname = File.basename( $0 )
-			default_configdb = Mongrel2::DEFAULT_CONFIG_URI
 
 			# Make a list of the log level names and the available commands
 			loglevels = Strelka::Logging::LOG_LEVELS.
@@ -157,15 +95,14 @@ class Strelka::LeashCommand
 			command_table = self.make_command_table
 
 			@option_parser = Trollop::Parser.new do
-				banner "Take your Mongrel(2) for a walk:"
+				banner "Manage Strelka apps"
 
 				text ''
 				command_table.each {|line| text(line) }
 				text ''
 
 				text 'Global Options'
-				opt :config, "Specify the configfile to use.",
-					:default => DEFAULT_CONFIG_URI
+				opt :config, "Specify the config file to load."
 				text ''
 
 				text 'Other Options:'
@@ -179,6 +116,45 @@ class Strelka::LeashCommand
 	end
 
 
+	### Add a help string for the given +command+.
+	def self::help( command, helpstring=nil )
+		if helpstring
+			@command_help[ command.to_sym ][:desc] = helpstring
+		end
+
+		return @command_help[ command.to_sym ][:desc]
+	end
+
+
+	### Add/fetch the +usagestring+ for +command+.
+	def self::usage( command, usagestring=nil )
+		if usagestring
+			prefix = usagestring[ /\A(\s+)/, 1 ]
+			usagestring.gsub!( /^#{prefix}/m, '' ) if prefix
+
+			@command_help[ command.to_sym ][:usage] = usagestring
+		end
+
+		return @command_help[ command.to_sym ][:usage]
+	end
+
+
+	### Return the global Highline prompt object, creating it if necessary.
+	def self::prompt
+		unless @prompt
+			@prompt = HighLine.new
+
+			columns = @prompt.output_cols.nonzero? || 80
+			rows    = @prompt.output_rows.nonzero? || 1000
+
+			@prompt.page_at = rows - 5
+			@prompt.wrap_at = columns - 2
+		end
+
+		return @prompt
+	end
+
+
 	#################################################################
 	###	I N S T A N C E   M E T H O D S
 	#################################################################
@@ -188,7 +164,6 @@ class Strelka::LeashCommand
 	def initialize( options )
 		Strelka.logger.formatter = Strelka::Logging::ColorFormatter.new( Strelka.logger )
 		@options = options
-		@shellmode = false
 
 		if @options.debug
 			$DEBUG = true
@@ -198,7 +173,6 @@ class Strelka::LeashCommand
 			Strelka.logger.level = Strelka::Logging::LOG_LEVELS[ @options.loglevel ]
 		end
 
-		Mongrel2::Config.configure( :configdb => @options.config )
 	end
 
 
@@ -209,9 +183,6 @@ class Strelka::LeashCommand
 	# The Trollop options hash the command will read its configuration from
 	attr_reader :options
 
-	# True if running in shell mode
-	attr_reader :shellmode
-
 
 	# Delegate the instance #prompt method to the class method instead
 	define_method( :prompt, &self.method(:prompt) )
@@ -264,84 +235,77 @@ class Strelka::LeashCommand
 	usage :help, "[COMMAND]"
 
 
-	### The 'setup' command
-	def setup_command( *args )
-		port = args.shift || DEFAULT_ADMIN_PORT
-		self.setup_bootstrap_config( port )
-		m2pid = self.start_admin_mongrel2
-		apppid = self.start_admin_app
+	### The 'discover' command
+	def discover_command( *args )
+		header "Searching for Strelka applications..."
 
-		header "Okay, point a browser at http://localhost:#{port}/"
+		paths = Strelka::App.discover_paths
+		if paths.empty?
+			message "None found."
+		else
+			paths.each do |gemname, paths|
+				message "Found:"
 
-	rescue
-		message "Killing admin mongrel2..."
-		Process.kill( :TERM, m2pid ) if m2pid
+				subheader "#{gemname}:"
+				filenames = paths.map {|path| path.basename.to_s }
+				list( filenames )
+			end
+		end
+	end
+	help :discover, "Show available Strelka applications installed as gems."
 
-		message "Killing admin app..."
-		Process.kill( apppid, :TERM ) if apppid
 
-	ensure
-		results = Process.waitall
-		message "Done: %p" % [ results ]
+	### The 'setup' command
+	def setup_command( *args )
 	end
 	help :setup, "Set up a new Strelka environment and start the admin server."
-	usage :setup, "[PORT]"
 
 
-	### Install a bootstrap config database for the admin server, which will run
-	### on localhost at the specified +port+.
-	def setup_bootstrap_config( port )
-		configfile = DATADIR + 'bootstrap-config.rb'
-		runspace = Module.new do
-			extend Mongrel2::Config::DSL, FileUtils::Verbose
-		end
-
-		header "Loading config from #{configfile}"
-		source = configfile.read
-		Mongrel2::Config.init_database!
-		runspace.module_eval( source, configfile.to_s, 0 )
+	### The 'start' command
+	def start_command( *args )
 	end
+	help :start, "Start the web adminstration app"
 
 
-	### Start the Mongrel2 instance that serves as the front end of the admin server.
-	def start_admin_mongrel2
-		server = Mongrel2::Config.servers.find {|s| s.name == 'adminserver' } or
-			raise ScriptError, "Ack! No server named 'adminserver' in #{Mongrel2::Config.pathname}"
-
-		message "Starting mongrel2..."
-		cmd = [ 'mongrel2', 'mongrel2 (Strelka Admin)' ]
-		args = [ Mongrel2::Config.pathname.to_s, server.uuid ]
-
-		return spawn( cmd, *args )
+	### The 'version' command
+	def version_command( *args )
+		message( "<%= color 'Version:', :header %> " + Mongrel2.version_string(true) )
 	end
+	help :version, "Prints the Ruby-Mongrel2 version."
 
 
-	### Start the admin app.
-	def start_admin_app
-		message "Starting up control app..."
-
-		pid = fork do
-			appsdir       = DATADIR + 'apps'
-			templatedir   = DATADIR + 'templates'
-			strelka_admin = appsdir + 'strelka-admin'
+	#
+	# Command functions
+	#
 
-			Kernel.load( strelka_admin )
+	### Install a bootstrap config database for the admin server.
+	def setup_bootstrap_config
+		Mongrel2::Config.init_database
 
-			Inversion::Template.configure( :template_paths => [templatedir] )
-			Strelka::AdminConsole.run( 'admin-console' )
+		if Mongrel2::Config::Server.by_uuid( ADMINSERVER_ID ).first
+			message "Admin server is already configured"
+			if !self.prompt.agree( "Replace the existing config? ", true )
+				message "Okay, keeping the existing config."
+				return
+			end
+		end
 
-			exit!
+		configfile = DATADIR + 'bootstrap-config.rb'
+		runspace = Module.new do
+			extend Mongrel2::Config::DSL, FileUtils::Verbose
 		end
 
-		return pid
+		header "Installing admin server config from #{configfile}"
+		source = configfile.read
+		runspace.module_eval( source, configfile.to_s, 1 )
 	end
 
 
-	### The 'version' command
-	def version_command( *args )
-		message( "<%= color 'Version:', :header %> " + Mongrel2.version_string(true) )
+	### Set up the mongrel2 chroot directory for Strelka's adminserver by copying static 
+	### files, and creating the necessary directories. This depends on the configuration
+	### being installed.
+	def setup_runtime_directory
 	end
-	help :version, "Prints the Ruby-Mongrel2 version."
 
 
 	#
@@ -360,42 +324,23 @@ class Strelka::LeashCommand
 	end
 
 
-	### Output the given +text+ highlighted as an error.
-	def error( text )
-		message( self.prompt.color(text, :error) )
+	### Output the given +text+ highlighted as a subheader.
+	def subheader( text )
+		message( self.prompt.color(text, :subheader) )
 	end
 
 
-	### Read command line history from HISTORY_FILE
-	def read_history
-		histfile = HISTORY_FILE.expand_path
-
-		if histfile.exist?
-			lines = histfile.readlines.collect {|line| line.chomp }
-			self.log.debug "Read %d saved history commands from %s." % [ lines.length, histfile ]
-			Readline::HISTORY.push( *lines )
-		else
-			self.log.debug "History file '%s' was empty or non-existant." % [ histfile ]
-		end
+	### Output the given +text+ highlighted as an error.
+	def error( text )
+		message( self.prompt.color(text, :error) )
 	end
 
 
-	### Save command line history to HISTORY_FILE
-	def save_history
-		histfile = HISTORY_FILE.expand_path
-
-		lines = Readline::HISTORY.to_a.reverse.uniq.reverse
-		lines = lines[ -DEFAULT_HISTORY_SIZE, DEFAULT_HISTORY_SIZE ] if
-			lines.length > DEFAULT_HISTORY_SIZE
-
-		self.log.debug "Saving %d history lines to %s." % [ lines.length, histfile ]
-
-		histfile.open( File::WRONLY|File::CREAT|File::TRUNC ) do |ofh|
-			ofh.puts( *lines )
-		end
+	### Output the given +items+ as a columnar list.
+	def list( *items )
+		message( self.prompt.list(items.flatten.compact.map(&:to_s), :columns_down) )
 	end
 
-
 end # class Strelka::LeashCommand
 
 

data/contrib/hoetemplate/.autotest.erb

@@ -0,0 +1,23 @@
+# -*- ruby -*-
+
+require 'autotest/restart'
+
+# Autotest.add_hook :initialize do |at|
+#   at.extra_files << "../some/external/dependency.rb"
+#
+#   at.libs << ":../some/external"
+#
+#   at.add_exception 'vendor'
+#
+#   at.add_mapping(/dependency.rb/) do |f, _|
+#     at.files_matching(/test_.*rb$/)
+#   end
+#
+#   %w(TestA TestB).each do |klass|
+#     at.extra_class_map[klass] = "test/test_misc.rb"
+#   end
+# end
+
+# Autotest.add_hook :run_command do |at|
+#   system "rake build"
+# end

data/contrib/hoetemplate/History.rdoc.erb

@@ -0,0 +1,4 @@
+## 0.0.1 [<%= Time.now.strftime("%Y-%m-%d") %>] Michael Granger <ged@FaerieMUD.org>
+
+Initial release.
+

data/contrib/hoetemplate/Manifest.txt.erb

@@ -0,0 +1,8 @@
+History.rdoc
+README.rdoc
+Rakefile
+data/<%= file_name %>/apps/<%= file_name %>_app
+data/<%= file_name %>/templates/layout.tmpl
+data/<%= file_name %>/templates/top.tmpl
+lib/<%= file_name %>.rb
+spec/<%= file_name %>_spec.rb

data/contrib/hoetemplate/README.rdoc.erb

@@ -0,0 +1,17 @@
+= <%= project %>
+
+* <%= XIF %> (url)
+
+== Description
+
+<%= XIF %> (describe your package)
+
+== Installation
+
+    gem install <%= project %>
+
+== License
+
+Copyright (c) <%= Time.now.strftime("%Y") %>, <%= XIF %>
+All rights reserved.
+

data/contrib/hoetemplate/Rakefile.erb

@@ -0,0 +1,24 @@
+#!/usr/bin/env rake
+
+begin
+	require 'hoe'
+rescue LoadError
+	abort "This Rakefile requires 'hoe' (gem install hoe)"
+end
+
+# Sign gems
+Hoe.plugin :signing
+
+Hoe.spec '<%= project %>' do
+	self.readme_file = 'README.rdoc'
+	self.history_file = 'History.rdoc'
+	self.extra_rdoc_files = FileList[ '*.rdoc' ]
+
+	self.developer '<%= XIF %>', '<%= XIF %>' # (name, email)
+
+	self.dependency 'strelka', '~> 0.1'
+	self.dependency 'rspec', '~> 2.7', :developer
+
+	self.require_ruby_version( '~> 1.9' )
+end
+

data/contrib/hoetemplate/data/file_name/apps/file_name_app

@@ -0,0 +1,36 @@
+#!/usr/bin/env ruby
+
+require 'strelka'
+
+
+# The main <%= project %> application
+class <%= klass %>::Application < Strelka::App
+
+	# Uncomment this if you need an appid other than 
+	# '<%= klass.gsub(/[^[:alnum:]]+/, '-').downcase %>-application'.
+	#ID = '<%= XIF %>' # (set the app id of the main application)
+
+	# Load some plugins
+	plugins :templating, :routing
+
+	# By default, responses are HTML
+	default_type 'text/html'
+
+	# Templating -- wrap everything in the layout
+	layout 'layout.tmpl'
+	templates \
+		:top => 'top.tmpl'
+
+
+	# GET request handler -- handles all GET requests
+	get do |req|
+		# Use the 'top' template for the body, wrapped in the 'layout' template
+		return :top
+	end
+
+
+end # class <%= klass %>::Application
+
+
+<%= klass %>::Application.run if __FILE__ == $0
+

data/contrib/hoetemplate/data/file_name/templates/layout.tmpl.erb

@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<title>
+			<%= XIF %> (application title)
+		</title>
+	</head>
+	<body>
+		<!-- <%= XIF %> (set up the main layout template) -->
+		<?attr body ?>
+	</body>
+</html>
+

data/contrib/hoetemplate/data/file_name/templates/top.tmpl.erb

@@ -0,0 +1,8 @@
+<!-- <%= XIF %> (set up the main content template) -->
+
+<p>Your request looked this:</p>
+
+<pre><code>
+<?prettyprint request ?>
+</code></pre>
+

data/contrib/hoetemplate/lib/file_name.rb.erb

@@ -0,0 +1,18 @@
+#!/usr/bin/env ruby
+
+# <%= XIF %> (top-level documentation)
+# 
+# == Author/s
+# 
+# * Michael Granger <ged@FaerieMUD.org>
+# 
+module <%= klass %>
+
+	# Library version constant
+	VERSION = '0.0.1'
+
+	# Version-control revision constant
+	REVISION = %q$Revision: c21afe9776d3 $
+
+end # module <%= klass %>
+

data/contrib/hoetemplate/spec/file_name_spec.rb.erb

@@ -0,0 +1,21 @@
+#!/usr/bin/env rspec -cfd -b
+
+BEGIN {
+	require 'pathname'
+	basedir = Pathname( __FILE__ ).dirname.parent
+	libdir = basedir + 'lib'
+
+	$LOAD_PATH.unshift( libdir.to_s ) unless $LOAD_PATH.include?( libdir.to_s )
+}
+
+require 'rspec'
+require '<%= file_name %>'
+
+describe <%= klass %> do
+
+	it "is well-tested" do
+		fail "it isn't"
+	end
+
+end
+

data/data/strelka/apps/hello-world

@@ -0,0 +1,30 @@
+#!/usr/bin/env ruby
+
+require 'strelka'
+
+# The Strelka admin web console.
+class HelloWorldApp < Strelka::App
+
+	# The route appid that will configure this app if no appid is specified
+	ID = 'hello-world'
+
+
+	# Use Sinatra-like routing
+	plugins :routing
+
+	# Set responses to plaintext if they don't specify differently
+	default_type 'text/plain'
+
+	# Handle all GET requests the same way
+	get do |req|
+		res = req.response
+		res.status = HTTP::OK
+		res << 'Hello, world!'
+		return res
+	end
+
+end # class HelloWorldApp
+
+
+# Run the app
+HelloWorldApp.run if __FILE__ == $0