cfoundry 0.6.0.rc3 → 0.6.0.rc4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (12) hide show
  1. data/lib/cfoundry/client.rb +0 -2
  2. data/lib/cfoundry/upload_helpers.rb +1 -1
  3. data/lib/cfoundry/v2/app.rb +1 -37
  4. data/lib/cfoundry/v2/service.rb +1 -0
  5. data/lib/cfoundry/version.rb +1 -1
  6. data/spec/fixtures/fake_cc_application.json +1 -5
  7. data/spec/fixtures/fake_cc_application_summary.json +0 -12
  8. data/spec/fixtures/fake_cc_service_types.json +3 -0
  9. data/spec/fixtures/fake_cc_space_summary.json +0 -8
  10. metadata +4 -6
  11. data/lib/cfoundry/v2/framework.rb +0 -14
  12. data/lib/cfoundry/v2/runtime.rb +0 -12
data/lib/cfoundry/client.rb CHANGED
@@ -11,8 +11,6 @@ require "cfoundry/v1/service_instance"
11
11
  require "cfoundry/v1/user"
12
12
 
13
13
  require "cfoundry/v2/app"
14
- require "cfoundry/v2/framework"
15
- require "cfoundry/v2/runtime"
16
14
  require "cfoundry/v2/service"
17
15
  require "cfoundry/v2/service_binding"
18
16
  require "cfoundry/v2/service_instance"
data/lib/cfoundry/upload_helpers.rb CHANGED
@@ -208,7 +208,7 @@ module CFoundry
208
208
  end
209
209
 
210
210
  def all_files(path)
211
- Dir.glob("#{path}/**/*", File::FNM_DOTMATCH).reject! do |fn|
211
+ Dir.glob("#{path}/**/*", File::FNM_DOTMATCH).reject do |fn|
212
212
  fn =~ /\.$/
213
213
  end
214
214
  end
data/lib/cfoundry/v2/app.rb CHANGED
@@ -20,8 +20,6 @@ module CFoundry::V2
20
20
  attribute :name, :string
21
21
  attribute :production, :boolean, :default => false
22
22
  to_one :space
23
- to_one :runtime
24
- to_one :framework
25
23
  attribute :environment_json, :hash, :default => {}
26
24
  attribute :memory, :integer, :default => 256
27
25
  attribute :total_instances, :integer, :default => 1, :at => :instances
@@ -37,48 +35,14 @@ module CFoundry::V2
37
35
 
38
36
  scoped_to_space
39
37
 
40
- queryable_by :name, :space_guid, :organization_guid, :framework_guid,
41
- :runtime_guid
38
+ queryable_by :name, :space_guid, :organization_guid
42
39
 
43
40
  has_summary :urls => proc { |x| self.cache[:uris] = x },
44
41
  :running_instances => proc { |x|
45
42
  self.cache[:running_instances] = x
46
43
  },
47
-
48
44
  :instances => proc { |x|
49
45
  self.total_instances = x
50
- },
51
-
52
- # TODO: remove these when cc consistently returns nested hashes
53
- :framework_guid => proc { |x|
54
- if f = self.cache[:framework]
55
- f.guid = x
56
- else
57
- self.framework = @client.framework(x, true)
58
- end
59
- },
60
- :framework_name => proc { |x|
61
- if f = self.cache[:framework]
62
- f.name = x
63
- else
64
- self.framework = @client.framework(nil, true)
65
- self.framework.name = x
66
- end
67
- },
68
- :runtime_guid => proc { |x|
69
- if f = self.cache[:runtime]
70
- f.guid = x
71
- else
72
- self.runtime = @client.runtime(x, true)
73
- end
74
- },
75
- :runtime_name => proc { |x|
76
- if f = self.cache[:runtime]
77
- f.name = x
78
- else
79
- self.runtime = @client.runtime(nil, true)
80
- self.runtime.name = x
81
- end
82
46
  }
