stella 2.1.1.002 → 2.1.2.001

data/CHANGES.txt

@@ -1,5 +1,14 @@
 STELLA, CHANGES
 
+#### 2.1.2 (2011-07-06) ###############################
+
+* FIXED: Stella::Report#postprocess loads log from a hash.
+* ADDED: Wait only up to 35 seconds for a remote checkup
+* CHANGE: Move stella/api.rb content to stella.rb
+* CHANGE: CLI output
+* CHANGE: Removed Stella::Template and require 'erb'
+
+
 #### 2.1.1 (2011-07-06) ###############################
 
 * ADDED: Append more info URI to CLI output for remote checkups

data/VERSION.yml

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

data/bin/stella

@@ -39,6 +39,7 @@ class Stella::CLI::Definition
   global :D, :debug, "Enable debug mode" do
     Drydock.debug true
     Stella.debug = true
+    Stella::API.debug_output $stdout
   end
   global :P, :pause, Integer, "Seconds to wait before starting test"
   #global :H, :withheader, "Include X-Stella-ID request header" 

data/lib/stella.rb

@@ -14,7 +14,7 @@ $:.unshift STELLA_LIB_HOME
 end
 
 require 'yajl'
-require 'erb'
+require 'httparty'
 require 'storable'
 require 'benelux'
 require 'gibbler/aliases'
@@ -40,20 +40,6 @@ class Stella
   end
 end
 
-class MatchData
-  include Gibbler::String
-end
-
-module Addressable
-  class URI
-    include Gibbler::String
-  end
-end
-
-class OpenStruct
-  include Gibbler::Object
-end
-
 #
 # Any object that wants to be serialized to JSON 
 # ought to inherit from this class. 
@@ -217,20 +203,73 @@ class Stella
   end
 end
 
-class Stella::Template
-  include Gibbler::String
-  attr_reader :src
-  def initialize(src)
-    src = src.to_s
-    @src, @template = src, ERB.new(src)
-  end
-  def result(binding)
-    @template.result(binding)
-  end
-  def self.from_file(path)
-    new File.read(path)
+class Stella  
+  class API
+    include HTTParty
+    ssl_ca_file Stella::Client::SSL_CERT_PATH
+    format :json
+    attr_reader :httparty_opts, :response, :account, :key
+    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
+      @account = account || ENV['STELLA_ACCOUNT']
+      @key = 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
+      opts[:query] = params || {}
+      execute_request :get, path, opts
+    end
+    def post path, params=nil
+      opts = httparty_opts
+      opts[:body] = params || {}
+      execute_request :post, path, opts
+    end
+    def site_uri path
+      uri = Addressable::URI.parse self.class.base_uri
+      uri.path = uri_path(path)
+      uri.to_s
+    end
+    private
+    def uri_path *args
+      args.unshift ''  # force leading slash
+      path = args.flatten.join('/')
+      path.gsub '//', '/'
+    end
+    def execute_request meth, path, opts
+      path = uri_path [path]
+      @response = self.class.send meth, path, opts
+      indifferent_params @response.parsed_response
+    end
+    # Enable string or symbol key access to the nested params hash.
+    def indifferent_params(params)
+      if params.is_a?(Hash)
+        params = indifferent_hash.merge(params)
+        params.each do |key, value|
+          next unless value.is_a?(Hash) || value.is_a?(Array)
+          params[key] = indifferent_params(value)
+        end
+      elsif params.is_a?(Array)
+        params.collect! do |value|
+          if value.is_a?(Hash) || value.is_a?(Array)
+            indifferent_params(value)
+          else
+            value
+          end
+        end
+      end
+    end
+    # Creates a Hash with indifferent access.
+    def indifferent_hash
+      Hash.new {|hash,key| hash[key.to_s] if Symbol === key }
+    end
+    
+    class Unauthorized < RuntimeError
+    end
   end
-  def to_s() src end
 end
 
 

data/lib/stella/cli.rb

@@ -13,7 +13,6 @@ class Stella::CLI < Drydock::Command
   
   
   def checkup
-    require 'stella/api'
     base_uri = Stella.canonical_uri(@argv.first)
     run_opts = { 
       :repetitions => @option.repetitions || 1,
@@ -42,11 +41,15 @@ class Stella::CLI < Drydock::Command
         STDERR.puts ret[:msg]
         @exit_code = 1 and return
       end
+      count = 0
       begin
         run_hash = @api.get "/checkup/#{ret[:runid]}"
         @run = Stella::Testrun.from_hash run_hash if run_hash
+        STDERR.print '.' if @global.verbose > 0
         sleep 1 if @run && !@run.done?
-      end while @run && !@run.done?
+        count += 1
+      end while @run && !@run.done? && count < 35
+      raise "Sorry, that took too long" if count >= 35
     else
       if @global.testplan
         unless File.owned?(@global.testplan)
@@ -83,8 +86,16 @@ class Stella::CLI < Drydock::Command
       when 'json', 'yaml'
         puts @run.dump(@global.format)
       else
+        if @global.verbose > 0 || @report.errors?
+          test_uri = @report.log.first ? @report.log.first.uri : '[unknown]'
+          Stella.li 'Checkup for %s' % [test_uri]
+          Stella.li
+          Stella.li '  %s' % [@report.headers.request_headers.split(/\n/).join("\n  ")]
+          Stella.li
+          Stella.li '  %s' % [@report.headers.response_headers.split(/\n/).join("\n  ")]
+          Stella.li ''
+        end
         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,
@@ -92,23 +103,19 @@ class Stella::CLI < Drydock::Command
           metrics.last_byte.mean*1000,
           @more_info]
         Stella.li "[%3s] %7.2fms (%5.2fms + %6.2fms + %6.2fms)  %s" % 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 "Create an account, at no charge! https://www.blamestella.com/signup/free"
