manifests-vmc-plugin 0.6.2 → 0.6.3.rc1

data/Rakefile

@@ -1,38 +1,5 @@
 require "rake"
 require "rspec/core/rake_task"
 
-$LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
-require "manifests-vmc-plugin/version"
-
 RSpec::Core::RakeTask.new(:spec)
 task :default => :spec
-
-namespace :deploy do
-  def last_staging_sha
-    `git rev-parse latest-staging`.strip
-  end
-
-  def last_release_sha
-    `git rev-parse latest-release`.strip
-  end
-
-  def last_staging_ref_was_released?
-    last_staging_sha == last_release_sha
-  end
-
-  task :staging, :version do |_, args|
-    sh "gem bump --push #{"--version #{args.version}" if args.version}" if last_staging_ref_was_released?
-    sh "git tag -f latest-staging"
-    sh "git push origin :latest-staging"
-    sh "git push origin latest-staging"
-  end
-
-  task :gem do
-    sh "git fetch"
-    sh "git checkout #{last_staging_sha}"
-    sh "gem release --tag"
-    sh "git tag -f latest-release"
-    sh "git push origin :latest-release"
-    sh "git push origin latest-release"
-  end
-end

data/lib/manifests-vmc-plugin.rb

@@ -186,6 +186,10 @@ module VMCManifests
       meta["command"] = cmd
     end
 
+    if buildpack = app.buildpack
+      meta["buildpack"] = buildpack
+    end
+
     meta
   end
 

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

@@ -1,4 +1,16 @@
 module VMCManifests
+  class InvalidManifest < RuntimeError
+    attr_reader :file
+
+    def initialize(file)
+      @file = file
+    end
+
+    def to_s
+      "Manifest file '#{@file}' is malformed."
+    end
+  end
+
   class CircularDependency < RuntimeError
     def initialize(app)
       @app = app

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

@@ -3,11 +3,14 @@ module VMCManifests
     # parse a manifest and merge with its inherited manifests
     def build(file)
       manifest = YAML.load_file file
+      raise InvalidManifest.new(file) unless manifest
 
       Array(manifest["inherit"]).each do |path|
         manifest = merge_parent(path, manifest)
       end
 
+      manifest.delete("inherit")
+
       manifest
     end
 

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

@@ -1,3 +1,3 @@
 module VMCManifests
-  VERSION = "0.6.2".freeze
+  VERSION = "0.6.3.rc1".freeze
 end

data/spec/manifests-vmc-plugin/errors_spec.rb

@@ -0,0 +1,29 @@
+require "spec_helper"
+
+require "manifests-vmc-plugin/errors"
+
+
+describe VMCManifests::InvalidManifest do
+  let(:file) { "/path/to/file" }
+
+  subject { described_class.new(file) }
+
+  describe "#initialize" do
+    it "is initialized with a file" do
+      described_class.new(file)
+    end
+  end
+
+  describe "#to_s" do
+    it "says the file is malformed" do
+      expect(subject.to_s).to eq(
+        "Manifest file '#{file}' is malformed.")
+    end
+  end
+
+  describe "#file" do
+    it "returns the file it was initialized with" do
+      expect(subject.file).to eq(file)
+    end
+  end
+end

data/spec/manifests-vmc-plugin/loader/builder_spec.rb

@@ -0,0 +1,84 @@
+require "spec_helper"
+
+require "manifests-vmc-plugin/loader"
+require "manifests-vmc-plugin/errors"
+
+
+describe VMCManifests::Builder do
+  subject { VMCManifests::Loader.new(nil, nil) }
+
+  describe "#build" do
+    let(:file) { "manifest.yml" }
+
+    before do
+      FakeFS.activate!
+
+      File.open(file, "w") do |io|
+        io.write manifest
+      end
+    end
+
+    after do
+      FakeFS.deactivate!
+      FakeFS::FileSystem.clear
+    end
+
+    context "with a simple manifest" do
+      let(:manifest) do
+        <<EOF
+---
+foo: bar
+EOF
+      end
+
+      it "loads the manifest YAML" do
+        expect(subject.build(file)).to eq("foo" => "bar")
+      end
+    end
+
+    context "with a manifest that inherits another" do
+      let(:manifest) do
+        <<EOF
+---
+inherit: other-manifest.yml
+foo:
+  baz: c
+EOF
+      end
+
+      before do
+        FakeFS.activate!
+
+        File.open("other-manifest.yml", "w") do |io|
+          io.write <<OTHER
+---
+foo:
+  bar: a
+  baz: b
+OTHER
+        end
+      end
+
+      it "merges itself into the parent, by depth" do
+        manifest = subject.build(file)
+        expect(manifest).to include(
+          "foo" => { "bar" => "a", "baz" => "c" })
+      end
+
+      it "does not include the 'inherit' attribute" do
+        manifest = subject.build(file)
+        expect(manifest).to_not include("inherit")
+      end
+    end
+
+    context "with an invalid manifest" do
+      let(:manifest) { "" }
+
+      it "raises an error" do
+        expect {
+          subject.build(file)
+        }.to raise_error(VMCManifests::InvalidManifest)
+      end
+    end
+  end
+end

data/spec/manifests-vmc-plugin_spec.rb

@@ -53,6 +53,7 @@ describe VMCManifests do
         :memory => 2048,
         :total_instances => 2,
         :command => "ruby main.rb",
+        :buildpack => "git://example.com/foo.git",
         :routes => [
           fake(:route,
                :host => "some-app-name",
@@ -83,6 +84,7 @@ describe VMCManifests do
     its(["path"]) { should eq "some-path" }
     its(["url"]) { should eq "some-app-name.${target-base}" }
     its(["command"]) { should eq "ruby main.rb" }
+    its(["buildpack"]) { should eq "git://example.com/foo.git" }
 
     it "contains the service information" do
       expect(subject["services"]).to be_a Hash

data/spec/spec_helper.rb

@@ -6,6 +6,7 @@ require "cfoundry"
 require "webmock"
 require "cfoundry/test_support"
 require "vmc/test_support"
+require "fakefs/safe"
 
 WebMock.disable_net_connect!
 
@@ -13,4 +14,4 @@ RSpec.configure do |c|
   c.include Fake::FakeMethods
   c.include VMC::TestSupport::InteractHelper
   c.mock_with :rr
-end
+end

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: manifests-vmc-plugin
 version: !ruby/object:Gem::Version 
-  hash: 3
-  prerelease: 
+  hash: -2300990570
+  prerelease: 6
   segments: 
   - 0
   - 6
-  - 2
-  version: 0.6.2
+  - 3
+  - rc
+  - 1
+  version: 0.6.3.rc1
 platform: ruby
 authors: 
 - Alex Suraci
@@ -15,20 +17,29 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-03-05 00:00:00 Z
+date: 2013-03-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: -2300990558
         segments: 
         - 0
         - 5
-        - 2
-        version: 0.5.2
+        - 3
+        - rc
+        - 3
+        version: 0.5.3.rc3
+    - - <
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 0
+        - 6
+        version: "0.6"
   prerelease: false
   type: :runtime
   name: cfoundry
@@ -112,8 +123,10 @@ files:
 - lib/manifests-vmc-plugin/plugin.rb
 - lib/manifests-vmc-plugin/version.rb
 - lib/manifests-vmc-plugin.rb
+- spec/manifests-vmc-plugin/errors_spec.rb
+- spec/manifests-vmc-plugin/loader/builder_spec.rb
 - spec/manifests-vmc-plugin/loader/normalizer_spec.rb
-- spec/manifests-vmc-plugin/loader/plugin_spec.rb
+- spec/manifests-vmc-plugin/plugin_spec.rb
 - spec/manifests-vmc-plugin_spec.rb
 - spec/spec_helper.rb
 homepage: http://cloudfoundry.com/
@@ -136,12 +149,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: manifests-vmc-plugin
@@ -150,7 +165,9 @@ signing_key:
 specification_version: 3
 summary: Cloud Foundry automation via manifest documents.
 test_files: 
+- spec/manifests-vmc-plugin/errors_spec.rb
+- spec/manifests-vmc-plugin/loader/builder_spec.rb
 - spec/manifests-vmc-plugin/loader/normalizer_spec.rb
-- spec/manifests-vmc-plugin/loader/plugin_spec.rb
+- spec/manifests-vmc-plugin/plugin_spec.rb
 - spec/manifests-vmc-plugin_spec.rb
 - spec/spec_helper.rb