gatling-rake 1.0.3 → 1.0.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YjE3ZjY3NTEyNGEyMzdiMzVkZWRiYmIwZDQ0Njk0YThmNWEwZWFhZA==
+    ZDFlZmM4N2QzZTBjYjA0Njk3ZDY2MzliODMwZWU3Y2I5MjI4ZDk2Yw==
   data.tar.gz: !binary |-
-    M2QzZjkyOWUxYzExODlkMjc4NWJiYWQ5ODkwY2MyMjI0Mzc3OTYzOA==
+    Y2YzNmIyODRhMTMzYjg2OTE4ZTkzZjI4ZjEwMDAyMzE3NmRkNjU1YQ==
 SHA512:
   metadata.gz: !binary |-
-    YTRkOWQ0ZDlmNmU1MzdhNDc0YzEyZWIwYTRlYzEwOTlkM2VhNDk1ODJiMWNk
-    OTAzNTZiMzA0ZWRlMGI1YTdjMDNkYTZiMzcxMGRlMWJlYTJjOGIyNzMxODk0
-    MDBkMmY2YTdmNTM3MzBhZDBkYjZiY2Y1MmY1OTQ2ZDk2MGU4M2U=
+    ZjY5Y2RmODZiYTZlMGVlNTM0MzU4Y2FlM2Q3YTVhZDY2NGE0ZjJkYWViNGQ1
+    MGQ2Yzg4NzJlMWRiNzExM2Q5YmY5ZWIwZWY3ZGZmZTcyZTdiOGM5N2NiOThk
+    ZWE3YWI4YjE0NGM5Yzc2MDAwNWZiZDA3ZWE2OGEyZDYwZjNkNDM=
   data.tar.gz: !binary |-
-    MzgzYTlhNmEyODNlZmMzZDE3YmFlMjFjNTZlNWM0MzNkY2ViMGY2YThiYzI1
-    MTQyYzdjMjE1N2IxOTkzYmRlMjMyZjBhNWNhNDMwNGRjNjk1MDk1NGI0ZjJj
-    YmJiM2JkMGI3M2U1NGZhMjQ2OGFjNzM3YzRiYTBlZDAzN2YzZDQ=
+    NWRmNWRkMTZjYmU1ZTA3MWEyNmNjMjVhM2Q4YjBiZWE5ZTgzZDJkZTJiZTRm
+    ODNkZDIyNjhkOWZkOWFlZWNlNGVmYmMwNDgwMzA4MzUyOTRiMGVlYmEwNmM0
+    MGI0NzNlOTIxNTgyZTFlMTk2MDZmMWZjZDRhNDk2ZjJkNjVjNjg=

data/lib/src/Gatling.rb

@@ -1,18 +1,17 @@
 require_relative 'GatlingCommand'
-require_relative 'RemoveDirectoryCommand'
 
 module RakeGatling
 	class Gatling 
 		include Commands
 		def initialize(shell)
 			@shell = shell
-			@remove_directory = RemoveDirectoryCommand.new(shell)
 			@run_gatling = GatlingCommand.new(shell)
 		end
 
 		def start(parameters)
-			@remove_directory.execute(parameters[:results_directory])
+			@shell.remove_directory(parameters[:results_directory])
 			@run_gatling.execute(parameters)
+			@shell.move_directory_contents_up(parameters[:results_directory])
 		end
 	end
 end

data/lib/src/GatlingCommand.rb

@@ -1,11 +1,10 @@
-require_relative 'ShellCommand'
 require_relative 'GatlingParameterBuilder'
 
 module RakeGatling
 	module Commands
-		class GatlingCommand < ShellCommand	
+		class GatlingCommand
 			def initialize(shell)
-				super
+				@shell = shell
 				@parameter_builder = GatlingParameterBuilder.new
 			end
 

data/lib/src/Shell.rb

@@ -7,5 +7,15 @@ module RakeGatling
 		def remove_directory(directory_name)
 			rm_rf directory_name
 		end
+
+		def move_directory_contents_up(location)
+			directories = Dir.glob("#{location}/*")
+			Dir.glob("#{location}/*/*") {
+				|f| mv File.expand_path(f), location
+			}
+			directories.each do | f |
+				rm_rf File.expand_path(f)
+			end
+		end
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gatling-rake
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - iainjmitchell
@@ -20,9 +20,7 @@ files:
 - lib/src/Gatling.rb
 - lib/src/GatlingCommand.rb
 - lib/src/GatlingParameterBuilder.rb
-- lib/src/RemoveDirectoryCommand.rb
 - lib/src/Shell.rb
-- lib/src/ShellCommand.rb
 homepage: https://github.com/code-computerlove/gatling-rake
 licenses:
 - MIT

data/lib/src/RemoveDirectoryCommand.rb

@@ -1,11 +0,0 @@
-require_relative 'ShellCommand'
-
-module RakeGatling
-	module Commands
-		class RemoveDirectoryCommand < ShellCommand
-			def execute(directory_name)
-				@shell.remove_directory(directory_name)
-			end
-		end
-	end
-end

data/lib/src/ShellCommand.rb

@@ -1,9 +0,0 @@
-module RakeGatling
-	module Commands
-		class ShellCommand
-			def initialize(shell)
-				@shell = shell
-			end
-		end
-	end
-end