simple_perf 0.0.15 → 0.0.17

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 4c11151da123300981ce70f315f209259801c486
+  data.tar.gz: ba7c88219ccde9a00f42ba131f9746e00d7e3cf1
+SHA512:
+  metadata.gz: 1764256ad0c724a06298e98d43e1a4111fadeaf3aeb252e00c614a08eba5c126a0d7dd4547cc0bd8ff2bd144a9bc59674ae8cb2b85bb149f43e339d3f3455ef7
+  data.tar.gz: 3a559af7c2fff00a0a1cc9c02e778aabd81e51eea301c746a3160afd5e2cbf7aa6dd580352adbac8482e2e3866d65b58e39e03dfb7721403914b5b79f12bd243

data/.ruby-version

@@ -1 +1 @@
-ruby-1.9.3-p385
+ruby-2.1.1

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2012 Intuit Inc
+Copyright (c) 2014 Intuit Inc
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -1,4 +1,6 @@
 I use CAP for distributed jmeter or Gatling performance testing in AWS EC2.
+Simple_perf is a command line interface that allows distribution of jmeter or gatling tests to multiple EC2 instances in AWS.
+Tests are run on every instance through a single command (no more starting tests on individual instances).  See the [wiki](https://github.com/intuit/simple_perf/wiki/How-to-get-started-with-simple_perf) for more
 
 Getting Started
 ---------------
@@ -26,3 +28,41 @@ Commands
 --------
 
 For a list of commands, run simple_perf -h.  To get more information about each subcommand, append a -h after the subcommand.  For example: **simple_perf status -h**.
+
+Contributing
+------------
+
+####I want to help with coding
+Awesome!  Simple_perf is built with Ruby.  To contribute, [fork the project](https://help.github.com/articles/fork-a-repo), make a change and submit a [pull request](https://help.github.com/articles/using-pull-requests).
+
+
+####I want to report a bug
+If you've found a repeatable bug, submit it in the [issues list](https://github.com/intuit/simple_perf/issues) on GitHub.  Please include the following:
+
+*  Descriptive Title
+*  Repeatable Steps
+*  What happens
+*  Any errors
+
+
+####I want to submit a suggestion
+Submit all suggestions as issues with the label *enhancement* through the GitHub [issues list](https://github.com/intuit/simple_perf/issues).
+
+Running
+-------
+
+The commands for simple_perf can be run once the gem is installed (gem install 'simple_perf') or a gemspec is created from a local copy.
+To create a local gem, do the following:
+
+*  Fork the code
+*  Clone the forked repo to your local
+*  Change the version (if you've made changes and want to see them)
+*  Build the gemspec 
+```
+gem build simple_perf.gemspec
+```
+*  Install the new local gem 
+```
+gem install /my/directory/simple_perf/simple_perf-0.0.16.gem
+```
+

data/lib/simple_perf/cli/gatling_results.rb

@@ -0,0 +1,59 @@
+require 'trollop'
+require 'aws-sdk'
+
+module SimplePerf
+  module CLI
+    class GatlingResults
+      include Shared
+
+      def execute
+        opts = Trollop::options do
+          version SimplePerf::VERSION
+          banner <<-EOS
+
+Moves simulations logs from  EC2 simple_perf instances to s3 bucket for respective project.
+
+Usage:
+      simple_perf gatling_results -e ENVIRONMENT -p PROJECT_NAME
+          EOS
+          opt :help, "Display Help"
+          opt :environment, "Set the target environment", :type => :string
+          opt :project, "Stack name to manage", :type => :string
+        end
+        Trollop::die :environment, "is required but not specified" unless opts[:environment]
+        Trollop::die :project, "is required but not specified" unless opts[:project]
+
+
+        config = Config.new.environment opts[:environment]
+
+        ENV['SIMPLE_DEPLOY_SSH_KEY'] = config['local_pem']
+        ENV['SIMPLE_DEPLOY_SSH_USER'] = config['user']
+
+        AWS.config(
+            :access_key_id => config['access_key'],
+            :secret_access_key => config['secret_key'])
+
+        command = 'simple_deploy list' +
+            ' -e ' + opts[:environment] +
+            ' | grep ' + opts[:project] + '-s3'
+        bucket_stack = `#{command}`
+
+        command = 'simple_deploy outputs' +
+            ' -e ' + opts[:environment] +
+            ' -n ' + bucket_stack
+        bucket_name = `#{command}`
+        bucket_name = bucket_name.split(' ')[1]
+
+
+        command = 'simple_deploy execute' +
+            ' -e ' + opts[:environment] +
+            ' -n ' + 'simple-perf-' + opts[:project] +
+            ' -c "~/sync_to_s3.sh "' + bucket_name +
+            ' -l debug -x'
+
+        Shared::pretty_print `#{command}`
+
+      end
+    end
+  end
+end

data/lib/simple_perf/cli/start_gatling.rb

@@ -19,6 +19,7 @@ EOS
           opt :environment, "Set the target environment", :type => :string
           opt :project, "Project name to manage", :type => :string
           opt :simulation, "Gatling User simulation file (e.g. sample.SampleUserModelSimulation)", :type => :string
+          opt :reports, "Pass 'nr' for no reporting.", :type => :string
         end
         Trollop::die :environment, "is required but not specified" unless opts[:environment]
         Trollop::die :project, "is required but not specified" unless opts[:project]
@@ -29,10 +30,15 @@ EOS
         ENV['SIMPLE_DEPLOY_SSH_KEY'] = config['local_pem']
         ENV['SIMPLE_DEPLOY_SSH_USER'] = config['user']
 
+        report = opts[:reports].to_s
+        if defined?(report) && (report != '')
+          report = " -#{report}"
+        end
+
         command = 'simple_deploy execute' +
                     ' -e ' + opts[:environment] +
                     ' -n ' + 'simple-perf-' + opts[:project] +
-                    ' -c "cd ~/simple_perf_test_files; nohup ./gatling.sh ' + opts[:simulation] + ' < input > gatling.log  &"' +
+                    ' -c "cd ~/simple_perf_test_files; nohup ./gatling.sh ' + opts[:simulation] + report + ' < input > gatling.log  &"' +
                     ' -l debug -x'
 
         Shared::pretty_print `#{command}`

data/lib/simple_perf/cli.rb

@@ -15,6 +15,7 @@ require 'simple_perf/cli/deploy'
 require 'simple_perf/cli/start_jmeter'
 require 'simple_perf/cli/start_gatling'
 require 'simple_perf/cli/start_custom'
+require 'simple_perf/cli/gatling_results'
 
 module SimplePerf
   module CLI
@@ -48,14 +49,16 @@ module SimplePerf
         CLI::Update.new.execute
       when 'chaos'
         CLI::Chaos.new.execute
+      when 'gatling_results'
+        CLI::GatlingResults.new.execute
       when '-h'
-        puts "simple_perf [start_jmeter|start_gatling|start_custom|stop|deploy|create_jmeter|create_gatling|create_bucket|destroy|status|results|update|chaos] [options]"
+        puts "simple_perf [start_jmeter|start_gatling|start_custom|stop|deploy|create_jmeter|create_gatling|create_bucket|destroy|status|results|update|chaos|gatling_results] [options]"
         puts "Append -h for help on specific subcommand."
       when '-v'
         puts SimplePerf::VERSION
       else
         puts "Unknown command: '#{cmd}'."
-        puts "simple_perf [start_jmeter|start_gatling|start_custom|stop|deploy|create_jmeter|create_gatling|create_bucket|destroy|status|results|update|chaos] [options]"
+        puts "simple_perf [start_jmeter|start_gatling|start_custom|stop|deploy|create_jmeter|create_gatling|create_bucket|destroy|status|results|update|chaos|gatling_results] [options]"
         puts "Append -h for help on specific subcommand."
         exit 1
       end

data/lib/simple_perf/cloud_formation_templates/instance_group_gatling.json

@@ -199,17 +199,6 @@
                     },
 
                     "gatling": {
-                        "commands": {
-
-                            "modify_etc_sudoers_1": {
-                                "command": "sed -i 's/Defaults    requiretty/#Defaults    requiretty/' /etc/sudoers"
-                            },
-
-                            "modify_etc_sudoers_2": {
-                                "command": "sed -i 's/Defaults   !visiblepw/#Defaults   !visiblepw/' /etc/sudoers"
-                            }
-
-                        },
                         "files": {
 
                             "/home/ec2-user/sync_test_files.sh": {
@@ -224,10 +213,19 @@
                                 "mode": "000770"
                             },
 
+                            "/home/ec2-user/sync_to_s3.sh": {
+                                "content": { "Fn::Join": [ "", [ "#!/bin/bash", "\n",
+                                    "cd /opt/gatling/results/taxusermodelsimulation*", "\n",
+                                    "s3cmd sync simulation.log s3://$1/logs/simulation$HOSTNAME.log"] ] },
+                                "owner": "ec2-user",
+                                "group": "ec2-user",
+                                "mode": "000770"
+                            },
+
                             "/home/ec2-user/simple_perf_test_files/gatling.sh": {
                                 "content": { "Fn::Join": [ "", [ "#!/bin/bash", "\n",
                                     "export GATLING_HOME=/opt/gatling", "\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" ] ] },
+                                    "$GATLING_HOME/bin/gatling.sh -df ~/simple_perf_test_files/user-files/data -sf ~/simple_perf_test_files/user-files/simulations -s $1 $2", "\n" ] ] },
                                 "owner": "ec2-user",
                                 "group": "ec2-user",
                                 "mode": "000770"

data/lib/simple_perf/version.rb

@@ -1,3 +1,3 @@
 module SimplePerf
-  VERSION = "0.0.15"
+  VERSION = "0.0.17"
 end

data/simple_perf.gemspec

@@ -19,10 +19,10 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_development_dependency "rake"
-  s.add_development_dependency "rspec", "~> 2.11.0"
+  s.add_development_dependency 'rake', '10.3.1'
+  s.add_development_dependency 'rspec', '2.14.1'
 
-  s.add_runtime_dependency "trollop", "2.0"
-  s.add_runtime_dependency "simple_deploy", "0.8.0"
-  s.add_runtime_dependency "aws-sdk", ">= 1.9.5"
-end
+  s.add_runtime_dependency 'trollop', '2.0'
+  s.add_runtime_dependency 'simple_deploy', '0.8.2'
+  s.add_runtime_dependency 'aws-sdk', '1.38.0'
+end

metadata

@@ -1,52 +1,46 @@
 --- !ruby/object:Gem::Specification
 name: simple_perf
 version: !ruby/object:Gem::Version
-  version: 0.0.15
-  prerelease: 
+  version: 0.0.17
 platform: ruby
 authors:
 - Jimmy Armitage
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-27 00:00:00.000000000 Z
+date: 2014-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 10.3.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 10.3.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 2.11.0
+        version: 2.14.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 2.11.0
+        version: 2.14.1
 - !ruby/object:Gem::Dependency
   name: trollop
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -62,35 +55,31 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: simple_deploy
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.8.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.8.2
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.9.5
+        version: 1.38.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.9.5
+        version: 1.38.0
 description: I am designed to control a JMeter or Gatling army of AWS EC2 instances
 email:
 - mrjimmy410@gmail.com
@@ -99,9 +88,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .ruby-gemset
-- .ruby-version
+- ".gitignore"
+- ".ruby-gemset"
+- ".ruby-version"
 - CHANGELOG
 - Gemfile
 - LICENSE
@@ -116,6 +105,7 @@ files:
 - lib/simple_perf/cli/create_jmeter.rb
 - lib/simple_perf/cli/deploy.rb
 - lib/simple_perf/cli/destroy.rb
+- lib/simple_perf/cli/gatling_results.rb
 - lib/simple_perf/cli/results.rb
 - lib/simple_perf/cli/shared.rb
 - lib/simple_perf/cli/start_custom.rb
@@ -134,27 +124,26 @@ files:
 homepage: https://github.com/intuit/simple_perf
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: simple_perf
-rubygems_version: 1.8.25
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: I help with performance testing
 test_files:
 - spec/spec_helper.rb