alicorn 0.4.1 → 0.4.2.pre

data/.travis.yml

@@ -0,0 +1,9 @@
+language: ruby
+rvm:
+  - "1.9.2"
+  - "1.9.3"
+  - "2.0.0"
+  - rbx-19mode
+# uncomment this line if your project needs to run something other than `rake`:
+# script: bundle exec rspec spec
+

data/Gemfile

@@ -3,10 +3,10 @@ source "http://rubygems.org"
 gem "raindrops", ">= 0.5.0"
 
 group :development do
-  gem "shoulda", "~> 3.0.1"
-  gem "rdoc", "~> 3.12"
-  gem "bundler", "~> 1.3.5"
-  gem "jeweler", "~> 1.8.3"
-  gem "mocha", "~> 0.11.4"
-  gem "simplecov", "~> 0.6.4", :require => false, :platforms => :ruby_19
+  gem "shoulda"
+  gem "rdoc"
+  gem "bundler"
+  gem "jeweler"
+  gem "mocha"
+  gem "simplecov", :require => false
 end

data/Gemfile.lock

@@ -9,7 +9,7 @@ GEM
       rdoc
     json (1.8.0)
     metaclass (0.0.1)
-    mocha (0.11.4)
+    mocha (0.14.0)
       metaclass (~> 0.0.1)
     multi_json (1.7.6)
     raindrops (0.11.0)
@@ -21,19 +21,19 @@ GEM
       shoulda-matchers (~> 1.0.0)
     shoulda-context (1.0.2)
     shoulda-matchers (1.0.0)
-    simplecov (0.6.4)
+    simplecov (0.7.1)
       multi_json (~> 1.0)
-      simplecov-html (~> 0.5.3)
-    simplecov-html (0.5.3)
+      simplecov-html (~> 0.7.1)
+    simplecov-html (0.7.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.3.5)
-  jeweler (~> 1.8.3)
-  mocha (~> 0.11.4)
+  bundler
+  jeweler
+  mocha
   raindrops (>= 0.5.0)
-  rdoc (~> 3.12)
-  shoulda (~> 3.0.1)
-  simplecov (~> 0.6.4)
+  rdoc
+  shoulda
+  simplecov

data/README.rdoc

