strelka 0.0.1.pre184 → 0.0.1.pre.185

data/IDEAS.rdoc

@@ -6,11 +6,11 @@ planned for a future release.
 Everything here is subject to change, but we'll try to keep this document
 up-to-date if it does.
 
-== Leash
+== /bin/strelka CLI App
 
 Show a list of installed applications:
 
-    $ leash discover
+    $ strelka discover
     Searching for Strelka applications...
     
     strelka:
@@ -27,7 +27,7 @@ mongrel2 config database:
 
     $ mkdir /service/cms
 	$ cd /service/cms
-    $ leash -c /usr/local/etc/mongrel2.sqlite setup strelka-cms content-manager
+    $ strelka -c /usr/local/etc/mongrel2.sqlite setup strelka-cms content-manager
 
 The application can register pre- and post-install hooks that run migrations,
 prompt for config values, etc.
@@ -35,7 +35,7 @@ prompt for config values, etc.
 Then, to start the app:
 
     $ cd /service/cms
-    $ leash --sudo start
+    $ strelka --sudo start
 
 This stuff will probably use Isolate[https://github.com/jbarnette/isolate] for
 gem sandboxing.

data/Manifest.txt

@@ -5,7 +5,7 @@ IDEAS.rdoc
 Manifest.txt
 README.rdoc
 Rakefile
-bin/leash
+bin/strelka
 contrib/hoetemplate/History.rdoc.erb
 contrib/hoetemplate/Manifest.txt.erb
 contrib/hoetemplate/README.rdoc.erb

data/bin/{leash → strelka}

@@ -10,8 +10,8 @@ gem 'sysexits'
 require 'sysexits'
 
 
-# A tool for setting up and controlling a Mongrel2 cluster.
-class Strelka::LeashCommand
+# A tool for setting up and running Strelka apps
+class Strelka::CLICommand
 	extend ::Sysexits
 	include Sysexits,
 	        Strelka::Loggable,
@@ -104,6 +104,8 @@ class Strelka::LeashCommand
 
 				text 'Global Options'
 				opt :config, "Specify the config file to load.", :type => :string
+				opt :datadir, "Override the Strelka data directory.", :type => :string,
+					:short => :D
 				text ''
 
 				text 'Other Options:'
@@ -194,6 +196,9 @@ class Strelka::LeashCommand
 		command ||= 'shell'
 		cmd_method = nil
 
+		# Set the datadir override if it's given
+		Strelka.datadir = Pathname( options.datadir ) if self.options.datadir
+
 		begin
 			cmd_method = self.method( "#{command}_command" )
 		rescue NameError => err
@@ -365,8 +370,8 @@ class Strelka::LeashCommand
 		message( self.prompt.list(items.flatten.compact.map(&:to_s), :columns_down) )
 	end
 
-end # class Strelka::LeashCommand
+end # class Strelka::CLICommand
 
 
-Strelka::LeashCommand.run( ARGV.dup )
+Strelka::CLICommand.run( ARGV.dup )
 

data/lib/strelka/app.rb

@@ -81,7 +81,7 @@ class Strelka::App < Mongrel2::Handler
 	### keyed by gemspec name .
 	def self::discover_paths
 		appfiles = {
-			'strelka' => Pathname.glob( DATADIR + APP_GLOB_PATTERN )
+			'strelka' => Pathname.glob( Strelka.datadir + APP_GLOB_PATTERN )
 		}
 
 		# Find all the gems that depend on Strelka

data/lib/strelka/constants.rb

@@ -12,7 +12,7 @@ module Strelka::Constants
 	include Mongrel2::Constants
 
 	# The data directory in the project if that exists, otherwise the gem datadir
-	DATADIR = if ENV['STRELKA_DATADIR']
+	DEFAULT_DATADIR = if ENV['STRELKA_DATADIR']
 			Pathname( ENV['STRELKA_DATADIR'] )
 		elsif File.directory?( 'data/strelka' )
 			Pathname( 'data/strelka' )

data/lib/strelka.rb

@@ -21,7 +21,7 @@ module Strelka
 	VERSION = '0.0.1'
 
 	# Version-control revision constant
-	REVISION = %q$Revision: 28465ed81190 $
+	REVISION = %q$Revision: 195b7937f42a $
 
 
 	require 'strelka/logging'
@@ -35,6 +35,8 @@ module Strelka
 	include Strelka::Constants
 
 	require 'strelka/exceptions'
+	require 'strelka/mixins'
+	extend Strelka::MethodUtilities
 
 
 	### Get the library version. If +include_buildnum+ is true, the version string will
@@ -45,8 +47,16 @@ module Strelka
 		return vstring
 	end
 
+
+	##
+	# The Pathname of the directory that will be searched for default applications,
+	# config, etc.
+	singleton_attr_accessor :datadir
+	self.datadir = DEFAULT_DATADIR
+
 	require 'strelka/app'
 	require 'strelka/httprequest'
+	require 'strelka/httpresponse'
 
 
 	# The installed Configurability::Config object

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: strelka
 version: !ruby/object:Gem::Version
-  version: 0.0.1.pre184
+  version: 0.0.1.pre.185
   prerelease: 
 platform: ruby
 authors:
@@ -305,7 +305,7 @@ description: ! 'Strelka is a framework for creating and deploying Mongrel2 web a
 email:
 - ged@FaerieMUD.org
 executables:
-- leash
+- strelka
 extensions: []
 extra_rdoc_files:
 - History.rdoc
@@ -320,7 +320,7 @@ files:
 - Manifest.txt
 - README.rdoc
 - Rakefile
-- bin/leash
+- bin/strelka
 - contrib/hoetemplate/History.rdoc.erb
 - contrib/hoetemplate/Manifest.txt.erb
 - contrib/hoetemplate/README.rdoc.erb