linux-lxc 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e86c7168089ae71c61a0ce55cd11ad3ec15b857d
-  data.tar.gz: 179ee22a4ce4e3a2c707db3700cb009f2fc4a668
+  metadata.gz: c561e17dc08b0113ac3e405952735e7e525ed368
+  data.tar.gz: f26d4595440b473efa4a1e3f22c0d3cf6afcdf68
 SHA512:
-  metadata.gz: b81e2d74d31261d884b83e4660dfe1d69cc522f669804d8a403178dc773987727e49d255ad5649448d6ef4bace80fdb5770d2cdb2eca17d5476147b2a294eae5
-  data.tar.gz: 31936e38061c98f764b0d616ee4a1f15c980759c71e8d955bc95c9cec940a614d176507bb1953c109304445d16abfe52dd2e547cd24c6ed8610f621bf73e1028
+  metadata.gz: 1e48d4c369c63a3a4f208208bb904b7d2af9fc09dcddef6af904d20fa6e982df3b1f65907780c21faeae18332399596aee1384e961ab8368446666778c346057
+  data.tar.gz: c6db6179afede394feaa37c85bbac3bb253c0badd7a10b05d4fd68b01c3db92e703d1cf851a1d63b3e94c9cd36ac00965b410a21ce16577c8c6c21fa65d655de

data/lib/linux/lxc/line.rb

@@ -18,8 +18,9 @@ module Linux
         return if @key == '#'
         # remove from index
         lxc.remove_from_index(self)
+        uncomment = to_s
         @key = '#'
-        @value = '# ' + to_s
+        @value = '# ' + uncomment
         lxc.add_to_index(self)
       end
 

data/lib/linux/lxc/lines.rb

@@ -14,6 +14,10 @@ module Linux
         @lines.each { |line| block.call(line) }
       end
 
+      def select(&block)
+        @lines.select { |line| block.call(line) }
+      end
+
       def find(&block)
         @lines.find(&block)
       end

data/lib/linux/lxc/version.rb

@@ -1,5 +1,5 @@
 module Linux
   module Lxc
-    VERSION = '0.1.4'
+    VERSION = '0.1.5'
   end
 end

data/lib/linux/lxc.rb

@@ -7,12 +7,28 @@ require_relative 'lxc/index'
 
 module Linux
   module Lxc
+    def self.numeric_prefix_order(data)
+      data.sort do |a,b|
+        a_m = a.match(/^(\d+)(.*)$/)
+        b_m = b.match(/^(\d+)(.*)$/)
+        if a_m && b_m
+          ret = a_m[1].to_i <=> b_m[1].to_i
+          if ret == 0
+            ret = a_m[2] <=> b_m[2]
+          end
+          ret
+        else
+          a <=> b
+        end
+      end
+    end
+
     def self.parse(file, index = Index.new)
       if ::File.directory?(file)
         fname = file
         entries = ::Dir.glob(::File.join(file, '*.conf')).select { |f| ::File.file?(f) }
         dir = index.get_directory(fname)
-        entries.each do |entry|
+        numeric_prefix_order(entries).each do |entry|
           dir.add_file(entry).parse
         end
         return dir

data/test/linux_lxc_test.rb

@@ -203,6 +203,7 @@ SAMPLE
     assert_equal lxc.get('#').length, 43
     lxc.get('lxc.network').comment!
     assert_equal lxc.get('#').length, 47
+    assert_equal lxc.get('#')[45].to_s, '# lxc.network.link = lxcbr0'
     assert_equal lxc.get('lxc.network'), nil
     lxc.index.files.values.each do |file|
       file.real_fname = ::File.join(::File.dirname(file.file), "-.#{::File.basename(file.file)}")
@@ -290,4 +291,12 @@ SAMPLE
     assert_equal lxc_read.get('lxc.network.hwaddr').first.file, lxc.file
     assert_equal lxc_read.get('lxc.network.hwaddr').first.line, 18
   end
+
+  def test_numeric_prefix_order
+    assert_equal Linux::Lxc.numeric_prefix_order(["100_a", "1_b", "34d"]), ["1_b","34d","100_a"]
+    assert_equal Linux::Lxc.numeric_prefix_order(["1_c", "1_a", "1a"]), ["1_a","1_c","1a"]
+    assert_equal Linux::Lxc.numeric_prefix_order(["000100_a", "000001_b", "034d"]), ["000001_b","034d","000100_a"]
+    assert_equal Linux::Lxc.numeric_prefix_order(["foo","100_a", "000001_b", "bar", "34d"]), ["000001_b","34d","100_a","bar", "foo"]
+    assert_equal Linux::Lxc.numeric_prefix_order(["foo","yyy", "bar"]), ["bar", "foo", "yyy"]
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: linux-lxc
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Meno Abels
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-17 00:00:00.000000000 Z
+date: 2015-10-18 00:00:00.000000000 Z
 dependencies: []
 description: Parse the output of ip addr on a linux system
 email: