manifests-vmc-plugin 0.4.19 → 0.5.0

data/lib/manifests-vmc-plugin.rb

@@ -117,11 +117,11 @@ module VMCManifests
   # returns the names that were not paths
   def specific_apps_or_all(input = nil, use_name = true, &blk)
     names_or_paths =
-      if input.given?(:apps)
+      if input.has?(:apps)
         # names may be given but be [], which will still cause
-        # interaction, so use #given instead of #[] here
-        input.given(:apps)
-      elsif input.given?(:app)
+        # interaction, so use #direct instead of #[] here
+        input.direct(:apps)
+      elsif input.has?(:app)
         [input[:app]]
       else
         []

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

@@ -22,7 +22,7 @@ class Manifests < VMC::App::Base
       next cmd.call if input[:all]
 
       unless manifest
-        if optional_name && !input.given?(:app)
+        if optional_name && !input.has?(:app)
           no_apps
         else
           next cmd.call
@@ -89,7 +89,7 @@ class Manifests < VMC::App::Base
 
   around(:push) do |push, input|
     particular =
-      if input.given?(:name)
+      if input.has?(:name)
         path = File.expand_path(input[:name])
         find_by = File.exists?(path) ? path : input[:name]
 

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

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

data/spec/manifests-vmc-plugin_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'manifests-vmc-plugin'
 
-require 'cfoundry/spec_helper'
+require 'cfoundry/test_support'
 
 describe VMCManifests do
   let(:cmd) do
@@ -28,32 +28,30 @@ describe VMCManifests do
 
   describe '#create_manifest_for' do
     let(:app) {
-      FactoryGirl.build(
-        :app,
-        :framework => FactoryGirl.build(:framework),
-        :runtime => FactoryGirl.build(:runtime),
+      fake :app,
+        :framework => fake(:framework),
+        :runtime => fake(:runtime),
         :memory => 2048,
         :instances => 2,
         :command => "ruby main.rb",
         :routes => [
-          FactoryGirl.build(
-            :route,
-            :host => "some-app-name",
-            :domain => FactoryGirl.build(:domain, :name => target_base))
+          fake(:route,
+               :host => "some-app-name",
+               :domain => fake(:domain, :name => target_base))
         ],
         :service_bindings => [
-          FactoryGirl.build(
+          fake(
             :service_binding,
             :service_instance =>
-              FactoryGirl.build(
+              fake(
                 :service_instance,
                 :name => "service-1",
                 :service_plan =>
-                  FactoryGirl.build(
+                  fake(
                     :service_plan,
                     :name => "P200",
-                    :service => FactoryGirl.build(:service))))
-        ])
+                    :service => fake(:service))))
+        ]
     }
 
     subject { cmd.create_manifest_for(app, "some-path") }
@@ -95,12 +93,11 @@ describe VMCManifests do
 
     context 'when there is no url' do
       let(:app) {
-        FactoryGirl.build(
-          :app,
-          :framework => FactoryGirl.build(:framework),
-          :runtime => FactoryGirl.build(:runtime),
+        fake :app,
+          :framework => fake(:framework),
+          :runtime => fake(:runtime),
           :memory => 2048,
-          :instances => 2)
+          :instances => 2
       }
 
       its(["url"]) { should eq "none" }
@@ -108,12 +105,11 @@ describe VMCManifests do
 
     context 'when there is no command' do
       let(:app) {
-        FactoryGirl.build(
-          :app,
-          :framework => FactoryGirl.build(:framework),
-          :runtime => FactoryGirl.build(:runtime),
+        fake :app,
+          :framework => fake(:framework),
+          :runtime => fake(:runtime),
           :memory => 2048,
-          :instances => 2)
+          :instances => 2
       }
 
       it { should_not include "command" }
@@ -121,12 +117,11 @@ describe VMCManifests do
 
     context 'when there are no service bindings' do
       let(:app) {
-        FactoryGirl.build(
-          :app,
-          :framework => FactoryGirl.build(:framework),
-          :runtime => FactoryGirl.build(:runtime),
+        fake :app,
+          :framework => fake(:framework),
+          :runtime => fake(:runtime),
           :memory => 2048,
-          :instances => 2)
+          :instances => 2
       }
 
       it { should_not include "services" }

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: manifests-vmc-plugin
 version: !ruby/object:Gem::Version 
-  hash: 41
+  hash: 11
   prerelease: 
   segments: 
   - 0
-  - 4
-  - 19
-  version: 0.4.19
+  - 5
+  - 0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Alex Suraci
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-12-15 00:00:00 -08:00
-default_executable: 
+date: 2013-01-15 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: cfoundry
@@ -34,26 +33,10 @@ dependencies:
         version: 0.4.0
   type: :runtime
   version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: vmc
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 0
-        - 4
-        - 7
-        version: 0.4.7
-  type: :development
-  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rake
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -64,11 +47,11 @@ dependencies:
         - 9
         version: "0.9"
   type: :development
-  version_requirements: *id003
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -79,26 +62,11 @@ dependencies:
         - 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
-        - 6
-        version: "0.6"
-  type: :development
-  version_requirements: *id005
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: webmock
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -109,11 +77,11 @@ dependencies:
         - 9
         version: "1.9"
   type: :development
-  version_requirements: *id006
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: rr
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -124,22 +92,7 @@ dependencies:
         - 0
         version: "1.0"
   type: :development
-  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
+  version_requirements: *id005
 description: 
 email: 
 - asuraci@vmware.com
@@ -151,18 +104,17 @@ extra_rdoc_files: []
 
 files: 
 - Rakefile
-- lib/manifests-vmc-plugin/version.rb
 - lib/manifests-vmc-plugin/errors.rb
-- lib/manifests-vmc-plugin/plugin.rb
-- lib/manifests-vmc-plugin/loader.rb
+- lib/manifests-vmc-plugin/loader/builder.rb
 - lib/manifests-vmc-plugin/loader/normalizer.rb
 - lib/manifests-vmc-plugin/loader/resolver.rb
-- lib/manifests-vmc-plugin/loader/builder.rb
+- lib/manifests-vmc-plugin/loader.rb
+- lib/manifests-vmc-plugin/plugin.rb
+- lib/manifests-vmc-plugin/version.rb
 - lib/manifests-vmc-plugin.rb
-- spec/spec_helper.rb
-- spec/manifests-vmc-plugin_spec.rb
 - spec/loader/normalizer_spec.rb
-has_rdoc: true
+- spec/manifests-vmc-plugin_spec.rb
+- spec/spec_helper.rb
 homepage: http://cloudfoundry.com/
 licenses: []
 
@@ -192,11 +144,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: manifests-vmc-plugin
-rubygems_version: 1.6.2
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Cloud Foundry automation via manifest documents.
 test_files: 
-- spec/spec_helper.rb
-- spec/manifests-vmc-plugin_spec.rb
 - spec/loader/normalizer_spec.rb
+- spec/manifests-vmc-plugin_spec.rb
+- spec/spec_helper.rb