manifests-cf-plugin 0.7.0.rc1 → 0.7.0.rc2

data/lib/manifests-cf-plugin.rb

@@ -162,23 +162,15 @@ module CFManifests
       meta["services"] = {}
 
       services.each do |i|
-        if v2?
-          p = i.service_plan
-          s = p.service
-
-          meta["services"][i.name] = {
-            "label" => s.label,
-            "provider" => s.provider,
-            "version" => s.version,
-            "plan" => p.name
-          }
-        else
-          meta["services"][i.name] = {
-            "vendor" => i.vendor,
-            "version" => i.version,
-            "tier" => i.tier
-          }
-        end
+        p = i.service_plan
+        s = p.service
+
+        meta["services"][i.name] = {
+          "label" => s.label,
+          "provider" => s.provider,
+          "version" => s.version,
+          "plan" => p.name
+        }
       end
     end
 
@@ -287,14 +279,12 @@ module CFManifests
 
         fail "Unknown service offering: #{svc.inspect}." unless offering
 
-        if v2?
-          plan = offering.service_plans.find { |p|
-            p.name == (svc[:plan] || "D100")
-          }
-
-          fail "Unknown service plan: #{svc[:plan]}." unless plan
-        end
+        plan = offering.service_plans.find { |p|
+          p.name == (svc[:plan] || "D100")
+        }
 
+        fail "Unknown service plan: #{svc[:plan]}." unless plan
+      
         invoke :create_service,
           :name => name,
           :offering => offering,

data/lib/manifests-cf-plugin/version.rb

@@ -1,3 +1,3 @@
 module CFManifests
-  VERSION = "0.7.0.rc1".freeze
+  VERSION = "0.7.0.rc2".freeze
 end

data/spec/manifests-cf-plugin_spec.rb

@@ -30,7 +30,6 @@ describe CFManifests do
 
   before do
     stub(cmd).target_base { target_base }
-    stub(cmd).v2? { true }
 
     stub(cmd).manifest { manifest }
     stub(cmd).manifest_file { manifest_file }

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: manifests-cf-plugin
 version: !ruby/object:Gem::Version 
-  hash: 639214861
+  hash: 1686705
   prerelease: 6
   segments: 
   - 0
   - 7
   - 0
   - rc
-  - 1
-  version: 0.7.0.rc1
+  - 2
+  version: 0.7.0.rc2
 platform: ruby
 authors: 
 - Alex Suraci
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-03-18 00:00:00 Z
+date: 2013-03-19 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: cfoundry
@@ -27,21 +27,21 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 639214909
+        hash: 1686689
         segments: 
         - 0
-        - 5
-        - 3
+        - 6
+        - 0
         - rc
-        - 5
-        version: 0.5.3.rc5
+        - 2
+        version: 0.6.0.rc2
     - - <
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 5
         segments: 
         - 0
-        - 6
-        version: "0.6"
+        - 7
+        version: "0.7"
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency