cfoundry 0.6.0.rc3 → 0.6.0.rc4

data/lib/cfoundry/client.rb

@@ -11,8 +11,6 @@ require "cfoundry/v1/service_instance"
 require "cfoundry/v1/user"
 
 require "cfoundry/v2/app"
-require "cfoundry/v2/framework"
-require "cfoundry/v2/runtime"
 require "cfoundry/v2/service"
 require "cfoundry/v2/service_binding"
 require "cfoundry/v2/service_instance"

data/lib/cfoundry/upload_helpers.rb

@@ -208,7 +208,7 @@ module CFoundry
     end
 
     def all_files(path)
-      Dir.glob("#{path}/**/*", File::FNM_DOTMATCH).reject! do |fn|
+      Dir.glob("#{path}/**/*", File::FNM_DOTMATCH).reject do |fn|
         fn =~ /\.$/
       end
     end

data/lib/cfoundry/v2/app.rb

@@ -20,8 +20,6 @@ module CFoundry::V2
     attribute :name,             :string
     attribute :production,       :boolean, :default => false
     to_one    :space
-    to_one    :runtime
-    to_one    :framework
     attribute :environment_json, :hash,    :default => {}
     attribute :memory,           :integer, :default => 256
     attribute :total_instances,  :integer, :default => 1, :at => :instances
@@ -37,48 +35,14 @@ module CFoundry::V2
 
     scoped_to_space
 
-    queryable_by :name, :space_guid, :organization_guid, :framework_guid,
-      :runtime_guid
+    queryable_by :name, :space_guid, :organization_guid
 
     has_summary :urls => proc { |x| self.cache[:uris] = x },
       :running_instances => proc { |x|
         self.cache[:running_instances] = x
       },
-
       :instances => proc { |x|
         self.total_instances = x
-      },
-
-      # TODO: remove these when cc consistently returns nested hashes
-      :framework_guid => proc { |x|
-        if f = self.cache[:framework]
-          f.guid = x
-        else
-          self.framework = @client.framework(x, true)
-        end
-      },
-      :framework_name => proc { |x|
-        if f = self.cache[:framework]
-          f.name = x
-        else
-          self.framework = @client.framework(nil, true)
-          self.framework.name = x
-        end
-      },
-      :runtime_guid => proc { |x|
-        if f = self.cache[:runtime]
-          f.guid = x
-        else
-          self.runtime = @client.runtime(x, true)
-        end
-      },
-      :runtime_name => proc { |x|
-        if f = self.cache[:runtime]
-          f.name = x
-        else
-          self.runtime = @client.runtime(nil, true)
-          self.runtime.name = x
-        end
       }
 
     private :environment_json

data/lib/cfoundry/v2/service.rb

@@ -12,6 +12,7 @@ module CFoundry::V2
       :default => nil
     attribute :timeout, Integer, :default => nil
     attribute :active, :boolean, :default => false
+    attribute :extra, String
     to_many   :service_plans
 
     queryable_by :service_plan_guid

data/lib/cfoundry/version.rb

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

data/spec/fixtures/fake_cc_application.json

@@ -8,8 +8,6 @@
   "entity": {
     "name": "newapp",
     "space_guid": "6eb251ee-1ddc-4947-b2b3-942c5fdf0742",
-    "framework_guid": "9cb7dfa5-7a90-4526-9458-c3380f67c505",
-    "runtime_guid": "3cbd5d44-932b-43c7-9654-1c69ebe597ce",
     "environment_json": null,
     "memory": 2048,
     "instances": 1,
@@ -17,8 +15,6 @@
     "disk_quota": 500,
     "state": "STARTED",
     "service_bindings_url": "/v2/service_bindings?q=app_guid:d336bafe-13dd-4efd-a425-1729f6191d91",
-    "space_url": "/v2/spaces/6eb251ee-1ddc-4947-b2b3-942c5fdf0742",
-    "runtime_url": "/v2/runtimes/3cbd5d44-932b-43c7-9654-1c69ebe597ce",
-    "framework_url": "/v2/frameworks/9cb7dfa5-7a90-4526-9458-c3380f67c505"
+    "space_url": "/v2/spaces/6eb251ee-1ddc-4947-b2b3-942c5fdf0742"
   }
 }

data/spec/fixtures/fake_cc_application_summary.json

@@ -18,16 +18,6 @@
       "domain": { "guid": "domain-id-3", "name": "vcap.me", "owning_organization_guid": null}
     }
   ],
