cfoundry 0.3.15 → 0.3.16

data/lib/cfoundry/v1/app.rb

@@ -86,7 +86,7 @@ module CFoundry::V1
     #
     # Call this after setting the various attributes.
     def create!
-      @client.base.create_app(write_manifest)
+      @client.base.create_app(create_manifest)
       @diff = {}
     end
 
@@ -116,7 +116,7 @@ module CFoundry::V1
         send(:"#{k}=", v)
       end
 
-      @client.base.update_app(@name, write_manifest)
+      @client.base.update_app(@name, update_manifest)
 
       @manifest = nil
       @diff = {}
@@ -284,14 +284,14 @@ module CFoundry::V1
 
     # Bind services to application.
     def bind(*instances)
-      update!(:services => services + instances.collect(&:name))
+      update!(:services => services + instances)
     end
 
     # Unbind services from application.
     def unbind(*instances)
       update!(:services =>
                 services.reject { |s|
-                  instances.any? { |i| i.name == s }
+                  instances.any? { |i| i.name == s.name }
                 })
     end
 
@@ -362,36 +362,60 @@ module CFoundry::V1
 
     private
 
+    ATTR_MAP = {
+      :instances => :instances,
+      :state => :state,
+      :env => :env,
+      :uris => :uris,
+      :services => :services,
+      :debug => :debug,
+
+      :framework => [:staging, :model],
+      :runtime => [:staging, :stack],
+      :command => [:staging, :command],
+
+      :console => [:meta, :console],
+      :meta_version => [:meta, :version],
+      :created => [:meta, :created],
+
+      :memory => [:resources, :memory],
+      :disk => [:resources, :disk],
+      :fds => [:resources, :fds]
+    }
+
     def manifest
       @manifest ||= @client.base.app(@name)
     end
 
-    def write_manifest
-      { :name => @name,
-        :instances => total_instances,
-        :state => state,
-        :env => env_array,
-        :uris => uris,
-        :version => version,
-        :services => service_names,
-        :staging => {
-          :model => framework_name,
-          :stack => runtime_name,
-          :command => command
-        },
-        :meta => {
-          :console => console,
-          :version => meta_version,
-          :debug => debug_mode,
-          :created => created
-        },
-        :resources => {
-          :memory => memory,
-          :disk => disk,
-          :fds => fds
-        },
-        :debug => debug_mode
-      }
+    def write_manifest(body = read_manifest, onto = {})
+      onto[:name] = @name
+
+      ATTR_MAP.each do |what, where|
+        if body.key?(what)
+          put(body[what], onto, Array(where))
+        end
+      end
+
+      onto
+    end
+
+    def put(what, where, path)
+      if path.size == 1
+        where[path.last] = what
+      elsif name = path.shift
+        where[name] ||= {}
+        put(what, where[name], path)
+      end
+
+      nil
+    end
+
+    def update_manifest
+      write_manifest(@diff, write_manifest)
+    end
+
+    def create_manifest
+      write_manifest(@diff)
     end
 
     def read_manifest

data/lib/cfoundry/v1/service_instance.rb

@@ -38,7 +38,7 @@ module CFoundry::V1
 
     # Show string representing the service.
     def inspect
-      "#<Service '#@name'>"
+      "#<ServiceInstance '#@name'>"
     end
 
     # Delete the service from the target.
@@ -71,6 +71,10 @@ module CFoundry::V1
       Time.at(meta[:updated])
     end
 
+    def invalidate!
+      @manifest = nil
+    end
+
     { :type => :type,
       :vendor => :vendor,
       :version => :version,

data/lib/cfoundry/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cfoundry
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 51
   prerelease: 
   segments: 
   - 0
   - 3
-  - 15
-  version: 0.3.15
+  - 16
+  version: 0.3.16
 platform: ruby
 authors: 
 - Alex Suraci
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-29 00:00:00 Z
+date: 2012-07-30 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rest-client