simple_perf 0.0.9 → 0.0.10

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

@@ -3,7 +3,7 @@ require 'aws-sdk'
 
 module SimplePerf
   module CLI
-    class DeployGatling
+    class Deploy
       include Shared
 
       def execute
@@ -11,10 +11,10 @@ module SimplePerf
           version SimplePerf::VERSION
           banner <<-EOS
 
-Deploys Gatling test assets (user-files directory) to EC2 Gatling instances.
+Deploys test assets (local directory) to EC2 simple_perf instances.
 
 Usage:
-      simple_perf deploy_gatling -e ENVIRONMENT -p PROJECT_NAME
+      simple_perf deploy -e ENVIRONMENT -p PROJECT_NAME
 EOS
           opt :help, "Display Help"
           opt :environment, "Set the target environment", :type => :string
@@ -23,9 +23,9 @@ EOS
         Trollop::die :environment, "is required but not specified" unless opts[:environment]
         Trollop::die :project, "is required but not specified" unless opts[:project]
 
-        file_name = 'user-files.tar.gz'
+        file_name = 'test-files.tar.gz'
 
-        `#{'COPYFILE_DISABLE=1; export COPYFILE_DISABLE; gnutar cvzf user-files.tar.gz user-files/'}`
+        `#{'tar -cvzf ' + file_name + ' --exclude="gatling.sh" *'}`
 
         config = Config.new.environment opts[:environment]
 
@@ -72,7 +72,7 @@ EOS
         command = 'simple_deploy execute' +
                     ' -e ' + opts[:environment] +
                     ' -n ' + 'simple-perf-' + opts[:project] +
-                    ' -c "~/sync_gatling_files.sh"' +
+                    ' -c "~/sync_test_files.sh"' +
                     ' -l debug'
 
         Shared::pretty_print `#{command}`
@@ -80,7 +80,7 @@ EOS
         command = 'simple_deploy execute' +
                             ' -e ' + opts[:environment] +
                             ' -n ' + 'simple-perf-' + opts[:project] +
-                            ' -c "cd ~/simple_perf_test_files; tar xvfz "' + file_name +
+                            ' -c "cd ~/simple_perf_test_files; tar -xzvf "' + file_name +
                             ' -l debug'
 
         Shared::pretty_print `#{command}`

data/lib/simple_perf/cli/shared.rb

@@ -6,7 +6,7 @@ module SimplePerf
         output.gsub!(/\r\n?/, "\n")
 
         output.each_line { |line|
-          puts line.split(" : ")[1]
+          puts line.split(" : ")[1] unless line.to_s.include? "tar: Ignoring unknown extended header keyword"
         }
       end
 

data/lib/simple_perf/cli.rb

@@ -11,8 +11,7 @@ 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/deploy'
 require 'simple_perf/cli/start_jmeter'
 require 'simple_perf/cli/start_gatling'
 require 'simple_perf/cli/start_custom'
@@ -31,10 +30,8 @@ module SimplePerf
         CLI::StartCustom.new.execute
       when 'stop'
         CLI::Stop.new.execute
-      when 'deploy_jmeter'
-        CLI::DeployJmeter.new.execute
-      when 'deploy_gatling'
-        CLI::DeployGatling.new.execute
+      when 'deploy'
+        CLI::Deploy.new.execute
       when 'create_jmeter'
         CLI::CreateJmeter.new.execute
       when 'create_gatling'
@@ -52,13 +49,13 @@ module SimplePerf
       when 'chaos'
         CLI::Chaos.new.execute
       when '-h'
-        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 "simple_perf [start_jmeter|start_gatling|start_custom|stop|deploy|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_jmeter|deploy_gatling|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] [options]"
         puts "Append -h for help on specific subcommand."
         exit 1
       end

data/lib/simple_perf/cloud_formation_templates/instance_group.json

@@ -217,7 +217,7 @@
                 "mode": "000644"
               },
 
-              "/home/ec2-user/sync_jmeter_files.sh": {
+              "/home/ec2-user/sync_test_files.sh": {
                 "content": { "Fn::Join": [ "", [ "#!/bin/bash", "\n",
                                                  "mkdir -p ~/simple_perf_test_files", "\n",
                                                  "cd ~/simple_perf_test_files", "\n",
@@ -262,7 +262,7 @@
             " --access-key=", { "Ref": "UserKey" },
             " --secret-key=", { "Fn::GetAtt": ["UserKey", "SecretAccessKey"] }, "\n",
 
-          "runuser -c \"~/sync_jmeter_files.sh\" ec2-user", "\n",
+          "runuser -c \"~/sync_test_files.sh\" ec2-user", "\n",
 
           "/opt/aws/bin/cfn-signal -e ",
             { "Fn::FindInMap": [ "BootstrapSettingMap", "abort", { "Ref": "Abort" } ] },

data/lib/simple_perf/cloud_formation_templates/instance_group_gatling.json

@@ -193,7 +193,7 @@
 
                         "files": {
 
-                            "/home/ec2-user/sync_gatling_files.sh": {
+                            "/home/ec2-user/sync_test_files.sh": {
                                 "content": { "Fn::Join": [ "", [ "#!/bin/bash", "\n",
                                     "mkdir -p ~/simple_perf_test_files", "\n",
                                     "cd ~/simple_perf_test_files", "\n",

data/lib/simple_perf/version.rb

@@ -1,3 +1,3 @@
 module SimplePerf
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_perf
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-22 00:00:00.000000000 Z
+date: 2013-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -114,8 +114,7 @@ files:
 - lib/simple_perf/cli/create_bucket.rb
 - lib/simple_perf/cli/create_gatling.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/deploy.rb
 - lib/simple_perf/cli/destroy.rb
 - lib/simple_perf/cli/results.rb
 - lib/simple_perf/cli/shared.rb

data/lib/simple_perf/cli/deploy_jmeter.rb

@@ -1,90 +0,0 @@
-require 'trollop'
-require 'aws-sdk'
-
-module SimplePerf
-  module CLI
-    class DeployJmeter
-      include Shared
-
-      def execute
-        opts = Trollop::options do
-          version SimplePerf::VERSION
-          banner <<-EOS
-
-Deploys jmeter test assets (csv's and jmx) to EC2 jmeter instances.
-
-Usage:
-      simple_perf deploy -e ENVIRONMENT -p PROJECT_NAME
-EOS
-          opt :help, "Display Help"
-          opt :environment, "Set the target environment", :type => :string
-          opt :project, "Project 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]
-
-        file_name = 'test.zip'
-
-        `#{'zip ' + file_name + ' *'}`
-
-        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]
-
-        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)
-
-        # create a bucket
-        #b = s3.buckets.create(bucket_name)
-
-        # use existing s3 bucket
-        b = s3.buckets[bucket_name] # no request made
-
-        # upload a file
-        basename = File.basename(file_name)
-        o = b.objects[basename]
-        o.write(:file => file_name)
-
-        puts "Uploaded #{file_name} to:"
-        puts o.public_url
-
-        command = 'simple_deploy execute' +
-                    ' -e ' + opts[:environment] +
-                    ' -n ' + 'simple-perf-' + opts[:project] +
-                    ' -c "~/sync_jmeter_files.sh"' +
-                    ' -l debug'
-
-        Shared::pretty_print `#{command}`
-
-        command = 'simple_deploy execute' +
-                            ' -e ' + opts[:environment] +
-                            ' -n ' + 'simple-perf-' + opts[:project] +
-                            ' -c "cd ~/simple_perf_test_files; unzip -o "' + file_name +
-                            ' -l debug'
-
-        Shared::pretty_print `#{command}`
-      end
-    end
-  end
-end