schroot 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0736aa3c2bf393670a231765da40367d4e33c50d
-  data.tar.gz: 81aca34c23f3f9c8f245acf8d51e93d47e84f14f
+  metadata.gz: 96418a492bc195394f2d36c2df2995fa38903ab9
+  data.tar.gz: 93f1682f71ee61a58437965a646078dadcc0e046
 SHA512:
-  metadata.gz: 14390f1cd286f513c1e8f0c38d2112c7c0576d102e8991032570714ea868eaa8de96dec33971f250f889fc4220da35354923772369adbdda91951c5fce03a5f1
-  data.tar.gz: 27da31f097bf5ddf2789a2e012669e1260ba1b3cf784904f83d5c58c8eb87f015ce052482fbb4c3166d01989c88f44b8e69122124402d7d8ed6014aa39b5d1da
+  metadata.gz: c5c09f56d4d3d802b55e277a4405f2feafeef1043975985f1dc6e370f8b4bbe516a9a10f1980164545d3ed99bb20ea5fbe108f6fa6b4da28052e43a02c9d35ae
+  data.tar.gz: 93c973a7780e72c691e35d67a2c59eb3b7d8a25dc0a62b085b5fe94a6abbfe6e6dc30351f9668348a7f746b7117ba251c6512d2f6d817dbdf7bb9e70cfc4bd3d

data/lib/schroot.rb

@@ -2,56 +2,61 @@ require 'open3'
 require 'logger'
 
 SCHROOT_BASE="/var/lib/schroot"
+BASE_CONF = "/etc/schroot/schroot.conf"
+CONF_D = "/etc/schroot/chroot.d/"
 
 class SchrootError < StandardError
 end
 
-# Schroot config unit
-class SchrootConfigUnit
-  attr_accessor :type, :description, :union_type,
-  :directory, :users, :groups, :root_groups,
-  :aliases
-end
-
-# Schroot config data
+# Schroot config manager
 class SchrootConfig
-  def initialize
-    @base_conf = "/etc/schroot/schroot.conf"
-    @conf_d = "/etc/schroot/chroot.d/"
-    @chroots = {}
-  end
-
-  def readconf
-    files = [@base_conf]
-    Dir.entries(@conf_d).each do |file|
-      files << (@conf_d+file) unless ['.','..'].include? file
+  # @return [Hash] representation of current config fules
+  def self.readconf
+    chroots = {}
+    files = [BASE_CONF]
+    Dir.entries(CONF_D).each do |file|
+      files << (CONF_D+file) unless ['.','..'].include? file
     end
-    name_regexp = /^\s*\[([a-z0-9A-Z\-\_]+)\]/
-    param_regexp = /^\s*([a-z0-9A-Z\-\_]+)\=(.*)$/
     files.each do |file|
       stream = File.open(file,"r")
       current = nil
       while (line = stream.gets)
-        if name_regexp.match line
-          current = name_regexp.match(line)[1]
-          @chroots[current.strip] = {"source" => file}
-        elsif current and param_regexp.match line
-          param, value = param_regexp.match(line)[1],param_regexp.match(line)[2]
-          @chroots[current][param.strip] = value.strip if current
+        if validate_name(line)
+          current = validate_name(line)[1]
+          chroots[current.strip] = {"source" => file}
+        elsif current and validate_param(line)
+          param, value = validate_param(line)[1],validate_param(line)[2]
+          chroots[current][param.strip] = value.strip if current
         end
       end
     end
+    return chroots
+  end
+
+  def validate_name(name)
+    return /^\s*\[([a-z0-9A-Z\-\_]+)\]/.match(name)
+  end
+
+  def validate_param(param)
+    return /^\s*([a-z0-9A-Z\-\_]+)\=(.*)$/.match(param)
   end
 
   # Adds new chroot configuration to .../chroot.d/ directory
   #
+  # @example
+  # SchrootConfig.add("testing", {"description" => "Debian testing",
+  #                               "file"        => "/srv/chroot/testing.tgz",
+  #                               "location"    => "/testing",
+  #                               "groups"      => "sbuild"})
+  #   => true
   # @param name [String] name of chroot
   # @param kwargs [Hash] options
-  # @return [Bool]
-  def add(name, kwargs = {})
-    readconf()
-    filename = @conf_d+name
-    if @chroots[name] or File.exists?(filename)
+  # @param force [Bool] should we override existing config
+  # @return [Bool] true if operation has completed successfully
+  def self.add(name, kwargs = {}, force=false)
+    chroots = readconf()
+    filename = CONF_D+name
+    if (chroots[name] or File.exists?(filename)) and !force
       return false
     else
       begin
@@ -64,9 +69,30 @@ class SchrootConfig
       kwargs.each do |param, value|
         stream.puts "#{param}=#{value}"
       end
+      stream.close
     end
     return true
   end
+
+  # Removes chroot from .../chroot.d/ directory
+  #
+  # @example
+  # SchrootConfig.remove("testing", true)
+  #   => true
+  # @param name [String] name of chroot
+  # @param kwargs [Hash] options
+  # @param force [Bool] should we override existing config
+  # @return [Bool] true if operation has completed successfully
+  def self.remove(name, force=false)
+    chroots = readconf()
+    filename = CONF_D+name
+    if (File.exists?(filename) and chroots[name]) or force
+      File.delete(filename)
+      return true
+    else
+      return false
+    end
+  end
 end
 
 # Schroot session handler

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: schroot
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Daniil Guzanov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-06 00:00:00.000000000 Z
+date: 2014-05-12 00:00:00.000000000 Z
 dependencies: []
 description: Schroot bindings
 email: melkor217@gmail.com
@@ -16,10 +16,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/schroot.rb
-- test/test_schroot.rb
 - README.md
 - Rakefile
+- lib/schroot.rb
+- test/test_schroot.rb
 homepage: https://github.com/melkor217/ruby-schroot
 licenses:
 - WTFPL
@@ -30,17 +30,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.8.6
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Schroot bindings