screenplay 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dbb612ed6af3abe140b84a1f5ff9f260c7d9b682
-  data.tar.gz: 6a7606ad77ba8dd2999d676b92d8b580b85759cb
+  metadata.gz: 44f52b1b8d4f20187a8b6b5cb50694b252ebca2e
+  data.tar.gz: 1235e198871f25c604b7916121aa04b7ff30b6f2
 SHA512:
-  metadata.gz: 1ae0e7d50879140a9f208e3ff93bdc3c27fa0b20ff01b2bd70df4529fe1aafab406c7d846be6e5c0f03a8a8bb32656d7539069de6b46c3bee2ea570bad1853e4
-  data.tar.gz: 4f3c5df6e4d8221f1b9950b9f76e1ff7164774e0098341680f3d5fe943fcc66fb8ae40c827061c73fdac718ce6c7bcfcf7ffad375796ac84664ac38b1755218d
+  metadata.gz: 7dc4d49f25e01384ac4880d6dd1be2cd6b82e2b842b59e85885fb8e8369c5be5698e2493fc7d53c590beea0544063f7428dd6e1cb2439ad69b70d7d1e3c4bf62
+  data.tar.gz: 02d6d947663b07aa93e6e83bf5b7e4d462234673a624e1d99a309bb8251b3f97fa14db8e84028c50e06ce964214d07780c25601a5e0475a51ac365657babe856

data/bin/screenplay

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 
+$:.unshift(Dir.pwd)
 $:.unshift(File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib')))
 
 require 'screenplay'
@@ -22,7 +23,8 @@ $ARGV_PARSER = OptionParser.new { | opts |
 	opts.on('-a DIR', '--actors DIR', 'Directory where custom actors can be found. By default in the ./actors directory near the config file.') { | d | $SCREENPLAY_ACTORS_DIR = d }
 	opts.on('-s DIR', '--scenarios DIR', 'Directory where the scenarios can be found. By default in the ./scenarios director near the config file.') { | d | $SCREENPLAY_SCENARIOS_DIR = d }
 	opts.on('-d', '--debug', 'Shows full stack trace on when failed. Especially usefull when developing new actors or other information.') { $SCREENPLAY_OPTIONS[:debug] = true }
-	opts.on('-q', '--quiet', 'Doesn\'t show the output of the scenes.') { $SCREENPLAY_OPTIONS[:quiet] = true }
+	opts.on('-q', '--quiet', 'Doesn\'t show dots or the output of the scenes.') { $SCREENPLAY_OPTIONS[:quiet] = true }
+	opts.on('-o', '--show-output', 'Show the output of the scenes instead of dots.') { $SCREENPLAY_OPTIONS[:show_output] = true }
 	opts.on('-h', '--human-friendly', 'Formats outputted JSON.') { $SCREENPLAY_OPTIONS[:human_friendly] = true }
 	opts.separator('')
 }
@@ -36,6 +38,9 @@ def play
 	Screenplay.prepare
 	begin
 		Screenplay.play($SCREENPLAY_OPTIONS)
+	rescue Screenplay::ScenarioFailedException => e
+		raise e.inner_exception if $SCREENPLAY_OPTIONS[:debug]
+		abort(e.message)
 	rescue Exception => e
 		raise if $SCREENPLAY_OPTIONS[:debug]
 		abort(e.message)

data/lib/screenplay.rb

@@ -21,7 +21,7 @@ module Screenplay
 		options[:quiet] ||= false
 		options[:human_friendly] ||= false
 
-		raise Exception.new('ERROR: Couldn\'t find any scenarios to play.') if Scenarios.size == 0
+		raise 'ERROR: Couldn\'t find any scenarios to play.' if Scenarios.size == 0
 
 		# First check if we know all needed actors
 		each_scene { | scenario_name, actor_name  |
@@ -29,20 +29,26 @@ module Screenplay
 		}
 
 		each_scene { | scenario, actor_name, params, input, index |
-			puts "##### #{scenario.name} - #{actor_name}: #####" unless (options[:quiet])
+			puts "##### #{scenario.name} - #{actor_name}: #####" if !options[:quiet] && options[:show_output]
+			params ||= {}
 			begin
 				output = Cast.get(actor_name).play(params, input)
 			rescue Exception => e
-				raise ScenarioFailedException.new(scenario, index, actor_name, e.message)
+				raise ScenarioFailedException.new(scenario, index, actor_name, e)
 			end
 			output.symbolize_keys!
 			unless (options[:quiet])
+				if (options[:show_output])
 				output_str = options[:human_friendly] ? JSON.pretty_generate(output) : output.to_s
 				puts "output = #{output_str}"
 				puts ''
+				else
+					STDOUT << '.'
+				end
 			end
 			output
 		}
+		puts '' unless (options[:quiet])
 	end
 
 	def each_scene

data/lib/screenplay/actor.rb

@@ -3,7 +3,7 @@ require 'screenplay/configuration'
 
 module Screenplay
 
-	class MethodNotImplemented < Exception
+	class MethodNotImplemented < StandardError
 
 		def initialize(name)
 			super("Method #{name} is not implemented.")
@@ -12,7 +12,7 @@ module Screenplay
 	end
 
 
-	class UnknownActorException < Exception
+	class UnknownActorException < StandardError
 
 		def initialize(scenario, name)
 			super("The scenario #{scenario} uses unknown actor #{name}.")

data/lib/screenplay/actors/api.rb

@@ -3,9 +3,9 @@ require File.join(File.dirname(__FILE__), '..', 'actor')
 
 module Screenplay
 
-	class WrongResponseCodeException < Exception
-		def initialize(expected, actual)
-			super("Expected HTTP response code #{expected}, but received #{actual}.")
+	class WrongResponseCodeException < StandardError
+		def initialize(expected, actual, body)
+			super("Expected HTTP response code #{expected}, but received #{actual}. Response body was: #{body}")
 		end
 	end
 
@@ -21,7 +21,7 @@ module Screenplay
 		end
 
 		def play(params, input)
-			raise Exception.new('Missing configuration api.url') if @url == '/'
+			raise 'Missing configuration api.url' if @url == '/'
 			path = params[:path]
 			method = params[:method].downcase.to_sym rescue :get
 			expects = (params[:expect] || 200).to_i
@@ -44,11 +44,12 @@ module Screenplay
 					payload: data
 				})
 			rescue => e
