stella 2.0.1.002 → 2.0.3.001

data/CHANGES.txt

@@ -1,8 +1,16 @@
 STELLA, CHANGES
 
-#### 2.0.2 (2011-06-??) ###############################
+#### 2.0.3 (2011-07-06) ###############################
 
+* ADDED: Stella::API
+* ADDED: --remote global for running checkups via www.blamestella.com (beta)
+
+
+#### 2.0.2 (2011-06-09) ###############################
+
+* FIXED: Gibbler ID fixes
 * ADDED: --wait option for checkup command
+* CHANGE: Don't freeze testplan
 
 
 #### 2.0.1 (2011-06-08) ###############################

data/Gemfile

@@ -17,4 +17,6 @@ gem 'ipaddress', '0.7.0'
 gem 'addressable', '2.2.2'
 gem 'redis', '2.2.0'
 
-gem 'rudy', '0.9.8.020'
+gem 'rudy', '0.9.8.020'
+
+gem 'httparty', '0.7.3'

data/Gemfile.lock

@@ -17,6 +17,7 @@ GEM
       storable (>= 0.8.6)
     builder (3.0.0)
     caesars (0.7.4)
+    crack (0.1.8)
     drydock (0.6.9)
     familia (0.7.1)
       gibbler (>= 0.8.6)
@@ -27,6 +28,8 @@ GEM
     gibbler (0.8.9)
       attic (>= 0.4.0)
     highline (1.6.1)
+    httparty (0.7.3)
+      crack (= 0.1.8)
     ipaddress (0.7.0)
     mime-types (1.16)
     multi_json (0.0.5)
@@ -73,6 +76,7 @@ DEPENDENCIES
   drydock (= 0.6.9)
   familia (= 0.7.1)
   gibbler (= 0.8.9)
+  httparty (= 0.7.3)
   ipaddress (= 0.7.0)
   multi_json
   nokogiri (= 1.4.4)

data/VERSION.yml

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

data/bin/stella

@@ -45,6 +45,7 @@ class Stella::CLI::Definition
   #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 :p, :testplan, String, "Path to testplan"
   global :n, :nocolor, "Disable output colors" do

data/lib/stella/api.rb

@@ -0,0 +1,65 @@
+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 user=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'] }
+      })
+    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
+    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
+  end
+end
+
+#Stella::API.debug_output $stdout
+#Stella::API.base_uri 'http://localhost:3000/api/v2'
+#@api = Stella::API.new

data/lib/stella/cli.rb

@@ -19,43 +19,52 @@ class Stella::CLI < Drydock::Command
       :concurrency => @option.concurrency || 1,
       :wait => @option.wait || 1
     }
-    if @global.testplan
-      unless File.owned?(@global.testplan)
-        raise ArgumentError, "File not found #{@global.testplan}"
-      end
-      Stella.ld "Load #{@global.testplan}"
-      load @global.testplan
-      filter = @global.filter
-      planname = Stella::Testplan.plans.keys.first
-      @plan = Stella::Testplan.plan(planname)
-      if filter
-        @plan.usecases.reject! { |uc| 
-          ret = !uc.desc.to_s.downcase.match(filter.downcase)
-          Stella.ld " rejecting #{uc.desc}" if ret
-          ret
-        }
-      end
-      Stella.ld "Running #{@plan.usecases.size} usecases"
+    if @global.remote
+      require 'stella/api'
+      @api = Stella::API.new
+      ret = @api.post :checkup, :uri => base_uri
+      begin
+        run_hash = @api.get "/checkup/#{ret[:runid]}"
+        @run = Stella::Testrun.from_hash run_hash if run_hash
+      end while @run && !@run.done?
     else
-      @plan = Stella::Testplan.new base_uri
+      if @global.testplan
+        unless File.owned?(@global.testplan)
+          raise ArgumentError, "File not found #{@global.testplan}"
+        end
+        Stella.ld "Load #{@global.testplan}"
+        load @global.testplan
+        filter = @global.filter
+        planname = Stella::Testplan.plans.keys.first
+        @plan = Stella::Testplan.plan(planname)
+        if filter
+          @plan.usecases.reject! { |uc| 
+            ret = !uc.desc.to_s.downcase.match(filter.downcase)
+            Stella.ld " rejecting #{uc.desc}" if ret
+            ret
+          }
+        end
+        Stella.ld "Running #{@plan.usecases.size} usecases"
+      else
+        @plan = Stella::Testplan.new base_uri
+      end
+      @run = @plan.checkup base_uri, run_opts
     end
-    @run = @plan.checkup base_uri, run_opts
+    
     @report = @run.report
+    
     if Stella.quiet?
-      @exit_code = report.error_count
+      @exit_code = @report.error_count
     else
       @global.format ||= 'json'
-      if @global.verbose == 2
-        if (@global.format == 'string' || @global.format == 'csv')
-          metrics = @report.metrics_pack
-          puts metrics.dump(@global.format)
-        else 
-          puts @report.dump(@global.format)
-        end
-      elsif @global.verbose >= 3
+      if @global.verbose == 0
+        metrics = @report.metrics_pack
+        puts metrics.dump(@global.format)
+      elsif @global.verbose >= 1
         puts @run.dump(@global.format)
       end
     end
+    
   end
 
   def example

data/lib/stella/report.rb

@@ -362,8 +362,9 @@ class Stella
     end
     
     field :processed => Boolean
+    field :runid
     
-    attr_reader :runid, :timeline, :filter
+    attr_reader :timeline, :filter
     def initialize(timeline=nil, runid=nil)
       @timeline, @runid = timeline, runid
       @processed = false

data/lib/stella/testplan.rb

@@ -23,7 +23,7 @@ class Stella
     include Common::PrivacyMethods
     prefix :testplan
     index :id
-    field :id, :class => Gibbler::Digest, :meth => :gibbler, &gibbler_id_processor
+    field :id, :class => Gibbler::Digest, :meth => :gibbler
     field :custid             => String
     field :usecases           => Array
     field :desc               => String
@@ -44,6 +44,10 @@ class Stella
         @usecases << Stella::Usecase.new(req) 
       end
     end
+    def id 
+      @id ||= gibbler
+      @id
+    end
     alias_method :planid, :id
     def favicon?() !@favicon.nil? && !@favicon.empty? end
     def preprocess
@@ -167,7 +171,7 @@ class Stella
   end
   class Usecase < Storable
     include Gibbler::Complex
-    field :id, :class => Gibbler::Digest, :meth => :gibbler, &gibbler_id_processor
+    field :id, :class => Gibbler::Digest, :meth => :gibbler
     field :desc             => String
     field :ratio            => Float
     field :requests         => Array
@@ -178,6 +182,10 @@ class Stella
       preprocess
       @requests << req if req
     end
+    def id 
+      @id ||= gibbler
+      @id
+    end
     alias_method :ucid, :id
     def preprocess
       @requests ||= []
@@ -274,6 +282,10 @@ class Stella
     
   class EventTemplate < Storable
     include Gibbler::Complex
+    def id 
+      @id ||= gibbler
+      @id
+    end
   end
   
   class StringTemplate
@@ -290,7 +302,7 @@ class Stella
   end
   
   class RequestTemplate < EventTemplate
-    field :id, :class => Gibbler::Digest, :meth => :gibbler, &gibbler_id_processor
+    field :id, :class => Gibbler::Digest, :meth => :gibbler
     field :protocol         => Symbol
     field :http_method
     field :http_version
@@ -351,7 +363,7 @@ class Stella
     index :id
     include Familia::Stamps
     include Common::PrivacyMethods
-    field :id, :class => Gibbler::Digest, :meth => :gibbler, &gibbler_id_processor
+    field :id, :class => Gibbler::Digest, :meth => :gibbler
     field :custid             => String
     field :status             => Symbol
     field :options            => Hash
@@ -378,6 +390,10 @@ class Stella
       }.merge options
       preprocess
     end
+    def id 
+      @id ||= gibbler
+      @id
+    end
     alias_method :runid, :id
     def duration
       return 0 unless @stime
@@ -400,7 +416,10 @@ class Stella
       @id &&= Gibbler::Digest.new(@id)
       # Calling plan calls Redis. 
       #@privacy = plan.privacy if Stella::Testplan === plan
-      @report = Stella::Report.from_hash @report if Hash === @report
+      if Hash === @report
+        @report = Stella::Report.from_hash @report
+        @report.runid = runid
+      end
       @planid &&= Gibbler::Digest.new(@planid)
     end
     def hostid
@@ -432,7 +451,7 @@ class Stella
     def plan
       if @plan.nil? 
         @plan = Stella::Testplan.from_redis @planid
-        @plan.freeze
+        #@plan.freeze
       end
       @plan
     end

data/stella.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{stella}
-  s.version = "2.0.1.002"
+  s.version = "2.0.3.001"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Delano Mandelbaum"]
-  s.date = %q{2011-06-08}
+  s.date = %q{2011-07-06}
   s.default_executable = %q{stella}
   s.description = %q{Define realistic testplans and run them against your webapps}
   s.email = %q{delano@solutious.com}
@@ -41,6 +41,7 @@ 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.0.1.002
+  version: 2.0.3.001
 platform: ruby
 authors: 
 - Delano Mandelbaum
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-08 00:00:00 -04:00
+date: 2011-07-06 00:00:00 -04:00
 default_executable: stella
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -144,6 +144,7 @@ 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