simple_perf 0.0.5 → 0.0.6

data/lib/simple_perf/cli/create_bucket.rb

@@ -11,14 +11,15 @@ module SimplePerf
 Creates CloudFormation stack for s3 bucket.
 
 Usage:
-      simple_perf create_bucket -e ENVIRONMENT -n STACK_NAME
+      simple_perf create_bucket -e ENVIRONMENT -p PROJECT_NAME
+
 EOS
           opt :help, "Display Help"
           opt :environment, "Set the target environment", :type => :string
-          opt :name, "Stack name to manage", :type => :string
+          opt :project, "Project 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]
+        Trollop::die :project, "is required but not specified" unless opts[:project]
 
         gem_root = File.expand_path '../..', __FILE__
 
@@ -26,14 +27,14 @@ EOS
 
         command = 'simple_deploy create' +
             ' -e ' + opts[:environment] +
-            ' -n ' + opts[:name] +
+            ' -n ' + 'simple-perf-' + opts[:project] + '-s3-' + config['region'] +
             ' -t '+ gem_root + '/cloud_formation_templates/s3_bucket.json'
 
         `#{command}`
 
         command = 'simple_deploy outputs' +
             ' -e ' + opts[:environment] +
-            ' -n ' + opts[:name]
+            ' -n ' + 'simple-perf-' + opts[:project] + '-s3-' + config['region']
 
         (0..5).each do |i|
           puts "Getting s3 bucket name..."

data/lib/simple_perf/cli/create_gatling.rb

@@ -13,17 +13,17 @@ module SimplePerf
 Creates CloudFormation stack for Gatling instances.
 
 Usage:
-      simple_perf create -e ENVIRONMENT -n STACK_NAME -a AMI -i INSTANCE_TYPE -s S3_BUCKET
+      simple_perf create_gatling -e ENVIRONMENT -p PROJECT_NAME -a AMI -i INSTANCE_TYPE -s S3_BUCKET
 EOS
           opt :help, "Display Help"
           opt :environment, "Set the target environment", :type => :string
-          opt :name, "Stack name to manage", :type => :string
+          opt :project, "Project name to manage", :type => :string
           opt :ami, "AWS ami", :type => :string
           opt :instancetype, "AWS instance type", :type => :string
           opt :s3bucket, "AWS s3 bucket", :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 :project, "is required but not specified" unless opts[:project]
         Trollop::die :ami, "is required but not specified" unless opts[:ami]
         Trollop::die :instancetype, "is required but not specified" unless opts[:instancetype]
         Trollop::die :s3bucket, "is required but not specified" unless opts[:s3bucket]
@@ -34,7 +34,7 @@ EOS
 
         command = 'simple_deploy create' +
             ' -e ' + opts[:environment] +
-            ' -n ' + opts[:name] +
+            ' -n ' + 'simple-perf-' + opts[:project] +
             ' -t '+ gem_root + '/cloud_formation_templates/instance_group_gatling.json' +
             ' -a Description="EC2 Gatling Instance"' +
             ' -a KeyName=' +  config['aws_keypair'] +

data/lib/simple_perf/cli/{create.rb → create_jmeter.rb}

@@ -2,7 +2,7 @@ require 'trollop'
 
 module SimplePerf
   module CLI
-    class Create
+    class CreateJmeter
       include Shared
 
       def execute
@@ -13,17 +13,17 @@ module SimplePerf
 Creates CloudFormation stack for JMeter instances.
 
 Usage:
-      simple_perf create -e ENVIRONMENT -n STACK_NAME -a AMI -i INSTANCE_TYPE -s S3_BUCKET
+      simple_perf create_jmeter -e ENVIRONMENT -p PROJECT_NAME -a AMI -i INSTANCE_TYPE -s S3_BUCKET
 EOS
           opt :help, "Display Help"
           opt :environment, "Set the target environment", :type => :string
