cfoundry 4.5.3 → 4.6.0

data/lib/cfoundry/client.rb

@@ -5,6 +5,7 @@ require "cfoundry/rest_client"
 require "cfoundry/auth_token"
 
 require "cfoundry/v2/app"
+require "cfoundry/v2/app_instance"
 require "cfoundry/v2/service"
 require "cfoundry/v2/service_binding"
 require "cfoundry/v2/managed_service_instance"

data/lib/cfoundry/v2/app.rb

@@ -52,14 +52,12 @@ module CFoundry::V2
     end
 
     def instances
-      @client.base.instances(@guid).collect do |i, m|
-        Instance.new(self, i.to_s, @client, m)
-      end
+      AppInstance.for_app(@client, @guid, name)
     end
 
     def crashes
       @client.base.crashes(@guid).collect do |m|
-        Instance.new(self, m[:instance], @client, m)
+        AppInstance.new(self.name, self.guid, m[:instance], @client, m)
       end
     end
 
@@ -203,6 +201,19 @@ module CFoundry::V2
       "STAGING FAILED"
     end
 
+    def percent_running
+      if state == "STARTED"
+        healthy_count = running_instances
+        expected = total_instances
+
+        expected > 0 ? (healthy_count / expected.to_f) * 100 : 0
+      else
+        0
+      end
+    rescue CFoundry::StagingError, CFoundry::NotStaged
+      0
+    end
+
     def running_instances
       return @cache[:running_instances] if @cache[:running_instances]
 
@@ -266,15 +277,15 @@ module CFoundry::V2
     end
 
     def files(*path)
-      Instance.new(self, "0", @client).files(*path)
+      AppInstance.new(self.name, self.guid, "0", @client).files(*path)
     end
 
     def file(*path)
-      Instance.new(self, "0", @client).file(*path)
+      AppInstance.new(self.name, self.guid, "0", @client).file(*path)
     end
 
     def stream_file(*path, &blk)
-      Instance.new(self, "0", @client).stream_file(*path, &blk)
+      AppInstance.new(self.name, self.guid, "0", @client).stream_file(*path, &blk)
     end
 
     private
@@ -288,70 +299,5 @@ module CFoundry::V2
 
       new
     end
-
-    class Instance
-      attr_reader :app, :id
-
-      def initialize(app, id, client, manifest = {})
-        @app = app
-        @id = id
-        @client = client
-        @manifest = manifest
-      end
-
-      def inspect
-        "#<App::Instance '#{@app.name}' \##@id>"
-      end
-
-      def state
-        @manifest[:state]
-      end
-      alias_method :status, :state
-
-      def since
-        if since = @manifest[:since]
-          Time.at(@manifest[:since])
-        end
-      end
-
-      def debugger
-        return unless @manifest[:debug_ip] and @manifest[:debug_port]
-
-        { :ip => @manifest[:debug_ip],
-          :port => @manifest[:debug_port]
-        }
-      end
-
-      def console
-        return unless @manifest[:console_ip] and @manifest[:console_port]
-
-        { :ip => @manifest[:console_ip],
-          :port => @manifest[:console_port]
-        }
-      end
-
-      def healthy?
-        case state
-        when "STARTING", "RUNNING"
-          true
-        when "DOWN", "FLAPPING"
-          false
-        end
-      end
-
-      def files(*path)
-        @client.base.files(@app.guid, @id, *path).split("\n").collect do |entry|
-          path + [entry.split(/\s+/, 2)[0]]
-        end
-      end
-
-      def file(*path)
-        @client.base.files(@app.guid, @id, *path)
-      end
-
-      def stream_file(*path, &blk)
-        @client.base.stream_file(@app.guid, @id, *path, &blk)
-      end
-    end
   end
 end

data/lib/cfoundry/v2/app_instance.rb

@@ -0,0 +1,74 @@
+module CFoundry::V2
+  class AppInstance
+    attr_reader :id
+
+    def self.for_app(name, guid, client)
+      client.base.instances(guid).collect do |i, m|
+        AppInstance.new(name, guid, i.to_s, client, m)
+      end
+    end
+
+    def initialize(app_name, app_guid, id, client, manifest = {})
+      @app_name = app_name
+      @app_guid = app_guid
+      @id = id
+      @client = client
+      @manifest = manifest
+    end
+
+    def inspect
+      "#<App::Instance '#{@app_name}' \##@id>"
+    end
+
+    def state
+      @manifest[:state]
+    end
+
+    alias_method :status, :state
+
+    def since
+      if since = @manifest[:since]
+        Time.at(@manifest[:since])
+      end
+    end
+
+    def debugger
+      return unless @manifest[:debug_ip] and @manifest[:debug_port]
+
+      {:ip => @manifest[:debug_ip],
+        :port => @manifest[:debug_port]
+      }
+    end
+
+    def console
+      return unless @manifest[:console_ip] and @manifest[:console_port]
+
+      {:ip => @manifest[:console_ip],
+        :port => @manifest[:console_port]
+      }
+    end
+
+    def healthy?
+      case state
+      when "STARTING", "RUNNING"
+        true
+      when "DOWN", "FLAPPING"
+        false
+      end
+    end
+
+    def files(*path)
+      @client.base.files(@app_guid, @id, *path).split("\n").collect do |entry|
+        path + [entry.split(/\s+/, 2)[0]]
+      end
+    end
+
+    def file(*path)
+      @client.base.files(@app_guid, @id, *path)
+    end
+
+    def stream_file(*path, &blk)
+      @client.base.stream_file(@app_guid, @id, *path, &blk)
+    end
+  end
+end

