cfoundry 0.3.6 → 0.3.7

data/lib/cfoundry/baseclient.rb

@@ -78,25 +78,25 @@ module CFoundry
 
       RestClient::Request.execute(req) do |response, request|
         if @trace
-          puts '>>>'
-          puts "PROXY: #{RestClient.proxy}" if RestClient.proxy
-          puts "REQUEST: #{req[:method]} #{req[:url]}"
-          puts "RESPONSE_HEADERS:"
+          $stderr.puts '>>>'
+          $stderr.puts "PROXY: #{RestClient.proxy}" if RestClient.proxy
+          $stderr.puts "REQUEST: #{req[:method]} #{req[:url]}"
+          $stderr.puts "RESPONSE_HEADERS:"
           response.headers.each do |key, value|
-            puts "    #{key} : #{value}"
+            $stderr.puts "    #{key} : #{value}"
           end
-          puts "REQUEST_HEADERS:"
+          $stderr.puts "REQUEST_HEADERS:"
           request.headers.each do |key, value|
-            puts "    #{key} : #{value}"
+            $stderr.puts "    #{key} : #{value}"
           end
-          puts "REQUEST_BODY: #{req[:payload]}" if req[:payload]
-          puts "RESPONSE: [#{response.code}]"
+          $stderr.puts "REQUEST_BODY: #{req[:payload]}" if req[:payload]
+          $stderr.puts "RESPONSE: [#{response.code}]"
           begin
-            puts JSON.pretty_generate(JSON.parse(response.body))
+            $stderr.puts JSON.pretty_generate(JSON.parse(response.body))
           rescue
-            puts "#{response.body}"
+            $stderr.puts "#{response.body}"
           end
-          puts '<<<'
+          $stderr.puts '<<<'
         end
 
         handle_response(response, accept)

data/lib/cfoundry/v1/app.rb

@@ -114,7 +114,7 @@ module CFoundry::V1
     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] = (what[:staging] || {}).merge(manifest[:staging] || {})
       what[:staging][:command] = command if command
 
       @client.base.update_app(@name, manifest.merge(what))
@@ -233,6 +233,8 @@ module CFoundry::V1
 
     # Application framework.
     def framework
+      return unless manifest[:staging]
+
       Framework.new(
         manifest[:staging][:framework] ||
           manifest[:staging][:model])
@@ -253,6 +255,8 @@ module CFoundry::V1
 
     # Application runtime.
     def runtime
+      return unless manifest[:staging]
+
       Framework.new(
         manifest[:staging][:runtime] ||
           manifest[:staging][:stack])
@@ -276,6 +280,8 @@ module CFoundry::V1
     #
     # Used for standalone apps.
     def command
+      return unless manifest[:staging] || manifest[:meta]
+
       manifest[:staging][:command] ||
         manifest[:meta][:command]
     end
@@ -289,6 +295,8 @@ module CFoundry::V1
 
     # Application memory.
     def memory
+      return unless manifest[:resources]
+
       manifest[:resources][:memory]
     end
 

data/lib/cfoundry/v1/client.rb

@@ -53,6 +53,14 @@ module CFoundry::V1
       end
     end
 
+    def current_space
+      nil
+    end
+
+    def current_organization
+      nil
+    end
+
 
     # Retrieve target metadata.
     def info

data/lib/cfoundry/v2/app.rb

@@ -19,7 +19,7 @@ module CFoundry::V2
   class App < Model
     attribute :name
     attribute :production
-    to_one    :app_space
+    to_one    :space
     to_one    :runtime
     to_one    :framework
     attribute :environment_json,    :default => {}
@@ -36,9 +36,6 @@ module CFoundry::V2
     alias :services :service_bindings
     alias :services= :service_bindings=
 
-    alias :space :app_space
-    alias :space= :app_space=
-
     private :environment_json, :environment_json=
 
     def env

data/lib/cfoundry/v2/base.rb