-          opt :name, "Stack name to manage", :type => :string
+          opt :project, "Project name to manage", :type => :string
           opt :ami, "AWS ami", :type => :string
           opt :instancetype, "AWS instance type", :type => :string
           opt :s3bucket, "AWS s3 bucket", :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 :project, "is required but not specified" unless opts[:project]
         Trollop::die :ami, "is required but not specified" unless opts[:ami]
         Trollop::die :instancetype, "is required but not specified" unless opts[:instancetype]
         Trollop::die :s3bucket, "is required but not specified" unless opts[:s3bucket]
@@ -34,7 +34,7 @@ EOS
 
         command = 'simple_deploy create' +
             ' -e ' + opts[:environment] +
-            ' -n ' + opts[:name] +
+            ' -n ' + 'simple-perf-' + opts[:project] +
             ' -t '+ gem_root + '/cloud_formation_templates/instance_group.json' +
             ' -a Description="EC2 JMeter Instance"' +
             ' -a KeyName=' +  config['aws_keypair'] +

data/lib/simple_perf/cli/deploy_gatling.rb

@@ -14,14 +14,14 @@ module SimplePerf
 Deploys Gatling test assets (user-files directory) to EC2 Gatling instances.
 
 Usage:
-      simple_perf deploy_gatling -e ENVIRONMENT -n STACK_NAME
+      simple_perf deploy_gatling -e ENVIRONMENT -p PROJECT_NAME
 EOS
           opt :help, "Display Help"
           opt :environment, "Set the target environment", :type => :string
-          opt :name, "Stack name to manage", :type => :string
+          opt :project, "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]
+        Trollop::die :project, "is required but not specified" unless opts[:project]
 
         file_name = 'user-files.tar.gz'
 
@@ -36,10 +36,9 @@ EOS
             :access_key_id => config['access_key'],
             :secret_access_key => config['secret_key'])
 
-        #TODO - This is a bad idea...there could be multiple stacks with s3 in the name...fix later
         command = 'simple_deploy list' +
                         ' -e ' + opts[:environment] +
-                        ' | grep s3'
+                        ' | grep ' + opts[:project] + '-s3'
         bucket_stack = `#{command}`
 
         command = 'simple_deploy outputs' +
@@ -72,7 +71,7 @@ EOS
 
         command = 'simple_deploy execute' +
                     ' -e ' + opts[:environment] +
-                    ' -n ' + opts[:name] +
+                    ' -n ' + 'simple-perf-' + opts[:project] +
                     ' -c "~/sync_gatling_files.sh"' +
                     ' -l debug'
 
@@ -80,7 +79,7 @@ EOS
 
         command = 'simple_deploy execute' +
                             ' -e ' + opts[:environment] +
-                            ' -n ' + opts[:name] +
+                            ' -n ' + 'simple-perf-' + opts[:project] +
                             ' -c "cd ~/simple_perf_test_files; tar xvfz "' + file_name +
                             ' -l debug'
 

data/lib/simple_perf/cli/{deploy.rb → deploy_jmeter.rb}

@@ -3,7 +3,7 @@ require 'aws-sdk'
 
 module SimplePerf
   module CLI
-    class Deploy
+    class DeployJmeter
       include Shared
 
       def execute
@@ -14,14 +14,14 @@ module SimplePerf
 Deploys jmeter test assets (csv's and jmx) to EC2 jmeter instances.
 
 Usage:
-      simple_perf deploy -e ENVIRONMENT -n STACK_NAME
+      simple_perf deploy -e ENVIRONMENT -p PROJECT_NAME
 EOS
           opt :help, "Display Help"
           opt :environment, "Set the target environment", :type => :string
-          opt :name, "Stack name to manage", :type => :string
+          opt :project, "Project 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]
+        Trollop::die :project, "is required but not specified" unless opts[:project]
 
         file_name = 'test.zip'
 
@@ -36,10 +36,9 @@ EOS
             :access_key_id => config['access_key'],
             :secret_access_key => config['secret_key'])
 
-        #TODO - This is a bad idea...there could be multiple stacks with s3 in the name...fix later
         command = 'simple_deploy list' +
                         ' -e ' + opts[:environment] +
-                        ' | grep s3'
+                        ' | grep ' + opts[:project] + '-s3'
         bucket_stack = `#{command}`
 
         command = 'simple_deploy outputs' +
