simple_perf 0.0.7 → 0.0.8

data/lib/simple_perf/cli/create_gatling.rb

@@ -40,7 +40,8 @@ EOS
             ' -a KeyName=' +  config['aws_keypair'] +
             ' -a AmiId=' +  opts[:ami] +
             ' -a S3BucketName=' + opts[:s3bucket] +
-            ' -a InstanceType=' + opts[:instancetype]
+            ' -a InstanceType=' + opts[:instancetype] +
+            ' -a Abort=no'
 
         Shared::pretty_print `#{command}`
       end

data/lib/simple_perf/cli/destroy.rb

@@ -10,7 +10,7 @@ module SimplePerf
           version SimplePerf::VERSION
           banner <<-EOS
 
-Destroys CloudFormation stack.
+Destroys CloudFormation stacks.
 
 Usage:
       simple_perf destroy -e ENVIRONMENT -p PROJECT_NAME
@@ -27,6 +27,52 @@ EOS
                         ' -n ' + 'simple-perf-' + opts[:project]
 
         Shared::pretty_print `#{command}`
+
+        config = Config.new.environment opts[:environment]
+
+        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}`
+
+        puts bucket_stack
+
+        if bucket_stack.empty?
+          return
+        end
+
+        command = 'simple_deploy outputs' +
+            ' -e ' + opts[:environment] +
+            ' -n ' + bucket_stack
+        bucket_name = `#{command}`
+        bucket_name = bucket_name.split(' ')[1]
+
+        if(config['region'] == 'us-east-1')
+          s3_endpoint = 's3.amazonaws.com'
+        else
+          s3_endpoint = "s3-#{config['region']}.amazonaws.com"
+        end
+
+        s3 = AWS::S3.new(:s3_endpoint => s3_endpoint)
+
+        # use existing s3 bucket
+        b = s3.buckets[bucket_name]
+
+        b.objects.each do |obj|
+          puts obj.key
+          obj.delete
+        end
+
+        command = 'simple_deploy destroy' +
+            ' -e ' + opts[:environment] +
+            ' -n ' + bucket_stack
+
+        Shared::pretty_print `#{command}`
+
       end
     end
   end

data/lib/simple_perf/cloud_formation_templates/instance_group_gatling.json

@@ -205,7 +205,7 @@
                                 "mode": "000770"
                             },
 
-                            "/home/ec2-user/gatling_test_files/gatling.sh": {
+                            "/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" ] ] },
@@ -214,7 +214,7 @@
                                 "mode": "000770"
                             },
 
-                            "/home/ec2-user/gatling_test_files/input": {
+                            "/home/ec2-user/simple_perf_test_files/input": {
                                 "content": { "Fn::Join": [ "", [ "GatlingSimulation", "\n",
                                     "EWLB", "\n" ] ] },
                                 "owner": "ec2-user",

data/lib/simple_perf/version.rb

@@ -1,3 +1,3 @@
 module SimplePerf
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

metadata

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