83
47
 
84
48
  private :environment_json
data/lib/cfoundry/v2/service.rb CHANGED
@@ -12,6 +12,7 @@ module CFoundry::V2
12
12
  :default => nil
13
13
  attribute :timeout, Integer, :default => nil
14
14
  attribute :active, :boolean, :default => false
15
+ attribute :extra, String
15
16
  to_many :service_plans
16
17
 
17
18
  queryable_by :service_plan_guid
data/lib/cfoundry/version.rb CHANGED
@@ -1,4 +1,4 @@
1
1
  module CFoundry # :nodoc:
2
2
  # CFoundry library version number.
3
- VERSION = "0.6.0.rc3".freeze
3
+ VERSION = "0.6.0.rc4".freeze
4
4
  end
data/spec/fixtures/fake_cc_application.json CHANGED
@@ -8,8 +8,6 @@
8
8
  "entity": {
9
9
  "name": "newapp",
10
10
  "space_guid": "6eb251ee-1ddc-4947-b2b3-942c5fdf0742",
11
- "framework_guid": "9cb7dfa5-7a90-4526-9458-c3380f67c505",
12
- "runtime_guid": "3cbd5d44-932b-43c7-9654-1c69ebe597ce",
13
11
  "environment_json": null,
14
12
  "memory": 2048,
15
13
  "instances": 1,
@@ -17,8 +15,6 @@
17
15
  "disk_quota": 500,
18
16
  "state": "STARTED",
19
17
  "service_bindings_url": "/v2/service_bindings?q=app_guid:d336bafe-13dd-4efd-a425-1729f6191d91",
20
- "space_url": "/v2/spaces/6eb251ee-1ddc-4947-b2b3-942c5fdf0742",
21
- "runtime_url": "/v2/runtimes/3cbd5d44-932b-43c7-9654-1c69ebe597ce",
22
- "framework_url": "/v2/frameworks/9cb7dfa5-7a90-4526-9458-c3380f67c505"
18
+ "space_url": "/v2/spaces/6eb251ee-1ddc-4947-b2b3-942c5fdf0742"
23
19
  }
24
20
  }
data/spec/fixtures/fake_cc_application_summary.json CHANGED
@@ -18,16 +18,6 @@
18
18
  "domain": { "guid": "domain-id-3", "name": "vcap.me", "owning_organization_guid": null}
19
19
  }
20
20
  ],
21
- "framework":{
22
- "guid":"framework-id-1",
23
- "name":"Ruby on Rails",
24
- "description":"Ruby on Rails 3.2"
25
- },
26
- "runtime":{
27
- "guid":"runtime-id-1",
28
- "name":"Ruby",
29
- "description":"Ruby 1.9"
30
- },
31
21
  "running_instances":0,
32
22
  "services":[{
33
23
  "guid":"service-id-1",
@@ -44,8 +34,6 @@
44
34
  }
45
35
  }],
46
36
  "space_guid":"space-id-1",
47
- "framework_guid":"framework-id-1",
48
- "runtime_guid":"runtime-id-1",
49
37
  "environment_json":{},
50
38
  "file_descriptors":256,
51
39
  "disk_quota":256,
data/spec/fixtures/fake_cc_service_types.json CHANGED
@@ -17,6 +17,7 @@
17
17
  "info_url": "service-info-url",
18
18
  "description": "service1-description",
19
19
  "service_plans_url": "/v2/services/service-id-1/service_plans",
20
+ "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}]}]}",
20
21
  "service_plans": [
21
22
  {
22
23
  "metadata": {
@@ -60,6 +61,7 @@
60
61
  "info_url": "service2-info-url",
61
62
  "description": "service2-description",
62
63
  "service_plans_url": "/v2/services/service-id-2/service_plans",
64
+ "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}]}]}",
63
65
  "service_plans": [
64
66
  {
65
67
  "metadata": {
@@ -103,6 +105,7 @@
103
105
  "info_url": "service3-info-url",
104
106
  "description": "service3-description",
105
107
  "service_plans_url": "/v2/services/service-id-3/service_plans",
108
+ "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}]}]}",
106
109
  "service_plans": [
107
110
  {
108
111
  "metadata": {
data/spec/fixtures/fake_cc_space_summary.json CHANGED
@@ -16,11 +16,7 @@
16
16
  "instances":1,
17
17
  "running_instances":1,
18
18
  "service_count":1,
19
- "framework_name":"framework-name-1",
20
- "runtime_name":"runtime-name-1",
21
19
  "space_guid":"space-id-1",
22
- "framework_guid":"framework-id-1",
23
- "runtime_guid":"runtime-id-1",
24
20
  "environment_json":{},
25
21
  "file_descriptors":256,
26
22
  "disk_quota":256
@@ -41,11 +37,7 @@
41
37
  "instances":2,
42
38
  "running_instances":0,
43
39
  "service_count":2,
44
- "framework_name":"framework-name-2",
45
- "runtime_name":"runtime-name-2",
46
40
  "space_guid":"space-id-1",
47
- "framework_guid":"framework-id-2",
48
- "runtime_guid":"runtime-id-2",
49
41
  "environment_json":{},
50
42
  "file_descriptors":256,
51
43
  "disk_quota":256
metadata CHANGED
@@ -1,15 +1,15 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: cfoundry
3
3
  version: !ruby/object:Gem::Version
4
- hash: -1948675322
4
+ hash: 1687798527
5
5
  prerelease: 6
6
6
  segments:
7
7
  - 0
8
8
  - 6
9
9
  - 0
10
10
  - rc
11
- - 3
12
- version: 0.6.0.rc3
11
+ - 4
12
+ version: 0.6.0.rc4
13
13
  platform: ruby
14
14
  authors:
15
15
  - Cloud Foundry Team
@@ -18,7 +18,7 @@ autorequire:
18
18
  bindir: bin
19
19
  cert_chain: []
20
20
 
21
- date: 2013-03-20 00:00:00 Z
21
+ date: 2013-03-21 00:00:00 Z
22
22
  dependencies:
23
23
  - !ruby/object:Gem::Dependency
24
24
  name: multipart-post
@@ -222,12 +222,10 @@ files:
222
222
  - lib/cfoundry/v2/base.rb
223
223
  - lib/cfoundry/v2/client.rb
224
224
  - lib/cfoundry/v2/domain.rb
225
- - lib/cfoundry/v2/framework.rb
226
225
  - lib/cfoundry/v2/model.rb
227
226
  - lib/cfoundry/v2/model_magic.rb
228
227
  - lib/cfoundry/v2/organization.rb
229
228
  - lib/cfoundry/v2/route.rb
230
- - lib/cfoundry/v2/runtime.rb
231
229
  - lib/cfoundry/v2/service.rb
232
230
  - lib/cfoundry/v2/service_auth_token.rb
233
231
  - lib/cfoundry/v2/service_binding.rb
data/lib/cfoundry/v2/framework.rb DELETED
@@ -1,14 +0,0 @@
1
- require "cfoundry/v2/model"
2
-
3
- module CFoundry::V2
4
- class Framework < Model
5
- attribute :name, :string
6
- attribute :description, :string
7
- to_many :apps
8
-
9
- queryable_by :name, :app_guid
10
-
11
- attr_accessor :detection, :runtimes
12
- end
13
- end
14
-
data/lib/cfoundry/v2/runtime.rb DELETED
@@ -1,12 +0,0 @@
1
- require "cfoundry/v2/model"
2
-
3
- module CFoundry::V2
4
- class Runtime < Model
5
- attribute :name, :string
6
- attribute :description, :string
7
- attribute :version, :string
8
- to_many :apps
9
-
10
- queryable_by :name, :app_guid
11
- end
12
- end