@@ -72,7 +71,7 @@ EOS
 
         command = 'simple_deploy execute' +
                     ' -e ' + opts[:environment] +
-                    ' -n ' + opts[:name] +
+                    ' -n ' + 'simple-perf-' + opts[:project] +
                     ' -c "~/sync_jmeter_files.sh"' +
                     ' -l debug'
 
@@ -80,7 +79,7 @@ EOS
 
         command = 'simple_deploy execute' +
                             ' -e ' + opts[:environment] +
-                            ' -n ' + opts[:name] +
+                            ' -n ' + 'simple-perf-' + opts[:project] +
                             ' -c "cd ~/simple_perf_test_files; unzip -o "' + file_name +
                             ' -l debug'
 

data/lib/simple_perf/cli/destroy.rb

@@ -13,18 +13,18 @@ module SimplePerf
 Destroys CloudFormation stack.
 
 Usage:
-      simple_perf destroy -e ENVIRONMENT -n STACK_NAME
+      simple_perf destroy -e ENVIRONMENT -p PROJECT_NAME
 EOS
           opt :help, "Display Help"
           opt :environment, "Set the target environment", :type => :string
-          opt :name, "Stack name to manage", :type => :string
+          opt :project, "Project 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]
+        Trollop::die :project, "is required but not specified" unless opts[:project]
 
         command = 'simple_deploy destroy' +
                         ' -e ' + opts[:environment] +
-                        ' -n ' + opts[:name]
+                        ' -n ' + 'simple-perf-' + opts[:project]
 
         Shared::pretty_print `#{command}`
       end

data/lib/simple_perf/cli/results.rb

@@ -13,14 +13,14 @@ module SimplePerf
 Display JMeter log file results.
 
 Usage:
-      simple_perf results -e ENVIRONMENT -n STACK_NAME
+      simple_perf results -e ENVIRONMENT -p PROJECT_NAME
 EOS
           opt :help, "Display Help"
           opt :environment, "Set the target environment", :type => :string
-          opt :name, "Stack name to manage", :type => :string
+          opt :project, "Project 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]
+        Trollop::die :project, "is required but not specified" unless opts[:project]
 
         config = Config.new.environment opts[:environment]
 
@@ -31,7 +31,7 @@ EOS
 
         command = 'simple_deploy execute' +
                     ' -e ' + opts[:environment] +
-                    ' -n ' + opts[:name] +
+                    ' -n ' + 'simple-perf-' + opts[:project] +
                     ' -c ' + grep_command +
                     ' -l debug'
 

data/lib/simple_perf/cli/start_custom.rb

@@ -13,14 +13,14 @@ module SimplePerf
 Starts JMeter or Gatling with custom shell script.
 
 Usage:
-      simple_perf start_custom -e ENVIRONMENT -n STACK_NAME
+      simple_perf start_custom -e ENVIRONMENT -p PROJECT_NAME
 EOS
           opt :help, "Display Help"
           opt :environment, "Set the target environment", :type => :string
-          opt :name, "Stack name to manage", :type => :string
+          opt :project, "Project 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]
+        Trollop::die :project, "is required but not specified" unless opts[:project]
 
         config = Config.new.environment opts[:environment]
 
@@ -29,7 +29,7 @@ EOS
 
         command = 'simple_deploy execute' +
                     ' -e ' + opts[:environment] +
-                    ' -n ' + opts[:name] +
+                    ' -n ' + 'simple-perf-' + opts[:project] +
                     ' -c "cd ~/simple_perf_test_files; nohup ./start_custom.sh > start_custom.log  &"' +
                     ' -l debug'
 

data/lib/simple_perf/cli/start_gatling.rb

@@ -13,15 +13,15 @@ module SimplePerf
 Starts Gatling java processes.
 
 Usage:
-      simple_perf start_gatling -e ENVIRONMENT -n STACK_NAME -s SIMULATION_NAME
+      simple_perf start_gatling -e ENVIRONMENT -p PROJECT_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 :project, "Project 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 :project, "is required but not specified" unless opts[:project]
         Trollop::die :simulation, "is required but not specified" unless opts[:simulation]
 
         config = Config.new.environment opts[:environment]
