alicorn 0.0.10 → 0.1.0

data/Gemfile

@@ -8,4 +8,5 @@ group :development do
   gem "bundler", "~> 1.1.3"
   gem "jeweler", "~> 1.8.3"
   gem "mocha", "~> 0.11.4"
+  gem "simplecov", "~> 0.6.4", :require => false, :platforms => :ruby_19
 end

data/Gemfile.lock

@@ -12,6 +12,7 @@ GEM
     metaclass (0.0.1)
     mocha (0.11.4)
       metaclass (~> 0.0.1)
+    multi_json (1.3.4)
     rake (0.9.2.2)
     rdoc (3.12)
       json (~> 1.4)
@@ -20,6 +21,10 @@ GEM
       shoulda-matchers (~> 1.0.0)
     shoulda-context (1.0.0)
     shoulda-matchers (1.0.0)
+    simplecov (0.6.4)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.5.3)
+    simplecov-html (0.5.3)
 
 PLATFORMS
   ruby
@@ -31,3 +36,4 @@ DEPENDENCIES
   mocha (~> 0.11.4)
   rdoc (~> 3.12)
   shoulda (~> 3.0.1)
+  simplecov (~> 0.6.4)

data/Rakefile

@@ -1,4 +1,5 @@
 # encoding: utf-8
+$:.push File.join(File.dirname(__FILE__),'lib')
 
 require 'rubygems'
 require 'bundler'
@@ -11,10 +12,12 @@ rescue Bundler::BundlerError => e
 end
 require 'rake'
 
+require 'alicorn'
 require 'jeweler'
 Jeweler::Tasks.new do |gem|
   # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
   gem.name = "alicorn"
+  gem.version = Alicorn::VERSION
   gem.homepage = "http://github.com/bensomers/alicorn"
   gem.license = "MIT"
   gem.summary = %Q{Standalone auto-scaler for unicorn}

data/alicorn.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "alicorn"
-  s.version = "0.0.10"
+  s.version = "0.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ben Somers"]
-  s.date = "2012-05-21"
+  s.date = "2012-05-22"
   s.description = "Highly configurable dumb auto-scaler for managing unicorn web servers"
   s.email = "somers.ben@gmail.com"
   s.executables = ["alicorn", "alicorn_profiler"]
@@ -24,15 +24,19 @@ Gem::Specification.new do |s|
     "LICENSE.txt",
     "README.rdoc",
     "Rakefile",
-    "VERSION",
     "alicorn.gemspec",
     "bin/alicorn",
     "bin/alicorn_profiler",
     "lib/alicorn.rb",
     "lib/alicorn/dataset.rb",
     "lib/alicorn/log_parser.rb",
+    "lib/alicorn/profiler.rb",
     "lib/alicorn/scaler.rb",
+    "lib/alicorn/version.rb",
+    "test/fixtures/sample.alicorn.log",
     "test/helper.rb",
+    "test/test_log_parser.rb",
+    "test/test_profiler.rb",
     "test/test_scaler.rb"
   ]
   s.homepage = "http://github.com/bensomers/alicorn"
@@ -51,6 +55,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<bundler>, ["~> 1.1.3"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.8.3"])
       s.add_development_dependency(%q<mocha>, ["~> 0.11.4"])
+      s.add_development_dependency(%q<simplecov>, ["~> 0.6.4"])
     else
       s.add_dependency(%q<curb>, ["~> 0.8.0"])
       s.add_dependency(%q<shoulda>, ["~> 3.0.1"])
@@ -58,6 +63,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<bundler>, ["~> 1.1.3"])
       s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
       s.add_dependency(%q<mocha>, ["~> 0.11.4"])
+      s.add_dependency(%q<simplecov>, ["~> 0.6.4"])
     end
   else
     s.add_dependency(%q<curb>, ["~> 0.8.0"])
@@ -66,6 +72,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<bundler>, ["~> 1.1.3"])
     s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
     s.add_dependency(%q<mocha>, ["~> 0.11.4"])
+    s.add_dependency(%q<simplecov>, ["~> 0.6.4"])
   end
 end
 

