cfoundry 0.3.49 → 0.3.50

data/lib/cfoundry/baseclient.rb

@@ -41,7 +41,7 @@ module CFoundry
 
     def parse_json(x)
       if x.empty?
-        raise MultiJson::DecodeError, "Empty JSON string"
+        raise MultiJson::DecodeError, "Empty JSON string", [], ""
       else
         MultiJson.load(x, :symbolize_keys => true)
       end

data/lib/cfoundry/v1/app.rb

@@ -170,6 +170,7 @@ module CFoundry::V1
       if s == "STARTED"
         healthy_count = running_instances
         expected = total_instances
+
         if healthy_count && expected > 0
           ratio = healthy_count / expected.to_f
           if ratio == 1.0

data/lib/cfoundry/v2/app.rb

@@ -155,18 +155,40 @@ module CFoundry::V2
     #
     # Otherwise, returns application's status.
     def health
-      state
+      if state == "STARTED"
+        healthy_count = running_instances
+        expected = total_instances
+
+        if expected > 0
+          ratio = healthy_count / expected.to_f
+          if ratio == 1.0
+            "RUNNING"
+          else
+            "#{(ratio * 100).to_i}%"
+          end
+        else
+          "N/A"
+        end
+      else
+        state
+      end
+    end
+
+    def running_instances
+      running = 0
+
+      instances.each do |i|
+        running += 1 if i.state == "RUNNING"
+      end
+
+      running
     end
 
     # Check that all application instances are running.
     def healthy?
       # invalidate cache so the check is fresh
       @manifest = nil
-
-      case health
-      when "RUNNING", "STARTED"
-        true
-      end
+      health == "RUNNING"
     end
     alias_method :running?, :healthy?
 

data/lib/cfoundry/v2/domain.rb

@@ -3,6 +3,7 @@ require "cfoundry/v2/model"
 module CFoundry::V2
   class Domain < Model
     attribute :name, :string
+    attribute :wildcard, :boolean, :default => true
     to_one    :owning_organization, :as => :organization
 
     scoped_to_organization :owning_organization

data/lib/cfoundry/version.rb

@@ -1,4 +1,4 @@
 module CFoundry # :nodoc:
   # CFoundry library version number.
-  VERSION = "0.3.49"
+  VERSION = "0.3.50"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cfoundry
 version: !ruby/object:Gem::Version 
-  hash: 113
+  hash: 119
   prerelease: 
   segments: 
   - 0
   - 3
-  - 49
-  version: 0.3.49
+  - 50
+  version: 0.3.50
 platform: ruby
 authors: 
 - Alex Suraci
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-10-25 00:00:00 Z
+date: 2012-10-29 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: multipart-post