stella 0.7.6.007 → 0.8.0.000

data/lib/stella/service.rb

@@ -0,0 +1,228 @@
+Stella::Utils.require_vendor "httpclient", '2.1.5.2'
+
+class Stella::Service
+  class Problem < Stella::Error
+    def res() @obj end
+  end
+  module V1
+    class NoTestplanSelected < Problem; end
+    class NoUsecaseSelected < Problem; end
+    class NoRequestSelected < Problem; end
+    class NoTestrunSelected < Problem; end
+    def testplan?(digest)
+      req = uri('v1', 'testplan', "#{digest}.json")
+      res = send_request :get, req
+      !res.content.empty?
+    rescue Stella::Service::Problem => ex
+      raise ex unless ex.res.status == 404
+      false
+    end
+    def testrun?(digest)
+      req = uri('v1', 'testrun', "#{digest}.json")
+      res = send_request :get, req
+      !res.content.empty?
+    rescue Stella::Service::Problem => ex
+      raise ex unless ex.res.status == 404
+      false
+    end
+    def testplan_create(desc, opts={})
+      req = uri('v1', 'testplan', "create.json")
+      params = {
+        :desc => desc
+      }.merge! opts
+      res = send_request :post, req, params
+      obj = JSON.parse res.content
+      Stella.ld "CREATED TP: #{obj.inspect}"
+      @tid = obj['digest']
+    end
+    def usecase_create(desc, opts={})
+      raise NoTestplanSelected unless @tid
+      req = uri('v1', 'testplan', 'usecase', "create.json")
+      params = {
+        :tid  => @tid,
+        :desc => desc
+      }.merge! opts
+      
+      res = send_request :post, req, params
+      obj = JSON.parse res.content
+      Stella.ld "CREATED UC: #{obj.inspect}"
+      @uid = obj['digest']
+    end
+    def request_create(uri, opts={})
+      raise NoUsecaseSelected unless @uid
+      req = uri('v1', 'testplan', 'usecase', 'request', "create.json")
+      params = {
+        :tid  => @tid,
+        :uid  => @uid,
+        :uri => uri
+      }.merge! opts
+      res = send_request :post, req, params
+      obj = JSON.parse res.content
+      @rtid = obj['digest']
+    end
+    def testrun_create(opts={})
+      raise NoTestplanSelected unless @tid
+      req = uri('v1', 'testrun', "create.json")
+      params = {
+        :tid => @tid,
+        :start_time => Stella::START_TIME
+      }.merge! opts
+      res = send_request :post, req, params
+      obj = JSON.parse res.content
+      Stella.ld "CREATED TRUN: #{obj.inspect}"
+      @runid = obj['digest']
+    end
+    def testrun_summary(opts={})
+      raise NoTestrunSelected unless @runid
+      req = uri('v1', 'testrun', 'summary', "create.json")
+      params = {
+        :runid => @runid
+      }.merge! opts
+      res = send_request :post, req, params
+      obj = JSON.parse res.content
+      Stella.ld "CREATED SUMMARY: #{obj.inspect}"
+      @runid
+    end
+    def client_create(clientid, opts={})
+      raise NoTestrunSelected unless @runid
+      req = uri('v1', 'client', "create.json")
+      params = {
+        :runid  => @runid,
+        :clientid  => clientid
+      }.merge! opts
+      res = send_request :post, req, params
+      obj = JSON.parse res.content
+      @rtid = obj['digest']
+    end
+    def client_log(clientid, data, opts={})
+      raise NoTestrunSelected unless @runid
+      req = uri('v1', 'client', clientid, 'log.json')
+      params = {
+        :data => data
+      }.merge! opts
+      res = send_request :post, req, params
+      obj = JSON.parse res.content
+      Stella.ld "LOGGED: #{obj.inspect}"
+      obj
+    end
+    # Returns true if the testplan was created. 
+    # Otherwise false if it already exists.
+    def testplan_sync(plan)
+      if testplan? plan.digest
+        @tid = plan.digest
+        return false 
+      end
+      Stella.stdout.info "Syncing Testplan #{plan.digest.short}"
+      testplan_create plan.desc, :digest => plan.digest
+      plan.usecases.each do |uc|
+        Stella.stdout.info "Syncing Usecase #{uc.digest.short}"
+        props = uc.to_hash
+        props[:digest] ||= uc.digest
+        usecase_create uc.desc, props
+        uc.requests.each do |req|
+          props = req.to_hash
+          props[:digest] ||= req.digest
+          props[:desc] = props.delete :description
+          request_create props[:uri], props
+        end
+      end
+      true
+    end
+  end
+end
+
+class Stella::Service
+  unless defined?(API_VERSION)
+    TOKEN = (ENV['STELLA_TOKEN'] || nil).freeze
+  end
+  
+  include Stella::Service::V1
+  
+  attr_reader :http_client
+  attr_accessor :proxy
+  attr_reader :conf
+  
+  attr_reader :source
+  attr_reader :apikey
+  
+  attr_accessor :tid, :uid, :rtid, :runid
+  
+  def initialize(source=nil,apikey=nil)
+    source ||= ENV['STELLA_SOURCE']
+    apikey ||= ENV['STELLA_TOKEN']
+    @source, @apikey = source, apikey
+    @proxy = OpenStruct.new
+    @http_client = create_http_client
+    raise Stella::Error, "Set STELLA_SOURCE" unless @source
+    raise Stella::Error, "Set STELLA_TOKEN" unless @apikey
+  end
+  
+  def uri(*parts)
+    uri = URI.parse @source
+    uri.path = '/api/' << parts.join( '/')
+    Stella.ld "SERVICE URI: #{uri}"
+    uri
+  end
+  
+  def send_request(meth, uri, params={}, headers={})
+    headers['X-TOKEN'] ||= @apikey
+    params = process_params(params)
+    if meth == "delete"
+      args = [meth, uri, headers]
+    else
+      args = [meth, uri, params, headers]
+    end
+    res = @http_client.send(*args) # booya!
+    
+    if res.status > 200
+      puts res.content
+      raise Problem.new(res) 
+    end
+    
+    res
+  end
+  
+  private
+    # Turn nested Hashes into: "key[name][1]" etc...
+    def process_params(raw={})
+      cooked = {}
+      raw.each_pair do |k,v|
+        cooked.merge!(process_enumerable(k, v)) and next if Enumerable === v
+        cooked[k] = v
+      end
+      cooked
+    end
+    
+    def process_enumerable(k,v)
+      cooked = {}
+      case v.class.to_s
+      when "Array"
+        v.each_with_index do |v2,index|
+          name = "#{k}[#{index}]"
+          cooked[name] = Enumerable === v2 ? process_enumerable(name, v2) : v2
+        end
+      when "Hash"
+        v.each_pair do |k2,v2|
+          name = "#{k}[#{k2}]"
+          cooked[name] = Enumerable === v2 ? process_enumerable(name, v2) : v2
+        end
+      end
+      cooked
+    end
+    
+    def create_http_client
+      opts = {
+        :proxy       => @proxy.uri || nil, # a tautology for clarity
+        :agent_name  => "Stella/#{Stella::VERSION}",
+        :from        => nil
+      }
+      http_client = HTTPClient.new opts
+      http_client.set_proxy_auth(@proxy.user, @proxy.pass) if @proxy.user
+      http_client.debug_dev = STDOUT if Stella.debug? && Stella.log.lev > 1
+      http_client.protocol_version = "HTTP/1.1"
+      #http_client.ssl_config.verify_mode = ::OpenSSL::SSL::VERIFY_NONE
+      http_client
+    end
+  
+end
+

data/lib/stella/testplan.rb

@@ -38,6 +38,9 @@ class Testplan < Storable
   field :description 
   #field :resources
   
+  # TODO: Add Stellar::TOKEN to the calculation
+  gibbler :id, :usecases, :description
+  
   def initialize(uris=[], opts={})
     self.description = "Test plan"
     @usecases = []
@@ -119,9 +122,7 @@ class Testplan < Storable
     self.description = args.first unless args.empty?
     self.description
   end
-
-    
-    
+  
   def pretty(long=false)
     str = []
     dig = long ? self.digest_cache : self.digest_cache.shorter
@@ -286,7 +287,11 @@ class Testplan
     end
     
     def add_request(meth, *args, &blk)
-      raise "'#{meth}' block given in #{self.plan_path} with no URI" if args[0].nil?
+      if args[0].nil?
+        msg = "No URI given for request ##{@requests.size} "
+        msg << "#{meth} block in #{self.plan_path}"
+        raise Stella::Error, msg 
+      end
       req = Stella::Data::HTTP::Request.new meth.to_s.upcase, args[0], &blk
       req.description = args[1] if args.size > 1 # Description is optional
       Stella.ld req

data/lib/stella.rb

@@ -21,9 +21,9 @@ module Stella
   module VERSION
     unless defined?(MAJOR)
       MAJOR = 0.freeze
