lxc 0.2.1 → 0.2.2

data/lib/lxc.rb

@@ -145,7 +145,7 @@ class LXC
   # @param [Array] args Additional command-line arguments.
   # @return [Array<String>] Output text of the "lxc-checkconfig" command.
   def checkconfig(*args)
-    self.exec("lxc-checkconfig", *args, " | #{SED_REMOVE_ANSI}").split("\n")
+    ZTK::ANSI.uncolor(self.exec("lxc-checkconfig", *args)).split("\n")
   end
 
   # Linux container command execution wrapper

data/lib/lxc/config.rb

@@ -100,6 +100,8 @@ class LXC
 
   private
 
+    NETWORK_KEY_ORDER = %w(lxc.network.type lxc.network.flags lxc.network.link lxc.network.name lxc.network.hwaddr lxc.network.ipv4 lxc.network.ipv6)
+
     def build_values(key, value)
       content = Array.new
 
@@ -120,8 +122,12 @@ class LXC
         content << build_values(key, value)
       end
       @networks.each do |network|
-        network.each do |key, value|
-          content << build_values(key, value)
+        network_keys = (network.keys - NETWORK_KEY_ORDER)
+        NETWORK_KEY_ORDER.each do |key|
+          network.has_key?(key) and (content << build_values(key, network[key]))
+        end
+        network_keys.each do |key|
+          content << build_values(key, network[key])
         end
       end
       content.join("\n")

data/lib/lxc/version.rb

@@ -2,7 +2,7 @@ class LXC
 
   unless const_defined?(:VERSION)
     # LXC Gem Version
-    VERSION = "0.2.1"
+    VERSION = "0.2.2"
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lxc
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-04 00:00:00.000000000 Z
+date: 2013-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ztk
@@ -216,7 +216,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -849561411533075041
+      hash: 936865488857019794
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -225,7 +225,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -849561411533075041
+      hash: 936865488857019794
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25