data/bin/alicorn

@@ -9,11 +9,17 @@ OptionParser.new do |opts|
 It relies on unicorn's built-in Raindrops middleware (so make sure you have
 enabled it). It computes rough load scores based on separately averaged
 data sets. \n\nUsage: alicorn [options]"
-  opts.on('-h', '--help', 'Display this screen' ) do
+
+  opts.on('-h', '--help', 'Display this screen') do
     puts opts
     exit
   end
 
+  opts.on('--version', "version number") do
+    puts Alicorn::VERSION
+    exit
+  end
+
   opts.on("--min-workers [N]", Integer, "the minimum number of workers to scale down to") do |v|
     options[:min_workers] = v
   end

data/bin/alicorn_profiler

@@ -3,7 +3,7 @@ $:.push File.join(File.dirname(__FILE__),'..','lib')
 
 require 'optparse'
 require 'alicorn'
-require 'alicorn/log_parser'
+require 'alicorn/profiler'
 
 
 options = {}
@@ -50,32 +50,7 @@ uses to trigger panic responses (which produce fast scale-ups).
   end
 end.parse!
 
-# Use these two variables to control the profiler
-# The log file is the output of the sampling-mode alicorn
-# The options are a stripped-down option set, including only
-# the options that matter to the scaling algorithm.
-@log_file = options[:log_path]
-@options = { :min_workers => options[:min_workers],
-             :max_workers => options[:max_workers],
-             :target_ratio => options[:target_ration],
-             :buffer => options[:buffer],
-             :debug => true,
-             :dry_run => true}
+options.merge!(:debug => true, :dry_run => true)
 
-@alp = Alicorn::LogParser.new(@log_file)
-@alp.parse
-
-scaler = Alicorn::Scaler.new(@options)
-@worker_count = @options[:max_workers]
-
-p "Testing #{@alp.samples.count} samples"
-@alp.samples.each do |sample|
-  connections = sample[:active].zip(sample[:queued]).map { |e| e.inject(:+) }
-  if connections.max > @worker_count
-    p "Overloaded! Ran #{@worker_count} and got #{connections.max} active + queued"
-    p sample if options[:verbose]
-  end
-  sig, count = scaler.send(:auto_scale, sample, @worker_count)
-  @worker_count += count if sig == "TTIN"
-  @worker_count -= count if sig == "TTOU"
-end
+profiler = Alicorn::Profiler.new(options)
+profiler.profile

data/lib/alicorn.rb

@@ -1,3 +1,4 @@
 module Alicorn; end
 
 require 'alicorn/scaler'
+require 'alicorn/version'

data/lib/alicorn/dataset.rb

@@ -3,15 +3,4 @@ class DataSet < Array
     return 0 if empty?
     inject(:+) / size.to_i
   end
-
-  def variance
-    return nil if empty?
-    sum=self.inject(0){|acc,i|acc +(i-avg)**2}
-    return(1/self.length.to_f*sum)
-  end
-
-  def stddev
-    return nil if empty?
-    Math.sqrt(self.variance)
-  end
 end

data/lib/alicorn/log_parser.rb

@@ -27,6 +27,7 @@ module Alicorn
           samples << @sample_hash # store the old sample
         end
       end
+      samples
     end
   end
 end

data/lib/alicorn/profiler.rb

@@ -0,0 +1,38 @@
+require 'alicorn/log_parser'
+
+module Alicorn
+  class Profiler
+    attr_accessor :log_path, :min_workers, :max_workers, :target_ratio, :buffer,
+      :worker_count, :verbose, :out
+
+    def initialize(options = {})
+      @log_path     = options[:log_path]
+      @min_workers  = options[:min_workers]
+      @max_workers  = options[:max_workers]
+      @target_ratio = options[:target_ratio]
+      @buffer       = options[:buffer]
+      @verbose      = options.delete(:verbose)
+
+      @out          = options[:test] ? File.open("/dev/null") : STDOUT
+      @worker_count = @max_workers
+      @scaler = Scaler.new(options.merge(:log_path => nil))
+      @alp    = LogParser.new(@log_path)
+    end
+
+    def profile
+      samples = @alp.parse
+      @out.puts "Profiling #{samples.count} samples"
+
+      samples.each do |sample|
+        connections = sample[:active].zip(sample[:queued]).map { |e| e.inject(:+) }
+        if connections.max > @worker_count
+          @out.puts "Overloaded! Ran #{@worker_count} and got #{connections.max} active + queued"
+          @out.puts sample if @verbose
+        end
+        sig, count = @scaler.auto_scale(sample, @worker_count)
+        @worker_count += count if sig == "TTIN"
+        @worker_count -= count if sig == "TTOU"
+      end
+    end
+  end
+end