-      MINOR = 7.freeze
-      TINY  = 6.freeze
-      PATCH = '007'.freeze 
+      MINOR = 8.freeze
+      TINY  = 0.freeze
+      PATCH = '000'.freeze 
     end
     def self.to_s; [MAJOR, MINOR, TINY].join('.'); end
     def self.to_f; self.to_s.to_f; end
@@ -40,16 +40,37 @@ module Stella
   class WackyRatio < Stella::Error; end
   class WackyDuration < Stella::Error; end
   class InvalidOption < Stella::Error; end
-  class NoHostDefined < Stella::Error; end
+  class NoHostDefined < Stella::Error
+    def message; "No host specified for uri: #{@obj}"; end
+  end
 end
 
+class Stella::Template
+  include Gibbler::String
+  attr_reader :src
+  def initialize(src)
+    src = src.to_s
+    @src, @template = src, ERB.new(Stella::Template.to_templ(src))
+  end
+  def result(binding)
+    @template.result(binding)
+  end
+  def to_s() src end
+  private
+  def self.to_templ(str)
+    return str if str.match(/\A<%.+%>\z/)
+    "<%= #{str} %>"
+  end
+end
 
 module Stella
   extend self
   
   require 'stella/logger'
   
-  START_TIME = Time.now.freeze
+  unless defined?(START_TIME)
+    START_TIME = Time.now.freeze
+  end
   
   @globals = {}
   @sysinfo = nil
@@ -67,7 +88,7 @@ module Stella
   def ld(*msg)
     return unless Stella.debug?
     prefix = "D(#{Thread.current.object_id}):  "
