cfoundry 0.3.28 → 0.3.29

data/lib/cfoundry/v1/app.rb

@@ -107,14 +107,14 @@ module CFoundry::V1
     # Retrieve all of the instances of the app, as Instance objects.
     def instances
       @client.base.instances(@name).collect do |m|
-        Instance.new(@name, m[:index], @client, m)
+        Instance.new(self, m[:index].to_s, @client, m)
       end
     end
 
     # Retrieve crashed instances
     def crashes
       @client.base.crashes(@name).collect do |i|
-        CrashedInstance.new(@name, i[:instance], @client, i)
+        Instance.new(self, i[:instance].to_s, @client, i)
       end
     end
 
@@ -323,7 +323,7 @@ module CFoundry::V1
     #
     #   For example, <code>files("foo", "bar")</code> for +foo/bar+.
     def files(*path)
-      Instance.new(@name, 0, @client).files(*path)
+      Instance.new(@name, "0", @client).files(*path)
     end
 
     # Retrieve file contents for the first instance of the application.
@@ -333,7 +333,7 @@ module CFoundry::V1
     #
     #   For example, <code>files("foo", "bar")</code> for +foo/bar+.
     def file(*path)
-      Instance.new(@name, 0, @client).file(*path)
+      Instance.new(@name, "0", @client).file(*path)
     end
 
     # Upload application's code to target. Do this after #create! and before
@@ -477,21 +477,21 @@ module CFoundry::V1
       attr_reader :app
 
       # Application instance number.
-      attr_reader :index
+      attr_reader :id
 
       # Create an Instance object.
       #
       # You'll usually call App#instances instead
-      def initialize(appname, index, client, manifest = {})
-        @app = appname
-        @index = index
+      def initialize(app, id, client, manifest = {})
+        @app = app
+        @id = id
         @client = client
         @manifest = manifest
       end
 
       # Show string representing the application instance.
       def inspect
-        "#<App::Instance '#@app' \##@index>"
+        "#<App::Instance '#{@app.name}' \##@id>"
       end
 
       # Instance state.
@@ -543,7 +543,7 @@ module CFoundry::V1
       #
       #   For example, <code>files("foo", "bar")</code> for +foo/bar+.
       def files(*path)
-        @client.base.files(@app, @index, *path).split("\n").collect do |entry|
+        @client.base.files(@app.name, @id, *path).split("\n").collect do |entry|
           path + [entry.split(/\s+/, 2)[0]]
         end
       end
@@ -555,58 +555,7 @@ module CFoundry::V1
       #
       #   For example, <code>files("foo", "bar")</code> for +foo/bar+.
       def file(*path)
-        @client.base.files(@app, @index, *path)
-      end
-    end
-
-    # Class represnting a crashed instance of an application.
-    class CrashedInstance
-      # The application this instance belonged to.
-      attr_reader :app
-
-      # Crashed instance (pseudo-)unique identifier.
-      attr_reader :id
-
-      # Create a CrashedInstance object.
-      #
-      # You'll usually call App#crashes instead
-      def initialize(appname, id, client, manifest = {})
-        @app = appname
-        @id = id
-        @client = client
-        @manifest = manifest
-      end
-
-      # Show string representing the application instance.
-      def inspect
-        "#<App::CrashedInstance '#@app' \##@id>"
-      end
-
-      # Instance crashed time.
-      def since
-        @manifest[:since] && Time.at(@manifest[:since])
-      end
-
-      # Retrieve file listing under path for this instance.
-      #
-      # [path]
-      #   A sequence of strings representing path segments.
-      #
-      #   For example, <code>files("foo", "bar")</code> for +foo/bar+.
-      def files(*path)
-        @client.base.files(@app, @id, *path).split("\n").collect do |entry|
-          path + [entry.split(/\s+/, 2)[0]]
-        end
-      end
-
-      # Retrieve file contents for this instance.
-      #
-      # [path]
-      #   A sequence of strings representing path segments.
-      #
-      #   For example, <code>file("foo", "bar")</code> for +foo/bar+.
-      def file(*path)
-        @client.base.files(@app, @id, *path)
+        @client.base.files(@app.name, @id, *path)
       end
     end
   end

data/lib/cfoundry/v2/app.rb

@@ -36,6 +36,16 @@ module CFoundry::V2
 
     private :environment_json, :environment_json=
 
+    def instances
+      @client.base.instances(@guid).collect do |i, m|
+        Instance.new(self, i.to_s, @client, m)
+      end
+    end
+
+    def stats
+      @client.base.stats(@guid)
+    end
+
     def services
       service_bindings.collect(&:service_instance)
     end
@@ -196,11 +206,11 @@ module CFoundry::V2
     end
 
     def files(*path)
-      Instance.new(self, 0, @client).files(*path)
+      Instance.new(self, "0", @client).files(*path)
     end
 
     def file(*path)
-      Instance.new(self, 0, @client).file(*path)
+      Instance.new(self, "0", @client).file(*path)
     end
 
     class Instance

data/lib/cfoundry/v2/base.rb

@@ -105,6 +105,14 @@ module CFoundry::V2
     end
     alias :file :files
 
+    def instances(guid)
+      get("v2", "apps", guid, "instances", nil => :json)
+    end
+
+    def stats(guid)
+      get("v2", "apps", guid, "stats", nil => :json)
+    end
+
 
     def params_from(args)
       depth, query = args

data/lib/cfoundry/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cfoundry
 version: !ruby/object:Gem::Version 
-  hash: 43
+  hash: 41
   prerelease: 
   segments: 
   - 0
   - 3
-  - 28
-  version: 0.3.28
+  - 29
+  version: 0.3.29
 platform: ruby
 authors: 
 - Alex Suraci
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-09-04 00:00:00 Z
+date: 2012-09-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rest-client