manifests-vmc-plugin 0.4.18 → 0.4.19

data/lib/manifests-vmc-plugin.rb

@@ -273,14 +273,15 @@ module VMCManifests
 
   def ask_to_save(input, app)
     return if manifest_file
+    return unless ask("Save configuration?", :default => false)
 
-    if ask("Save configuration?", :default => false)
-      with_progress("Saving to #{c("manifest.yml", :name)}") do
-        File.open("manifest.yml", "w") do |io|
-          YAML.dump(
-            { "applications" => [meta] },
-            io)
-        end
+    manifest = create_manifest_for(app, input[:path])
+
+    with_progress("Saving to #{c("manifest.yml", :name)}") do
+      File.open("manifest.yml", "w") do |io|
+        YAML.dump(
+          { "applications" => [manifest] },
+          io)
       end
     end
   end
@@ -308,7 +309,7 @@ module VMCManifests
   def setup_services(app, info)
     return if !info[:services] || info[:services].empty?
 
-    services = client.services
+    offerings = client.services
 
     to_bind = []
 
@@ -318,16 +319,16 @@ module VMCManifests
       if instance = client.service_instance_by_name(name)
         to_bind << instance
       else
-        service = services.find { |s|
-          s.label == (svc[:label] || svc[:type] || svc[:vendor]) &&
-            (!svc[:version] || s.version == svc[:version]) &&
-            (s.provider == (svc[:provider] || "core"))
+        offering = offerings.find { |o|
+          o.label == (svc[:label] || svc[:type] || svc[:vendor]) &&
+            (!svc[:version] || o.version == svc[:version]) &&
+            (o.provider == (svc[:provider] || "core"))
         }
 
-        fail "Unknown service: #{svc.inspect}." unless service
+        fail "Unknown service offering: #{svc.inspect}." unless offering
 
         if v2?
-          plan = service.service_plans.find { |p|
+          plan = offering.service_plans.find { |p|
             p.name == (svc[:plan] || "D100")
           }
 
@@ -336,17 +337,15 @@ module VMCManifests
 
         invoke :create_service,
           :name => name,
-          :service => service,
+          :offering => offering,
           :plan => plan,
           :app => app
       end
     end
 
-    to_bind.each do |i|
+    to_bind.each do |s|
       # TODO: splat
-      invoke :bind_service,
-        :app => app,
-        :instance => i
+      invoke :bind_service, :app => app, :service => s
     end
   end
 

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

@@ -1,3 +1,3 @@
 module VMCManifests
-  VERSION = "0.4.18".freeze
+  VERSION = "0.4.19".freeze
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: manifests-vmc-plugin
 version: !ruby/object:Gem::Version 
-  hash: 43
+  hash: 41
   prerelease: 
   segments: 
   - 0
   - 4
-  - 18
-  version: 0.4.18
+  - 19
+  version: 0.4.19
 platform: ruby
 authors: 
 - Alex Suraci
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-12-14 00:00:00 -08:00
+date: 2012-12-15 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency