strelka 0.14.0 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a3240568b10c3d9c47ad9523c8d41d6b9c87c9c0
-  data.tar.gz: d6e59f27d6a5bf2bd5387a79fec0df667aee742a
+SHA256:
+  metadata.gz: b3f507404467109d9a12cc44e9812b9a6b1dda25bc81dd31f18f98045dc29a9b
+  data.tar.gz: 9d22995690154b9f4506363d8d711d82c67bd8c937518d7ceafbb525134768c3
 SHA512:
-  metadata.gz: fa0e979b77b9d5a531cee6f0ff28dac2b9ae5e67fc6b4dc27eacc7e797634a8ea14f5874dcf1e26b1143e8c96852ef796fb20a4f0cc20cdd67cf170b02e90998
-  data.tar.gz: 6ad652606601a7ab37210e9843c4bc8e5639d35e9fc525da140e48f0a59a9a216350f6b254a0383a0b2a181acac7c30cbb2ddc774be696639dda39247bc2258e
+  metadata.gz: 4356e70224bd00be85f760c9a02a751d4f3cc36c47a1d4ac6e2a0317f6ef8f58ec2489adfa1def40b411df3a60832bb840b85cf6f0d3e67b73bc01eaa40c587b
+  data.tar.gz: b078ce2eddb2f291644b5930abb3f6f0e9dc82b9acfb324dc89941c24420f31f666ec41fffd62d515478f6a9e3f9ef9e560e02cd07a410913c260628a5582638

data/ChangeLog

@@ -1,9 +1,49 @@
+2017-05-31  Mahlon E. Smith  <mahlon@martini.nu>
+
+	* spec/strelka/app_spec.rb, spec/strelka/discovery_spec.rb:
+	Fix tests for discovery loader, mock zmq poller.
+	[dbe28e0e407c] [tip]
+
+	* lib/strelka/discovery.rb, spec/strelka/app_spec.rb,
+	spec/strelka/discovery_spec.rb, spec/strelka/exceptions_spec.rb,
+	spec/strelka/websocketserver_spec.rb:
+	Have Discovery load the last subclass instead of the first, to
+	support classes that inherit from Strelka::App.
+	[e90ecc97e78c]
+
+2017-05-24  Mahlon E. Smith  <mahlon@martini.nu>
+
+	* lib/strelka/command/start.rb:
+	Load configuration from the global options in the 'start' cli
+	command.
+	[e0744ecac370]
+
 2017-01-19  Michael Granger  <ged@FaerieMUD.org>
 
+	* .hgtags:
+	Added tag v0.14.0 for changeset 8a6b1bb961ba
+	[844003989c8a]
+
+	* .hgsigs:
+	Added signature for changeset e44936a1b4ac
+	[8a6b1bb961ba] [v0.14.0]
+
+	* History.rdoc, lib/strelka.rb:
+	Bump the minor version, update history.
+	[e44936a1b4ac]
+
+	* Rakefile, lib/strelka.rb, lib/strelka/app.rb,
+	lib/strelka/multipartparser.rb:
+	Bump Inversion dependency, fix a few small issues
+
+	- Fix devmode when $DEBUG is set
+	- Fix spooldir when explicitly unconfigured.
+	[0fc4cd3ec733]
+
 	* lib/strelka/app.rb, lib/strelka/discovery.rb,
 	lib/strelka/multipartparser.rb:
 	Change Strelka configuration to use 3.x syntax/naming
-	[72c4fff2f719] [tip]
+	[72c4fff2f719]
 
 	* lib/strelka.rb, lib/strelka/cli.rb, lib/strelka/command/config.rb,
 	lib/strelka/discovery.rb, spec/strelka/app/templating_spec.rb:

data/History.rdoc

@@ -1,3 +1,14 @@
+==  v0.15.0 [2017-06-14] Michael Granger <ged@FaerieMUD.org>
+
+Enhancements:
+
+- Warn instead of raising on duplicate app names during discover.
+- Have Discovery load the last subclass instead of the first, to
+  support classes that inherit from Strelka::App.
+- Load configuration from the global options in the 'start' cli
+  command.
+
+
 == v0.14.0 [2017-01-19] Michael Granger <ged@FaerieMUD.org>
 
 Enhancements:

data/lib/strelka.rb

@@ -25,10 +25,10 @@ module Strelka
 	log_as :strelka
 
 	# Library version constant
-	VERSION = '0.14.0'
+	VERSION = '0.15.0'
 
 	# Version-control revision constant
-	REVISION = %q$Revision: e44936a1b4ac $
+	REVISION = %q$Revision: 670190273d27 $
 
 	require 'strelka/mixins'
 	require 'strelka/constants'

data/lib/strelka/command/start.rb

@@ -13,10 +13,9 @@ module Strelka::CLI::Start
 	arg :APPNAME
 	command :start do |cmd|
 
-		cmd.action do |globals, options, args|
+		cmd.action do |global, options, args|
 			appname = args.pop
 			gemname = args.pop
-			path    = nil
 
 			gem( gemname ) if gemname
 
@@ -29,7 +28,7 @@ module Strelka::CLI::Start
 				end
 
 			Strelka::CLI.prompt.say "Starting %s (%p)." % [ appname, app ]
