Ack,
Thanks
----- Original Message -----
From: "Mark McLoughlin" <markmc(a)redhat.com>
To: aeolus-devel(a)lists.fedorahosted.org
Cc: "Mark McLoughlin" <markmc(a)redhat.com>, "Martyn Taylor"
<mtaylor(a)redhat.com>
Sent: Wednesday, 20 July, 2011 9:21:07 AM
Subject: [PATCH aeolus-image] Rename image_factory_console to imagefactory-console
As discussed here:
https://fedorahosted.org/pipermail/aeolus-devel/2011-July/003247.html
An RPM called rubygem-image_factory_console is a bit ugly, its common
for gem names to use hyphen as a separator and imagefactory is the name
of Image Factory's RPM.
So, imagefactory-console makes the most sense as the gem name.
---
services/image_factory/aeolus-image/Rakefile | 2 +-
.../aeolus-image/lib/build_command.rb | 2 +-
.../aeolus-image/rubygem-aeolus-image.spec | 2 +-
services/image_factory/console/Rakefile | 4 ++--
.../image_factory/console/lib/image_factory.rb | 2 --
services/image_factory/console/lib/imagefactory.rb | 2 ++
.../base_handler.rb | 0
.../console.rb} | 0
...sole.spec => rubygem-imagefactory-console.spec} | 2 +-
services/image_factory/console/spec/spec_helper.rb | 2 +-
10 files changed, 9 insertions(+), 9 deletions(-)
delete mode 100644 services/image_factory/console/lib/image_factory.rb
create mode 100644 services/image_factory/console/lib/imagefactory.rb
rename services/image_factory/console/lib/{image_factory =>
imagefactory}/base_handler.rb (100%)
rename services/image_factory/console/lib/{image_factory/image_factory_console.rb =>
imagefactory/console.rb} (100%)
rename services/image_factory/console/{rubygem-image_factory_console.spec =>
rubygem-imagefactory-console.spec} (97%)
diff --git a/services/image_factory/aeolus-image/Rakefile
b/services/image_factory/aeolus-image/Rakefile
index c9bfb7b..2bac2e0 100644
--- a/services/image_factory/aeolus-image/Rakefile
+++ b/services/image_factory/aeolus-image/Rakefile
@@ -26,7 +26,7 @@ spec = Gem::Specification.new do |s|
s.bindir = "bin"
s.add_dependency('nokogiri', '>=0.4.0')
s.add_dependency('rest-client')
- s.add_dependency('image_factory_console', '>=0.4.0')
+ s.add_dependency('imagefactory-console', '>=0.4.0')
s.add_development_dependency('rspec', '~>1.3.0')
end
diff --git a/services/image_factory/aeolus-image/lib/build_command.rb
b/services/image_factory/aeolus-image/lib/build_command.rb
index ee8b89c..8712a55 100644
--- a/services/image_factory/aeolus-image/lib/build_command.rb
+++ b/services/image_factory/aeolus-image/lib/build_command.rb
@@ -1,4 +1,4 @@
-require 'image_factory'
+require 'imagefactory'
module Aeolus
module Image
diff --git a/services/image_factory/aeolus-image/rubygem-aeolus-image.spec
b/services/image_factory/aeolus-image/rubygem-aeolus-image.spec
index aa55a2a..f7f5e06 100644
--- a/services/image_factory/aeolus-image/rubygem-aeolus-image.spec
+++ b/services/image_factory/aeolus-image/rubygem-aeolus-image.spec
@@ -17,7 +17,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u}
-n)
Requires: rubygems
Requires: rubygem(nokogiri) >= 1.4.0
Requires: rubygem(rest-client)
-Requires: rubygem(image_factory_console) >= 0.4.0
+Requires: rubygem(imagefactory-console) >= 0.4.0
BuildRequires: rubygems
BuildArch: noarch
diff --git a/services/image_factory/console/Rakefile
b/services/image_factory/console/Rakefile
index 7c9b95c..42e576a 100644
--- a/services/image_factory/console/Rakefile
+++ b/services/image_factory/console/Rakefile
@@ -28,10 +28,10 @@ require 'spec/rake/spectask'
require 'rake/rpmtask'
RPMBUILD_DIR = "#{File.expand_path('~')}/rpmbuild"
-RPM_SPEC = "rubygem-image_factory_console.spec"
+RPM_SPEC = "rubygem-imagefactory-console.spec"
spec = Gem::Specification.new do |s|
- s.name = 'image_factory_console'
+ s.name = 'imagefactory-console'
s.version = '0.4.0'
s.has_rdoc = true
#s.extra_rdoc_files = ['README', 'COPYING']
diff --git a/services/image_factory/console/lib/image_factory.rb
b/services/image_factory/console/lib/image_factory.rb
deleted file mode 100644
index af8f3f9..0000000
--- a/services/image_factory/console/lib/image_factory.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-require 'image_factory/image_factory_console'
-require 'image_factory/base_handler'
\ No newline at end of file
diff --git a/services/image_factory/console/lib/imagefactory.rb
b/services/image_factory/console/lib/imagefactory.rb
new file mode 100644
index 0000000..2a8bc29
--- /dev/null
+++ b/services/image_factory/console/lib/imagefactory.rb
@@ -0,0 +1,2 @@
+require 'imagefactory/console'
+require 'imagefactory/base_handler'
diff --git a/services/image_factory/console/lib/image_factory/base_handler.rb
b/services/image_factory/console/lib/imagefactory/base_handler.rb
similarity index 100%
rename from services/image_factory/console/lib/image_factory/base_handler.rb
rename to services/image_factory/console/lib/imagefactory/base_handler.rb
diff --git a/services/image_factory/console/lib/image_factory/image_factory_console.rb
b/services/image_factory/console/lib/imagefactory/console.rb
similarity index 100%
rename from services/image_factory/console/lib/image_factory/image_factory_console.rb
rename to services/image_factory/console/lib/imagefactory/console.rb
diff --git a/services/image_factory/console/rubygem-image_factory_console.spec
b/services/image_factory/console/rubygem-imagefactory-console.spec
similarity index 97%
rename from services/image_factory/console/rubygem-image_factory_console.spec
rename to services/image_factory/console/rubygem-imagefactory-console.spec
index 57d93ab..59cfc8a 100644
--- a/services/image_factory/console/rubygem-image_factory_console.spec
+++ b/services/image_factory/console/rubygem-imagefactory-console.spec
@@ -1,7 +1,7 @@
# Generated from image_factory_console-0.2.0.gem by gem2rpm -*- rpm-spec -*-
%define ruby_sitelib %(ruby -rrbconfig -e "puts
Config::CONFIG['sitelibdir']")
%define gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
-%define gemname image_factory_console
+%define gemname imagefactory-console
%define geminstdir %{gemdir}/gems/%{gemname}-%{version}
Summary: QMF Console for Aeolus Image Factory
diff --git a/services/image_factory/console/spec/spec_helper.rb
b/services/image_factory/console/spec/spec_helper.rb
index 56baf4a..3772953 100644
--- a/services/image_factory/console/spec/spec_helper.rb
+++ b/services/image_factory/console/spec/spec_helper.rb
@@ -1,3 +1,3 @@
$: << File.expand_path(File.join(File.dirname(__FILE__), "../lib"))
require 'rubygems'
-require 'image_factory'
+require 'imagefactory'
--
1.7.4.4
_______________________________________________
aeolus-devel mailing list
aeolus-devel(a)lists.fedorahosted.org
https://fedorahosted.org/mailman/listinfo/aeolus-devel