From: Martyn Taylor <mtaylor(a)redhat.com>
---
bin/aeolus-image | 4 ++--
lib/aeolus_cli/command/base_command.rb | 2 +-
lib/aeolus_cli/command/build_command.rb | 2 +-
lib/aeolus_cli/command/config_parser.rb | 2 +-
lib/aeolus_cli/command/delete_command.rb | 2 +-
lib/aeolus_cli/command/import_command.rb | 2 +-
lib/aeolus_cli/command/list_command.rb | 2 +-
lib/aeolus_cli/command/push_command.rb | 2 +-
spec/base_command_spec.rb | 2 +-
spec/build_command_spec.rb | 2 +-
spec/config_parser_spec.rb | 2 +-
spec/import_command_spec.rb | 2 +-
spec/list_command_spec.rb | 2 +-
spec/push_command_spec.rb | 2 +-
spec/spec_helper.rb | 4 +---
15 files changed, 16 insertions(+), 18 deletions(-)
diff --git a/bin/aeolus-image b/bin/aeolus-image
index a6ddbee..f3af29b 100755
--- a/bin/aeolus-image
+++ b/bin/aeolus-image
@@ -15,6 +15,6 @@
# limitations under the License.
$: << File.expand_path(File.dirname(__FILE__) + '/../lib')
-require 'aeolus_cli.rb'
-parser = Aeolus::Image::ConfigParser.new(ARGV)
+require 'aeolus_cli'
+parser = Aeolus::CLI::ConfigParser.new(ARGV)
puts parser.process
diff --git a/lib/aeolus_cli/command/base_command.rb
b/lib/aeolus_cli/command/base_command.rb
index 5d3f8ed..c727098 100644
--- a/lib/aeolus_cli/command/base_command.rb
+++ b/lib/aeolus_cli/command/base_command.rb
@@ -17,7 +17,7 @@ require 'rest_client'
require 'nokogiri'
module Aeolus
- module Image
+ module CLI
#This will house some methods that multiple Command classes need to use.
class BaseCommand
attr_accessor :options
diff --git a/lib/aeolus_cli/command/build_command.rb
b/lib/aeolus_cli/command/build_command.rb
index 651b0e9..78b361c 100644
--- a/lib/aeolus_cli/command/build_command.rb
+++ b/lib/aeolus_cli/command/build_command.rb
@@ -15,7 +15,7 @@
require 'imagefactory'
module Aeolus
- module Image
+ module CLI
class BuildCommand < BaseCommand
attr_accessor :console
def initialize(opts={}, logger=nil)
diff --git a/lib/aeolus_cli/command/config_parser.rb
b/lib/aeolus_cli/command/config_parser.rb
index 98e1c00..249dc32 100644
--- a/lib/aeolus_cli/command/config_parser.rb
+++ b/lib/aeolus_cli/command/config_parser.rb
@@ -16,7 +16,7 @@ require 'optparse'
require 'logger'
module Aeolus
- module Image
+ module CLI
class ConfigParser
COMMANDS = %w(list build push import delete)
attr_accessor :options, :command, :args
diff --git a/lib/aeolus_cli/command/delete_command.rb
b/lib/aeolus_cli/command/delete_command.rb
index ba9078e..96cebcc 100644
--- a/lib/aeolus_cli/command/delete_command.rb
+++ b/lib/aeolus_cli/command/delete_command.rb
@@ -13,7 +13,7 @@
# limitations under the License.
module Aeolus
- module Image
+ module CLI
class DeleteCommand < BaseCommand
def initialize(opts={}, logger=nil)
super(opts, logger)
diff --git a/lib/aeolus_cli/command/import_command.rb
b/lib/aeolus_cli/command/import_command.rb
index 8fa15cf..aea159f 100644
--- a/lib/aeolus_cli/command/import_command.rb
+++ b/lib/aeolus_cli/command/import_command.rb
@@ -13,7 +13,7 @@
# limitations under the License.
module Aeolus
- module Image
+ module CLI
class ImportCommand < BaseCommand
def initialize(opts={}, logger=nil)
super(opts, logger)
diff --git a/lib/aeolus_cli/command/list_command.rb
b/lib/aeolus_cli/command/list_command.rb
index f350c9a..09d029e 100644
--- a/lib/aeolus_cli/command/list_command.rb
+++ b/lib/aeolus_cli/command/list_command.rb
@@ -13,7 +13,7 @@
# limitations under the License.
module Aeolus
- module Image
+ module CLI
class ListCommand < BaseCommand
def initialize(opts={}, logger=nil)
super(opts, logger)
diff --git a/lib/aeolus_cli/command/push_command.rb
b/lib/aeolus_cli/command/push_command.rb
index 275ed37..6068e5c 100644
--- a/lib/aeolus_cli/command/push_command.rb
+++ b/lib/aeolus_cli/command/push_command.rb
@@ -15,7 +15,7 @@
require 'rest_client'
module Aeolus
- module Image
+ module CLI
class PushCommand < BaseCommand
attr_accessor :console
def initialize(opts={}, logger=nil)
diff --git a/spec/base_command_spec.rb b/spec/base_command_spec.rb
index 9c9042d..3078e62 100644
--- a/spec/base_command_spec.rb
+++ b/spec/base_command_spec.rb
@@ -15,7 +15,7 @@
require 'spec_helper'
module Aeolus
- module Image
+ module CLI
describe BaseCommand do
describe "configure_active_resource" do
it "should setup ActiveResource with endpoint and authentication" do
diff --git a/spec/build_command_spec.rb b/spec/build_command_spec.rb
index be4b2b9..c9887d0 100644
--- a/spec/build_command_spec.rb
+++ b/spec/build_command_spec.rb
@@ -15,7 +15,7 @@
require 'spec_helper'
module Aeolus
- module Image
+ module CLI
describe BuildCommand do
before(:each) do
@options[:target] = ['mock','ec2']
diff --git a/spec/config_parser_spec.rb b/spec/config_parser_spec.rb
index f920afb..8cb3c7c 100644
--- a/spec/config_parser_spec.rb
+++ b/spec/config_parser_spec.rb
@@ -15,7 +15,7 @@
require 'spec_helper'
module Aeolus
- module Image
+ module CLI
describe ConfigParser do
it "should parse the specified command" do
config_parser = ConfigParser.new(%w(list --images))
diff --git a/spec/import_command_spec.rb b/spec/import_command_spec.rb
index 6b9121a..9477f9e 100644
--- a/spec/import_command_spec.rb
+++ b/spec/import_command_spec.rb
@@ -15,7 +15,7 @@
require 'spec_helper'
module Aeolus
- module Image
+ module CLI
describe ImportCommand do
before(:each) do
@options[:id] = "ami-test"
diff --git a/spec/list_command_spec.rb b/spec/list_command_spec.rb
index bf7fc0d..9a7bbbb 100644
--- a/spec/list_command_spec.rb
+++ b/spec/list_command_spec.rb
@@ -15,7 +15,7 @@
require 'spec_helper'
module Aeolus
- module Image
+ module CLI
describe ListCommand do
end
end
diff --git a/spec/push_command_spec.rb b/spec/push_command_spec.rb
index 4d60606..5694e76 100644
--- a/spec/push_command_spec.rb
+++ b/spec/push_command_spec.rb
@@ -15,7 +15,7 @@
require 'spec_helper'
module Aeolus
- module Image
+ module CLI
describe PushCommand do
before(:each) do
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 435ff5c..a268424 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -30,8 +30,6 @@ require 'push_command'
require 'import_command'
require 'delete_command'
-
-
module Helpers
# Silences any stream for the duration of the block.
#
@@ -55,7 +53,7 @@ end
RSpec.configure do |config|
config.include Helpers
config.before(:all) do
- Aeolus::Image::BaseCommand.class_eval do
+ Aeolus::CLI::BaseCommand.class_eval do
def load_config
YAML::load(File.open(File.join(File.dirname(__FILE__),
"/../examples/aeolus-cli")))
end
--
1.7.6.2