cfoundry 0.3.14 → 0.3.15

data/lib/cfoundry/v1/app.rb

@@ -62,6 +62,7 @@ module CFoundry::V1
       @name = name
       @client = client
       @manifest = manifest
+      @diff = {}
     end
 
     # Show string representing the application.
@@ -76,9 +77,8 @@ module CFoundry::V1
       @client.base.delete_app(@name)
 
       if @manifest
-        @manifest.delete :meta
-        @manifest.delete :version
-        @manifest.delete :state
+        @diff = read_manifest
+        @manifest = nil
       end
     end
 
@@ -86,8 +86,8 @@ module CFoundry::V1
     #
     # Call this after setting the various attributes.
     def create!
-      @client.base.create_app(@manifest.merge(:name => @name))
-      @manifest = nil
+      @client.base.create_app(write_manifest)
+      @diff = {}
     end
 
     # Check if the application exists on the target.
@@ -112,13 +112,16 @@ module CFoundry::V1
 
     # Update application attributes. Does not restart the application.
     def update!(what = {})
-      # bleh. have to set these here (normally in :meta) or they'll get lost.
-      what[:debug] = debug_mode
-      what[:staging] = (what[:staging] || {}).merge(manifest[:staging] || {})
-      what[:staging][:command] = command if command
+      what.each do |k, v|
+        send(:"#{k}=", v)
+      end
+
+      @client.base.update_app(@name, write_manifest)
 
-      @client.base.update_app(@name, manifest.merge(what))
       @manifest = nil
+      @diff = {}
+
+      self
     end
 
     # Stop the application.
@@ -146,8 +149,8 @@ module CFoundry::V1
     def health
       s = state
       if s == "STARTED"
-        healthy_count = manifest[:runningInstances]
-        expected = manifest[:instances]
+        healthy_count = running_instances
+        expected = total_instances
         if healthy_count && expected > 0
           ratio = healthy_count / expected.to_f
           if ratio == 1.0
@@ -184,51 +187,41 @@ module CFoundry::V1
       state == "STARTED"
     end
 
-    def env
-      e = manifest[:env] || []
-
-      env = {}
-      e.each do |pair|
-        name, val = pair.split("=", 2)
-        env[name] = val
-      end
-
-      CFoundry::ChattyHash.new(method(:env=), env)
-    end
-
-    def env=(hash)
-      @manifest ||= {}
-      @manifest[:env] = hash.collect { |k, v| "#{k}=#{v}" }
-    end
-
-    def services
-      manifest[:services].collect do |name|
-        @client.service_instance(name)
-      end
-    end
-
-    def services=(instances)
-      @manifest ||= {}
-      @manifest[:services] = instances.collect(&:name)
-    end
-
 
     { :total_instances => :instances,
+      :running_instances => :running_instances,
+      :runtime_name => :runtime,
+      :framework_name => :framework,
+      :service_names => :services,
+      :env_array => :env,
       :state => :state,
       :status => :state,
       :uris => :uris,
-      :urls => :uris
+      :urls => :uris,
+      :command => :command,
+      :console => :console,
+      :memory => :memory,
+      :disk => :disk,
+      :fds => :fds,
+      :debug_mode => :debug,
+      :version => :version,
+      :meta_version => :meta_version,
+      :created => :created
     }.each do |meth, attr|
       define_method(meth) do
-        manifest[attr]
+        if @diff.key?(attr)
+          @diff[attr]
+        else
+          read_manifest[attr]
+        end
       end
 
       define_method(:"#{meth}=") do |v|
-        @manifest ||= {}
-        @manifest[attr] = v
+        @diff[attr] = v
       end
     end
 
+
     # Shortcut for uris[0]
     def uri
       uris[0]
@@ -244,90 +237,48 @@ module CFoundry::V1
 
     # Application framework.
     def framework
-      return unless manifest[:staging]
-
-      Framework.new(
-        manifest[:staging][:framework] ||
-          manifest[:staging][:model])
+      Framework.new(framework_name)
     end
 
     def framework=(v) # :nodoc:
       v = v.name if v.is_a?(Framework)
-
-      @manifest ||= {}
-      @manifest[:staging] ||= {}
-
-      if @manifest[:staging].key? :model
-        @manifest[:staging][:model] = v
-      else
-        @manifest[:staging][:framework] = v
-      end
+      self.framework_name = v
     end
 
     # Application runtime.
     def runtime
-      return unless manifest[:staging]
-
-      Framework.new(
-        manifest[:staging][:runtime] ||
-          manifest[:staging][:stack])
+      Runtime.new(runtime_name)
     end
 
     def runtime=(v) # :nodoc:
       v = v.name if v.is_a?(Runtime)
-
-      @manifest ||= {}
-      @manifest[:staging] ||= {}
-
-      if @manifest[:staging].key? :stack
-        @manifest[:staging][:stack] = v
-      else
-        @manifest[:staging][:runtime] = v
-      end
-    end
-
-
-    # Application startup command.
-    #
-    # Used for standalone apps.
-    def command
-      return unless manifest[:staging] || manifest[:meta]
-
-      manifest[:staging][:command] ||
-        manifest[:meta][:command]
-    end
-
-    def command=(v) # :nodoc:
-      @manifest ||= {}
-      @manifest[:staging] ||= {}
-      @manifest[:staging][:command] = v
+      self.runtime_name = v
     end
 
+    def env
+      e = env_array || []
 
-    # Application memory.
-    def memory
-      return unless manifest[:resources]
+      env = {}
+      e.each do |pair|
+        name, val = pair.split("=", 2)
+        env[name] = val
+      end
 
-      manifest[:resources][:memory]
+      CFoundry::ChattyHash.new(method(:env=), env)
     end
 
-    def memory=(v) # :nodoc:
-      @manifest ||= {}
-      @manifest[:resources] ||= {}
-      @manifest[:resources][:memory] = v
+    def env=(hash)
+      self.env_array = hash.collect { |k, v| "#{k}=#{v}" }
     end
 
-
-    # Application debug mode.
-    def debug_mode
-      manifest.fetch(:debug) do
-        manifest[:meta] && manifest[:meta][:debug]
+    def services
+      service_names.collect do |name|
+        @client.service_instance(name)
       end
     end
 
-    def debug_mode=(v) # :nodoc:
-      @manifest ||= {}
-      @manifest[:debug] = v
+    def services=(instances)
+      self.service_names = instances.collect(&:name)
     end
 
 
@@ -415,6 +366,55 @@ module CFoundry::V1
       @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
+      }
+    end
+
+    def read_manifest
+      { :name => @name,
+        :instances => manifest[:instances],
+        :running_instances => manifest[:runningInstances],
+        :state => manifest[:state],
+        :env => manifest[:env],
+        :uris => manifest[:uris],
+        :version => manifest[:version],
+        :services => manifest[:services],
+        :framework => manifest[:staging][:model],
+        :runtime => manifest[:staging][:stack],
+        :console => manifest[:meta][:console],
+        :meta_version => manifest[:meta][:version],
+        :debug => manifest[:meta][:debug],
+        :created => manifest[:meta][:created],
+        :memory => manifest[:resources][:memory],
+        :disk => manifest[:resources][:disk],
+        :fds => manifest[:resources][:fds]
+      }
+    end
+
     def prepare_package(path, to)
       if path =~ /\.(jar|war|zip)$/
         CFoundry::Zip.unpack(path, to)

data/lib/cfoundry/v2/service_instance.rb

@@ -7,6 +7,6 @@ module CFoundry::V2
     to_one    :service_plan
     to_many   :service_bindings
     attribute :credentials
-    attribute :vendor_data, :default => ""
+    attribute :gateway_data, :default => {}
   end
 end

data/lib/cfoundry/version.rb

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

metadata

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