strelka 0.11.0 → 0.12.0

data/spec/strelka/discovery_spec.rb

@@ -19,15 +19,16 @@ require 'strelka/discovery'
 describe Strelka::Discovery do
 
 	before( :all ) do
-		Mongrel2::Config.db = Mongrel2::Config.in_memory_db
-		Mongrel2::Config.init_database
+		@real_discovered_apps = described_class.instance_variable_get( :@discovered_apps )
+	end
 
-		# Skip loading the 'strelka' gem, which probably doesn't exist in the right version
-		# in the dev environment
-		strelkaspec = make_gemspec( 'strelka', Strelka::VERSION, false )
-		loaded_specs = Gem.instance_variable_get( :@loaded_specs )
-		loaded_specs['strelka'] = strelkaspec
+	after( :all ) do
+		described_class.instance_variable_set( :@discovered_apps, @real_discovered_apps )
+	end
 
+	before( :each ) do
+		described_class.instance_variable_set( :@discovered_apps, nil )
+		described_class.configure
 	end
 
 
@@ -38,101 +39,88 @@ describe Strelka::Discovery do
 	# Examples
 	#
 
-	it "has a method for loading app class/es from a file" do
-
-		app_file = 'an_app.rb'
-		app_path = Pathname( app_file ).expand_path
-		app_class = nil
+	it "provides a mechanism for registering apps" do
+		described_class.register_app( 'foo', 'a/path/to/foo.rb' )
+		described_class.register_app( 'bar', 'a/path/to/bar.rb' )
 
-		expect( Kernel ).to receive( :load ).with( app_path.to_s ) do
-			app_class = Class.new( discoverable_class )
-		end
-		expect( described_class.load(app_file) ).to eq( [ app_class ] )
+		expect( described_class.discovered_apps ).to include(
+			'foo' => 'a/path/to/foo.rb',
+            'bar' => 'a/path/to/bar.rb'
+		)
 	end
 
 
