RubyGems - simple_perf - Versions diffs - 0.0.4 → 0.0.5 - Mend

simple_perf 0.0.4 → 0.0.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (10) hide show

data/lib/simple_perf/cli/deploy.rb +1 -1
data/lib/simple_perf/cli/deploy_gatling.rb +1 -1
data/lib/simple_perf/cli/start_custom.rb +40 -0
data/lib/simple_perf/cli/start_gatling.rb +1 -1
data/lib/simple_perf/cli/{start.rb → start_jmeter.rb} +3 -3
data/lib/simple_perf/cli.rb +8 -5
data/lib/simple_perf/cloud_formation_templates/instance_group.json +2 -2
data/lib/simple_perf/cloud_formation_templates/instance_group_gatling.json +4 -4
data/lib/simple_perf/version.rb +1 -1
metadata +4 -3

data/lib/simple_perf/cli/deploy.rb CHANGED Viewed

@@ -81,7 +81,7 @@ EOS
         command = 'simple_deploy execute' +
                             ' -e ' + opts[:environment] +
                             ' -n ' + opts[:name] +
-                            ' -c "cd ~/jmeter_test_files; unzip -o "' + file_name +
+                            ' -c "cd ~/simple_perf_test_files; unzip -o "' + file_name +
                             ' -l debug'
         Shared::pretty_print `#{command}`

data/lib/simple_perf/cli/deploy_gatling.rb CHANGED Viewed

@@ -81,7 +81,7 @@ EOS
         command = 'simple_deploy execute' +
                             ' -e ' + opts[:environment] +
                             ' -n ' + opts[:name] +
-                            ' -c "cd ~/gatling_test_files; tar xvfz "' + file_name +
+                            ' -c "cd ~/simple_perf_test_files; tar xvfz "' + file_name +
                             ' -l debug'
         Shared::pretty_print `#{command}`

data/lib/simple_perf/cli/start_custom.rb ADDED Viewed

@@ -0,0 +1,40 @@
+require 'trollop'
+module SimplePerf
+  module CLI
+    class StartCustom
+      include Shared
+      def execute
+        opts = Trollop::options do
+          version SimplePerf::VERSION
+          banner <<-EOS
+Starts JMeter or Gatling with custom shell script.
+Usage:
+      simple_perf start_custom -e ENVIRONMENT -n STACK_NAME
+EOS
+          opt :help, "Display Help"
+          opt :environment, "Set the target environment", :type => :string
+          opt :name, "Stack name to manage", :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]
+        config = Config.new.environment opts[:environment]
+        ENV['SIMPLE_DEPLOY_SSH_KEY'] = config['local_pem']
+        ENV['SIMPLE_DEPLOY_SSH_USER'] = config['user']
+        command = 'simple_deploy execute' +
+                    ' -e ' + opts[:environment] +
+                    ' -n ' + opts[:name] +
+                    ' -c "cd ~/simple_perf_test_files; nohup ./start_custom.sh > start_custom.log  &"' +
+                    ' -l debug'
+        Shared::pretty_print `#{command}`
+      end
+    end
+  end
+end

data/lib/simple_perf/cli/start_gatling.rb CHANGED Viewed

@@ -32,7 +32,7 @@ EOS
         command = 'simple_deploy execute' +
                     ' -e ' + opts[:environment] +
                     ' -n ' + opts[:name] +
-                    ' -c "cd ~/gatling_test_files; nohup ./gatling.sh ' + opts[:simulation] + ' < input > gatling.log  &"' +
+                    ' -c "cd ~/simple_perf_test_files; nohup ./gatling.sh ' + opts[:simulation] + ' < input > gatling.log  &"' +
                     ' -l debug'
         Shared::pretty_print `#{command}`

data/lib/simple_perf/cli/{start.rb → start_jmeter.rb} RENAMED Viewed

@@ -2,7 +2,7 @@ require 'trollop'
 module SimplePerf
   module CLI
-    class Start
+    class StartJmeter
       include Shared
       def execute
@@ -13,7 +13,7 @@ module SimplePerf
 Starts JMeter java processes.
 Usage:
-      simple_perf start -e ENVIRONMENT -n STACK_NAME -t JMETER_TEST_PLAN
+      simple_perf start_jmeter -e ENVIRONMENT -n STACK_NAME -t JMETER_TEST_PLAN
 EOS
           opt :help, "Display Help"
           opt :environment, "Set the target environment", :type => :string
@@ -32,7 +32,7 @@ EOS
         command = 'simple_deploy execute' +
                     ' -e ' + opts[:environment] +
                     ' -n ' + opts[:name] +
-                    ' -c "cd ~/jmeter_test_files; nohup jmeter -Dsun.net.inetaddr.ttl=60 -n -t ' + opts[:testplan] + ' </dev/null >/dev/null 2>&1 &"' +
+                    ' -c "cd ~/simple_perf_test_files; nohup jmeter -Dsun.net.inetaddr.ttl=60 -n -t ' + opts[:testplan] + ' </dev/null >/dev/null 2>&1 &"' +
                     ' -l debug'
         Shared::pretty_print `#{command}`

data/lib/simple_perf/cli.rb CHANGED Viewed

@@ -2,7 +2,6 @@ require 'trollop'
 require 'simple_perf/cli/shared'