@@ -1,6 +1,7 @@
 = Alicorn: Auto-scaler for Unicorn webserver 
 {<img src="https://codeclimate.com/badge.png" />}[https://codeclimate.com/github/bensomers/alicorn]
 {<img src="https://gemnasium.com/bensomers/alicorn.png" alt="Dependency Status" />}[https://gemnasium.com/bensomers/alicorn]
+{<img src="https://travis-ci.org/bensomers/alicorn.png?branch=master" alt="Build Status" />}[https://travis-ci.org/bensomers/alicorn]
 
 An experimental auto-scaler for the {Unicorn}[http://unicorn.bogomips.org] 
 webserver. Designed for Unicorn webservers running with the {Raindrops}[raindrops.bogomips.org]

data/alicorn.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "alicorn"
-  s.version = "0.4.1"
+  s.version = "0.4.2.pre"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ben Somers"]
-  s.date = "2013-06-12"
+  s.date = "2013-06-18"
   s.description = "Highly configurable dumb auto-scaler for managing unicorn web servers"
   s.email = "somers.ben@gmail.com"
   s.executables = ["alicorn", "alicorn-profiler"]
@@ -20,6 +20,7 @@ Gem::Specification.new do |s|
   s.files = [
     ".document",
     ".ruby-gemset",
+    ".travis.yml",
     "CHANGELOG.txt",
     "Gemfile",
     "Gemfile.lock",
@@ -54,29 +55,29 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<raindrops>, [">= 0.5.0"])
-      s.add_development_dependency(%q<shoulda>, ["~> 3.0.1"])
-      s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.3.5"])
-      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"])
+      s.add_development_dependency(%q<shoulda>, [">= 0"])
+      s.add_development_dependency(%q<rdoc>, [">= 0"])
+      s.add_development_dependency(%q<bundler>, [">= 0"])
+      s.add_development_dependency(%q<jeweler>, [">= 0"])
+      s.add_development_dependency(%q<mocha>, [">= 0"])
+      s.add_development_dependency(%q<simplecov>, [">= 0"])
     else
       s.add_dependency(%q<raindrops>, [">= 0.5.0"])
-      s.add_dependency(%q<shoulda>, ["~> 3.0.1"])
-      s.add_dependency(%q<rdoc>, ["~> 3.12"])
-      s.add_dependency(%q<bundler>, ["~> 1.3.5"])
-      s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
-      s.add_dependency(%q<mocha>, ["~> 0.11.4"])
-      s.add_dependency(%q<simplecov>, ["~> 0.6.4"])
+      s.add_dependency(%q<shoulda>, [">= 0"])
+      s.add_dependency(%q<rdoc>, [">= 0"])
+      s.add_dependency(%q<bundler>, [">= 0"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
+      s.add_dependency(%q<mocha>, [">= 0"])
+      s.add_dependency(%q<simplecov>, [">= 0"])
     end
   else
     s.add_dependency(%q<raindrops>, [">= 0.5.0"])
-    s.add_dependency(%q<shoulda>, ["~> 3.0.1"])
-    s.add_dependency(%q<rdoc>, ["~> 3.12"])
-    s.add_dependency(%q<bundler>, ["~> 1.3.5"])
-    s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
-    s.add_dependency(%q<mocha>, ["~> 0.11.4"])
-    s.add_dependency(%q<simplecov>, ["~> 0.6.4"])
+    s.add_dependency(%q<shoulda>, [">= 0"])
+    s.add_dependency(%q<rdoc>, [">= 0"])
+    s.add_dependency(%q<bundler>, [">= 0"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
+    s.add_dependency(%q<mocha>, [">= 0"])
+    s.add_dependency(%q<simplecov>, [">= 0"])
   end
 end
 

data/lib/alicorn/scaler.rb

@@ -83,10 +83,10 @@ module Alicorn
   protected
 
     def collect_data
-      logger.debug "Sampling #{sample_count} times at #{delay} second intervals"
+      logger.debug "Sampling #{listener_type} listener at #{listener_address} #{sample_count} times at #{delay} second intervals"
       active, queued = DataSet.new, DataSet.new
       sample_count.times do
-        stats = Raindrops::Linux.send(:"#{listener_type}_listener_stats", listener_address)[listener_address]
+        stats = Raindrops::Linux.send(:"#{listener_type}_listener_stats")[listener_address]
         active << stats.active
         queued << stats.queued
         sleep(delay)

data/lib/alicorn/version.rb

@@ -1,3 +1,3 @@
 module Alicorn
-  VERSION = "0.4.1"
+  VERSION = "0.4.2.pre"
 end

data/test/helper.rb

@@ -14,7 +14,7 @@ rescue Bundler::BundlerError => e
 end
 require 'test/unit'
 require 'shoulda'
-require 'mocha'
+require 'mocha/setup'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))

data/test/test_scaler.rb

@@ -7,7 +7,7 @@ class TestScaler < Test::Unit::TestCase
 
     # stub out stats gathering
     mock_struct = stub_everything(:active => 4, :queued => 0)
-    Raindrops::Linux.stubs(:tcp_listener_stats).returns({"0.0.0.0:80" =>  mock_struct})
+    Raindrops::Linux.stubs(:tcp_listener_stats).with().returns({"0.0.0.0:80" =>  mock_struct})
 
     # enable us to test private methods, for the complicated ones
     class << @scaler
@@ -192,11 +192,29 @@ class TestScaler < Test::Unit::TestCase
   end
 
   context "#collect_data" do
-    should "return the correct data" do
-      data = @scaler.send(:collect_data)
-      expected_data = { :active  => [4]*30,
-                        :queued  => [0]*30 }
-      assert_equal expected_data, data
+    context "when using a tcp listener" do
+      should "return the correct data" do
+        data = @scaler.send(:collect_data)
+        expected_data = { :active  => [4]*30,
+                          :queued  => [0]*30 }
+        assert_equal expected_data, data
+      end
+    end
+
+    
+    context "when using a unix listener" do
+
+      should "sample unix stats as well as tcp" do
+        @scaler.listener_type = :unix
+        @scaler.listener_address = "/tmp/app.socket"
+        mock_struct = stub_everything(:active => 6, :queued => 0)
+        Raindrops::Linux.expects(:unix_listener_stats).times(30).with().returns({"/tmp/app.socket" =>  mock_struct})
+
+        data = @scaler.send(:collect_data)
+        expected_data = { :active  => [6]*30,
+                          :queued  => [0]*30 }
+        assert_equal expected_data, data
+      end
     end
   end
 

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: alicorn
 version: !ruby/object:Gem::Version
-  version: 0.4.1
-  prerelease: 
+  version: 0.4.2.pre
+  prerelease: 6
 platform: ruby
 authors:
 - Ben Somers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-12 00:00:00.000000000 Z
+date: 2013-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: raindrops
@@ -32,97 +32,97 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.0.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.0.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.3.5
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.3.5
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.8.3
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.8.3
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.11.4
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.11.4
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.6.4
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.6.4
+        version: '0'
 description: Highly configurable dumb auto-scaler for managing unicorn web servers
 email: somers.ben@gmail.com
 executables:
@@ -135,6 +135,7 @@ extra_rdoc_files:
 files:
 - .document
 - .ruby-gemset
+- .travis.yml
 - CHANGELOG.txt
 - Gemfile
 - Gemfile.lock
@@ -172,13 +173,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1826442975081019144
+      hash: 770616866604528155
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25