-	it "defaults to loading as a file when finding an app"
-
+	it "raises an error if two apps try to register with the same name" do
+		described_class.register_app( 'foo', 'a/path/to/foo.rb' )
+		expect {
+			described_class.register_app( 'foo', 'a/path/to/bar.rb' )
+		}.to raise_error( /can't register a second 'foo' app/i )
+			end
 
-	it "has a method for discovering installed Strelka app files" do
-		specs = {}
-		specs[:donkey]     = make_gemspec( 'donkey',  '1.0.0' )
-		specs[:rabbit_old] = make_gemspec( 'rabbit',  '1.0.0' )
-		specs[:rabbit_new] = make_gemspec( 'rabbit',  '1.0.8' )
-		specs[:bear]       = make_gemspec( 'bear',    '1.0.0', false )
-		specs[:giraffe]    = make_gemspec( 'giraffe', '1.0.0' )
 
-		expect( Gem::Specification ).to receive( :each ).once do |&block|
-			specs.values.each {|val| block.call(val) }
-		end
+	it "uses Rubygems discovery to find apps" do
+		expect( Gem ).to receive( :find_latest_files ).with( 'strelka/apps.rb' ).
+			and_return([
+				'/some/directory/with/strelka/apps.rb',
+				'/some/other/directory/with/strelka/apps.rb'
+			])
+		expect( Kernel ).to receive( :load ).twice do |file|
+			case file
+			when %r{some/directory}
+				described_class.register_app( 'foo', 'a/path/to/foo.rb' )
+			when %r{other/directory}
+				described_class.register_app( 'bar', 'a/path/to/bar.rb' )
+			end
+	end
 
-		donkey_path  = specs[:donkey].full_gem_path
-		rabbit_path  = specs[:rabbit_new].full_gem_path
-		giraffe_path = specs[:giraffe].full_gem_path
-
-		expect( Dir ).to receive( :glob ).with( 'data/*/{apps,handlers}/**/*' ).
-			and_return( [] )
-		expect( Dir ).to receive( :glob ).with( "#{giraffe_path}/data/giraffe/{apps,handlers}/**/*" ).
-			and_return([ "#{giraffe_path}/data/giraffe/apps/app" ])
-		expect( Dir ).to receive( :glob ).with( "#{rabbit_path}/data/rabbit/{apps,handlers}/**/*" ).
-			and_return([ "#{rabbit_path}/data/rabbit/apps/subdir/app1.rb",
-			             "#{rabbit_path}/data/rabbit/apps/subdir/app2.rb" ])
-		expect( Dir ).to receive( :glob ).with( "#{donkey_path}/data/donkey/{apps,handlers}/**/*" ).
-			and_return([ "#{donkey_path}/data/donkey/apps/app.rb" ])
-
-		app_paths = described_class.discover_paths
-
-		expect( app_paths.size ).to eq(  4  )
-		expect( app_paths ).to include(
-			'donkey'  => [Pathname("#{donkey_path}/data/donkey/apps/app.rb")],
-			'rabbit'  => [Pathname("#{rabbit_path}/data/rabbit/apps/subdir/app1.rb"),
-			              Pathname("#{rabbit_path}/data/rabbit/apps/subdir/app2.rb")],
-			'giraffe' => [Pathname("#{giraffe_path}/data/giraffe/apps/app")]
+		expect( described_class.discovered_apps ).to include(
+			'foo' => 'a/path/to/foo.rb',
+            'bar' => 'a/path/to/bar.rb'
 		)
 	end
 
 
-	it "has a method for loading discovered app classes from installed Strelka app files" do
-		gemspec = make_gemspec( 'blood-orgy', '0.0.3' )
-		expect( Gem::Specification ).to receive( :each ).and_yield( gemspec ).at_least( :once )
+	it "can be configured to look for a different discovery file" do
+		acme_discovery_files = [
+			'/some/directory/with/acme/apps.rb',
+			'/some/other/directory/with/acme/apps.rb'
+		]
 
-		expect( Dir ).to receive( :glob ).with( 'data/*/{apps,handlers}/**/*' ).
-			and_return( [] )
-		expect( Dir ).to receive( :glob ).with( "#{gemspec.full_gem_path}/data/blood-orgy/{apps,handlers}/**/*" ).
-			and_return([ "#{gemspec.full_gem_path}/data/blood-orgy/apps/kurzweil" ])
+		expect( Gem ).to receive( :find_latest_files ).with( 'acme/apps.rb' ).
+			and_return( acme_discovery_files )
 
-		expect( described_class ).to receive( :gem ).with( 'blood-orgy' )
-		expect( Kernel ).to receive( :load ).
-			with( "#{gemspec.full_gem_path}/data/blood-orgy/apps/kurzweil" ) do
-				Class.new( discoverable_class )
-				true
-			end
-
-		app_classes = described_class.discover
-		expect( app_classes.size ).to eq(  1  )
-		expect( app_classes.first ).to be_a( Class )
-		expect( app_classes.first ).to be < discoverable_class
+		described_class.configure( app_discovery_file: 'acme/apps.rb' )
+		expect( described_class.app_discovery_files ).to eq( acme_discovery_files )
 	end
 
 
-	it "handles exceptions while loading discovered apps" do
-		gemspec = make_gemspec( 'blood-orgy', '0.0.3' )
-		expect( Gem::Specification ).to receive( :each ).and_yield( gemspec ).at_least( :once )
+	it "can return the app class associated with an application name" do
+		described_class.register_app( 'foo', 'a/path/to/foo.rb' )
 
-		expect( Dir ).to receive( :glob ).with( 'data/*/{apps,handlers}/**/*' ).
-			and_return( [] )
-		expect( Dir ).to receive( :glob ).with( "#{gemspec.full_gem_path}/data/blood-orgy/{apps,handlers}/**/*" ).
-			and_return([ "#{gemspec.full_gem_path}/data/blood-orgy/apps/kurzweil" ])
+		app_class = nil
+		expect( Kernel ).to receive( :load ) do |path|
+			expect( path ).to eq( 'a/path/to/foo.rb' )
 
-		expect( described_class ).to receive( :gem ).with( 'blood-orgy' )
-		expect( Kernel ).to receive( :load ).
-			with( "#{gemspec.full_gem_path}/data/blood-orgy/apps/kurzweil" ).
-			and_raise( SyntaxError.new("kurzweil:1: syntax error, unexpected coffeeshop philosopher") )
+			app_class = Class.new( discoverable_class )
+		end
 
-		app_classes = Strelka::Discovery.discover
-		expect( app_classes ).to be_empty()
+		expect( described_class.load('foo') ).to eq( app_class )
 	end
 
 
+	it "only returns the first class even if the file declares two" do
+		described_class.register_app( 'foo', 'a/path/to/foo.rb' )
+
+		app_class = app_class2 = nil
+		expect( Kernel ).to receive( :load ) do |path|
+			expect( path ).to eq( 'a/path/to/foo.rb' )
+
+			app_class = Class.new( discoverable_class )
+			app_class2 = Class.new( discoverable_class )
+		end
+
+		expect( described_class.load('foo') ).to eq( app_class )
+	end
+
 end
 

data/spec/strelka_spec.rb

@@ -19,17 +19,5 @@ describe Strelka do
 		end
 	end
 
-	it "provides syntactic sugar for looking up an app class by name" do
-		mox_app = nil
-		expect( Pathname ).to receive( :glob ).
-			with( 'data/*/{apps,handlers}/**/*' ).
-			and_return([ Pathname('data/mox/apps/moxthefox') ])
-
-		expect( Kernel ).to receive( :load ).
-			with( File.expand_path 'data/mox/apps/moxthefox' ) { mox_app = Class.new(Strelka::App) }
-
-		expect( described_class::App('moxthefox') ).to be( mox_app )
-	end
-
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: strelka
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
 platform: ruby
 authors:
 - Mahlon E. Smith
@@ -11,27 +11,32 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDbDCCAlSgAwIBAgIBATANBgkqhkiG9w0BAQUFADA+MQwwCgYDVQQDDANnZWQx
+  MIIEbDCCAtSgAwIBAgIBATANBgkqhkiG9w0BAQsFADA+MQwwCgYDVQQDDANnZWQx
   GTAXBgoJkiaJk/IsZAEZFglGYWVyaWVNVUQxEzARBgoJkiaJk/IsZAEZFgNvcmcw
-  HhcNMTUwNDAxMjEyNDEzWhcNMTYwMzMxMjEyNDEzWjA+MQwwCgYDVQQDDANnZWQx
+  HhcNMTYwODIwMTgxNzQyWhcNMTcwODIwMTgxNzQyWjA+MQwwCgYDVQQDDANnZWQx
   GTAXBgoJkiaJk/IsZAEZFglGYWVyaWVNVUQxEzARBgoJkiaJk/IsZAEZFgNvcmcw
-  ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDb92mkyYwuGBg1oRxt2tkH
-  +Uo3LAsaL/APBfSLzy8o3+B3AUHKCjMUaVeBoZdWtMHB75X3VQlvXfZMyBxj59Vo
-  cDthr3zdao4HnyrzAIQf7BO5Y8KBwVD+yyXCD/N65TTwqsQnO3ie7U5/9ut1rnNr
-  OkOzAscMwkfQxBkXDzjvAWa6UF4c5c9kR/T79iA21kDx9+bUMentU59aCJtUcbxa
-  7kcKJhPEYsk4OdxR9q2dphNMFDQsIdRO8rywX5FRHvcb+qnXC17RvxLHtOjysPtp
-  EWsYoZMxyCDJpUqbwoeiM+tAHoz2ABMv3Ahie3Qeb6+MZNAtMmaWfBx3dg2u+/WN
-  AgMBAAGjdTBzMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQWBBSZ0hCV
-  qoHr122fGKelqffzEQBhszAcBgNVHREEFTATgRFnZWRARmFlcmllTVVELm9yZzAc
-  BgNVHRIEFTATgRFnZWRARmFlcmllTVVELm9yZzANBgkqhkiG9w0BAQUFAAOCAQEA
-  lUKo3NXePpuvN3QGsOLJ6QhNd4+Q9Rz75GipuMrCl296V8QFkd2gg9EG44Pqtk+9
-  Zac8TkKc9bCSR0snakp+cCPplVvZF0/gMzkSTUJkDBHlNV16z73CyWpbQQa+iLJ4
-  uisI6gF2ZXK919MYLn2bFJfb7OsCvVfyTPqq8afPY+rq9vlf9ZPwU49AlD8bPRic
-  0LX0gO5ykvETIOv+WgGcqp96ceNi9XVuJMh20uWuw6pmv/Ub2RqAf82jQSbpz09G
-  G8LHR7EjtPPmqCCunfyecJ6MmCNaiJCBxq2NYzyNmluPyHT8+0fuB5kccUVZm6CD
-  xn3DzOkDE6NYbk8gC9rTsA==
+  ggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQC/JWGRHO+USzR97vXjkFgt
+  83qeNf2KHkcvrRTSnR64i6um/ziin0I0oX23H7VYrDJC9A/uoUa5nGRJS5Zw/+wW
+  ENcvWVZS4iUzi4dsYJGY6yEOsXh2CcF46+QevV8iE+UmbkU75V7Dy1JCaUOyizEt
+  TH5UHsOtUU7k9TYARt/TgYZKuaoAMZZd5qyVqhF1vV+7/Qzmp89NGflXf2xYP26a
+  4MAX2qqKX/FKXqmFO+AGsbwYTEds1mksBF3fGsFgsQWxftG8GfZQ9+Cyu2+l1eOw
+  cZ+lPcg834G9DrqW2zhqUoLr1MTly4pqxYGb7XoDhoR7dd1kFE2a067+DzWC/ADt
+  +QkcqWUm5oh1fN0eqr7NsZlVJDulFgdiiYPQiIN7UNsii4Wc9aZqBoGcYfBeQNPZ
+  soo/6za/bWajOKUmDhpqvaiRv9EDpVLzuj53uDoukMMwxCMfgb04+ckQ0t2G7wqc
+  /D+K9JW9DDs3Yjgv9k4h7YMhW5gftosd+NkNC/+Y2CkCAwEAAaN1MHMwCQYDVR0T
+  BAIwADALBgNVHQ8EBAMCBLAwHQYDVR0OBBYEFHKN/nkRusdqCJEuq3lgB3fJvyTg
+  MBwGA1UdEQQVMBOBEWdlZEBGYWVyaWVNVUQub3JnMBwGA1UdEgQVMBOBEWdlZEBG
+  YWVyaWVNVUQub3JnMA0GCSqGSIb3DQEBCwUAA4IBgQAPJzKiT0zBU7kpqe0aS2qb
+  FI0PJ4y5I8buU4IZGUD5NEt/N7pZNfOyBxkrZkXhS44Fp+xwBH5ebLbq/WY78Bqd
+  db0z6ZgW4LMYMpWFfbXsRbd9TU2f52L8oMAhxOvF7Of5qJMVWuFQ8FPagk2iHrdH
+  inYLQagqAF6goWTXgAJCdPd6SNeeSNqA6vlY7CV1Jh5kfNJJ6xu/CVij1GzCLu/5
+  DMOr26DBv+qLJRRC/2h34uX71q5QgeOyxvMg+7V3u/Q06DXyQ2VgeeqiwDFFpEH0
+  PFkdPO6ZqbTRcLfNH7mFgCBJjsfSjJrn0sPBlYyOXgCoByfZnZyrIMH/UY+lgQqS
+  6Von1VDsfQm0eJh5zYZD64ZF86phSR7mUX3mXItwH04HrZwkWpvgd871DZVR3i1n
+  w8aNA5re5+Rt/Vvjxj5AcEnZnZiz5x959NaddQocX32Z1unHw44pzRNUur1GInfW
+  p4vpx2kUSFSAGjtCbDGTNV2AH8w9OU4xEmNz8c5lyoA=
   -----END CERTIFICATE-----
-date: 2016-01-20 00:00:00.000000000 Z
+date: 2016-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: configurability
@@ -109,20 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.43'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.43.1
+        version: '0.44'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.43'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.43.1
+        version: '0.44'
 - !ruby/object:Gem::Dependency
   name: pluggability
   requirement: !ruby/object:Gem::Requirement
@@ -213,14 +212,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: hoe-highline
   requirement: !ruby/object:Gem::Requirement
@@ -236,75 +235,75 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.2'
 - !ruby/object:Gem::Dependency
-  name: rdoc
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0.7'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: rdoc-generator-fivefish
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.1'
 - !ruby/object:Gem::Dependency
-  name: rdoc-generator-fivefish
+  name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: hoe
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.14'
+        version: '3.15'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.14'
+        version: '3.15'
 description: |-
   Strelka is a framework for creating and deploying
   Mongrel2[http://mongrel2.org/] web applications in Ruby.
@@ -385,6 +384,10 @@ files:
 - lib/strelka/authprovider/basic.rb
 - lib/strelka/authprovider/hostaccess.rb
 - lib/strelka/behavior/plugin.rb
+- lib/strelka/cli.rb
+- lib/strelka/command/config.rb
+- lib/strelka/command/discover.rb
+- lib/strelka/command/start.rb
 - lib/strelka/constants.rb
 - lib/strelka/cookie.rb
 - lib/strelka/cookieset.rb
@@ -438,6 +441,7 @@ files:
 - spec/strelka/authprovider/basic_spec.rb
 - spec/strelka/authprovider/hostaccess_spec.rb
 - spec/strelka/authprovider_spec.rb
+- spec/strelka/cli_spec.rb
 - spec/strelka/cookie_spec.rb
 - spec/strelka/cookieset_spec.rb
 - spec/strelka/discovery_spec.rb
@@ -477,7 +481,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -485,7 +489,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.7
 signing_key: 
 specification_version: 4
 summary: Strelka is a framework for creating and deploying Mongrel2[http://mongrel2.org/]