-    STDERR.puts "Then specify your credentials:"
-    STDERR.puts "      export STELLA_ACCOUNT=youraccount"
-    STDERR.puts "      export STELLA_KEY=yourapikey"
+    accnt = @api.account || 'youraccount'
+    key = @api.key || 'yourapikey'
+    STDERR.puts "Specify your credentials"
+    STDERR.puts "  export STELLA_ACCOUNT=#{accnt}"
+    STDERR.puts "  export STELLA_KEY=#{key}"
     STDERR.puts " OR "
-    STDERR.puts "      stella -A youraccount -K yourapikey checkup #{@argv.first}"
+    STDERR.puts "  stella -A #{accnt} -K #{key} checkup #{@argv.first}"
+    STDERR.puts 
+    STDERR.puts "Create an account, at no charge!"
+    STDERR.puts "https://www.blamestella.com/signup/free"
   end
 
   def example

data/lib/stella/core_ext.rb

@@ -2,6 +2,20 @@
 
 $KCODE = "u" if RUBY_VERSION =~ /^1.8/
 
+class MatchData
+  include Gibbler::String
+end
+
+module Addressable
+  class URI
+    include Gibbler::String
+  end
+end
+
+class OpenStruct
+  include Gibbler::Object
+end
+
 
 # A hash with indifferent access and magic predicates.
 #

data/lib/stella/report.rb

@@ -374,6 +374,9 @@ class Stella
         val = klass.from_hash(self.send(name))
         self.send("#{name}=", val)
       end
+      # When we load a report from a hash, some plugin
+      # attributes need to be recontituted from a hash as well. 
+      (self.content.log || []).collect! { |v| Stella::Log::HTTP.from_hash(v) }
     end
     def process
       self.class.plugin_order.each do |name|

data/stella.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{stella}
-  s.version = "2.1.1.002"
+  s.version = "2.1.2.001"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Delano Mandelbaum"]
@@ -41,7 +41,6 @@ Gem::Specification.new do |s|
      "certs/startssl-sub.class1.server.ca.pem",
      "certs/stella-master.crt",
      "lib/stella.rb",
-     "lib/stella/api.rb",
      "lib/stella/cli.rb",
      "lib/stella/client.rb",
      "lib/stella/core_ext.rb",

metadata

@@ -2,7 +2,7 @@
 name: stella
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 2.1.1.002
+  version: 2.1.2.001
 platform: ruby
 authors: 
 - Delano Mandelbaum
@@ -144,7 +144,6 @@ files:
 - certs/startssl-sub.class1.server.ca.pem
 - certs/stella-master.crt
 - lib/stella.rb
-- lib/stella/api.rb
 - lib/stella/cli.rb
 - lib/stella/client.rb
 - lib/stella/core_ext.rb

data/lib/stella/api.rb

@@ -1,75 +0,0 @@
-require 'httparty'
-require 'stella'
-
-class Stella  
-  class API
-    include HTTParty
-    ssl_ca_file Stella::Client::SSL_CERT_PATH
-    format :json
-    attr_reader :httparty_opts, :response
-    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
-      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
-      opts[:query] = params || {}
-      execute_request :get, path, opts
-    end
-    def post path, params=nil
-      opts = httparty_opts
-      opts[:body] = params || {}
-      execute_request :post, path, opts
-    end
-    def site_uri path
-      uri = Addressable::URI.parse self.class.base_uri
-      uri.path = uri_path(path)
-      uri.to_s
-    end
-    private
-    def uri_path *args
-      args.unshift ''  # force leading slash
-      path = args.flatten.join('/')
-      path.gsub '//', '/'
-    end
-    def execute_request meth, path, opts
-      path = uri_path [path]
-      @response = self.class.send meth, path, opts
-      indifferent_params @response.parsed_response
-    end
-    # Enable string or symbol key access to the nested params hash.
-    def indifferent_params(params)
-      if params.is_a?(Hash)
-        params = indifferent_hash.merge(params)
-        params.each do |key, value|
-          next unless value.is_a?(Hash) || value.is_a?(Array)
-          params[key] = indifferent_params(value)
-        end
-      elsif params.is_a?(Array)
-        params.collect! do |value|
-          if value.is_a?(Hash) || value.is_a?(Array)
-            indifferent_params(value)
-          else
-            value
-          end
-        end
-      end
-    end
-    # Creates a Hash with indifferent access.
-    def indifferent_hash
-      Hash.new {|hash,key| hash[key.to_s] if Symbol === key }
-    end
-    
-    class Unauthorized < RuntimeError
-    end
-  end
-end
-
-#Stella::API.debug_output $stdout
-#Stella::API.base_uri 'http://localhost:3000/api/v2'
-#@api = Stella::API.new