linux-lxc 0.0.4 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b046b82ebb5b24db19f4e93d53ee8c7b932f44b
-  data.tar.gz: 3fe3961749468474f2e673f45b283ab7e3db50ef
+  metadata.gz: c9ea4fb656b6d88f11202061ddf0177756b8e330
+  data.tar.gz: 801d1d04602c7ca47baaa87ae62bfdf8c7c7aa5e
 SHA512:
-  metadata.gz: e0b848e1d55edd2edbe26290c0f0f325baab67a8551887a7afa5636480faa960059ffc25065bf0b2f06bd080c121cee10d0d8ee03526c12a9c1ac007e92622ff
-  data.tar.gz: beb3d9773ef16949070c2816fc02be8714f1e4757e32d391944eabb9d2fae75d09effead7b7ec4df7f085ab0b0d35e9229e4aff36d2b126d0bcf31aea0e0dc1c
+  metadata.gz: ced9dd2ca6f1e5fa8d832981c2985a9d8cb7b50cbbef6ba9b2af30a39b255865ea20399692bc8710230153ebb4d43ec44444314caa97deb697bb0b16570f0dd2
+  data.tar.gz: 45b562050ef4c80f461b123531a25a5bd5a616780599abdf78ab46a94058e42fdf23508f7058922fd4c91e15504e01424fc6c8fb76b615dbb233209784e7201e

data/lib/linux/lxc/directory.rb

@@ -0,0 +1,53 @@
+#      def glob?
+#        @used_glob
+#      end
+
+#      def get_entries
+#        entries = []
+#        if ::File.directory?(file)
+#          @used_glob = true
+#          entries += ::Dir.glob(::File.join(file, "*")).select{|f| ::File.file?(f) }
+#        elsif ::File.file?(file)
+#          entries += [file]
+#        end
+#        entries
+#      end
+
+
+module Linux
+  module Lxc
+    class Directory
+      attr_reader :entries, :index, :file
+      def initialize(fname, index)
+        @file = fname
+        @index = index
+        @entries = {}
+      end
+
+      def all_lines(&block)
+        @entries.values.each do |entry|
+          entry.all_lines(&block)
+        end
+      end
+
+      def to_s
+        @file
+      end
+
+      def get(key)
+        @index.get_key(key)
+      end
+
+      def add_file(fname)
+        @entries[fname] ||= @index.add_file(fname, self)
+      end
+
+      def write
+        FileUtils.mkdir_p file
+        @entries.values.each do |entry|
+          entry.write
+        end
+      end
+    end
+  end
+end

data/lib/linux/lxc/file.rb

@@ -0,0 +1,116 @@
+
+module Linux
+  module Lxc
+    class File
+      attr_reader :index, :lines, :file, :dir
+      attr_accessor :real_fname
+
+      def initialize(file, dir, index)
+        self.file = file
+        @dir = dir
+        @lines = Lines.new
+        @index = index
+      end
+
+      # file is more important than real_fname
+      def file=(a)
+        @file = a
+        @real_fname = a
+      end
+
+      def get(key)
+        @index.get_key(key)
+      end
+
+      def key_to_path(key, &block)
+        path = ''
+        dot = ''
+        key.split('.').each do |element|
+          path += dot + element
+          dot = '.'
+          # puts ">>>>#{path}"
+          block.call(path)
+        end
+      end
+
+      def remove_from_index(line)
+        key_to_path(line.key) do |path|
+          lines = @index.get_key(path)
+          lines.remove(line)
+          @index.delete_key(path)
+        end
+      end
+
+      def add(key, value = nil)
+        key = key.strip
+        value = value.strip if value && value.instance_of?(String)
+        line = Line.new(self, key, value)
+        add_to_index(line)
+      end
+
+      def add_to_index(line)
+        key_to_path(line.key) do |path|
+          @index.add_line(path, line)
+        end
+      end
+
+      def all_lines(&block)
+        @lines.each do |line|
+          block.call(line)
+          line.value.all_lines(&block) if line.value.respond_to?(:all_lines)
+        end
+      end
+
+      # def files
+      #   ret = [Line.new(nil, 'lxc.include', self)]
+      #   all_lines do |line|
+      #     line.value.instance_of?(File) && (ret << line)
+      #   end
+      #   ret
+      # end
+
+      def entries
+        {file => self}
+      end
+
+      def write
+        FileUtils.mkdir_p ::File.dirname(real_fname)
+        ::File.open(real_fname, 'w') do |f|
+          @lines.each do |line|
+            if line.key == 'lxc.include'
+              line.value.write
+              f.write(line.to_s + "\n")
+            else
+              f.write(line.to_s + "\n")
+            end
+          end
+        end
+      end
+
+      def to_s
+        @file
+      end
+
+      def parse
+        IO.read(file).lines.each do |line|
+          line = line.chop
+          if line.match(/^\s*$/)
+            self.add(line, nil)
+          elsif line.match(/^\s*#.*$/)
+            self.add('#', line)
+          else
+            match = line.match(/^\s*([a-z_\.]+)\s*=\s*(.*)\s*$/)
+            throw "illegal line in #{@file}:#{@lines.length}" unless match
+            if match[1] == 'lxc.include'
+              self.add(match[1], Lxc.parse(match[2], index))
+            else
+              self.add(match[1], match[2])
+            end
+          end
+        end
+
+        self
+      end
+    end
+  end
+end

data/lib/linux/lxc/index.rb

@@ -0,0 +1,35 @@
+module Linux
+  module Lxc
+    class Index
+      attr_reader :files
+
+      def initialize
+        @key_index = {}
+        @dirs = {}
+        @files = {}
+      end
+
+      def add_line(key, line)
+        @key_index[key] ||= Lines.new
+        @key_index[key].add(line)
+      end
+
+      def get_key(key)
+        @key_index[key]
+      end
+
+      def delete_key(key)
+        return if @key_index[key].nil? || !@key_index[key].empty?
+        @key_index.delete(key)
+      end
+
+      def get_directory(fname)
+        @dirs[fname] ||= Directory.new(fname, self)
+      end
+
+      def add_file(fname, dir)
+        @files[fname] ||= File.new(fname, dir, self)
+      end
+    end
+  end
+end

data/lib/linux/lxc/line.rb

@@ -0,0 +1,35 @@
+module Linux
+  module Lxc
+    class Line
+      attr_reader :lxc, :line, :key
+      attr_accessor :value
+      def initialize(lxc, key, value)
+        @lxc = lxc
+        @line = lxc && lxc.lines.add(self).length
+        @key = key
+        @value = value
+      end
+
+      def file
+        @lxc.file
+      end
+
+      def comment!
+        return if @key == '#'
+        # remove from index
+        lxc.remove_from_index(self)
+        @key = '#'
+        @value = '# ' + to_s
+        lxc.add_to_index(self)
+      end
+
+      def to_s
+        if value
+          "#{key} = #{value}"
+        else
+          key
+        end
+      end
+    end
+  end
+end

data/lib/linux/lxc/lines.rb

@@ -0,0 +1,46 @@
+module Linux
+  module Lxc
+    class Lines
+      def initialize
+        @lines = []
+      end
+
+      def add(line)
+        @lines << line
+        @lines
+      end
+
+      def each(&block)
+        @lines.each { |line| block.call(line) }
+      end
+
+      def values
+        @lines.map(&:value)
+      end
+
+      def remove(line)
+        @lines = @lines.select { |i| i != line }
+      end
+
+      def [](idx)
+        @lines[idx]
+      end
+
+      def comment!
+        @lines.each(&:comment!)
+      end
+
+      def length
+        @lines.length
+      end
+
+      def empty?
+        @lines.empty?
+      end
+
+      def first
+        @lines.first
+      end
+    end
+  end
+end

data/lib/linux/lxc/version.rb

@@ -1,5 +1,5 @@
 module Linux
-  class Lxc
-      VERSION = "0.0.4"
+  module Lxc
+    VERSION = '0.1.0'
   end
 end

data/lib/linux/lxc.rb

@@ -1,181 +1,32 @@
-require "linux/lxc/version"
+require_relative 'lxc/version'
+require_relative 'lxc/line'
+require_relative 'lxc/lines'
+require_relative 'lxc/file'
+require_relative 'lxc/directory'
+require_relative 'lxc/index'
 
 module Linux
-    class Lxc
-
-      class Line
-        attr_reader :lxc, :line, :key
-        attr_accessor :value
-        def initialize(lxc, key, value)
-          @lxc = lxc
-          @line = lxc && lxc.lines.add(self).length
-          @key = key
-          @value = value
-        end
-        def file
-          @lxc.file
-        end
-        def comment!
-          return if @key == '#'
-          # remove from index
-          lxc.remove_from_index(self)
-          @key = '#'
-          @value = '# ' + self.to_s
-          lxc.add_to_index(self)
-        end
-        def to_s
-          if value
-            "#{key} = #{value}"
-          else
-            key
-          end
-        end
-      end
-
-
-      class Lines
-        def initialize
-          @lines = []
-        end
-        def add(line)
-          @lines << line
-          @lines
-        end
-        def each(&block)
-          @lines.each { |line| block.call(line) }
-        end
-        def values
-          @lines.map{|i| i.value}
-        end
-
-        def remove(line)
-          @lines = @lines.select{|i| i != line }
-        end
-
-        def [](idx)
-          @lines[idx]
-        end
-
-        def comment!
-          @lines.each{|i| i.comment! }
-        end
-
-        def length
-          @lines.length
-        end
-
-        def empty?
-          @lines.empty?
-        end
-
-        def first
-          @lines.first
-        end
-      end
-
-      attr_reader :index, :lines, :file
-      attr_accessor :real_fname
-
-      def initialize(file, index = {})
-        self.file = file
-        @lines = Lines.new
-        @index = index
-      end
-
-      # file is more important than real_fname
-      def file=(a)
-        @file = a
-        @real_fname = a
-      end
-
-      def get(key)
-        @index[key]
-      end
-
-      def key_to_path(key, &block)
-        path = ""
-        dot = ""
-        key.split('.').each do |element|
-          path += dot + element
-          dot = "."
-          #puts ">>>>#{path}"
-          block.call(path)
-        end
-      end
-
-      def remove_from_index(line)
-        key_to_path(line.key) do |path|
-          get(path).remove(line)
-          get(path).empty? && @index.delete(path)
-        end
-      end
-
-      def add(key, value = nil)
-        key = key.strip
-        if value and value.instance_of?(String)
-          value = value.strip
-        end
-        line = Line.new(self, key, value)
-        add_to_index(line)
-      end
-
-      def add_to_index(line)
-        key_to_path(line.key) do |path|
-          @index[path] ||= Lines.new
-          @index[path].add(line)
-        end
-      end
-
-      def all_lines(&block)
-        @lines.each do |line|
-          block.call(line)
-          if line.value.instance_of?(Lxc)
-            line.value.all_lines(&block)
-          end
-        end
-      end
-
-      def files
-        ret = [Line.new(nil, "lxc.include", self)]
-        all_lines {|line| line.value.instance_of?(Lxc) && (ret << line) }
-        ret
-      end
-
-      def write
-        File.open(real_fname, 'w') do |f|
-          @lines.each do |line|
-            if line.key == "lxc.include"
-              line.value.write
-            end
-            f.write(line.to_s + "\n")
-          end
-        end
-      end
-
-      def to_s
-        @file
-      end
+  module Lxc
+    def self.parse(file, index = Index.new)
+      if ::File.directory?(file)
+        fname = file
+        entries = ::Dir.glob(::File.join(file, '*')).select { |f| ::File.file?(f) }
+        dir = index.get_directory(fname)
+        entries.each do |entry|
+          dir.add_file(entry).parse
+        end
+        return dir
+      end
+      return Lxc.file(file, index).parse
+    end
 
-      def self.parse(file, index = {})
-        lxc = Lxc.new(file, index)
-        IO.read(file).lines.each do |line|
-          line = line.chop
-          if line.match(/^\s*$/)
-              lxc.add(line, nil)
-          elsif line.match(/^\s*#.*$/)
-              lxc.add('#', line)
-          else
-            match = line.match(/^\s*([a-z\.]+)\s*=\s*(.*)\s*$/)
-            throw "illegal line in #{@file}:#{@lines.length}" unless match
-            if match[1] == 'lxc.include'
-              lxc.add(match[1], parse(match[2], index))
-            else
-              lxc.add(match[1], match[2])
-            end
-          end
-        end
-        lxc
-      end
+    def self.file(fname, index = Index.new)
+      dir = index.get_directory(::File.dirname(fname))
+      dir.add_file(fname)
+    end
 
+    def self.directory(fname, index = Index.new)
+      index.get_directory(fname)
     end
+  end
 end

data/test/linux_lxc_test.rb

@@ -20,8 +20,8 @@ require 'linux/lxc'
 
 class LinuxLxcTest < Test::Unit::TestCase
   def setup
-    @temp_dir =  Dir.mktmpdir
-    @lxc_config = File.join(@temp_dir, "lxc.config")
+    @temp_dir = Dir.mktmpdir
+    @lxc_config = File.join(@temp_dir, 'lxc.config')
     File.write(@lxc_config, <<SAMPLE)
 # Template used to create this container: /usr/share/lxc/templates/lxc-ubuntu
 # Parameters passed to the template:
@@ -42,7 +42,7 @@ lxc.network.flags = up
 lxc.network.link = lxcbr0
 lxc.network.hwaddr = 00:16:3e:67:03:4a
 SAMPLE
-    @lxc_ubuntu_common_conf = File.join(@temp_dir, "ubuntu.common.conf")
+    @lxc_ubuntu_common_conf = File.join(@temp_dir, 'ubuntu.common.conf')
     File.write(@lxc_ubuntu_common_conf, <<SAMPLE)
 # Default pivot location
 lxc.pivotdir = lxc_putold
@@ -118,6 +118,15 @@ lxc.cgroup.devices.allow = c 10:232 rwm
 # Blacklist some syscalls which are not safe in privileged
 # containers
 lxc.seccomp = /usr/share/lxc/config/common.seccomp
+
+lxc.include = #{File.join(@temp_dir, 'empty.conf.d')}
+lxc.include = #{File.join(@temp_dir, 'common.conf.d')}
+SAMPLE
+    FileUtils.mkdir_p File.join(@temp_dir, 'empty.conf.d')
+    FileUtils.mkdir_p File.join(@temp_dir, 'common.conf.d')
+    @lxc_common_conf_d_wildcard = File.join(@temp_dir, 'common.conf.d', 'wildcard')
+    File.write(@lxc_common_conf_d_wildcard, <<SAMPLE)
+lxc.wildcard.loaded = true
 SAMPLE
   end
 
@@ -128,11 +137,15 @@ SAMPLE
   def test_reader
     lxc = Linux::Lxc.parse(@lxc_config)
 
-    assert_equal lxc.get('lxc').length, 38
+    assert_equal lxc.get('lxc').length, 41
     assert_equal lxc.get('lxc.network').length, 4
     assert_equal lxc.get('lxc.network.hwaddr').length, 1
     assert_equal lxc.get('lxc.network.murks'), nil
 
+    assert_equal lxc.get('lxc.wildcard.loaded').values[0], 'true'
+    assert_equal lxc.get('lxc.wildcard.loaded')[0].file, @lxc_common_conf_d_wildcard
+    assert_equal lxc.get('lxc.wildcard.loaded')[0].line, 1
+
     assert_equal lxc.get('lxc.cgroup.devices.allow').values[4], 'c 5:0 rwm'
     assert_equal lxc.get('lxc.cgroup.devices.allow')[4].file, @lxc_ubuntu_common_conf
     assert_equal lxc.get('lxc.cgroup.devices.allow')[4].line, 48
@@ -142,19 +155,29 @@ SAMPLE
     assert_equal lxc.get('lxc.network.hwaddr').first.line, 18
   end
 
-
   def test_from_scratch
-    lxc = Linux::Lxc.new(File.join(@temp_dir, "base"))
-    lxc.add("# base meno")
-    lxc.add("lxc.cgroup.devices.allow", "meno")
-    incl = Linux::Lxc.new(File.join(@temp_dir, "incl"))
-    lxc.add("lxc.include", incl)
-    incl.add("# include meno")
-    incl.add("lxc.network.hwaddr", '00:16:3e:67:03:4a')
+    lxc = Linux::Lxc.file(File.join(@temp_dir, 'base.f'))
+    lxc.add('# base meno')
+    lxc.add('lxc.cgroup.devices.allow', 'meno')
+    incl = Linux::Lxc.file(File.join(@temp_dir, 'incl.f'))
+    lxc.add('lxc.include', incl)
+    incl.add('# include meno')
+    incl.add('lxc.network.hwaddr', '00:16:3e:67:03:4a')
+
+    empty_d = Linux::Lxc.directory(File.join(@temp_dir, 'scratch.empty.d'))
+    lxc.add('lxc.include', empty_d)
+
+    scratch_d = Linux::Lxc.directory(File.join(@temp_dir, 'scratch.d'))
+    lxc.add('lxc.include', scratch_d)
+
+
+    scratch_file = scratch_d.add_file(File.join(@temp_dir, 'scratch.d', 'file.f'))
+    scratch_file.add('# include scratch')
+    scratch_file.add('lxc.scratch_file', 'it_is_scratch_file')
     lxc.write
 
     lxc_read = Linux::Lxc.parse(lxc.file)
-    assert_equal lxc_read.get('#').length, 2
+    assert_equal lxc_read.get('#').length, 3
     assert_equal lxc_read.get('lxc.cgroup.devices.allow').values, ['meno']
     assert_equal lxc_read.get('lxc.cgroup.devices.allow').first.file, lxc.file
     assert_equal lxc_read.get('lxc.cgroup.devices.allow').first.line, 2
@@ -162,6 +185,13 @@ SAMPLE
     assert_equal lxc_read.get('lxc.network.hwaddr').values, ['00:16:3e:67:03:4a']
     assert_equal lxc_read.get('lxc.network.hwaddr').first.file, incl.file
     assert_equal lxc_read.get('lxc.network.hwaddr').first.line, 2
+
+    assert_equal lxc_read.get('lxc.scratch_file').values, ['it_is_scratch_file']
+    assert_equal lxc_read.get('lxc.scratch_file').first.file, scratch_file.file
+    assert_equal lxc_read.get('lxc.scratch_file').first.line, 2
+
+    assert_equal lxc_read.index.files.length, 3
+
   end
 
   def test_comment
@@ -174,61 +204,60 @@ SAMPLE
     lxc.get('lxc.network').comment!
     assert_equal lxc.get('#').length, 47
     assert_equal lxc.get('lxc.network'), nil
-
   end
 
   def test_real_fname
-    lxc = Linux::Lxc.new(File.join(@temp_dir, "real_name"))
-    lxc.add("# base meno")
-    lxc.add("lxc.cgroup.devices.allow", "meno")
+    lxc = Linux::Lxc.file(File.join(@temp_dir, 'real_name'))
+    lxc.add('# base meno')
+    lxc.add('lxc.cgroup.devices.allow', 'meno')
     lxc.write
-    lxc.real_fname = File.join(@temp_dir, "test_name")
-    incl = Linux::Lxc.new(File.join(@temp_dir, "test_incl"))
-    incl.real_fname = File.join(@temp_dir, "real_incl")
-    lxc.add("lxc.include", incl)
-    incl.add("# include meno")
-    incl.add("lxc.network.hwaddr", '00:16:3e:67:03:4a')
+    lxc.real_fname = File.join(@temp_dir, 'test_name')
+    incl = Linux::Lxc.file(File.join(@temp_dir, 'test_incl'))
+    incl.real_fname = File.join(@temp_dir, 'real_incl')
+    lxc.add('lxc.include', incl)
+    incl.add('# include meno')
+    incl.add('lxc.network.hwaddr', '00:16:3e:67:03:4a')
     lxc.write
-    assert_equal File.exists?(File.join(@temp_dir, "test_name")), true
-    assert_equal File.exists?(File.join(@temp_dir, "real_name")), true
-    assert_equal File.exists?(File.join(@temp_dir, "real_incl")), true
-    assert_equal File.exists?(File.join(@temp_dir, "test_incl")), false
-#    assert_raise do #Fails, no Exceptions are raised
+    assert_equal File.exist?(File.join(@temp_dir, 'test_name')), true
+    assert_equal File.exist?(File.join(@temp_dir, 'real_name')), true
+    assert_equal File.exist?(File.join(@temp_dir, 'real_incl')), true
+    assert_equal File.exist?(File.join(@temp_dir, 'test_incl')), false
+    #    assert_raise do #Fails, no Exceptions are raised
     begin
-      lxc = Linux::Lxc.parse(File.join(@temp_dir, "test_name"))
-      assert_equal "Doof", "Darf nie passieren"
+      lxc = Linux::Lxc.parse(File.join(@temp_dir, 'test_name'))
+      assert_equal 'Doof', 'Darf nie passieren'
     rescue Exception => e
       assert_equal e.instance_of?(Errno::ENOENT), true
-      assert_equal File.basename(e.message), "test_incl"
+      assert_equal File.basename(e.message), 'test_incl'
     end
-#    end
+    #    end
   end
 
   def test_lines
     lxc = Linux::Lxc.parse(@lxc_config)
     cnt = 0
-    lxc.all_lines{|line| cnt+=1 }
-    assert_equal cnt, 92
+    lxc.all_lines { |_line| cnt += 1 }
+    assert_equal cnt, 96
   end
 
   def test_files
     lxc = Linux::Lxc.parse(@lxc_config)
-    assert_equal lxc.files[0].value.file, @lxc_config
-    assert_equal File.basename(lxc.files[1].value.file), "ubuntu.common.conf"
-    assert_equal lxc.files.length, 2
+    files = lxc.index.files.keys
+    assert_equal files[0], @lxc_config
+    assert_equal files[1], @lxc_ubuntu_common_conf
+    assert_equal files[2], @lxc_common_conf_d_wildcard
+    assert_equal files.length, 3
   end
 
   def test_write
     lxc = Linux::Lxc.parse(@lxc_config)
-    lxc.file = "#{@lxc_config}.new"
     inc_file = "#{lxc.get('lxc.cgroup.devices.allow').first.lxc.file}.new"
     lxc.get('lxc.cgroup.devices.allow').first.lxc.file = inc_file
-    lxc.get('lxc.cgroup.devices.allow')[5].value='meno'
+    lxc.get('lxc.cgroup.devices.allow')[5].value = 'meno'
     assert_equal lxc.get('lxc.cgroup.devices.allow').values[5], 'meno'
 
-    lxc.get('lxc.network.hwaddr').first.value='construqt'
+    lxc.get('lxc.network.hwaddr').first.value = 'construqt'
     assert_equal lxc.get('lxc.network.hwaddr').values, ['construqt']
-
     lxc.write
 
     lxc_read = Linux::Lxc.parse(lxc.file)
@@ -239,9 +268,5 @@ SAMPLE
     assert_equal lxc_read.get('lxc.network.hwaddr').values, ['construqt']
     assert_equal lxc_read.get('lxc.network.hwaddr').first.file, lxc.file
     assert_equal lxc_read.get('lxc.network.hwaddr').first.line, 18
-
   end
-
-
 end
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: linux-lxc
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.0
 platform: ruby
 authors:
 - Meno Abels
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-24 00:00:00.000000000 Z
+date: 2015-10-16 00:00:00.000000000 Z
 dependencies: []
 description: Parse the output of ip addr on a linux system
 email:
@@ -23,6 +23,11 @@ files:
 - README.md
 - Rakefile
 - lib/linux/lxc.rb
+- lib/linux/lxc/directory.rb
+- lib/linux/lxc/file.rb
+- lib/linux/lxc/index.rb
+- lib/linux/lxc/line.rb
+- lib/linux/lxc/lines.rb
 - lib/linux/lxc/version.rb
 - linux-lxc.gemspec
 - test/linux_lxc_test.rb