-require 'simple_perf/cli/start'
 require 'simple_perf/cli/stop'
 require 'simple_perf/cli/deploy'
 require 'simple_perf/cli/create'
@@ -14,7 +13,9 @@ require 'simple_perf/cli/update'
 require 'simple_perf/cli/chaos'
 require 'simple_perf/cli/create_gatling'
 require 'simple_perf/cli/deploy_gatling'
+require 'simple_perf/cli/start_jmeter'
 require 'simple_perf/cli/start_gatling'
+require 'simple_perf/cli/start_custom'
 module SimplePerf
   module CLI
@@ -22,10 +23,12 @@ module SimplePerf
       cmd = ARGV.shift
       case cmd
-      when 'start'
-        CLI::Start.new.execute
+      when 'start_jmeter'
+        CLI::StartJmeter.new.execute
       when 'start_gatling'
         CLI::StartGatling.new.execute
+      when 'start_custom'
+        CLI::StartCustom.new.execute
       when 'stop'
         CLI::Stop.new.execute
       when 'deploy'
@@ -49,13 +52,13 @@ module SimplePerf
       when 'chaos'
         CLI::Chaos.new.execute
       when '-h'
-        puts "simple_perf [start|start_gatling|stop|deploy|deploy_gatling|create|create_gatling|create_bucket|destroy|status|results|update|chaos] [options]"
+        puts "simple_perf [start_jmeter|start_gatling|start_custom|stop|deploy|deploy_gatling|create|create_gatling|create_bucket|destroy|status|results|update|chaos] [options]"
         puts "Append -h for help on specific subcommand."
       when '-v'
         puts SimplePerf::VERSION
       else
         puts "Unknown command: '#{cmd}'."
-        puts "simple_perf [start|start_gatling|stop|deploy|deploy_gatling|create|create_gatling|create_bucket|destroy|status|results|update|chaos] [options]"
+        puts "simple_perf [start_jmeter|start_gatling|start_custom|stop|deploy|deploy_gatling|create|create_gatling|create_bucket|destroy|status|results|update|chaos] [options]"
         puts "Append -h for help on specific subcommand."
         exit 1
       end

data/lib/simple_perf/cloud_formation_templates/instance_group.json CHANGED Viewed

@@ -219,8 +219,8 @@
               "/home/ec2-user/sync_jmeter_files.sh": {
                 "content": { "Fn::Join": [ "", [ "#!/bin/bash", "\n",
-                                                 "mkdir -p ~/jmeter_test_files", "\n",
-                                                 "cd ~/jmeter_test_files", "\n",
+                                                 "mkdir -p ~/simple_perf_test_files", "\n",
+                                                 "cd ~/simple_perf_test_files", "\n",
                                                  "s3cmd sync s3://",
                                                     { "Ref": "S3BucketName" },
                                                     " ." ] ] },

data/lib/simple_perf/cloud_formation_templates/instance_group_gatling.json CHANGED Viewed

@@ -195,8 +195,8 @@
                             "/home/ec2-user/sync_gatling_files.sh": {
                                 "content": { "Fn::Join": [ "", [ "#!/bin/bash", "\n",
-                                    "mkdir -p ~/gatling_test_files", "\n",
-                                    "cd ~/gatling_test_files", "\n",
+                                    "mkdir -p ~/simple_perf_test_files", "\n",
+                                    "cd ~/simple_perf_test_files", "\n",
                                     "s3cmd sync s3://",
                                     { "Ref": "S3BucketName" },
                                     " ." ] ] },
@@ -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 -s $1", "\n" ] ] },
+                                    "$GATLING_HOME/bin/gatling.sh -df ~/simple_perf_test_files/user-files/data -sf ~/simple_perf_test_files/user-files/simulations -s $1", "\n" ] ] },
                                 "owner": "ec2-user",
                                 "group": "ec2-user",
                                 "mode": "000770"
@@ -256,7 +256,7 @@
                     " --secret-key=", { "Fn::GetAtt": ["UserKey", "SecretAccessKey"] }, "\n",
                     "runuser -c \"chown -R ec2-user:ec2-user /opt/gatling\" root", "\n",
-                    "runuser -c \"chown -R ec2-user:ec2-user /home/ec2-user/gatling_test_files\" root", "\n",
+                    "runuser -c \"chown -R ec2-user:ec2-user /home/ec2-user/simple_perf_test_files\" root", "\n",
                     "/opt/aws/bin/cfn-signal -e ",
                     { "Fn::FindInMap": [ "BootstrapSettingMap", "abort", { "Ref": "Abort" } ] },

data/lib/simple_perf/version.rb CHANGED Viewed

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

metadata CHANGED Viewed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_perf
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease:
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-09-13 00:00:00.000000000 Z
+date: 2013-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -119,8 +119,9 @@ files:
 - lib/simple_perf/cli/destroy.rb
 - lib/simple_perf/cli/results.rb
 - lib/simple_perf/cli/shared.rb
-- lib/simple_perf/cli/start.rb
+- lib/simple_perf/cli/start_custom.rb
 - lib/simple_perf/cli/start_gatling.rb
+- lib/simple_perf/cli/start_jmeter.rb
 - lib/simple_perf/cli/status.rb
 - lib/simple_perf/cli/stop.rb
 - lib/simple_perf/cli/update.rb