data/lib/cfoundry/version.rb

@@ -1,4 +1,4 @@
 module CFoundry # :nodoc:
   # CFoundry library version number.
-  VERSION = "4.5.3".freeze
+  VERSION = "4.6.0".freeze
 end

data/spec/cfoundry/v2/app_instance_spec.rb

@@ -0,0 +1,31 @@
+require 'spec_helper'
+
+module CFoundry::V2
+  describe AppInstance do
+    let(:client) { double }
+    let(:guid) { 'a snowflake' }
+    let(:name) { 'test-app' }
+    let(:instance_json) {
+      {
+        :state => "RUNNING",
+        :since => 1383588787.1809542,
+        :debug_ip => nil,
+        :debug_port => nil,
+        :console_ip => nil,
+        :console_port => nil
+      }
+    }
+    describe '.for_app' do
+      before do
+        instances_json = {:"0" => instance_json}
+        client.stub_chain(:base, :instances).and_return instances_json
+      end
+
+      it 'returns instances' do
+        instances = AppInstance.for_app(name, guid, client)
+        expect(instances.count).to eq 1
+        expect(instances.first.inspect).to eq "#<App::Instance '#{name}' \#0>"
+      end
+    end
+  end
+end

data/spec/cfoundry/v2/app_spec.rb

@@ -5,7 +5,7 @@ module CFoundry
     describe App do
       let(:client) { build(:client) }
 
-      subject { build(:app, :client => client) }
+      subject { build(:app, :client => client, :name => 'foo-app') }
 
       describe "#events" do
         let(:events) { [build(:app_event)] }
@@ -257,7 +257,7 @@ module CFoundry
       describe "#health" do
         describe "when staging failed for an app" do
           it "returns 'STAGING FAILED' as state" do
-            client.base.stub(:instances).with(subject.guid) { raise CFoundry::StagingError }
+            AppInstance.stub(:for_app) { raise CFoundry::StagingError }
             subject.stub(:state) { "STARTED" }
 
             expect(subject.health).to eq("STAGING FAILED")
@@ -265,6 +265,38 @@ module CFoundry
         end
       end
 
+      describe "#percent_running" do
+        before do
+          subject.stub(:state) { "STARTED" }
+          subject.total_instances = instances.count
+          AppInstance.stub(:for_app).with(client, subject.guid, subject.name) { instances }
+        end
+
+        let(:instances) do
+          (1..3).map { double(AppInstance, state: "RUNNING") }
+        end
+
+        it "returns the percent of instances running as an integer" do
+          expect(subject.percent_running).to eq(100)
+        end
+
+        context "when half the instances are running" do
+          let(:instances) { [double(AppInstance, state: "RUNNING"), double(AppInstance, state: "STOPPED")] }
+
+          it "returns 50" do
+            expect(subject.percent_running).to eq(50)
+          end
+        end
+
+        context "when staging has failed" do
+          before { AppInstance.stub(:for_app) { raise CFoundry::StagingError } }
+
+          it "returns 0" do
+            expect(subject.percent_running).to eq(0)
+          end
+        end
+      end
+
       describe "#host" do
         let(:route) { build(:route, :host => "my-host") }
         let(:app) { build(:app) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cfoundry
 version: !ruby/object:Gem::Version
-  version: 4.5.3
+  version: 4.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-22 00:00:00.000000000 Z
+date: 2013-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -298,6 +298,7 @@ files:
 - lib/cfoundry/upload_helpers.rb
 - lib/cfoundry/v2/app.rb
 - lib/cfoundry/v2/app_event.rb
+- lib/cfoundry/v2/app_instance.rb
 - lib/cfoundry/v2/base.rb
 - lib/cfoundry/v2/client.rb
 - lib/cfoundry/v2/domain.rb
@@ -357,6 +358,7 @@ files:
 - spec/cfoundry/uaaclient_spec.rb
 - spec/cfoundry/upload_helpers_spec.rb
 - spec/cfoundry/v2/app_event_spec.rb
+- spec/cfoundry/v2/app_instance_spec.rb
 - spec/cfoundry/v2/app_spec.rb
 - spec/cfoundry/v2/base_spec.rb
 - spec/cfoundry/v2/client_spec.rb
@@ -465,7 +467,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2392374929846355282
+      hash: 1366794048103760910
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -474,7 +476,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2392374929846355282
+      hash: 1366794048103760910
 requirements: []
 rubyforge_project: cfoundry
 rubygems_version: 1.8.25
@@ -506,6 +508,7 @@ test_files:
 - spec/cfoundry/uaaclient_spec.rb
 - spec/cfoundry/upload_helpers_spec.rb
 - spec/cfoundry/v2/app_event_spec.rb
+- spec/cfoundry/v2/app_instance_spec.rb
 - spec/cfoundry/v2/app_spec.rb
 - spec/cfoundry/v2/base_spec.rb
 - spec/cfoundry/v2/client_spec.rb