+				raise e if e.response.nil?
 				response = e.response
 			end
 
 			if response.code != expects
-				raise WrongResponseCodeException.new(expects, response.code)
+				raise WrongResponseCodeException.new(expects, response.code, response.body.to_s)
 			end
 
 			unless response.nil?

data/lib/screenplay/actors/cache.rb

@@ -15,11 +15,11 @@ module Screenplay
 				if action == :clear
 					@cache.clear
 				elsif action == :set
-					values.each { | input_key, cache_key |
-						@cache[cache_key.to_sym] = (input_key == '$input'.to_sym) ? input : input[input_key]
+					values.each { | cache_key, input_key  |
+						@cache[cache_key.to_sym] = (input_key == '$input'.to_sym) ? input : input[input_key.to_sym]
 					}
 				elsif (action == :merge || action == :get)
-					values.each { | cache_key, input_key |
+					values.each { | input_key, cache_key |
 						output[input_key.to_sym] = @cache[cache_key.to_sym]
 					}
 				end

data/lib/screenplay/actors/test.rb

@@ -2,25 +2,25 @@ require File.join(File.dirname(__FILE__), '..', 'actor')
 
 module Screenplay
 
-	class TestFailedException < Exception
+	class TestFailedException < StandardError
 		def initialize(test, a, b)
 			super("#{test} on #{a.to_s} failed. Expected: #{b.to_s}.")
 		end
 	end
 
-	class UnknownTestException < Exception
+	class UnknownTestException < StandardError
 		def initialize(test)
 			super("Unknown test #{test}")
 		end
 	end
 
-	class UnsupportedTypeTestException < Exception
+	class UnsupportedTypeTestException < StandardError
 		def initialize(test, a)
 			super("Unsupported data type for test #{test}: #{a.to_s}")
 		end
 	end
 
-	class UnknownInputKeyException < Exception
+	class UnknownInputKeyException < StandardError
 		def initialize(test, key)
 			super("Couldn't find #{key} in the input for test #{test}.")
 		end

data/lib/screenplay/cast.rb

@@ -9,7 +9,7 @@ module Screenplay
 		include Enumerable
 
 		def register(actor)
-			raise Exception.new("Actor #{actor.name} is already registered.") if @actors.include?(actor.name)
+			raise "Actor #{actor.name} is already registered." if @actors.include?(actor.name)
 			@actors.push(actor)
 			@actors.sort_by!{ | actor | actor.name }
 		end

data/lib/screenplay/datatype-extensions.rb

@@ -38,6 +38,7 @@ class Hash
 			end
 			self[key.to_sym].symbolize_keys! if (recursive && (self[key.to_sym].is_a?(Hash) || self[key.to_sym].is_a?(Array)))
 		}
+		return self
 	end
 
 	# Changes all keys to strings.  If the value is an array or hash, it will do this recursively.
@@ -49,6 +50,7 @@ class Hash
 				self[(key.to_s rescue key) || key] = val
 			end
 		end
+		return self
 	end
 
 end

data/lib/screenplay/scenario.rb

@@ -2,9 +2,12 @@ require 'yaml'
 
 module Screenplay
 
-	class ScenarioFailedException < Exception
-		def initialize(scenario, index, actor_name, message)
-			super("FAILED: Scenario #{scenario.name}, scene #{index} of #{scenario.size}, actor #{actor_name}: #{message}")
+	class ScenarioFailedException < StandardError
+		attr_reader :inner_exception
+
+		def initialize(scenario, index, actor_name, exception)
+			@inner_exception = exception
+			super("FAILED: Scenario #{scenario.name}, scene #{index} of #{scenario.size}, actor #{actor_name}: #{exception.message}")
 		end
 	end
 
@@ -22,8 +25,10 @@ module Screenplay
 
 		def each
 			@actions.each { | action |
+				next if action.nil?
+				action = { action => {} } if action.is_a?(String)
 				actor = action.keys[0]
-				data = action[actor]
+				data = action[actor] || {}
 				yield actor, data
 			}
 		end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: screenplay
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Taco Jan Osinga
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-31 00:00:00.000000000 Z
+date: 2015-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client