manifests-vmc-plugin 0.4.17 → 0.4.18

data/lib/manifests-vmc-plugin/loader/normalizer.rb

@@ -78,6 +78,10 @@ module VMCManifests
       if app.key?("mem")
         app["memory"] = app.delete("mem")
       end
+
+      if app.key?("url") && app["url"].nil?
+        app["url"] = "none"
+      end
     end
 
     def toplevel_attributes(manifest)
@@ -104,6 +108,8 @@ module VMCManifests
         stringified
       when Array
         val.collect { |x| normalize_key_val(x) }
+      when nil
+        nil
       else
         val.to_s
       end

data/lib/manifests-vmc-plugin/loader/resolver.rb

@@ -1,13 +1,16 @@
 module VMCManifests
   module Resolver
-    def resolve!(manifest, resolver)
-      manifest[:applications].each_value do |v|
-        resolve_lexically(resolver, v, [manifest])
-      end
+    def resolve(manifest, resolver)
+      new = {}
 
-      resolve_lexically(resolver, manifest, [manifest])
+      new[:applications] = {}
 
-      nil
+      manifest[:applications].each do |k, v|
+        new[:applications][k] =
+          resolve_lexically(resolver, v, [manifest])
+      end
+
+      resolve_lexically(resolver, new, [new])
     end
 
     private
@@ -16,24 +19,28 @@ module VMCManifests
     def resolve_lexically(resolver, val, ctx)
       case val
       when Hash
-        val.each_value do |v|
-          resolve_lexically(resolver, v, [val] + ctx)
+        new = {}
+
+        val.each do |k, v|
+          new[k] = resolve_lexically(resolver, v, [val] + ctx)
         end
+
+        new
       when Array
-        val.each do |v|
+        val.collect do |v|
           resolve_lexically(resolver, v, ctx)
         end
       when String
-        val.gsub!(/\$\{([^\}]+)\}/) do
-          resolve(resolver, $1, ctx)
+        val.gsub(/\$\{([^\}]+)\}/) do
+          resolve_symbol(resolver, $1, ctx)
         end
+      else
+        val
       end
-
-      nil
     end
 
     # resolve a symbol to its value, and then resolve that value
-    def resolve(resolver, sym, ctx)
+    def resolve_symbol(resolver, sym, ctx)
       if found = find_symbol(sym.to_sym, ctx)
         resolve_lexically(resolver, found, ctx)
         found

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

@@ -16,8 +16,7 @@ module VMCManifests
     def manifest
       info = build(@file)
       normalize! info
-      resolve! info, @resolver
-      info
+      resolve info, @resolver
     end
 
     private

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

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

data/lib/manifests-vmc-plugin.rb

@@ -131,9 +131,9 @@ module VMCManifests
     in_manifest = []
 
     if names_or_paths.empty?
-      specific = find_apps(Dir.pwd)
+      apps = find_apps(Dir.pwd)
 
-      if !specific.empty?
+      if !apps.empty?
         in_manifest += apps
       else
         each_app(&blk)
@@ -167,6 +167,50 @@ module VMCManifests
     external
   end
 
+  def create_manifest_for(app, path)
+    meta = {
+      "name" => app.name,
+      "framework" => app.framework.name,
+      "runtime" => app.runtime.name,
+      "memory" => human_size(app.memory * 1024 * 1024, 0),
+      "instances" => app.total_instances,
+      "url" => app.url ? app.url.sub(target_base, '${target-base}') : "none",
+      "path" => path
+    }
+
+    services = app.services
+
+    unless services.empty?
+      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
+      end
+    end
+
+    if cmd = app.command
+      meta["command"] = cmd
+    end
+
+    meta
+  end
+
   private
 
   def show_manifest_usage
@@ -230,46 +274,6 @@ module VMCManifests
   def ask_to_save(input, app)
     return if manifest_file
 