-			Strelka.load_config( options[:c] ) if options[:c]
+			Strelka.load_config( global.config ) if global.config
 			unless_dryrun( "starting the app" ) do
 				app.run
 			end

data/lib/strelka/discovery.rb

@@ -131,8 +131,9 @@ module Strelka::Discovery
 		@discovered_apps ||= {}
 
 		if @discovered_apps.key?( name )
-			raise "Can't register a second '%s' app at %s; already have one at %s" %
+			warn "Can't register a second '%s' app at %s; already have one at %s" %
 				[ name, path, @discovered_apps[name] ]
+			return
 		end
 
 		self.log.debug "Registered app at %s as %p" % [ path, name ]
@@ -218,7 +219,7 @@ module Strelka::Discovery
 		new_subclasses = self.discovered_classes[ loading_file ]
 		self.log.debug "  loaded %d new app class/es" % [ new_subclasses.size ]
 
-		return new_subclasses.first
+		return new_subclasses.last
 	ensure
 		Thread.current[ :__loading_file ] = nil
 	end

data/spec/strelka/app_spec.rb

@@ -5,7 +5,6 @@
 require_relative '../helpers'
 
 require 'rspec'
-require 'zmq'
 require 'mongrel2'
 
 require 'strelka'
@@ -209,6 +208,8 @@ describe Strelka::App do
 	it "uses the app's ID constant for the appid if .run is called without one" do
 		@app.const_set( :ID, 'testing-app' )
 		conn = double( "Mongrel2 connection", close: true )
+		allow( conn ).to receive( :request_sock )
+		allow( CZTop::Poller ).to receive( :new )
 
 		expect( Mongrel2::Handler ).to receive( :connection_info_for ).with( 'testing-app' ).
 			and_return([ TEST_SEND_SPEC, TEST_RECV_SPEC ])
@@ -225,6 +226,8 @@ describe Strelka::App do
 			def self::name; "My::First::Blog" ; end
 		end
 		conn = double( "Mongrel2 connection", close: true )
+		allow( conn ).to receive( :request_sock )
+		allow( CZTop::Poller ).to receive( :new )
 
 		expect( Mongrel2::Handler ).to receive( :connection_info_for ).with( 'my-first-blog' ).
 			and_return([ TEST_SEND_SPEC, TEST_RECV_SPEC ])

data/spec/strelka/discovery_spec.rb

@@ -5,7 +5,6 @@
 require_relative '../helpers'
 
 require 'rspec'
-require 'zmq'
 require 'mongrel2'
 
 require 'strelka'
@@ -54,8 +53,8 @@ describe Strelka::Discovery 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
+		}.to output( /can't register a second 'foo' app/i ).to_stderr
+	end
 
 
 	it "uses Rubygems discovery to find apps" do
@@ -71,7 +70,7 @@ describe Strelka::Discovery do
 			when %r{other/directory}
 				described_class.register_app( 'bar', 'a/path/to/bar.rb' )
 			end
-	end
+		end
 
 		expect( described_class.discovered_apps ).to include(
 			'foo' => 'a/path/to/foo.rb',
@@ -108,7 +107,7 @@ describe Strelka::Discovery do
 	end
 
 
-	it "only returns the first class even if the file declares two" do
+	it "only returns the last class that was declared" do
 		described_class.register_app( 'foo', 'a/path/to/foo.rb' )
 
 		app_class = app_class2 = nil
@@ -119,7 +118,7 @@ describe Strelka::Discovery do
 			app_class2 = Class.new( discoverable_class )
 		end
 
-		expect( described_class.load('foo') ).to eq( app_class )
+		expect( described_class.load('foo') ).to eq( app_class2 )
 	end
 
 end

data/spec/strelka/exceptions_spec.rb

@@ -5,7 +5,6 @@
 require_relative '../helpers'
 
 require 'rspec'
-require 'zmq'
 require 'mongrel2'
 
 require 'strelka'

data/spec/strelka/websocketserver_spec.rb

@@ -5,7 +5,6 @@
 require_relative '../helpers'
 
 require 'rspec'
-require 'zmq'
 require 'mongrel2'
 
 require 'strelka'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: strelka
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.15.0
 platform: ruby
 authors:
 - Mahlon E. Smith
@@ -36,7 +36,7 @@ cert_chain:
   w8aNA5re5+Rt/Vvjxj5AcEnZnZiz5x959NaddQocX32Z1unHw44pzRNUur1GInfW
   p4vpx2kUSFSAGjtCbDGTNV2AH8w9OU4xEmNz8c5lyoA=
   -----END CERTIFICATE-----
-date: 2017-01-19 00:00:00.000000000 Z
+date: 2017-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: configurability
@@ -212,14 +212,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: hoe-highline
   requirement: !ruby/object:Gem::Requirement
@@ -296,14 +296,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.15'
+        version: '3.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.15'
+        version: '3.16'
 description: |-
   Strelka is a framework for creating and deploying
   Mongrel2[http://mongrel2.org/] web applications in Ruby.
@@ -489,7 +489,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Strelka is a framework for creating and deploying Mongrel2[http://mongrel2.org/]