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

data/lib/manifests-cf-plugin.rb

@@ -148,8 +148,6 @@ module CFManifests
   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",

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

@@ -94,10 +94,6 @@ module CFManifests
     end
 
     def normalize_app!(app)
-      if app["framework"].is_a?(Hash)
-        app["framework"] = app["framework"]["name"]
-      end
-
       if app.key?("mem")
         app["memory"] = app.delete("mem")
       end

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

@@ -70,8 +70,6 @@ class ManifestsPlugin < CF::App::Base
     app.total_instances = input[:instances] if input.has?(:instances)
     app.command = input[:command] if input.has?(:command)
     app.production = input[:plan].upcase.start_with?("P") if input.has?(:plan)
-    app.framework = input[:framework] if input.has?(:framework)
-    app.runtime = input[:runtime] if input.has?(:runtime)
     app.buildpack = input[:buildpack] if input.has?(:buildpack)
   end
 

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

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

data/spec/manifests-cf-plugin/loader/normalizer_spec.rb

@@ -87,20 +87,19 @@ describe CFManifests::Normalizer do
 
       context 'and applications' do
         let(:manifest) {
-          { "runtime" => "ruby19",
-            "applications" => {
+          { "applications" => {
               "./foo" => { "name" => "foo" },
               "./bar" => { "name" => "bar" },
-              "./baz" => { "name" => "baz", "runtime" => "ruby18" }
+              "./baz" => { "name" => "baz" }
             }
           }
         }
 
         it "merges the toplevel attributes into the applications" do
           expect(subject[:applications]).to match_array [
-            { :name => "foo", :path => "./foo", :runtime => "ruby19" },
-            { :name => "bar", :path => "./bar", :runtime => "ruby19" },
-            { :name => "baz", :path => "./baz", :runtime => "ruby18" }
+            { :name => "foo", :path => "./foo" },
+            { :name => "bar", :path => "./bar" },
+            { :name => "baz", :path => "./baz" }
           ]
         end
       end
@@ -151,20 +150,6 @@ describe CFManifests::Normalizer do
       manifest
     end
 
-    context 'with framework as a hash' do
-      let(:manifest) {
-        { "name" => "foo",
-          "framework" => { "name" => "ruby19", "mem" => "64M" }
-        }
-      }
-
-      it 'sets the framework to just the name' do
-        expect(subject).to eq(
-          "name" => "foo",
-          "framework" => "ruby19")
-      end
-    end
-
     context 'with mem instead of memory' do
       let(:manifest) { { "name" => "foo", "mem" => "128M" } }
 

data/spec/manifests-cf-plugin_spec.rb

@@ -47,8 +47,6 @@ describe CFManifests do
   describe '#create_manifest_for' do
     let(:app) {
       fake :app,
-        :framework => fake(:framework),
-        :runtime => fake(:runtime),
         :memory => 2048,
         :total_instances => 2,
         :command => "ruby main.rb",
@@ -76,8 +74,6 @@ describe CFManifests do
     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" }
@@ -113,8 +109,6 @@ describe CFManifests do
     context 'when there is no url' do
       let(:app) {
         fake :app,
-          :framework => fake(:framework),
-          :runtime => fake(:runtime),
           :memory => 2048,
           :total_instances => 2
       }
@@ -125,8 +119,6 @@ describe CFManifests do
     context 'when there is no command' do
       let(:app) {
         fake :app,
-          :framework => fake(:framework),
-          :runtime => fake(:runtime),
           :memory => 2048,
           :total_instances => 2
       }
@@ -137,8 +129,6 @@ describe CFManifests do
     context 'when there are no service bindings' do
       let(:app) {
         fake :app,
-          :framework => fake(:framework),
-          :runtime => fake(:runtime),
           :memory => 2048,
           :total_instances => 2
       }

metadata

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