data/lib/alicorn/scaler.rb

@@ -7,27 +7,29 @@ module Alicorn
     attr_accessor :min_workers, :max_workers, :target_ratio, :buffer,
       :raindrops_url, :delay, :sample_count, :app_name, :dry_run, :logger
 
+    attr_reader :signal_delay
+
     def initialize(options = {})
-      self.min_workers        = options[:min_workers]         || 1
-      self.max_workers        = options[:max_workers]
-      self.target_ratio       = options[:target_ratio]        || 1.3
-      self.buffer             = options[:buffer]              || 2
-      self.raindrops_url      = options[:url]                 || "http://127.0.0.1/_raindrops"
-      self.delay              = options[:delay]               || 1
-      self.sample_count       = options[:sample_count]        || 30
-      self.app_name           = options[:app_name]            || "unicorn"
-      self.dry_run            = options[:dry_run]
-      log_path                = options[:log_path]            || "/dev/null"
+      @min_workers        = options[:min_workers]         || 1
+      @max_workers        = options[:max_workers]
+      @target_ratio       = options[:target_ratio]        || 1.3
+      @buffer             = options[:buffer]              || 2
+      @raindrops_url      = options[:url]                 || "http://127.0.0.1/_raindrops"
+      @delay              = options[:delay]               || 1
+      @sample_count       = options[:sample_count]        || 30
+      @app_name           = options[:app_name]            || "unicorn"
+      @dry_run            = options[:dry_run]
+      @signal_delay       = 1
+      log_path            = options[:log_path]            || "/dev/null"
 
       self.logger = Logger.new(log_path)
       logger.level = options[:verbose] ? Logger::DEBUG : Logger::WARN
     end
 
-    def scale!
+    def scale
       data          = collect_data
       unicorns      = find_unicorns
 
-      abort "Could not find any unicorn processes" if unicorns.empty?
       master_pid    = find_master_pid(unicorns)
       worker_count  = find_worker_count(unicorns)
 
@@ -35,13 +37,14 @@ module Alicorn
       if sig and !dry_run
         number.times do
           send_signal(master_pid, sig) 
-          sleep(1) # Make sure unicorn doesn't discard repeated signals
+          sleep(signal_delay) # Make sure unicorn doesn't discard repeated signals
         end
       end
+    rescue Exception => e
+      logger.error "exception occurred: #{e.class}\n\n#{e.message}"
+      raise e
     end
 
-  protected
-
     def auto_scale(data, worker_count)
       return nil if data[:active].empty? or data[:queued].empty?
       connections = data[:active].zip(data[:queued]).map { |e| e.inject(:+) }
@@ -56,8 +59,11 @@ module Alicorn
       target = target.ceil
 
       logger.debug "target calculated at: #{target}, worker count at #{worker_count}"
-      if connections.avg > worker_count and data[:queued].avg > 1
-        logger.debug "danger, will robinson! scaling up fast!"
+      if target >= max_workers
+        logger.warn "at maximum capacity! cannot scale up"
+        return nil, 0
+      elsif connections.avg > worker_count and data[:queued].avg > 1
+        logger.warn "danger, will robinson! scaling up fast!"
         return "TTIN", target - worker_count
       elsif target > worker_count
         logger.debug "scaling up!"
@@ -71,26 +77,7 @@ module Alicorn
       end
     end
 
-    def find_master_pid(unicorns)
-      master_lines = unicorns.select { |line| line.match /master/ }
-      if master_lines.size > 1
-        abort "Too many unicorn master processes detected. You may be restarting, or have an app name collision: #{master_lines}"
-      elsif master_lines.first.match /\(old\)/
-        abort "Old master process detected. You may be restarting: #{master_lines.first}"
-      else
-        master_lines.first.split.first.to_i
-      end
-    end
-
-    def find_worker_count(unicorns)
-      unicorns.select { |line| line.match /worker\[[\d]\]/ }.count
-    end
-
-    def find_unicorns
-      ptable = %x(ps ax).split("\n")
-      unicorns = ptable.select { |line| line.match(/unicorn/) && line.match(/#{Regexp.escape(app_name)}/) }
-      unicorns.map(&:strip)
-    end
+  protected
 
     def collect_data
       logger.debug "Sampling #{sample_count} times"
@@ -113,15 +100,44 @@ module Alicorn
       {:calling => calling, :writing => writing, :active => active, :queued => queued}
     end
 
+  private
+
+    # Raises errors if the master is busy restarting, or we can't be certain which PID to signal
+    def find_master_pid(unicorns)
+      master_lines = unicorns.select { |line| line.match /master/ }
+      if master_lines.size == 0
+        raise "No unicorn master processes detected. You may still be starting up."
+      elsif master_lines.size > 1
+        raise "Too many unicorn master processes detected. You may be restarting, or have an app name collision: #{master_lines}"
+      elsif master_lines.first.match /\(old\)/
+        raise "Old master process detected. You may be restarting: #{master_lines.first}"
+      else
+        master_lines.first.split.first.to_i
+      end
+    end
+
+    def find_worker_count(unicorns)
+      unicorns.select { |line| line.match /worker\[[\d+]\]/ }.count
+    end
+
+    def find_unicorns
+      ptable = grep_process_list.split("\n")
+      unicorns = ptable.select { |line| line.match(/unicorn/) && line.match(/#{Regexp.escape(app_name)}/) }
+      raise "Could not find any unicorn processes" if unicorns.empty?
+
+      unicorns.map(&:strip)
+    end
+
+    def grep_process_list
+      %x(ps ax)
+    end
+
     def send_signal(master_pid, sig)
       Process.kill(sig, master_pid)
     end
 
-private
-
     def get_raindrops(url)
       Curl::Easy.http_get(url).body_str.split("\n")
     end
-    
   end
 end

data/lib/alicorn/version.rb

@@ -0,0 +1,3 @@
+module Alicorn
+  VERSION = "0.1.0"
+end

data/test/fixtures/sample.alicorn.log

@@ -0,0 +1,14 @@
+D, [2012-05-17T14:45:02.092344 #26889] DEBUG -- : Sampling 3 times
+D, [2012-05-17T14:45:32.901373 #26889] DEBUG -- : Collected:
+D, [2012-05-17T14:45:32.901563 #26889] DEBUG -- : calling:[1, 2, 1]
+D, [2012-05-17T14:45:32.901960 #26889] DEBUG -- : writing:[2, 1, 2]
+D, [2012-05-17T14:45:32.902297 #26889] DEBUG -- : active:[1, 4, 3]
+D, [2012-05-17T14:45:32.902606 #26889] DEBUG -- : queued:[0, 2, 1]
+D, [2012-05-17T14:45:32.902944 #26889] DEBUG -- : target calculated at: 4, worker count at 2
+D, [2012-05-17T14:50:01.575204 #27727] DEBUG -- : Sampling 5 times
+D, [2012-05-17T14:50:31.697833 #27727] DEBUG -- : Collected:
+D, [2012-05-17T14:50:31.698001 #27727] DEBUG -- : calling:[11, 12, 11, 13, 14]
+D, [2012-05-17T14:50:31.698452 #27727] DEBUG -- : writing:[12, 11, 12, 14, 13]
+D, [2012-05-17T14:50:31.698792 #27727] DEBUG -- : active:[11, 14, 13, 12, 11]
+D, [2012-05-17T14:50:31.699107 #27727] DEBUG -- : queued:[10, 12, 11, 11, 12]
+D, [2012-05-17T14:50:31.699448 #27727] DEBUG -- : target calculated at: 14, worker count at 12

data/test/helper.rb

@@ -1,3 +1,8 @@
+unless RUBY_VERSION.match(/1\.8/)
+  require 'simplecov'
+  SimpleCov.start
+end
+
 require 'rubygems'
 require 'bundler'
 begin

data/test/test_log_parser.rb

@@ -0,0 +1,28 @@
+require 'helper'
+require 'alicorn/log_parser'
+
+class TestLogParser < Test::Unit::TestCase
+
+  def setup
+    @alp = Alicorn::LogParser.new("test/fixtures/sample.alicorn.log")
+  end
+
+  context "#parse" do
+    should "correctly read log file" do
+      expected = [ { :calling => DataSet.new([1,2,1]),
+                     :writing => DataSet.new([2,1,2]),
+                     :active  => DataSet.new([1,4,3]),
+                     :queued  => DataSet.new([0,2,1]) },
+                   { :calling => DataSet.new([11, 12, 11, 13, 14]),
+                     :writing => DataSet.new([12, 11, 12, 14, 13]),
+                     :active  => DataSet.new([11, 14, 13, 12, 11]),
+                     :queued  => DataSet.new([10, 12, 11, 11, 12]) }
+                 ]
+
+      @alp.parse
+
+      assert_equal 2, @alp.samples.count
+      assert_equal expected, @alp.samples
+    end
+  end
+end

data/test/test_profiler.rb

@@ -0,0 +1,28 @@
+require 'helper'
+require 'alicorn/profiler'
+
+class TestProfiler < Test::Unit::TestCase
+
+  def setup
+    @prof = Alicorn::Profiler.new(:log_path     => "test/fixtures/sample.alicorn.log",
+                                  :min_workers  => 2,
+                                  :max_workers  => 10,
+                                  :target_ratio => 1.3,
+                                  :buffer       => 1,
+                                  :test         => true)
+    @out = StringIO.new
+    @prof.out = @out
+  end
+
+  context "#profile" do
+    should "simulate real-world alicorn runs" do
+      Alicorn::Scaler.any_instance.stubs(:auto_scale).returns(["TTIN", 1], ["TTOU", 3])
+      @out.expects(:puts).with("Profiling 2 samples")
+      @out.expects(:puts).with { |string| string.match /Overloaded! Ran 11 and got 26/ }
+
+      @prof.profile
+      assert_equal 8, @prof.worker_count
+    end
+  end
+  
+end

data/test/test_scaler.rb

@@ -4,27 +4,112 @@ class TestScaler < Test::Unit::TestCase
 
   def setup
     @scaler = Alicorn::Scaler.new(:delay => 0)
+
+    # stub out external call
+    raindrops = "calling: 3\nwriting: 1\n/tmp/cart.socket active: 4\n/tmp/cart.socket queued: 0\n"
+    Curl::Easy.stubs(:http_get).returns(stub(:body_str => raindrops))
+
+    # enable us to test private methods, for the complicated ones
     class << @scaler
-      def publicize(method)
-        self.class.class_eval { public method }
+      def publicize(*methods)
+        methods.each do |meth|
+          self.class.class_eval { public meth }
+        end
       end
     end
   end
 
-  context "#scale!" do
+  context "#scale" do
     context "when no unicorn processes are running" do
+      setup do
+        @scaler.stubs(:grep_process_list).returns("foo\nbar")
+      end
+
+      should "raise an error" do
+        exception = assert_raise(RuntimeError) do
+          @scaler.scale
+        end
+        assert_equal "Could not find any unicorn processes", exception.message
+      end
+    end
+
+    context "when no master processes are running" do
+      setup do
+        plist = "1050 ?  Sl  1:06 unicorn_rails worker[0] -c first_unicorn.rb -E staging -D\n 
+                 1051 ?  Sl  1:06 unicorn_rails worker[1] -c other_unicorn.rb -E staging -D\n"
+        @scaler.stubs(:grep_process_list).returns(plist)
+      end
+
+      should "raise an error" do
+        exception = assert_raise(RuntimeError) do
+          @scaler.scale
+        end
+        assert_match /No unicorn master processes/, exception.message
+      end
     end
+
     context "when multiple master processes are found" do
+      setup do
+        plist = "1050 ?  Sl  1:06 unicorn_rails master -c first_unicorn.rb -E staging -D\n 
+                 1051 ?  Sl  1:06 unicorn_rails master -c other_unicorn.rb -E staging -D\n"
+        @scaler.stubs(:grep_process_list).returns(plist)
+      end
+
+      should "raise an error" do
+        exception = assert_raise(RuntimeError) do
+          @scaler.scale
+        end
+        assert_match /Too many unicorn master processes/, exception.message
+      end
     end
+
     context "when an old master process is running" do
+      setup do
+        plist = "1050 ?  Sl  1:06 unicorn_rails master (old) -c first_unicorn.rb -E staging -D\n 
+                 1051 ?  Sl  1:06 unicorn_rails worker[0] -c other_unicorn.rb -E staging -D\n"
+        @scaler.stubs(:grep_process_list).returns(plist)
+      end
+
+      should "raise an error" do
+        exception = assert_raise(RuntimeError) do
+          @scaler.scale
+        end
+        assert_match /Old master process detected/, exception.message
+      end
     end
+
     context "when things are properly detected" do
+      setup do
+        plist = "1050 ?  Sl  1:06 unicorn_rails master -c first_unicorn.rb -E staging -D\n 
+                 1051 ?  Sl  1:06 unicorn_rails master -c other_unicorn.rb -E staging -D\n
+                 1052 ?  Sl  1:06 unicorn_rails worker[0] -c other_unicorn.rb -E staging -D\n
+                 1053 ?  Sl  1:06 unicorn_rails worker[1] -c other_unicorn.rb -E staging -D\n
+                 1054 ?  Sl  1:06 unicorn_rails worker[0] -c first_unicorn.rb -E staging -D\n" 
+        @scaler.stubs(:grep_process_list).returns(plist)
+        @scaler.stubs(:auto_scale).returns(["NOTASIGNAL", 2])
+        @scaler.stubs(:signal_delay).returns(0)
+        @scaler.app_name = "first"
+      end
+
+      should "find the correct master and correct worker quantity" do
+        @scaler.publicize(:find_unicorns, :find_master_pid, :find_worker_count)
+        unicorns = @scaler.find_unicorns
+
+        assert_equal 1050, @scaler.find_master_pid(unicorns)
+        assert_equal 1, @scaler.find_worker_count(unicorns)
+      end
+
+      should "send the correct number of signals" do
+        @scaler.expects(:send_signal).with(1050, "NOTASIGNAL").twice
+        @scaler.scale
+        assert true
+      end      
     end
   end
 
+  # Test the scaling algorithm separately for simplicity's sake
   context "#auto_scale" do
     setup do
-      @scaler.publicize :auto_scale
       @worker_count = 10
       @scaler.min_workers = 1
       @scaler.max_workers = 25
@@ -35,7 +120,7 @@ class TestScaler < Test::Unit::TestCase
       @data[:queued]
     end
 
-    context "when we're above the target" do
+    context "when we need to scale down" do
       setup do
         @data[:active] << 3 << 4 << 5
         @data[:queued] << 0 << 0 << 0
@@ -44,9 +129,19 @@ class TestScaler < Test::Unit::TestCase
       should "return 1 TTOU" do
         assert_equal ["TTOU", 1], @scaler.auto_scale(@data, @worker_count)
       end
+
+      context "but we've hit our minimum workers" do
+        setup do
+          @scaler.min_workers = 10
+        end
+
+        should "return no signal" do
+          assert_equal [nil, 0], @scaler.auto_scale(@data, @worker_count)
+        end
+      end
     end
 
-    context "when we're below the target" do
+    context "when we need to scale up" do
       setup do
         @data[:active] << 2 << 10
         @data[:queued] << 0 << 0
@@ -55,9 +150,19 @@ class TestScaler < Test::Unit::TestCase
       should "return 1 TTIN" do
         assert_equal ["TTIN", 1], @scaler.auto_scale(@data, @worker_count)
       end
+
+      context "but we've hit our maximum workers" do
+        setup do
+          @scaler.max_workers = 10
+        end
+
+        should "return no signal" do
+          assert_equal [nil, 0], @scaler.auto_scale(@data, @worker_count)
+        end
+      end
     end
 
-    context "when we need to scale up fast" do
+    context "when we need to panic and scale up fast" do
       setup do
         @data[:queued] << 6
         @data[:active] << 6
@@ -74,7 +179,7 @@ class TestScaler < Test::Unit::TestCase
         @data[:queued] << 0
       end
 
-      should "return several TTIN" do
+      should "return no signal" do
         assert_equal [nil, 0], @scaler.auto_scale(@data, @worker_count)
       end
     end
@@ -82,14 +187,8 @@ class TestScaler < Test::Unit::TestCase
   end
 
   context "#collect_data" do
-    setup do
-      @scaler.publicize :collect_data
-      raindrops = "calling: 3\nwriting: 1\n/tmp/cart.socket active: 4\n/tmp/cart.socket queued: 0\n"
-      Curl::Easy.stubs(:http_get).returns(stub(:body_str => raindrops))
-    end
-
     should "return the correct data" do
-      data = @scaler.collect_data
+      data = @scaler.send(:collect_data)
       expected_data = { :calling => [3]*30,
                         :writing => [1]*30,
                         :active  => [4]*30,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alicorn
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curb
-  requirement: &70103116675180 !ruby/object:Gem::Requirement
+  requirement: &70298610808540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.8.0
   type: :runtime
   prerelease: false
-  version_requirements: *70103116675180
+  version_requirements: *70298610808540
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70103116673500 !ruby/object:Gem::Requirement
+  requirement: &70298610808060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 3.0.1
   type: :development
   prerelease: false
-  version_requirements: *70103116673500
+  version_requirements: *70298610808060
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70103116672420 !ruby/object:Gem::Requirement
+  requirement: &70298610807580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *70103116672420
+  version_requirements: *70298610807580
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70103116671500 !ruby/object:Gem::Requirement
+  requirement: &70298610807100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.1.3
   type: :development
   prerelease: false
-  version_requirements: *70103116671500
+  version_requirements: *70298610807100
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70103116670920 !ruby/object:Gem::Requirement
+  requirement: &70298610806620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *70103116670920
+  version_requirements: *70298610806620
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70103116670380 !ruby/object:Gem::Requirement
+  requirement: &70298610806140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,7 +76,18 @@ dependencies:
         version: 0.11.4
   type: :development
   prerelease: false
-  version_requirements: *70103116670380
+  version_requirements: *70298610806140
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: &70298610805600 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.6.4
+  type: :development
+  prerelease: false
+  version_requirements: *70298610805600
 description: Highly configurable dumb auto-scaler for managing unicorn web servers
 email: somers.ben@gmail.com
 executables:
@@ -93,15 +104,19 @@ files:
 - LICENSE.txt
 - README.rdoc
 - Rakefile
-- VERSION
 - alicorn.gemspec
 - bin/alicorn
 - bin/alicorn_profiler
 - lib/alicorn.rb
 - lib/alicorn/dataset.rb
 - lib/alicorn/log_parser.rb
+- lib/alicorn/profiler.rb
 - lib/alicorn/scaler.rb
+- lib/alicorn/version.rb
+- test/fixtures/sample.alicorn.log
 - test/helper.rb
+- test/test_log_parser.rb
+- test/test_profiler.rb
 - test/test_scaler.rb
 homepage: http://github.com/bensomers/alicorn
 licenses:
@@ -118,7 +133,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -225078698717891469
+      hash: 1604332443773651441
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/VERSION

@@ -1 +0,0 @@
-0.0.10