cf 4.2.4 → 4.2.5

data/lib/cf.rb

@@ -9,8 +9,8 @@ Dir[File.expand_path(command_files, __FILE__)].each do |file|
   require file unless File.basename(file) == 'base.rb'
 end
 
+require "manifests/plugin"
 require "admin/plugin"
 require "console/plugin"
 require "tunnel/plugin"
-require "manifests/plugin"
 require "micro/plugin"

data/lib/cf/version.rb

@@ -1,3 +1,3 @@
 module CF
-  VERSION = "4.2.4".freeze
+  VERSION = "4.2.5".freeze
 end

data/lib/console/plugin.rb

@@ -22,6 +22,8 @@ module CFConsolePlugin
       console.start_console
     end
 
+    ::ManifestsPlugin.default_to_app_from_manifest :console, true
+
     filter(:start, :start_app) do |app|
       app.console = true
       app

data/lib/manifests/plugin.rb

@@ -5,23 +5,21 @@ require "manifests/manifests"
 class ManifestsPlugin < CF::App::Base
   include CFManifests
 
-  option :manifest, :aliases => "-m", :value => :file,
-    :desc => "Path to manifest file to use"
+  def self.default_to_app_from_manifest(command, fail_without_app)
+    name_made_optional = change_argument(command, :app, :optional)
+    around(command) do |cmd, input|
+      wrap_with_optional_name(name_made_optional, cmd, input, fail_without_app)
+    end
+  end
 
+  option :manifest, :aliases => "-m", :value => :file, :desc => "Path to manifest file to use"
 
-  [ :start, :restart, :instances, :logs, :env, :health, :stats,
-    :scale, :app, :stop, :delete, :events
-  ].each do |wrap|
-    name_made_optional = change_argument(wrap, :app, :optional)
 
-    around(wrap) do |cmd, input|
-      wrap_with_optional_name(name_made_optional, cmd, input)
-    end
+  [:start, :restart, :instances, :logs, :env, :health, :stats, :scale, :app, :stop, :delete, :events].each do |command|
+    ::ManifestsPlugin.default_to_app_from_manifest command, true
   end
 
-
-  add_input :push, :reset, :desc => "Reset to values in the manifest",
-            :default => false
+  add_input :push, :reset, :desc => "Reset to values in the manifest", :default => false
 
   around(:push) do |push, input|
     wrap_push(push, input)
@@ -29,12 +27,12 @@ class ManifestsPlugin < CF::App::Base
 
   private
 
-  def wrap_with_optional_name(name_made_optional, cmd, input)
+  def wrap_with_optional_name(name_made_optional, cmd, input, fail_without_app)
     return cmd.call if input[:all]
 
     unless manifest
       # if the command knows how to handle this
-      if input.has?(:app) || !name_made_optional
+      if input.has?(:app) || !name_made_optional || !fail_without_app
         return cmd.call
       else
         return no_apps
@@ -55,7 +53,7 @@ class ManifestsPlugin < CF::App::Base
     internal = internal.collect { |app| app[:name] }
 
     apps = internal + external
-    return no_apps if apps.empty?
+    return no_apps if fail_without_app && apps.empty?
 
     apps.each.with_index do |app, num|
       line unless quiet? || num == 0

data/spec/manifests/plugin_spec.rb

@@ -18,11 +18,27 @@ describe ManifestsPlugin do
     plugin.stub(:client) { client }
   end
 
+  describe ".use_manifest_for_app_input" do
+    it "makes the app argument optional and wraps it in an around that gets the app from the manifest" do
+      command = described_class.commands[:app]
+      command.instance_variable_set(:@arguments, [{:name => :app, :type => :required, :value => nil}])
+
+      expect(command.arguments).to eq [{:name => :app, :type => :required, :value => nil}]
+      expect(command.around.size).to eq 1
+
+      described_class.default_to_app_from_manifest :app, false
+
+      expect(command.arguments).to eq [{:name => :app, :type => :optional, :value => nil}]
+      expect(command.around.size).to eq 2
+    end
+  end
+
   describe "#wrap_with_optional_name" do
     let(:name_made_optional) { true }
+    let(:fail_without_app) { true }
     let(:wrapped) { double(:wrapped).as_null_object }
 
-    subject { plugin.send(:wrap_with_optional_name, name_made_optional, wrapped, inputs) }
+    subject { plugin.send(:wrap_with_optional_name, name_made_optional, wrapped, inputs, fail_without_app) }
 
     context "when --all is given" do
       let(:inputs_hash) { { :all => true } }
@@ -55,6 +71,14 @@ describe ManifestsPlugin do
             plugin.should_receive(:no_apps)
             subject
           end
+
+          context "when it is not supposed to fail" do
+            let(:fail_without_app) { false }
+            it "doesnt fail" do
+              plugin.should_not_receive(:no_apps)
+              subject
+            end
+          end
         end
 
         context "and we did NOT make it optional" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cf
 version: !ruby/object:Gem::Version
-  version: 4.2.4
+  version: 4.2.5
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-18 00:00:00.000000000 Z
+date: 2013-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -429,7 +429,6 @@ files:
 - lib/manifests/loader.rb
 - lib/manifests/manifests.rb
 - lib/manifests/plugin.rb
-- lib/manifests/README.md
 - lib/micro/errors.rb
 - lib/micro/micro.rb
 - lib/micro/plugin.rb
@@ -614,7 +613,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1109668810208652656
+      hash: -2757679513979336961
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -623,7 +622,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1109668810208652656
+      hash: -2757679513979336961
 requirements: []
 rubyforge_project: cf
 rubygems_version: 1.8.25

data/lib/manifests/README.md

@@ -1,13 +0,0 @@
-[![Build Status](https://travis-ci.org/cloudfoundry/manifests-cf-plugin.png)](https://travis-ci.org/cloudfoundry/manifests-cf-plugin)
-[![Gem Version](https://badge.fury.io/rb/manifests-cf-plugin.png)](http://badge.fury.io/rb/manifests-cf-plugin)
-[![Code Climate](https://codeclimate.com/github/cloudfoundry/manifests-cf-plugin.png)](https://codeclimate.com/github/cloudfoundry/manifests-cf-plugin)
-
-## Manifests
-### Info
-With this plugin enabled, any configuration changes you make using the CF `start`, `restart`, `instances`, `logs`, `env`, `health`, `stats`, `scale`, and `app` commands will be saved to a file called *manifest.yml*.
-
-### Installation
-```
-gem install manifests-cf-plugin
-```
-