simple_perf 0.0.3 → 0.0.4

data/lib/simple_perf/cli/start_gatling.rb

@@ -13,14 +13,16 @@ module SimplePerf
 Starts Gatling java processes.
 
 Usage:
-      simple_perf start_gatling -e ENVIRONMENT -n STACK_NAME
+      simple_perf start_gatling -e ENVIRONMENT -n STACK_NAME -s SIMULATION_NAME
 EOS
           opt :help, "Display Help"
           opt :environment, "Set the target environment", :type => :string
           opt :name, "Stack name to manage", :type => :string
+          opt :simulation, "Gatling User simulation file (e.g. sample.SampleUserModelSimulation)", :type => :string
         end
         Trollop::die :environment, "is required but not specified" unless opts[:environment]
         Trollop::die :name, "is required but not specified" unless opts[:name]
+        Trollop::die :simulation, "is required but not specified" unless opts[:simulation]
 
         config = Config.new.environment opts[:environment]
 
@@ -30,7 +32,7 @@ EOS
         command = 'simple_deploy execute' +
                     ' -e ' + opts[:environment] +
                     ' -n ' + opts[:name] +
-                    ' -c "cd ~/gatling_test_files; nohup ./gatling.sh < input > gatling.log &"' +
+                    ' -c "cd ~/gatling_test_files; nohup ./gatling.sh ' + opts[:simulation] + ' < input > gatling.log  &"' +
                     ' -l debug'
 
         Shared::pretty_print `#{command}`

data/lib/simple_perf/cli/status.rb

@@ -10,7 +10,7 @@ module SimplePerf
           version SimplePerf::VERSION
           banner <<-EOS
 
-Display JMeter army process status
+Display JMeter or Gatling army process status
 
 Usage:
       simple_perf status -e ENVIRONMENT -n STACK_NAME
@@ -30,7 +30,7 @@ EOS
         command = 'simple_deploy execute' +
                      ' -e ' + opts[:environment] +
                      ' -n ' + opts[:name] +
-                     ' -c "ps -ef | grep java | grep -v grep || echo \"jmeter process not found\""' +
+                     ' -c "ps -ef | grep java | grep -v grep || echo \"java process not found\""' +
                      ' -l debug'
 
         Shared::pretty_print `#{command}`

data/lib/simple_perf/cli/stop.rb

@@ -10,7 +10,7 @@ module SimplePerf
           version SimplePerf::VERSION
           banner <<-EOS
 
-Stops the current test by killing JMeter java processes.
+Stops the current test by killing JMeter or Gatling java processes.
 
 Usage:
       simple_perf stop -e ENVIRONMENT -n STACK_NAME

data/lib/simple_perf/cloud_formation_templates/instance_group_gatling.json

@@ -208,7 +208,7 @@
                             "/home/ec2-user/gatling_test_files/gatling.sh": {
                                 "content": { "Fn::Join": [ "", [ "#!/bin/bash", "\n",
                                     "export GATLING_HOME=/opt/gatling", "\n",
-                                    "$GATLING_HOME/bin/gatling.sh -df ~/gatling_test_files/user-files/data -sf ~/gatling_test_files/user-files/simulations", "\n" ] ] },
+                                    "$GATLING_HOME/bin/gatling.sh -df ~/gatling_test_files/user-files/data -sf ~/gatling_test_files/user-files/simulations -s $1", "\n" ] ] },
                                 "owner": "ec2-user",
                                 "group": "ec2-user",
                                 "mode": "000770"

data/lib/simple_perf/version.rb

@@ -1,3 +1,3 @@
 module SimplePerf
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_perf
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-28 00:00:00.000000000 Z
+date: 2013-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake