You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@deltacloud.apache.org by lu...@redhat.com on 2013/03/01 01:08:20 UTC

Minor cleanup patches

These patches address a few small annoyances

David

Re: Minor cleanup patches

Posted by Michal Fojtik <mf...@redhat.com>.
On 02/28, lutter@redhat.com wrote:

ACK, pushing.

> 
> These patches address a few small annoyances
> 
> David

-- 
Michal Fojtik <mf...@redhat.com>
Deltacloud API, CloudForms

[PATCH 2/3] * tests/test_helper.rb: quietly ignore missing 'turn'

Posted by lu...@redhat.com.
From: David Lutterkort <lu...@redhat.com>

---
 server/tests/test_helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/tests/test_helper.rb b/server/tests/test_helper.rb
index 4d5b1ef..61ee26d 100644
--- a/server/tests/test_helper.rb
+++ b/server/tests/test_helper.rb
@@ -26,7 +26,7 @@ end
 begin
   require 'turn'
 rescue LoadError => e
-  warn "[WARN] The 'turn' gem is not available. (#{e.message})"
+  # We'll be fine
 end
 
 begin
-- 
1.8.1.2


[PATCH 3/3] * server/.gitignore: ignore .bundle/ dir

Posted by lu...@redhat.com.
From: David Lutterkort <lu...@redhat.com>

---
 server/.gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/server/.gitignore b/server/.gitignore
index ead216b..69c8e89 100644
--- a/server/.gitignore
+++ b/server/.gitignore
@@ -4,3 +4,4 @@ log/*.log
 tmp/*
 pkg/*
 *.lock
+.bundle/
-- 
1.8.1.2


[PATCH 1/3] CIMI (cimi_helper): remove unused code

Posted by lu...@redhat.com.
From: David Lutterkort <lu...@redhat.com>

---
 server/lib/cimi/helpers/cimi_helper.rb | 24 ------------------------
 1 file changed, 24 deletions(-)

diff --git a/server/lib/cimi/helpers/cimi_helper.rb b/server/lib/cimi/helpers/cimi_helper.rb
index 5e74c2c..e23d819 100644
--- a/server/lib/cimi/helpers/cimi_helper.rb
+++ b/server/lib/cimi/helpers/cimi_helper.rb
@@ -85,27 +85,3 @@ module CIMI
 
   end
 end
-
-class Array
-  def to_xml_cimi_collection(_self)
-    model_name = first.class.xml_tag_name
-    XmlSimple.xml_out({
-      "xmlns" => "http://schemas.dmtf.org/cimi/1",
-      "uri" => [ _self.send(:"#{model_name.underscore.pluralize}_url") ],
-      "name" => [ "default" ],
-      "created" => [ Time.now.to_s ],
-      model_name => map { |model| { 'href' => model.uri } }
-    }, :root_name => "#{model_name}Collection")
-  end
-
-  def to_json_cimi_collection(_self)
-    model_name = first.class.xml_tag_name
-    {
-      "uri" => _self.send(:"#{model_name.underscore.pluralize}_url"),
-      "name" => "default",
-      "created" => Time.now.to_s,
-      model_name.pluralize.uncapitalize => map { |model| { 'href' => model.uri } }
-    }.to_json
-  end
-
-end
-- 
1.8.1.2


Re: Minor cleanup patches

Posted by "marios@redhat.com" <ma...@redhat.com>.
On 01/03/13 02:08, lutter@redhat.com wrote:
> These patches address a few small annoyances
> 
> David
> 
ACK