@@ -46,7 +46,7 @@ module CFoundry::V2
     end
 
 
-    [ :app, :organization, :app_space, :user, :runtime, :framework,
+    [ :app, :organization, :space, :user, :runtime, :framework,
       :service, :service_plan, :service_binding, :service_instance
     ].each do |obj|
       plural = "#{obj}s"
@@ -87,12 +87,6 @@ module CFoundry::V2
       end
     end
 
-    alias :spaces :app_spaces
-    alias :space :app_space
-    alias :update_space :update_app_space
-    alias :delete_space :delete_app_space
-    alias :create_space :create_app_space
-
     private
 
     def handle_response(response, accept)

data/lib/cfoundry/v2/client.rb

@@ -123,7 +123,7 @@ module CFoundry::V2
     end
 
 
-    [ :app, :organization, :app_space, :user, :runtime, :framework,
+    [ :app, :organization, :space, :user, :runtime, :framework,
       :service, :service_plan, :service_binding, :service_instance
     ].each do |singular|
       klass = singular.to_s.capitalize.gsub(/(.)_(.)/) do
@@ -132,21 +132,21 @@ module CFoundry::V2
 
       plural = :"#{singular}s"
 
-      has_app_space =
-        CFoundry::V2.const_get(klass).method_defined? :app_space
+      has_space =
+        CFoundry::V2.const_get(klass).method_defined? :space
 
       define_method(singular) do |*args|
-        id, _ = args
-        CFoundry::V2.const_get(klass).new(id, self)
+        guid, _ = args
+        CFoundry::V2.const_get(klass).new(guid, self)
       end
 
       define_method(plural) do |*args|
         depth, query = args
         depth ||= 1
 
-        if has_app_space
+        if has_space && current_space
           query ||= {}
-          query[:app_space_guid] ||= current_space.id
+          query[:space_guid] ||= current_space.guid
         end
 
         @base.send(plural, depth, query)[:resources].collect do |json|
@@ -201,8 +201,5 @@ module CFoundry::V2
           json)
       end
     end
-
-    alias :spaces :app_spaces
-    alias :space :app_space
   end
 end

data/lib/cfoundry/v2/model.rb

@@ -43,7 +43,7 @@ module CFoundry::V2
           @manifest ||= {}
           @manifest[:entity] ||= {}
           @manifest[:entity][:"#{name}_guid"] =
-            @diff[:"#{name}_guid"] = x.id
+            @diff[:"#{name}_guid"] = x.guid
         }
       end
 
@@ -74,14 +74,14 @@ module CFoundry::V2
         define_method(:"add_#{singular}") { |x|
           @client.base.request_path(
             :put,
-            ["v2", "#{object_name}s", @id, plural, x.id],
+            ["v2", "#{object_name}s", @guid, plural, x.guid],
             nil => :json)
         }
 
         define_method(:"remove_#{singular}") {
           @client.base.request_path(
             :delete,
-            ["v2", "#{object_name}s", @id, plural, x.id],
+            ["v2", "#{object_name}s", @guid, plural, x.guid],
             nil => :json)
         }
 
@@ -89,15 +89,15 @@ module CFoundry::V2
           @manifest ||= {}
           @manifest[:entity] ||= {}
           @manifest[:entity][:"#{singular}_guids"] =
-            @diff[:"#{singular}_guids"] = xs.collect(&:id)
+            @diff[:"#{singular}_guids"] = xs.collect(&:guid)
         }
       end
     end
 
-    attr_reader :id
+    attr_reader :guid
 
-    def initialize(id, client, manifest = nil)
-      @id = id
+    def initialize(guid, client, manifest = nil)
+      @guid = guid
       @client = client
       @manifest = manifest
       @diff = {}
@@ -105,11 +105,11 @@ module CFoundry::V2
 
     def manifest
       # inline depth of 2 for fewer requests