-  "framework":{
-    "guid":"framework-id-1",
-    "name":"Ruby on Rails",
-    "description":"Ruby on Rails 3.2"
-  },
-  "runtime":{
-    "guid":"runtime-id-1",
-    "name":"Ruby",
-    "description":"Ruby 1.9"
-  },
   "running_instances":0,
   "services":[{
     "guid":"service-id-1",
@@ -44,8 +34,6 @@
     }
   }],
   "space_guid":"space-id-1",
-  "framework_guid":"framework-id-1",
-  "runtime_guid":"runtime-id-1",
   "environment_json":{},
   "file_descriptors":256,
   "disk_quota":256,

data/spec/fixtures/fake_cc_service_types.json

@@ -17,6 +17,7 @@
         "info_url": "service-info-url",
         "description": "service1-description",
         "service_plans_url": "/v2/services/service-id-1/service_plans",
+        "extra": "{\"id\": 1140,\"name\": \"PostgreSQL\",\"type\": \"WEB_APP\",\"provider\": {\"uuid\": \"core-guid\",\"name\": \"core\"},\"listing\": {\"myAppLogoIconUrl\": \"https://app-logo-icon-url.png\",\"imageUrl\": \"https://image-url.png\",\"profileImageUrl\": \"https://app-direct-www-cloudfront.s3.amazonaws.com/app_resources/1140/thumbs_112/img3998904370530190257.png\",\"blurb\": \"Manage and monitor your apps\",\"overview\": \"New Relic is the all-in-one web app performance tool that lets you see performance from the end user experience, through servers, and down to the line of code.\",\"rating\": 5,\"reviewCount\": 1},\"support\": {\"email\": \"support@newrelic.com\",\"phone\": null,\"knowledgebaseUrl\": \"http://newrelic.com/docs\",\"description\": \"We want to be so easy you don't need help, but in case you need it we're happy to help!\"},\"lastModified\": 1363682653000,\"pricing\": {\"editions\": [{\"id\": 1698,\"name\": \"Standard\",\"primary\": true,\"trial\": {\"length\": 0,\"unit\": \"DAY\"},\"expiredTrialGracePeriod\": 0,\"plans\": [{\"id\": 1846,\"frequency\": \"MONTHLY\",\"contract\": {\"minimumServiceLength\": null,\"cancellationPeriodLimit\": null,\"endOfContractGracePeriod\": null,\"blockSwitchToShorterContract\": false,\"blockContractDowngrades\": false,\"blockContractUpgrades\": false,\"gracePeriod\": null,\"terminationFee\": null,\"autoExtensionPricingId\": null},\"allowCustomUsage\": false,\"keepBillDateOnUsageChange\": false,\"separatePrepaid\": false,\"costs\": [{\"unit\": \"NOT_APPLICABLE\",\"minUnits\": 0,\"maxUnits\": null,\"meteredUsage\": false,\"increment\": null,\"pricePerIncrement\": false,\"amounts\": [{\"currency\": \"USD\",\"value\": 0},{\"currency\": \"CAD\",\"value\": 0}]}]}],\"bullets\": [{\"content\": \"24x7 App Monitoring\",\"tooltip\": null},{\"content\": \"24x7 Real User Monitoring\",\"tooltip\": null},{\"content\": \"24x7 Server Monitoring\",\"tooltip\": null},{\"content\": \"Performance Troubleshooting\",\"tooltip\": null},{\"content\": \"Database Performance\",\"tooltip\": null},{\"content\": \"Data retention: 7 Days\",\"tooltip\": null}],\"items\": [{\"unit\": \"USER\",\"amount\": null,\"unlimited\": true}]},{\"id\": 1699,\"name\": \"Pro\",\"primary\": false,\"trial\": {\"length\": 0,\"unit\": \"DAY\"},\"expiredTrialGracePeriod\": 0,\"plans\": [{\"id\": 1847,\"frequency\": \"MONTHLY\",\"contract\": {\"minimumServiceLength\": null,\"cancellationPeriodLimit\": null,\"endOfContractGracePeriod\": null,\"blockSwitchToShorterContract\": false,\"blockContractDowngrades\": false,\"blockContractUpgrades\": false,\"gracePeriod\": null,\"terminationFee\": null,\"autoExtensionPricingId\": null},\"allowCustomUsage\": false,\"keepBillDateOnUsageChange\": false,\"separatePrepaid\": false,\"costs\": [{\"unit\": \"HOST\",\"minUnits\": 1,\"maxUnits\": null,\"meteredUsage\": false,\"increment\": null,\"pricePerIncrement\": false,\"amounts\": [{\"currency\": \"USD\",\"value\": 199},{\"currency\": \"CAD\",\"value\": 199}]}]},{\"id\": 1848,\"frequency\": \"YEARLY\",\"contract\": {\"minimumServiceLength\": null,\"cancellationPeriodLimit\": null,\"endOfContractGracePeriod\": null,\"blockSwitchToShorterContract\": false,\"blockContractDowngrades\": false,\"blockContractUpgrades\": false,\"gracePeriod\": null,\"terminationFee\": null,\"autoExtensionPricingId\": null},\"allowCustomUsage\": false,\"keepBillDateOnUsageChange\": false,\"separatePrepaid\": false,\"costs\": [{\"unit\": \"HOST\",\"minUnits\": 1,\"maxUnits\": null,\"meteredUsage\": false,\"increment\": null,\"pricePerIncrement\": false,\"amounts\": [{\"currency\": \"USD\",\"value\": 1788},{\"currency\": \"CAD\",\"value\": 1788}]}]}],\"bullets\": [{\"content\": \"$149/month/server (with annual commitment)\",\"tooltip\": null},{\"content\": \"24x7 Transaction Analysis and Breakdown\",\"tooltip\": null},{\"content\": \"Real User Analysis and Breakdown\",\"tooltip\": null},{\"content\": \"24x7 Server Monitoring\",\"tooltip\": null},{\"content\": \"Database Analysis and Breakdown\",\"tooltip\": null},{\"content\": \"Error Detection and Analysis\",\"tooltip\": null},{\"content\": \"Reporting and Optimization\",\"tooltip\": null},{\"content\": \"Proactive Alerting\",\"tooltip\": null},{\"content\": \"Data Retention: Unlimited\",\"tooltip\": null},{\"content\": \"Month-to-Month: $199/server/month\",\"tooltip\": null}],\"items\": [{\"unit\": \"USER\",\"amount\": null,\"unlimited\": true}]},{\"id\": 1700,\"name\": \"Volume\",\"primary\": false,\"trial\": {\"length\": 0,\"unit\": \"DAY\"},\"expiredTrialGracePeriod\": 0,\"plans\": [{\"id\": 1849,\"frequency\": \"MONTHLY\",\"contract\": {\"minimumServiceLength\": null,\"cancellationPeriodLimit\": null,\"endOfContractGracePeriod\": null,\"blockSwitchToShorterContract\": false,\"blockContractDowngrades\": false,\"blockContractUpgrades\": false,\"gracePeriod\": null,\"terminationFee\": null,\"autoExtensionPricingId\": null},\"allowCustomUsage\": false,\"keepBillDateOnUsageChange\": false,\"separatePrepaid\": false,\"costs\": [{\"unit\": \"HOST\",\"minUnits\": 1,\"maxUnits\": null,\"meteredUsage\": false,\"increment\": null,\"pricePerIncrement\": false,\"amounts\": [{\"currency\": \"USD\",\"value\": 159},{\"currency\": \"CAD\",\"value\": 159}]}]},{\"id\": 1850,\"frequency\": \"YEARLY\",\"contract\": {\"minimumServiceLength\": null,\"cancellationPeriodLimit\": null,\"endOfContractGracePeriod\": null,\"blockSwitchToShorterContract\": false,\"blockContractDowngrades\": false,\"blockContractUpgrades\": false,\"gracePeriod\": null,\"terminationFee\": null,\"autoExtensionPricingId\": null},\"allowCustomUsage\": false,\"keepBillDateOnUsageChange\": false,\"separatePrepaid\": false,\"costs\": [{\"unit\": \"SERVER\",\"minUnits\": 1,\"maxUnits\": null,\"meteredUsage\": false,\"increment\": null,\"pricePerIncrement\": false,\"amounts\": [{\"currency\": \"USD\",\"value\": 119},{\"currency\": \"CAD\",\"value\": 119}]}]}],\"bullets\": [{\"content\": \"$119/month/server (with annual commitment)\",\"tooltip\": null},{\"content\": \"24x7 Transaction Analysis and Breakdown\",\"tooltip\": null},{\"content\": \"Real User Analysis and Breakdown\",\"tooltip\": null},{\"content\": \"24x7 Server Monitoring\",\"tooltip\": null},{\"content\": \"Database Analysis and Breakdown\",\"tooltip\": null},{\"content\": \"Error Detection and Analysis\",\"tooltip\": null},{\"content\": \"Reporting and Optimization\",\"tooltip\": null},{\"content\": \"Proactive Alerting\",\"tooltip\": null},{\"content\": \"Data Retention: Unlimited\",\"tooltip\": null},{\"content\": \"Multiple Administrators\",\"tooltip\": null},{\"content\": \"Phone Support\",\"tooltip\": null},{\"content\": \"Access to Tech Expert\",\"tooltip\": null},{\"content\": \"Month-to-Month: $159/month/server\",\"tooltip\": null},{\"content\": \"5+ servers? Contact New Relic sales.\",\"tooltip\": null}],\"items\": [{\"unit\": \"USER\",\"amount\": null,\"unlimited\": true}]}]},\"tags\": [{\"type\": \"CATEGORY\",\"id\": 365,\"name\": \"IT & Administration\",\"badge\": null,\"showBadge\": false,\"children\": [{\"type\": \"SUB_CATEGORY\",\"id\": 2172,\"name\": \"Application Performance Management\",\"badge\": null,\"showBadge\": false,\"children\": null}]}]}",
         "service_plans": [
           {
             "metadata": {
@@ -60,6 +61,7 @@
         "info_url": "service2-info-url",
         "description": "service2-description",
         "service_plans_url": "/v2/services/service-id-2/service_plans",
+        "extra": "{\"id\": 1141,\"name\": \"MongoDB\",\"type\": \"WEB_APP\",\"provider\": {\"uuid\": \"core-guid\",\"name\": \"core\"},\"listing\": {\"myAppLogoIconUrl\": \"https://app-direct-www-cloudfront.s3.amazonaws.com/app_resources/1140/myAppIcon/img2713834581379867546.png\",\"imageUrl\": \"https://image-url.png\",\"profileImageUrl\": \"https://app-direct-www-cloudfront.s3.amazonaws.com/app_resources/1140/thumbs_112/img3998904370530190257.png\",\"blurb\": \"Manage and monitor your apps\",\"overview\": \"New Relic is the all-in-one web app performance tool that lets you see performance from the end user experience, through servers, and down to the line of code.\",\"rating\": 5,\"reviewCount\": 1},\"support\": {\"email\": \"support@newrelic.com\",\"phone\": null,\"knowledgebaseUrl\": \"http://newrelic.com/docs\",\"description\": \"We want to be so easy you don't need help, but in case you need it we're happy to help!\"},\"lastModified\": 1363682653000,\"pricing\": {\"editions\": [{\"id\": 1698,\"name\": \"Standard\",\"primary\": true,\"trial\": {\"length\": 0,\"unit\": \"DAY\"},\"expiredTrialGracePeriod\": 0,\"plans\": [{\"id\": 1846,\"frequency\": \"MONTHLY\",\"contract\": {\"minimumServiceLength\": null,\"cancellationPeriodLimit\": null,\"endOfContractGracePeriod\": null,\"blockSwitchToShorterContract\": false,\"blockContractDowngrades\": false,\"blockContractUpgrades\": false,\"gracePeriod\": null,\"terminationFee\": null,\"autoExtensionPricingId\": null},\"allowCustomUsage\": false,\"keepBillDateOnUsageChange\": false,\"separatePrepaid\": false,\"costs\": [{\"unit\": \"NOT_APPLICABLE\",\"minUnits\": 0,\"maxUnits\": null,\"meteredUsage\": false,\"increment\": null,\"pricePerIncrement\": false,\"amounts\": [{\"currency\": \"USD\",\"value\": 0},{\"currency\": \"CAD\",\"value\": 0}]}]}],\"bullets\": [{\"content\": \"24x7 App Monitoring\",\"tooltip\": null},{\"content\": \"24x7 Real User Monitoring\",\"tooltip\": null},{\"content\": \"24x7 Server Monitoring\",\"tooltip\": null},{\"content\": \"Performance Troubleshooting\",\"tooltip\": null},{\"content\": \"Database Performance\",\"tooltip\": null},{\"content\": \"Data retention: 7 Days\",\"tooltip\": null}],\"items\": [{\"unit\": \"USER\",\"amount\": null,\"unlimited\": true}]},{\"id\": 1699,\"name\": \"Pro\",\"primary\": false,\"trial\": {\"length\": 0,\"unit\": \"DAY\"},\"expiredTrialGracePeriod\": 0,\"plans\": [{\"id\": 1847,\"frequency\": \"MONTHLY\",\"contract\": {\"minimumServiceLength\": null,\"cancellationPeriodLimit\": null,\"endOfContractGracePeriod\": null,\"blockSwitchToShorterContract\": false,\"blockContractDowngrades\": false,\"blockContractUpgrades\": false,\"gracePeriod\": null,\"terminationFee\": null,\"autoExtensionPricingId\": null},\"allowCustomUsage\": false,\"keepBillDateOnUsageChange\": false,\"separatePrepaid\": false,\"costs\": [{\"unit\": \"HOST\",\"minUnits\": 1,\"maxUnits\": null,\"meteredUsage\": false,\"increment\": null,\"pricePerIncrement\": false,\"amounts\": [{\"currency\": \"USD\",\"value\": 199},{\"currency\": \"CAD\",\"value\": 199}]}]},{\"id\": 1848,\"frequency\": \"YEARLY\",\"contract\": {\"minimumServiceLength\": null,\"cancellationPeriodLimit\": null,\"endOfContractGracePeriod\": null,\"blockSwitchToShorterContract\": false,\"blockContractDowngrades\": false,\"blockContractUpgrades\": false,\"gracePeriod\": null,\"terminationFee\": null,\"autoExtensionPricingId\": null},\"allowCustomUsage\": false,\"keepBillDateOnUsageChange\": false,\"separatePrepaid\": false,\"costs\": [{\"unit\": \"HOST\",\"minUnits\": 1,\"maxUnits\": null,\"meteredUsage\": false,\"increment\": null,\"pricePerIncrement\": false,\"amounts\": [{\"currency\": \"USD\",\"value\": 1788},{\"currency\": \"CAD\",\"value\": 1788}]}]}],\"bullets\": [{\"content\": \"$149/month/server (with annual commitment)\",\"tooltip\": null},{\"content\": \"24x7 Transaction Analysis and Breakdown\",\"tooltip\": null},{\"content\": \"Real User Analysis and Breakdown\",\"tooltip\": null},{\"content\": \"24x7 Server Monitoring\",\"tooltip\": null},{\"content\": \"Database Analysis and Breakdown\",\"tooltip\": null},{\"content\": \"Error Detection and Analysis\",\"tooltip\": null},{\"content\": \"Reporting and Optimization\",\"tooltip\": null},{\"content\": \"Proactive Alerting\",\"tooltip\": null},{\"content\": \"Data Retention: Unlimited\",\"tooltip\": null},{\"content\": \"Month-to-Month: $199/server/month\",\"tooltip\": null}],\"items\": [{\"unit\": \"USER\",\"amount\": null,\"unlimited\": true}]},{\"id\": 1700,\"name\": \"Volume\",\"primary\": false,\"trial\": {\"length\": 0,\"unit\": \"DAY\"},\"expiredTrialGracePeriod\": 0,\"plans\": [{\"id\": 1849,\"frequency\": \"MONTHLY\",\"contract\": {\"minimumServiceLength\": null,\"cancellationPeriodLimit\": null,\"endOfContractGracePeriod\": null,\"blockSwitchToShorterContract\": false,\"blockContractDowngrades\": false,\"blockContractUpgrades\": false,\"gracePeriod\": null,\"terminationFee\": null,\"autoExtensionPricingId\": null},\"allowCustomUsage\": false,\"keepBillDateOnUsageChange\": false,\"separatePrepaid\": false,\"costs\": [{\"unit\": \"HOST\",\"minUnits\": 1,\"maxUnits\": null,\"meteredUsage\": false,\"increment\": null,\"pricePerIncrement\": false,\"amounts\": [{\"currency\": \"USD\",\"value\": 159},{\"currency\": \"CAD\",\"value\": 159}]}]},{\"id\": 1850,\"frequency\": \"YEARLY\",\"contract\": {\"minimumServiceLength\": null,\"cancellationPeriodLimit\": null,\"endOfContractGracePeriod\": null,\"blockSwitchToShorterContract\": false,\"blockContractDowngrades\": false,\"blockContractUpgrades\": false,\"gracePeriod\": null,\"terminationFee\": null,\"autoExtensionPricingId\": null},\"allowCustomUsage\": false,\"keepBillDateOnUsageChange\": false,\"separatePrepaid\": false,\"costs\": [{\"unit\": \"SERVER\",\"minUnits\": 1,\"maxUnits\": null,\"meteredUsage\": false,\"increment\": null,\"pricePerIncrement\": false,\"amounts\": [{\"currency\": \"USD\",\"value\": 119},{\"currency\": \"CAD\",\"value\": 119}]}]}],\"bullets\": [{\"content\": \"$119/month/server (with annual commitment)\",\"tooltip\": null},{\"content\": \"24x7 Transaction Analysis and Breakdown\",\"tooltip\": null},{\"content\": \"Real User Analysis and Breakdown\",\"tooltip\": null},{\"content\": \"24x7 Server Monitoring\",\"tooltip\": null},{\"content\": \"Database Analysis and Breakdown\",\"tooltip\": null},{\"content\": \"Error Detection and Analysis\",\"tooltip\": null},{\"content\": \"Reporting and Optimization\",\"tooltip\": null},{\"content\": \"Proactive Alerting\",\"tooltip\": null},{\"content\": \"Data Retention: Unlimited\",\"tooltip\": null},{\"content\": \"Multiple Administrators\",\"tooltip\": null},{\"content\": \"Phone Support\",\"tooltip\": null},{\"content\": \"Access to Tech Expert\",\"tooltip\": null},{\"content\": \"Month-to-Month: $159/month/server\",\"tooltip\": null},{\"content\": \"5+ servers? Contact New Relic sales.\",\"tooltip\": null}],\"items\": [{\"unit\": \"USER\",\"amount\": null,\"unlimited\": true}]}]},\"tags\": [{\"type\": \"CATEGORY\",\"id\": 365,\"name\": \"IT & Administration\",\"badge\": null,\"showBadge\": false,\"children\": [{\"type\": \"SUB_CATEGORY\",\"id\": 2172,\"name\": \"Application Performance Management\",\"badge\": null,\"showBadge\": false,\"children\": null}]}]}",
         "service_plans": [
           {
             "metadata": {
@@ -103,6 +105,7 @@
         "info_url": "service3-info-url",
         "description": "service3-description",
         "service_plans_url": "/v2/services/service-id-3/service_plans",
+        "extra": "{\"id\": 1142,\"name\": \"MongoDB\",\"type\": \"WEB_APP\",\"provider\": {\"uuid\": \"mongo-guid\",\"name\": \"mongoLab\"},\"listing\": {\"myAppLogoIconUrl\": \"https://app-direct-www-cloudfront.s3.amazonaws.com/app_resources/1140/myAppIcon/img2713834581379867546.png\",\"imageUrl\": \"https://image-url.png\",\"profileImageUrl\": \"https://app-direct-www-cloudfront.s3.amazonaws.com/app_resources/1140/thumbs_112/img3998904370530190257.png\",\"blurb\": \"Manage and monitor your apps\",\"overview\": \"New Relic is the all-in-one web app performance tool that lets you see performance from the end user experience, through servers, and down to the line of code.\",\"rating\": 5,\"reviewCount\": 1},\"support\": {\"email\": \"support@newrelic.com\",\"phone\": null,\"knowledgebaseUrl\": \"http://newrelic.com/docs\",\"description\": \"We want to be so easy you don't need help, but in case you need it we're happy to help!\"},\"lastModified\": 1363682653000,\"pricing\": {\"editions\": [{\"id\": 1698,\"name\": \"Standard\",\"primary\": true,\"trial\": {\"length\": 0,\"unit\": \"DAY\"},\"expiredTrialGracePeriod\": 0,\"plans\": [{\"id\": 1846,\"frequency\": \"MONTHLY\",\"contract\": {\"minimumServiceLength\": null,\"cancellationPeriodLimit\": null,\"endOfContractGracePeriod\": null,\"blockSwitchToShorterContract\": false,\"blockContractDowngrades\": false,\"blockContractUpgrades\": false,\"gracePeriod\": null,\"terminationFee\": null,\"autoExtensionPricingId\": null},\"allowCustomUsage\": false,\"keepBillDateOnUsageChange\": false,\"separatePrepaid\": false,\"costs\": [{\"unit\": \"NOT_APPLICABLE\",\"minUnits\": 0,\"maxUnits\": null,\"meteredUsage\": false,\"increment\": null,\"pricePerIncrement\": false,\"amounts\": [{\"currency\": \"USD\",\"value\": 0},{\"currency\": \"CAD\",\"value\": 0}]}]}],\"bullets\": [{\"content\": \"24x7 App Monitoring\",\"tooltip\": null},{\"content\": \"24x7 Real User Monitoring\",\"tooltip\": null},{\"content\": \"24x7 Server Monitoring\",\"tooltip\": null},{\"content\": \"Performance Troubleshooting\",\"tooltip\": null},{\"content\": \"Database Performance\",\"tooltip\": null},{\"content\": \"Data retention: 7 Days\",\"tooltip\": null}],\"items\": [{\"unit\": \"USER\",\"amount\": null,\"unlimited\": true}]},{\"id\": 1699,\"name\": \"Pro\",\"primary\": false,\"trial\": {\"length\": 0,\"unit\": \"DAY\"},\"expiredTrialGracePeriod\": 0,\"plans\": [{\"id\": 1847,\"frequency\": \"MONTHLY\",\"contract\": {\"minimumServiceLength\": null,\"cancellationPeriodLimit\": null,\"endOfContractGracePeriod\": null,\"blockSwitchToShorterContract\": false,\"blockContractDowngrades\": false,\"blockContractUpgrades\": false,\"gracePeriod\": null,\"terminationFee\": null,\"autoExtensionPricingId\": null},\"allowCustomUsage\": false,\"keepBillDateOnUsageChange\": false,\"separatePrepaid\": false,\"costs\": [{\"unit\": \"HOST\",\"minUnits\": 1,\"maxUnits\": null,\"meteredUsage\": false,\"increment\": null,\"pricePerIncrement\": false,\"amounts\": [{\"currency\": \"USD\",\"value\": 199},{\"currency\": \"CAD\",\"value\": 199}]}]},{\"id\": 1848,\"frequency\": \"YEARLY\",\"contract\": {\"minimumServiceLength\": null,\"cancellationPeriodLimit\": null,\"endOfContractGracePeriod\": null,\"blockSwitchToShorterContract\": false,\"blockContractDowngrades\": false,\"blockContractUpgrades\": false,\"gracePeriod\": null,\"terminationFee\": null,\"autoExtensionPricingId\": null},\"allowCustomUsage\": false,\"keepBillDateOnUsageChange\": false,\"separatePrepaid\": false,\"costs\": [{\"unit\": \"HOST\",\"minUnits\": 1,\"maxUnits\": null,\"meteredUsage\": false,\"increment\": null,\"pricePerIncrement\": false,\"amounts\": [{\"currency\": \"USD\",\"value\": 1788},{\"currency\": \"CAD\",\"value\": 1788}]}]}],\"bullets\": [{\"content\": \"$149/month/server (with annual commitment)\",\"tooltip\": null},{\"content\": \"24x7 Transaction Analysis and Breakdown\",\"tooltip\": null},{\"content\": \"Real User Analysis and Breakdown\",\"tooltip\": null},{\"content\": \"24x7 Server Monitoring\",\"tooltip\": null},{\"content\": \"Database Analysis and Breakdown\",\"tooltip\": null},{\"content\": \"Error Detection and Analysis\",\"tooltip\": null},{\"content\": \"Reporting and Optimization\",\"tooltip\": null},{\"content\": \"Proactive Alerting\",\"tooltip\": null},{\"content\": \"Data Retention: Unlimited\",\"tooltip\": null},{\"content\": \"Month-to-Month: $199/server/month\",\"tooltip\": null}],\"items\": [{\"unit\": \"USER\",\"amount\": null,\"unlimited\": true}]},{\"id\": 1700,\"name\": \"Volume\",\"primary\": false,\"trial\": {\"length\": 0,\"unit\": \"DAY\"},\"expiredTrialGracePeriod\": 0,\"plans\": [{\"id\": 1849,\"frequency\": \"MONTHLY\",\"contract\": {\"minimumServiceLength\": null,\"cancellationPeriodLimit\": null,\"endOfContractGracePeriod\": null,\"blockSwitchToShorterContract\": false,\"blockContractDowngrades\": false,\"blockContractUpgrades\": false,\"gracePeriod\": null,\"terminationFee\": null,\"autoExtensionPricingId\": null},\"allowCustomUsage\": false,\"keepBillDateOnUsageChange\": false,\"separatePrepaid\": false,\"costs\": [{\"unit\": \"HOST\",\"minUnits\": 1,\"maxUnits\": null,\"meteredUsage\": false,\"increment\": null,\"pricePerIncrement\": false,\"amounts\": [{\"currency\": \"USD\",\"value\": 159},{\"currency\": \"CAD\",\"value\": 159}]}]},{\"id\": 1850,\"frequency\": \"YEARLY\",\"contract\": {\"minimumServiceLength\": null,\"cancellationPeriodLimit\": null,\"endOfContractGracePeriod\": null,\"blockSwitchToShorterContract\": false,\"blockContractDowngrades\": false,\"blockContractUpgrades\": false,\"gracePeriod\": null,\"terminationFee\": null,\"autoExtensionPricingId\": null},\"allowCustomUsage\": false,\"keepBillDateOnUsageChange\": false,\"separatePrepaid\": false,\"costs\": [{\"unit\": \"SERVER\",\"minUnits\": 1,\"maxUnits\": null,\"meteredUsage\": false,\"increment\": null,\"pricePerIncrement\": false,\"amounts\": [{\"currency\": \"USD\",\"value\": 119},{\"currency\": \"CAD\",\"value\": 119}]}]}],\"bullets\": [{\"content\": \"$119/month/server (with annual commitment)\",\"tooltip\": null},{\"content\": \"24x7 Transaction Analysis and Breakdown\",\"tooltip\": null},{\"content\": \"Real User Analysis and Breakdown\",\"tooltip\": null},{\"content\": \"24x7 Server Monitoring\",\"tooltip\": null},{\"content\": \"Database Analysis and Breakdown\",\"tooltip\": null},{\"content\": \"Error Detection and Analysis\",\"tooltip\": null},{\"content\": \"Reporting and Optimization\",\"tooltip\": null},{\"content\": \"Proactive Alerting\",\"tooltip\": null},{\"content\": \"Data Retention: Unlimited\",\"tooltip\": null},{\"content\": \"Multiple Administrators\",\"tooltip\": null},{\"content\": \"Phone Support\",\"tooltip\": null},{\"content\": \"Access to Tech Expert\",\"tooltip\": null},{\"content\": \"Month-to-Month: $159/month/server\",\"tooltip\": null},{\"content\": \"5+ servers? Contact New Relic sales.\",\"tooltip\": null}],\"items\": [{\"unit\": \"USER\",\"amount\": null,\"unlimited\": true}]}]},\"tags\": [{\"type\": \"CATEGORY\",\"id\": 365,\"name\": \"IT & Administration\",\"badge\": null,\"showBadge\": false,\"children\": [{\"type\": \"SUB_CATEGORY\",\"id\": 2172,\"name\": \"Application Performance Management\",\"badge\": null,\"showBadge\": false,\"children\": null}]}]}",
         "service_plans": [
           {
             "metadata": {

data/spec/fixtures/fake_cc_space_summary.json

@@ -16,11 +16,7 @@
       "instances":1,
       "running_instances":1,
       "service_count":1,
-      "framework_name":"framework-name-1",
-      "runtime_name":"runtime-name-1",
       "space_guid":"space-id-1",
-      "framework_guid":"framework-id-1",
-      "runtime_guid":"runtime-id-1",
       "environment_json":{},
       "file_descriptors":256,
       "disk_quota":256
@@ -41,11 +37,7 @@
       "instances":2,
       "running_instances":0,
       "service_count":2,
-      "framework_name":"framework-name-2",
-      "runtime_name":"runtime-name-2",
       "space_guid":"space-id-1",
-      "framework_guid":"framework-id-2",
-      "runtime_guid":"runtime-id-2",
       "environment_json":{},
       "file_descriptors":256,
       "disk_quota":256

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: cfoundry
 version: !ruby/object:Gem::Version 
-  hash: -1948675322
+  hash: 1687798527
   prerelease: 6
   segments: 
   - 0
   - 6
   - 0
   - rc
-  - 3
-  version: 0.6.0.rc3
+  - 4
+  version: 0.6.0.rc4
 platform: ruby
 authors: 
 - Cloud Foundry Team
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-03-20 00:00:00 Z
+date: 2013-03-21 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: multipart-post
@@ -222,12 +222,10 @@ files:
 - lib/cfoundry/v2/base.rb
 - lib/cfoundry/v2/client.rb
 - lib/cfoundry/v2/domain.rb
-- lib/cfoundry/v2/framework.rb
 - lib/cfoundry/v2/model.rb
 - lib/cfoundry/v2/model_magic.rb
 - lib/cfoundry/v2/organization.rb
 - lib/cfoundry/v2/route.rb
-- lib/cfoundry/v2/runtime.rb
 - lib/cfoundry/v2/service.rb
 - lib/cfoundry/v2/service_auth_token.rb
 - lib/cfoundry/v2/service_binding.rb

data/lib/cfoundry/v2/framework.rb

@@ -1,14 +0,0 @@
-require "cfoundry/v2/model"
-
-module CFoundry::V2
-  class Framework < Model
-    attribute :name, :string
-    attribute :description, :string
-    to_many   :apps
-
-    queryable_by :name, :app_guid
-
-    attr_accessor :detection, :runtimes
-  end
-end
-

data/lib/cfoundry/v2/runtime.rb

@@ -1,12 +0,0 @@
-require "cfoundry/v2/model"
-
-module CFoundry::V2
-  class Runtime < Model
-    attribute :name, :string
-    attribute :description, :string
-    attribute :version, :string
-    to_many   :apps
-
-    queryable_by :name, :app_guid
-  end
-end