@@ -31,7 +31,7 @@ EOS
 
         command = 'simple_deploy execute' +
                     ' -e ' + opts[:environment] +
-                    ' -n ' + opts[:name] +
+                    ' -n ' + 'simple-perf-' + opts[:project] +
                     ' -c "cd ~/simple_perf_test_files; nohup ./gatling.sh ' + opts[:simulation] + ' < input > gatling.log  &"' +
                     ' -l debug'
 

data/lib/simple_perf/cli/start_jmeter.rb

@@ -13,15 +13,15 @@ module SimplePerf
 Starts JMeter java processes.
 
 Usage:
-      simple_perf start_jmeter -e ENVIRONMENT -n STACK_NAME -t JMETER_TEST_PLAN
+      simple_perf start_jmeter -e ENVIRONMENT -p PROJECT_NAME -t JMETER_TEST_PLAN
 EOS
           opt :help, "Display Help"
           opt :environment, "Set the target environment", :type => :string
-          opt :name, "Stack name to manage", :type => :string
+          opt :project, "Project name to manage", :type => :string
           opt :testplan, "JMeter Test Plan (.jmx file)", :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 :project, "is required but not specified" unless opts[:project]
         Trollop::die :testplan, "is required but not specified" unless opts[:testplan]
 
         config = Config.new.environment opts[:environment]
@@ -31,7 +31,7 @@ EOS
 
         command = 'simple_deploy execute' +
                     ' -e ' + opts[:environment] +
-                    ' -n ' + opts[:name] +
+                    ' -n ' + 'simple-perf-' + opts[:project] +
                     ' -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'
 

data/lib/simple_perf/cli/status.rb

@@ -13,14 +13,14 @@ module SimplePerf
 Display JMeter or Gatling army process status
 
 Usage:
-      simple_perf status -e ENVIRONMENT -n STACK_NAME
+      simple_perf status -e ENVIRONMENT -p PROJECT_NAME
 EOS
           opt :help, "Display Help"
           opt :environment, "Set the target environment", :type => :string
-          opt :name, "Stack name to manage", :type => :string
+          opt :project, "Project 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]
+        Trollop::die :project, "is required but not specified" unless opts[:project]
 
         config = Config.new.environment opts[:environment]
 
@@ -29,7 +29,7 @@ EOS
 
         command = 'simple_deploy execute' +
                      ' -e ' + opts[:environment] +
-                     ' -n ' + opts[:name] +
+                     ' -n ' + 'simple-perf-' + opts[:project] +
                      ' -c "ps -ef | grep java | grep -v grep || echo \"java process not found\""' +
                      ' -l debug'
 

data/lib/simple_perf/cli/stop.rb

@@ -13,14 +13,14 @@ module SimplePerf
 Stops the current test by killing JMeter or Gatling java processes.
 
 Usage:
-      simple_perf stop -e ENVIRONMENT -n STACK_NAME
+      simple_perf stop -e ENVIRONMENT -p PROJECT_NAME
 EOS
           opt :help, "Display Help"
           opt :environment, "Set the target environment", :type => :string
-          opt :name, "Stack name to manage", :type => :string
+          opt :project, "Project 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]
+        Trollop::die :project, "is required but not specified" unless opts[:project]
 
         config = Config.new.environment opts[:environment]
 
@@ -29,7 +29,7 @@ EOS
 
         command = 'simple_deploy execute' +
                     ' -e ' + opts[:environment] +
-                    ' -n ' + opts[:name] +
+                    ' -n ' + 'simple-perf-' + opts[:project] +
                     ' -c "killall java"' +
                     ' -l debug'
 

data/lib/simple_perf/cli/update.rb

@@ -10,23 +10,23 @@ module SimplePerf
           version SimplePerf::VERSION
           banner <<-EOS
 
-Updates CloudFormation stack parameters.
+Updates number of JMeter or Gatling instances.
 
 Usage:
-      simple_perf update -e ENVIRONMENT -n STACK_NAME -c COUNT
+      simple_perf update -e ENVIRONMENT -p PROJECT_NAME -c COUNT
 EOS
           opt :help, "Display Help"
           opt :environment, "Set the target environment", :type => :string
-          opt :name, "Stack name to manage", :type => :string
-          opt :count, "Number of jmeter instances", :type => :string
+          opt :project, "Project name to manage", :type => :string
+          opt :count, "Number of JMeter or Gatling instances", :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 :project, "is required but not specified" unless opts[:project]
         Trollop::die :count, "is required but not specified" unless opts[:count]
 
         command = 'simple_deploy update' +
                  ' -e ' + opts[:environment] +
-                 ' -n ' + opts[:name] +
+                 ' -n ' + 'simple-perf-' + opts[:project] +
                  ' -a MinimumInstances=' + opts[:count] +
                  ' -a MaximumInstances=' + opts[:count]
 

data/lib/simple_perf/cli.rb

@@ -3,15 +3,15 @@ require 'trollop'
 require 'simple_perf/cli/shared'
 
 require 'simple_perf/cli/stop'
-require 'simple_perf/cli/deploy'
-require 'simple_perf/cli/create'
-require 'simple_perf/cli/create_bucket'
 require 'simple_perf/cli/destroy'
 require 'simple_perf/cli/status'
 require 'simple_perf/cli/results'
 require 'simple_perf/cli/update'
 require 'simple_perf/cli/chaos'
+require 'simple_perf/cli/create_bucket'
+require 'simple_perf/cli/create_jmeter'
 require 'simple_perf/cli/create_gatling'
+require 'simple_perf/cli/deploy_jmeter'
 require 'simple_perf/cli/deploy_gatling'
 require 'simple_perf/cli/start_jmeter'
 require 'simple_perf/cli/start_gatling'
@@ -31,12 +31,12 @@ module SimplePerf
         CLI::StartCustom.new.execute
       when 'stop'
         CLI::Stop.new.execute
-      when 'deploy'
-        CLI::Deploy.new.execute
+      when 'deploy_jmeter'
+        CLI::DeployJmeter.new.execute
       when 'deploy_gatling'
         CLI::DeployGatling.new.execute
-      when 'create'
-        CLI::Create.new.execute
+      when 'create_jmeter'
+        CLI::CreateJmeter.new.execute
       when 'create_gatling'
         CLI::CreateGatling.new.execute
       when 'create_bucket'
@@ -52,13 +52,13 @@ module SimplePerf
       when 'chaos'
         CLI::Chaos.new.execute
       when '-h'
-        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 "simple_perf [start_jmeter|start_gatling|start_custom|stop|deploy_jmeter|deploy_gatling|create_jmeter|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_jmeter|start_gatling|start_custom|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_jmeter|deploy_gatling|create_jmeter|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/version.rb

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

data/simple_perf.gemspec

@@ -10,6 +10,7 @@ Gem::Specification.new do |s|
   s.homepage    = "https://github.com/intuit/simple_perf"
   s.summary     = %q{I help with performance testing}
   s.description = %q{I am designed to control a JMeter or Gatling army of AWS EC2 instances}
+  s.license = 'MIT'
 
   s.rubyforge_project = "simple_perf"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_perf
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-19 00:00:00.000000000 Z
+date: 2013-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -111,11 +111,11 @@ files:
 - lib/simple_perf.rb
 - lib/simple_perf/cli.rb
 - lib/simple_perf/cli/chaos.rb
-- lib/simple_perf/cli/create.rb
 - lib/simple_perf/cli/create_bucket.rb
 - lib/simple_perf/cli/create_gatling.rb
-- lib/simple_perf/cli/deploy.rb
+- lib/simple_perf/cli/create_jmeter.rb
 - lib/simple_perf/cli/deploy_gatling.rb
+- lib/simple_perf/cli/deploy_jmeter.rb
 - lib/simple_perf/cli/destroy.rb
 - lib/simple_perf/cli/results.rb
 - lib/simple_perf/cli/shared.rb
@@ -133,7 +133,8 @@ files:
 - simple_perf.gemspec
 - spec/spec_helper.rb
 homepage: https://github.com/intuit/simple_perf
-licenses: []
+licenses:
+- MIT
 post_install_message: 
 rdoc_options: []
 require_paths: