Skip to content
This repository has been archived by the owner on Jan 26, 2022. It is now read-only.

Commit

Permalink
Rename PluginOrchestrator to PluginRunner
Browse files Browse the repository at this point in the history
Test plan:
- Unit tests pass

Change-Id: I38f73612d0a541dc2031885b9be8a55b23c5a1d3
  • Loading branch information
mpage committed Nov 7, 2011
1 parent 96f1192 commit 1ef58a4
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 19 deletions.
4 changes: 2 additions & 2 deletions stager/lib/vcap/stager.rb
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
require 'vcap/stager/constants'
require 'vcap/stager/config'
require 'vcap/stager/plugin_action_proxy'
require 'vcap/stager/plugin_orchestrator'
require 'vcap/stager/plugin_orchestrator_error'
require 'vcap/stager/plugin_runner'
require 'vcap/stager/plugin_runner_error'
require 'vcap/stager/plugin_registry'
require 'vcap/stager/task'
require 'vcap/stager/task_error'
Expand Down
8 changes: 0 additions & 8 deletions stager/lib/vcap/stager/plugin_orchestrator_error.rb

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
require 'fileutils'
require 'rubygems'


require 'vcap/cloud_controller/ipc'
require 'vcap/logging'
require 'vcap/stager/constants'
require 'vcap/stager/droplet'
require 'vcap/stager/plugin_action_proxy'
require 'vcap/stager/plugin_orchestrator_error'
require 'vcap/stager/plugin_runner_error'
require 'vcap/stager/plugin_registry'

module VCAP
Expand All @@ -17,7 +16,7 @@ module Stager

# Responsible for orchestrating the execution of all staging plugins selected
# by the user.
class VCAP::Stager::PluginOrchestrator
class VCAP::Stager::PluginRunner
# @param source_dir String Directory containing application source
# @param dest_dir String Directory where the staged droplet should live
# @param app_properties
Expand Down
8 changes: 8 additions & 0 deletions stager/lib/vcap/stager/plugin_runner_error.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
module VCAP
module Stager
class PluginRunnerError < StandardError; end
class MissingFrameworkPluginError < PluginRunnerError; end
class DuplicateFrameworkPluginError < PluginRunnerError; end
class UnknownPluginTypeError < PluginRunnerError; end
end
end
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
require 'fileutils'
require 'tmpdir'

describe VCAP::Stager::PluginOrchestrator do
describe VCAP::Stager::PluginRunner do
describe '#run_plugins' do
before :each do
@src_dir = Dir.mktmpdir
Expand Down Expand Up @@ -37,14 +37,14 @@

it 'should raise an error for unknown plugins' do
@app_props['plugins'] = [{'gem' => {'name' => 'invalid_gem'}}]
orch = VCAP::Stager::PluginOrchestrator.new(@src_dir, @dst_dir, @app_props, @cc_info)
orch = VCAP::Stager::PluginRunner.new(@src_dir, @dst_dir, @app_props, @cc_info)
expect do
orch.run_plugins
end.to raise_error(LoadError)
end

it 'should raise an error if no framework plugin is supplied' do
orch = VCAP::Stager::PluginOrchestrator.new(@src_dir, @dst_dir, @app_props, @cc_info)
orch = VCAP::Stager::PluginRunner.new(@src_dir, @dst_dir, @app_props, @cc_info)
expect do
orch.run_plugins
end.to raise_error(VCAP::Stager::MissingFrameworkPluginError)
Expand All @@ -56,7 +56,7 @@
p = create_mock_plugin("plugin_#{i}", :framework)
VCAP::Stager::PluginRegistry.register_plugin(p)
end
orch = VCAP::Stager::PluginOrchestrator.new(@src_dir, @dst_dir, @app_props, @cc_info)
orch = VCAP::Stager::PluginRunner.new(@src_dir, @dst_dir, @app_props, @cc_info)
expect do
orch.run_plugins
end.to raise_error(VCAP::Stager::DuplicateFrameworkPluginError)
Expand All @@ -65,7 +65,7 @@
it 'should raise an error if a plugin of unknown type is supplied' do
p = create_mock_plugin(:plugin0, :invalid_plugin_type)
VCAP::Stager::PluginRegistry.register_plugin(p)
orch = VCAP::Stager::PluginOrchestrator.new(@src_dir, @dst_dir, @app_props, @cc_info)
orch = VCAP::Stager::PluginRunner.new(@src_dir, @dst_dir, @app_props, @cc_info)
expect do
orch.run_plugins
end.to raise_error(VCAP::Stager::UnknownPluginTypeError)
Expand All @@ -78,7 +78,7 @@
p.should_receive(:stage).with(any_args())
VCAP::Stager::PluginRegistry.register_plugin(p)
end
orch = VCAP::Stager::PluginOrchestrator.new(@src_dir, @dst_dir, @app_props, @cc_info)
orch = VCAP::Stager::PluginRunner.new(@src_dir, @dst_dir, @app_props, @cc_info)
orch.run_plugins
end
end
Expand Down

0 comments on commit 1ef58a4

Please sign in to comment.