big_brother 0.6.2 → 0.6.3

data/lib/big_brother/app.rb

@@ -15,13 +15,21 @@ Stopped:
       CONTENT
     end
 
-    before "/cluster/:name" do |name|
+    before %r{/cluster/([^/]+).*$} do |name|
       @cluster = BigBrother.clusters[name]
       halt 404, "Cluster #{name} not found" if @cluster.nil?
     end
 
+    get "/cluster/:name/status" do |name|
+      _cluster_status
+    end
+
     get "/cluster/:name" do |name|
       @cluster.synchronize! unless @cluster.monitored?
+      _cluster_status
+    end
+
+    def _cluster_status
       [200, "Running: #{@cluster.monitored?}\nCombinedWeight: #{@cluster.combined_weight}\n"]
     end
 

data/lib/big_brother/version.rb

@@ -1,3 +1,3 @@
 module BigBrother
-  VERSION = "0.6.2"
+  VERSION = "0.6.3"
 end

data/spec/big_brother/app_spec.rb

@@ -81,6 +81,55 @@ CombinedWeight: 60
       end
     end
 
+    describe "GET /cluster/:name/status" do
+      it "returns 'Running: false' when the cluster isn't running" do
+        BigBrother.clusters['test'] = Factory.cluster(:name => 'test')
+
+        get "/cluster/test/status"
+
+        last_response.status.should == 200
+        last_response.body.should =~ /^Running: false$/
+      end
+
+      it "returns 'Running: true' and the combined weight when the cluster is running" do
+        BigBrother.clusters['test'] = Factory.cluster(
+          :name => 'test',
+          :nodes => [
+            Factory.node(:weight => 10),
+            Factory.node(:weight => 20),
+            Factory.node(:weight => 30)
+          ]
+        )
+
+        put "/cluster/test"
+        get "/cluster/test/status"
+
+        last_response.status.should == 200
+        last_response.body.should == <<-RESPONSE_BODY
+Running: true
+CombinedWeight: 60
+        RESPONSE_BODY
+      end
+
+      it "does not synchronize the cluster, so litmus_paper can call this route often" do
+        cluster = Factory.cluster(:name => 'test')
+        BigBrother.clusters['test'] = cluster
+
+        cluster.should_receive(:synchronize!).never
+
+        get "/cluster/test/status"
+
+        last_response.status.should == 200
+        last_response.body.should =~ /^Running: false$/
+      end
+
+      it "returns a 404 http status when the cluster is not found" do
+        get "/cluster/not_found/status"
+
+        last_response.status.should == 404
+      end
+    end
+
     describe "PUT /cluster/:name" do
       it "marks the cluster as monitored" do
         BigBrother.clusters['test'] = Factory.cluster(:name => 'test')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: big_brother
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thin
-  requirement: &70326700803540 !ruby/object:Gem::Requirement
+  requirement: &70206819206640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.3.1
   type: :runtime
   prerelease: false
-  version_requirements: *70326700803540
+  version_requirements: *70206819206640
 - !ruby/object:Gem::Dependency
   name: async-rack
-  requirement: &70326700802400 !ruby/object:Gem::Requirement
+  requirement: &70206819205540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.5.1
   type: :runtime
   prerelease: false
-  version_requirements: *70326700802400
+  version_requirements: *70206819205540
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70326700801720 !ruby/object:Gem::Requirement
+  requirement: &70206819204740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70326700801720
+  version_requirements: *70206819204740
 - !ruby/object:Gem::Dependency
   name: rack-fiber_pool
-  requirement: &70326700800420 !ruby/object:Gem::Requirement
+  requirement: &70206819203640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '0.9'
   type: :runtime
   prerelease: false
-  version_requirements: *70326700800420
+  version_requirements: *70206819203640
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &70326700799700 !ruby/object:Gem::Requirement
+  requirement: &70206819202880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>'
@@ -68,10 +68,10 @@ dependencies:
         version: 1.0.0.beta.100
   type: :runtime
   prerelease: false
-  version_requirements: *70326700799700
+  version_requirements: *70206819202880
 - !ruby/object:Gem::Dependency
   name: em-http-request
-  requirement: &70326700826080 !ruby/object:Gem::Requirement
+  requirement: &70206819229160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -79,10 +79,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70326700826080
+  version_requirements: *70206819229160
 - !ruby/object:Gem::Dependency
   name: em-synchrony
-  requirement: &70326700825260 !ruby/object:Gem::Requirement
+  requirement: &70206819228380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -90,10 +90,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70326700825260
+  version_requirements: *70206819228380
 - !ruby/object:Gem::Dependency
   name: em-resolv-replace
-  requirement: &70326700824360 !ruby/object:Gem::Requirement
+  requirement: &70206819227500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -101,10 +101,10 @@ dependencies:
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70326700824360
+  version_requirements: *70206819227500
 - !ruby/object:Gem::Dependency
   name: em-syslog
-  requirement: &70326700823500 !ruby/object:Gem::Requirement
+  requirement: &70206819226640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -112,10 +112,10 @@ dependencies:
         version: 0.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *70326700823500
+  version_requirements: *70206819226640
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70326700822660 !ruby/object:Gem::Requirement
+  requirement: &70206819225740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -123,10 +123,10 @@ dependencies:
         version: 2.9.0
   type: :development
   prerelease: false
-  version_requirements: *70326700822660
+  version_requirements: *70206819225740
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70326700821800 !ruby/object:Gem::Requirement
+  requirement: &70206819224860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -134,10 +134,10 @@ dependencies:
         version: 0.6.1
   type: :development
   prerelease: false
-  version_requirements: *70326700821800
+  version_requirements: *70206819224860
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70326700821080 !ruby/object:Gem::Requirement
+  requirement: &70206819224020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -145,10 +145,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70326700821080
+  version_requirements: *70206819224020
 - !ruby/object:Gem::Dependency
   name: rake_commit
-  requirement: &70326700819800 !ruby/object:Gem::Requirement
+  requirement: &70206819222600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -156,10 +156,10 @@ dependencies:
         version: '0.13'
   type: :development
   prerelease: false
-  version_requirements: *70326700819800
+  version_requirements: *70206819222600
 - !ruby/object:Gem::Dependency
   name: vagrant
-  requirement: &70326700818860 !ruby/object:Gem::Requirement
+  requirement: &70206819247040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -167,7 +167,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70326700818860
+  version_requirements: *70206819247040
 description: IPVS backend supervisor
 email:
 - code@getbraintree.com