-    service_instances = app.services
-
-    meta = {
-      "name" => app.name,
-      "framework" => app.framework.name,
-      "runtime" => app.runtime.name,
-      "memory" => human_size(app.memory * 1024 * 1024, 0),
-      "instances" => app.total_instances,
-      "url" => app.url && app.url.sub(target_base, '${target-base}'),
-      "path" => input[:path]
-    }
-
-    unless service_instances.empty?
-      meta["services"] = {}
-
-      service_instances.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
-      end
-    end
-
-    if cmd = app.command
-      meta["command"] = cmd
-    end
-
     if ask("Save configuration?", :default => false)
       with_progress("Saving to #{c("manifest.yml", :name)}") do
         File.open("manifest.yml", "w") do |io|

data/spec/loader/normalizer_spec.rb

@@ -22,6 +22,17 @@ describe VMCManifests::Normalizer do
       end
     end
 
+    context 'with a manifest where the url is nil' do
+      let(:manifest) { { "applications" => { "." => { "url" => nil } } } }
+
+      it "sets it to none" do
+        expect(subject).to eq(
+          :applications => {
+            :"." => { :path => ".", :url => "none" }
+          })
+      end
+    end
+
     context 'with a manifest with toplevel attributes' do
       context 'and properties' do
         let(:manifest) {

data/spec/manifests-vmc-plugin_spec.rb

@@ -1,13 +1,22 @@
 require 'spec_helper'
 require 'manifests-vmc-plugin'
 
+require 'cfoundry/spec_helper'
+
 describe VMCManifests do
   let(:cmd) do
-    manifest = Object.new
+    manifest = VMC::App::Push.new
     manifest.extend VMCManifests
     manifest
   end
 
+  let(:target_base) { "some-cloud.com" }
+
+  before do
+    stub(cmd).target_base { target_base }
+    stub(cmd).v2? { true }
+  end
+
   describe '#find_apps' do
     subject { cmd.find_apps(nil) }
 
@@ -16,4 +25,111 @@ describe VMCManifests do
       it { should eq [] }
     end
   end
-end
+
+  describe '#create_manifest_for' do
+    let(:app) {
+      FactoryGirl.build(
+        :app,
+        :framework => FactoryGirl.build(:framework),
+        :runtime => FactoryGirl.build(:runtime),
+        :memory => 2048,
+        :instances => 2,
+        :command => "ruby main.rb",
+        :routes => [
+          FactoryGirl.build(
+            :route,
+            :host => "some-app-name",
+            :domain => FactoryGirl.build(:domain, :name => target_base))
+        ],
+        :service_bindings => [
+          FactoryGirl.build(
+            :service_binding,
+            :service_instance =>
+              FactoryGirl.build(
+                :service_instance,
+                :name => "service-1",
+                :service_plan =>
+                  FactoryGirl.build(
+                    :service_plan,
+                    :name => "P200",
+                    :service => FactoryGirl.build(:service))))
+        ])
+    }
+
+    subject { cmd.create_manifest_for(app, "some-path") }
+
+    its(["name"]) { should eq app.name }
+    its(["framework"]) { should eq app.framework.name }
+    its(["runtime"]) { should eq app.runtime.name }
+    its(["memory"]) { should eq "2G" }
+    its(["instances"]) { should eq 2 }
+    its(["path"]) { should eq "some-path" }
+    its(["url"]) { should eq "some-app-name.${target-base}" }
+    its(["command"]) { should eq "ruby main.rb" }
+
+    it "contains the service information" do
+      manifest = subject
+      expect(manifest["services"]).to be_a Hash
+
+      services = manifest["services"]
+      app.service_bindings.each do |b|
+        service = b.service_instance
+
+        expect(services).to include service.name
+
+        info = services[service.name]
+
+        plan = service.service_plan
+        offering = plan.service
+
+        { "plan" => plan.name,
+          "label" => offering.label,
+          "provider" => offering.provider,
+          "version" => offering.version
+        }.each do |attr, val|
+          expect(info).to include attr
+          expect(info[attr]).to eq val
+        end
+      end
+    end
+
+    context 'when there is no url' do
+      let(:app) {
+        FactoryGirl.build(
+          :app,
+          :framework => FactoryGirl.build(:framework),
+          :runtime => FactoryGirl.build(:runtime),
+          :memory => 2048,
+          :instances => 2)
+      }
+
+      its(["url"]) { should eq "none" }
+    end
+
+    context 'when there is no command' do
+      let(:app) {
+        FactoryGirl.build(
+          :app,
+          :framework => FactoryGirl.build(:framework),
+          :runtime => FactoryGirl.build(:runtime),
+          :memory => 2048,
+          :instances => 2)
+      }
+
+      it { should_not include "command" }
+    end
+
+    context 'when there are no service bindings' do
+      let(:app) {
+        FactoryGirl.build(
+          :app,
+          :framework => FactoryGirl.build(:framework),
+          :runtime => FactoryGirl.build(:runtime),
+          :memory => 2048,
+          :instances => 2)
+      }
+
+      it { should_not include "services" }
+    end
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: manifests-vmc-plugin
 version: !ruby/object:Gem::Version 
-  hash: 45
+  hash: 43
   prerelease: 
   segments: 
   - 0
   - 4
-  - 17
-  version: 0.4.17
+  - 18
+  version: 0.4.18
 platform: ruby
 authors: 
 - Alex Suraci
@@ -15,7 +15,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-12-05 00:00:00 Z
+date: 2012-12-14 00:00:00 -08:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: cfoundry
@@ -34,50 +35,111 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rake
+  name: vmc
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 1
         segments: 
         - 0
-        version: "0"
+        - 4
+        - 7
+        version: 0.4.7
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: rake
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 25
         segments: 
-        - 2
         - 0
-        version: "2.0"
+        - 9
+        version: "0.9"
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: vmc
+  name: rspec
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 21
+        segments: 
+        - 2
+        - 11
+        version: "2.11"
+  type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: simplecov
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
         - 0
-        - 4
+        - 6
+        version: "0.6"
+  type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: webmock
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 29
+        segments: 
+        - 1
+        - 9
+        version: "1.9"
+  type: :development
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: rr
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 1
         - 0
-        version: 0.4.0
+        version: "1.0"
   type: :development
-  version_requirements: *id004
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: factory_girl
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 2
+        - 6
+        version: "2.6"
+  type: :development
+  version_requirements: *id008
 description: 
 email: 
 - asuraci@vmware.com
@@ -89,17 +151,18 @@ extra_rdoc_files: []
 
 files: 
 - Rakefile
+- lib/manifests-vmc-plugin/version.rb
 - lib/manifests-vmc-plugin/errors.rb
-- lib/manifests-vmc-plugin/loader/builder.rb
+- lib/manifests-vmc-plugin/plugin.rb
+- lib/manifests-vmc-plugin/loader.rb
 - lib/manifests-vmc-plugin/loader/normalizer.rb
 - lib/manifests-vmc-plugin/loader/resolver.rb
-- lib/manifests-vmc-plugin/loader.rb
-- lib/manifests-vmc-plugin/plugin.rb
-- lib/manifests-vmc-plugin/version.rb
+- lib/manifests-vmc-plugin/loader/builder.rb
 - lib/manifests-vmc-plugin.rb
-- spec/loader/normalizer_spec.rb
-- spec/manifests-vmc-plugin_spec.rb
 - spec/spec_helper.rb
+- spec/manifests-vmc-plugin_spec.rb
+- spec/loader/normalizer_spec.rb
+has_rdoc: true
 homepage: http://cloudfoundry.com/
 licenses: []
 
@@ -129,11 +192,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: manifests-vmc-plugin
-rubygems_version: 1.8.24
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Cloud Foundry automation via manifest documents.
 test_files: 
-- spec/loader/normalizer_spec.rb
-- spec/manifests-vmc-plugin_spec.rb
 - spec/spec_helper.rb
+- spec/manifests-vmc-plugin_spec.rb
+- spec/loader/normalizer_spec.rb