stella 2.0.3.001 → 2.1.0.001

data/CHANGES.txt

@@ -1,5 +1,16 @@
 STELLA, CHANGES
 
+#### 2.1.0 (2011-07-06) ###############################
+
+* FIXED: Different CLI output when a testplan is specified
+* ADDED: Handle bad or missing api credentials
+* ADDED: Globals -A and -K for supplying API credentials
+* CHANGE: Default output is now CLI (use -F json)
+* CHANGE: Global -f is now -u (for usecase)
+* CHANGE: Global -F is now -f (output format)
+* CHANGE: STELLA_USER env var is now STELLA_ACCOUNT
+
+
 #### 2.0.3 (2011-07-06) ###############################
 
 * ADDED: Stella::API

data/VERSION.yml

@@ -1,4 +1,4 @@
 :MAJOR: 2
-:MINOR: 0
-:PATCH: 3
+:MINOR: 1
+:PATCH: 0
 :BUILD: '001'

data/bin/stella

@@ -44,10 +44,15 @@ class Stella::CLI::Definition
   #global :H, :withheader, "Include X-Stella-ID request header" 
   #global :P, :withparam, "Include __stella query parameter header"
   global :T, :timeout, Float, "HTTP request timeout (default: unlimited)"
-  global :F, :format, String, "Output format (partial support)"
   global :R, :remote, "Run command remotely (via blamestella.com)"
-  global :f, :filter, String, "Only run usecases that match this filter"
+  global :A, :account, String, "API account (overrides STELLA_ACCOUNT)"
+  global :K, :key, String, "API key (overrides STELLA_KEY)"
   global :p, :testplan, String, "Path to testplan"
+  global :u, :usecase, String, "Only run usecases that match the given filter"
+  global :f, :format, String, "Output format (partial support)" do |v|
+    raise "Unsupported format: #{v}" unless ['csv', 'json', 'yaml'].member?(v)
+    v
+  end
   global :n, :nocolor, "Disable output colors" do
     String.disable_color
   end
@@ -96,9 +101,9 @@ class Stella::CLI::Definition
 
   after do |obj|  
     @elapsed = Time.now - @start
-    if @elapsed > 0.1 && Stella.noise > 1
-      Stella.li "#{$/}Elapsed: %.2f seconds" % @elapsed.to_f
-    end
+    #if @elapsed > 0.1 && Stella.noise > 3
+    #  Stella.li "#{$/}Elapsed: %.2f seconds" % @elapsed.to_f
+    #end
     code = obj.exit_code if obj.respond_to? :exit_code
     exit code ||= 0
   end

data/lib/stella/api.rb

@@ -1,18 +1,20 @@
 require 'httparty'
 require 'stella'
 
-class Stella
+class Stella  
   class API
     include HTTParty
-    
     ssl_ca_file Stella::Client::SSL_CERT_PATH
     format :json
     attr_reader :httparty_opts, :response
-    def initialize user=nil, key=nil, httparty_opts={}
+    def initialize account=nil, key=nil, httparty_opts={}
       self.class.base_uri ENV['STELLA_HOST'] || 'https://www.blamestella.com/api/v2'
-      @httparty_opts = httparty_opts.merge({
-        :basic_auth => { :username => user || ENV['STELLA_USER'], :password => key || ENV['STELLA_KEY'] }
-      })
+      @httparty_opts = httparty_opts
+      account ||= ENV['STELLA_ACCOUNT']
+      key ||= ENV['STELLA_KEY']
+      unless account.to_s.empty? || key.to_s.empty?
+        @httparty_opts[:basic_auth] ||= { :username => account, :password => key }
+      end
     end
     def get path, params=nil
       opts = httparty_opts
@@ -57,6 +59,9 @@ class Stella
     def indifferent_hash
       Hash.new {|hash,key| hash[key.to_s] if Symbol === key }
     end
+    
+    class Unauthorized < RuntimeError
+    end
   end
 end
 

data/lib/stella/cli.rb

@@ -13,20 +13,38 @@ class Stella::CLI < Drydock::Command
   
   
   def checkup
+    require 'stella/api'
     base_uri = Stella.canonical_uri(@argv.first)
     run_opts = { 
       :repetitions => @option.repetitions || 1,
       :concurrency => @option.concurrency || 1,
       :wait => @option.wait || 1
     }
+    # NOTE ABOUT CLI OUTPUT:
+    # Output when a testplan is supplied comes from Engine.run
+    # while it's being executed. Otherwise it's generated from
+    # testrun.report after the generic testplan has run.
+    if @global.format || !@global.testplan
+      Stella.noise = 0 
+    end
+    @global.remote ||= @global.account || @global.key
     if @global.remote
-      require 'stella/api'
-      @api = Stella::API.new
+      raise "Running a testplan remotely isn't supported yet (soon!)" if @global.testplan
+      @api = Stella::API.new @global.account, @global.key
       ret = @api.post :checkup, :uri => base_uri
+      pp @api.response if Stella.debug
+      if @api.response.code >= 400
+        raise Stella::API::Unauthorized if @api.response.code == 401
+        STDERR.puts ret[:msg]
+        @exit_code = 1 and return
+      end
       begin
         run_hash = @api.get "/checkup/#{ret[:runid]}"
         @run = Stella::Testrun.from_hash run_hash if run_hash
+        STDERR.print '.' unless Stella.quiet?
+        sleep 1 if @run && !@run.done?
       end while @run && !@run.done?
+      STDERR.puts unless Stella.quiet?
     else
       if @global.testplan
         unless File.owned?(@global.testplan)
@@ -34,7 +52,7 @@ class Stella::CLI < Drydock::Command
         end
         Stella.ld "Load #{@global.testplan}"
         load @global.testplan
-        filter = @global.filter
+        filter = @global.usecase
         planname = Stella::Testplan.plans.keys.first
         @plan = Stella::Testplan.plan(planname)
         if filter
@@ -53,18 +71,41 @@ class Stella::CLI < Drydock::Command
     
     @report = @run.report
     
-    if Stella.quiet?
-      @exit_code = @report.error_count
-    else
-      @global.format ||= 'json'
-      if @global.verbose == 0
+    @exit_code = @report.error_count if Stella.quiet?
+    
+    unless @global.testplan
+      case @global.format
+      when 'csv'
         metrics = @report.metrics_pack
         puts metrics.dump(@global.format)
-      elsif @global.verbose >= 1
+      when 'json', 'yaml'
         puts @run.dump(@global.format)
+      else
+        metrics = @report.metrics
+        # @run.planid.shorten(12), @run.runid.shorten(12),
+        args = [@report.statuses.values.first,
+          metrics.response_time.mean*1000,
+          metrics.socket_connect.mean*1000,
+          metrics.first_byte.mean*1000,
+          metrics.last_byte.mean*1000]
+        Stella.li "[%3s] %6.2fms  (%5.2fms + %5.2fms + %5.2fms)" % args
+        if @global.verbose > 0 || @report.errors?
+          Stella.li ''
+          Stella.li ' Headers:'
+          Stella.li '  %s' % [@report.headers.request_headers.split(/\n/).join("\n  ")]
+          Stella.li
+          Stella.li '  %s' % [@report.headers.response_headers.split(/\n/).join("\n  ")]
+        end
+        #puts @report.metrics_pack.dump(:json)
       end
     end
-    
+  rescue Stella::API::Unauthorized => ex
+    STDERR.puts "Please check your credentials!"
+    STDERR.puts " e.g."
+    STDERR.puts "  export STELLA_ACCOUNT=youraccount"
+    STDERR.puts "  export STELLA_KEY=yourapikey"
+    STDERR.puts " OR "
+    STDERR.puts "  stella -A youraccount -K yourapikey checkup #{@argv.first}"
   end
 
   def example

data/lib/stella/engine.rb

@@ -49,28 +49,31 @@ class Stella
             Benelux.current_track "client_#{client.clientid.shorten}"
             begin
               opts[:repetitions].times do |idx|
-                Stella.li '%-61s %s' % [testrun.plan.desc, testrun.plan.planid.shorten(12)] if Stella.noise >= 2
+                Stella.li '%-61s %s' % [testrun.plan.desc, testrun.plan.planid.shorten(12)] if Stella.noise >= 2 && !Stella.quiet?
                 testrun.plan.usecases.each_with_index do |uc,i|
                   if opts[:usecases].nil? || opts[:usecases].member?(uc.class)
                     Benelux.current_track.add_tags :usecase => uc.id
                     Stella.rescue { 
-                      Stella.li ' %-60s %s' % [uc.desc, uc.ucid.shorten(12)] if Stella.noise >= 2
+                      Stella.li ' %-60s %s' % [uc.desc, uc.ucid.shorten(12)] if Stella.noise >= 1 && !Stella.quiet?
                       client.execute uc do |session|
-                        Stella.li '  %3d %4s %-76s' % [session.status, session.http_method.upcase, session.uri] if Stella.noise >= 2
-                        if Stella.noise >= 3
-                          Stella.li '       %s' % [session.req.header.dump.split(/\n/).join("\n       ")]
+                        Stella.li '  %3d %-4s %-76s' % [session.status, session.http_method.upcase, session.uri] if Stella.noise >= 1 && !Stella.quiet?
+                        if Stella.noise >= 2 && !Stella.quiet?
+                          Stella.li '   %s' % [session.req.header.dump.split(/\n/).join("\n   ")]
                           Stella.li
-                          Stella.li '       %s' % [session.res.header.dump.split(/\n/).join("\n       ")]
+                          Stella.li '   %s' % [session.res.header.dump.split(/\n/).join("\n   ")]
+                          Stella.li ''
                         end
                       end
                     }
                     if client.exception
-                      Stella.li '  %4s %s (%s)' % ['', client.exception.message, client.exception.class]
+                      if Stella.noise >= 1
+                        Stella.li '  %4s %s (%s)' % ['', client.exception.message, client.exception.class]
+                      end
                       # TODO: use a throw. This won't stop the next repetition.
                       break if Stella::TestplanQuit === client.exception
                     end
                   else
-                    Stella.li ' %-60s %s' % ["#{uc.desc} (skipped)", uc.ucid.shorten(12)] if Stella.noise >= 2
+                    #Stella.li ' %-60s %s' % ["#{uc.desc} (skipped)", uc.ucid.shorten(12)] if Stella.noise >= 2
                   end
                   Benelux.current_track.remove_tags :usecase
                 end

data/stella.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{stella}
-  s.version = "2.0.3.001"
+  s.version = "2.1.0.001"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Delano Mandelbaum"]

metadata

@@ -2,7 +2,7 @@
 name: stella
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 2.0.3.001
+  version: 2.1.0.001
 platform: ruby
 authors: 
 - Delano Mandelbaum