-    Stella.stdout.info "#{prefix}" << msg.join("#{$/}#{prefix}")
+    Stella.stdout.info("#{prefix}#{msg.join("#{$/}#{prefix}")}".colour(:yellow))
   end
   
   def sysinfo
@@ -106,6 +127,7 @@ module Stella
   autoload :Testplan, 'stella/testplan'
   autoload :Engine, 'stella/engine'
   autoload :Client, 'stella/client'
+  autoload :Service, 'stella/service'
   
 end
 

data/stella.gemspec

@@ -1,25 +1,25 @@
 @spec = Gem::Specification.new do |s|
   s.name = "stella"
   s.rubyforge_project = 'stella'
-  s.version = "0.7.6.007"
-  s.summary = "Blame Stella for breaking your web applications."
+  s.version = "0.8.0.000"
+  s.summary = "Blame Stella for breaking your web application!"
   s.description = s.summary
   s.author = "Delano Mandelbaum"
   s.email = "delano@solutious.com"
   s.homepage = "http://solutious.com/projects/stella/"
   
-  s.extra_rdoc_files = %w[README.rdoc LICENSE.txt CHANGES.txt]
+  s.extra_rdoc_files = %w[README.md LICENSE.txt CHANGES.txt]
   s.has_rdoc = true
-  s.rdoc_options = ["--line-numbers", "--title", s.summary, "--main", "README.rdoc"]
+  s.rdoc_options = ["--line-numbers", "--title", s.summary, "--main", "README.md"]
   s.require_paths = %w[lib]
   
   s.executables = %w[stella]
   
   s.add_dependency 'benelux',    '>= 0.5.3'
   s.add_dependency 'drydock',    '>= 0.6.8'
-  s.add_dependency 'gibbler',    '>= 0.7.1'
+  s.add_dependency 'gibbler',    '>= 0.7.3'
   s.add_dependency 'sysinfo',    '>= 0.7.1'
-  s.add_dependency 'storable',   '>= 0.6.0'
+  s.add_dependency 'storable',   '>= 0.6.1'
   s.add_dependency 'nokogiri'
   
   # = MANIFEST =
@@ -27,7 +27,7 @@
   s.files = %w(
   CHANGES.txt
   LICENSE.txt
-  README.rdoc
+  README.md
   Rakefile
   Rudyfile
   bin/stella
@@ -58,6 +58,7 @@
   lib/stella/engine/loadbase.rb
   lib/stella/guidelines.rb
   lib/stella/logger.rb
+  lib/stella/service.rb
   lib/stella/testplan.rb
   lib/stella/utils.rb
   lib/stella/utils/httputil.rb
@@ -68,6 +69,7 @@
   support/useragents.txt
   tryouts/01_numeric_mixins_tryouts.rb
   tryouts/12_digest_tryouts.rb
+  tryouts/api/10_functional.rb
   tryouts/configs/failed_requests.rb
   tryouts/configs/global_sequential.rb
   tryouts/proofs/thread_queue.rb

data/tryouts/api/10_functional.rb

@@ -0,0 +1,20 @@
+# ruby -Ilib tryouts/api/10_functional.rb
+require 'stella'
+require 'bone'
+
+Stella.enable_debug 
+
+Bone['STELLA_TOKEN'] = '1'.gibbler
+abort 'Set STELLA_SOURCE' unless Bone['STELLA_SOURCE']
+
+plan_path = File.join STELLA_LIB_HOME, '..', 'examples', 'essentials', 'plan.rb'
+plan = Stella::Testplan.load_file plan_path
+
+service = Stella::Service.new Bone['STELLA_SOURCE'], Bone['STELLA_TOKEN']
+service.testplan_sync plan
+
+service.testrun_create :hosts => ['http://locahost:3000', 'http://locahost:3001']
+
+
+
+

data/vendor/httpclient-2.1.5.2/httpclient/session.rb

@@ -618,8 +618,8 @@ class HTTPClient
           req.version = $1.to_f
         end
       end
-      if @agent_name
-        req.header.set('User-Agent', "#{@agent_name} #{LIB_NAME}")
+      if @agent_name && req.header.get('User-Agent').nil?
+        req.header.set('User-Agent', "#{@agent_name}")
       end
       if @from
         req.header.set('From', @from)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: stella
 version: !ruby/object:Gem::Version 
-  version: 0.7.6.007
+  version: 0.8.0.000
 platform: ruby
 authors: 
 - Delano Mandelbaum
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-09 00:00:00 -05:00
+date: 2010-01-16 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -40,7 +40,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.7.1
+        version: 0.7.3
     version: 
 - !ruby/object:Gem::Dependency 
   name: sysinfo
@@ -60,7 +60,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.6.0
+        version: 0.6.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: nokogiri
@@ -72,20 +72,20 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
-description: Blame Stella for breaking your web applications.
+description: Blame Stella for breaking your web application!
 email: delano@solutious.com
 executables: 
 - stella
 extensions: []
 
 extra_rdoc_files: 
-- README.rdoc
+- README.md
 - LICENSE.txt
 - CHANGES.txt
 files: 
 - CHANGES.txt
 - LICENSE.txt
-- README.rdoc
+- README.md
 - Rakefile
 - Rudyfile
 - bin/stella
@@ -116,6 +116,7 @@ files:
 - lib/stella/engine/loadbase.rb
 - lib/stella/guidelines.rb
 - lib/stella/logger.rb
+- lib/stella/service.rb
 - lib/stella/testplan.rb
 - lib/stella/utils.rb
 - lib/stella/utils/httputil.rb
@@ -126,6 +127,7 @@ files:
 - support/useragents.txt
 - tryouts/01_numeric_mixins_tryouts.rb
 - tryouts/12_digest_tryouts.rb
+- tryouts/api/10_functional.rb
 - tryouts/configs/failed_requests.rb
 - tryouts/configs/global_sequential.rb
 - tryouts/proofs/thread_queue.rb
@@ -148,9 +150,9 @@ post_install_message:
 rdoc_options: 
 - --line-numbers
 - --title
-- Blame Stella for breaking your web applications.
+- Blame Stella for breaking your web application!
 - --main
-- README.rdoc
+- README.md
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -171,6 +173,6 @@ rubyforge_project: stella
 rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
-summary: Blame Stella for breaking your web applications.
+summary: Blame Stella for breaking your web application!
 test_files: []
 

data/README.rdoc

@@ -1,114 +0,0 @@
-= Stella - 0.7 PREVIEW
-
-<b>Blame Stella for breaking your web applications.</b>
-
-== Features
-
-* Realistic load simulation
-* Sophisticated response handling (with automatic HTML document parsing)
-* Dynamic variable replacement 
-
-
-== PREVIEW NOTICE
-
-This is an early preview of Stella. The following features are still under development (as of 2009-09-15):
-
-* Reporting of any kind. 
-* File uploads.
-* Documentation.
-
-
-== Usage Example
-
-    # Verify a test plan is defined correctly
-    # by running a single user functional test.
-    $ stella verify -p examples/basic/plan.rb http://stellaaahhhh.com/
-    
-    # Generate load using the same test plan. 
-    $ stella generate -p examples/basic/plan.rb -c 50 http://stellaaahhhh.com/
-    
-    
-== Test Plan Example
-
-
-Test plans are defined in the Ruby programming language. This makes it possible to define sophisticated logic to handle responses. They also typically contain more than one usecase which is important when simulating realistic load. In this example, 65% of virtual users will execute the first usecase and 35% will execute the second.
-
-    usecase 65, "Simple search" do
-  
-      get "/", "Homepage" do
-        wait 1..5
-        response 200 do
-          status                       # => 200
-          headers['Content-Type']      # => ['text/html']
-          body                         # => <html>...
-          doc                          # => Nokigiri::HTML::Document
-        end
-      end
-  
-      get "/search", "Search Results" do
-        wait 2..5
-        param :what  => 'Sarsaparilla'
-        param :where => 'Lexington'
-        response 200 do
-          listing = doc.css('div.listing').first
-          set :lid, listing['id'].match(/(\d+)/)[0]
-        end
-      end
-      
-      get "/listing/:lid" do           # URIs can contain variables.
-        desc "Selected listing"        # This one will be replaced by
-        wait 1..8                      # the one stored in the previous
-      end                              # request.
-  
-    end
-
-    usecase 35, "YAML API" do
-    
-      resource :listing_ids, list('ids.csv')
-      
-      get "/listing/:lid.yaml" do
-        desc "Select listing"
-        param :lid => random(:listing_ids)
-        response 200 do
-          repeat 5
-        end
-      end
-
-    end
-    
-See examples/ for more. 
-
-    
-== Installation
-
-Get it in one of the following ways:
-
-     $ gem install stella 
-     $ git clone git://github.com/solutious/stella.git
-     $ gem install solutious-stella --source http://gems.github.com
-
-
-== More Information
-
-* Homepage[http://solutious.com/projects/stella]
-* Codes[http://github.com/solutious/stella]
-* RDocs[http://solutious.com/stella]
-* Stellaaahhhh[http://www.youtube.com/watch?v=jHHprvyl-Hc]
-
-
-== Credits
-
-* Delano Mandelbaum (http://solutious.com)
-
-
-== Thanks 
-
-* Harm Aarts for the great test case and feedback!
-* Kalin Harvey for keeping me on track.
-* Dave L, the best intern money can't buy. 
-* Peter McCurdy for the feedback and bug fixes. 
-
-
-== License
-
-See LICENSE.txt