-      @manifest ||= @client.base.send(object_name, @id, 2)
+      @manifest ||= @client.base.send(object_name, @guid, 2)
     end
 
     def inspect
-      "\#<#{self.class.name} '#@id'>"
+      "\#<#{self.class.name} '#@guid'>"
     end
 
     def object_name
@@ -125,19 +125,19 @@ module CFoundry::V2
           :"create_#{object_name}",
           self.class.defaults.merge(@manifest[:entity]))
 
-      @id = @manifest[:metadata][:guid]
+      @guid = @manifest[:metadata][:guid]
 
       true
     end
 
     def update!(diff = @diff)
-      @client.base.send(:"update_#{object_name}", @id, diff)
+      @client.base.send(:"update_#{object_name}", @guid, diff)
 
       @manifest = nil
     end
 
     def delete!
-      @client.base.send(:"delete_#{object_name}", @id)
+      @client.base.send(:"delete_#{object_name}", @guid)
 
       if @manifest
         @manifest.delete :metadata
@@ -145,14 +145,14 @@ module CFoundry::V2
     end
 
     def exists?
-      @client.base.send(object_name, @id)
+      @client.base.send(object_name, @guid)
       true
     rescue CFoundry::APIError # TODO: NotFound would be better
       false
     end
 
     def ==(other)
-      other.is_a?(self.class) && @id == other.id
+      other.is_a?(self.class) && @guid == other.guid
     end
   end
 end

data/lib/cfoundry/v2/organization.rb

@@ -3,13 +3,11 @@ require "cfoundry/v2/model"
 module CFoundry::V2
   class Organization < Model
     attribute :name
-    to_many   :app_spaces
+    to_many   :spaces
     to_many   :domains
     to_many   :users
     to_many   :managers, :as => :user
     to_many   :billing_managers, :as => :user
     to_many   :auditors, :as => :user
-
-    alias :spaces :app_spaces
   end
 end

data/lib/cfoundry/v2/service_instance.rb

@@ -3,13 +3,10 @@ require "cfoundry/v2/model"
 module CFoundry::V2
   class ServiceInstance < Model
     attribute :name
-    to_one    :app_space
+    to_one    :space
     to_one    :service_plan
     to_many   :service_bindings
     attribute :credentials
     attribute :vendor_data, :default => ""
-
-    alias :space :app_space
-    alias :space= :app_space=
   end
 end

data/lib/cfoundry/v2/space.rb

@@ -1,7 +1,7 @@
 require "cfoundry/v2/model"
 
 module CFoundry::V2
-  class AppSpace < Model
+  class Space < Model
     attribute :name
     to_one    :organization
     to_many   :developers, :as => :user

data/lib/cfoundry/v2/user.rb

@@ -2,24 +2,28 @@ require "cfoundry/v2/model"
 
 module CFoundry::V2
   class User < Model
-    to_many   :app_spaces
+    to_many   :spaces
     to_many   :organizations
     to_many   :managed_organizations, :as => :organization
     to_many   :billing_managed_organizations, :as => :organization
     to_many   :audited_organizations, :as => :organization
-    to_many   :managed_app_spaces, :as => :app_space
-    to_many   :audited_app_spaces, :as => :app_space
+    to_many   :managed_spaces, :as => :space
+    to_many   :audited_spaces, :as => :space
     attribute :admin
-    to_one    :default_app_space, :as => :app_space
+    to_one    :default_space, :as => :space
 
     attribute :guid # guid is explicitly set for users
 
-    alias :admin? :admin
+    def guid
+      @guid
+    end
 
-    alias :spaces :app_spaces
-    alias :managed_spaces :managed_app_spaces
-    alias :audited_spaces :audited_app_spaces
-    alias :default_space :default_app_space
+    def guid=(x)
+      @guid = x
+      super
+    end
+
+    alias :admin? :admin
 
     # optional metadata from UAA
     attr_accessor :emails, :name

data/lib/cfoundry/version.rb

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

metadata

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