schroot 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 96418a492bc195394f2d36c2df2995fa38903ab9
-  data.tar.gz: 93f1682f71ee61a58437965a646078dadcc0e046
+  metadata.gz: 2fe498cb8c7197740cfcf89abc824d08a6a6e8eb
+  data.tar.gz: e34b0f70154cb55974043756d421a3783c0fbaab
 SHA512:
-  metadata.gz: c5c09f56d4d3d802b55e277a4405f2feafeef1043975985f1dc6e370f8b4bbe516a9a10f1980164545d3ed99bb20ea5fbe108f6fa6b4da28052e43a02c9d35ae
-  data.tar.gz: 93c973a7780e72c691e35d67a2c59eb3b7d8a25dc0a62b085b5fe94a6abbfe6e6dc30351f9668348a7f746b7117ba251c6512d2f6d817dbdf7bb9e70cfc4bd3d
+  metadata.gz: d71a3b23c47c8df968d346a1a73d5afa7062ad7f0a63ce067cecbb5fb249a3e34d51ea5655d0efeef9d11e424ab45a94dd9142a9922f190ed134b1c28e54b33e
+  data.tar.gz: eaa6d98672e65ad6ae07925ce0712e67d0bdaf3cc6073f1171f5a2d3736346147bd65b70cffd4254879b809d4b125ec5148e034e1ec973a8969f0c4bdd66cdfa

data/README.md

@@ -35,7 +35,8 @@ $ gem install ./*.gem
 or just
 ```bash
 $ rake install
-```  
+```
+
 Examples
 ------
 
@@ -52,6 +53,7 @@ Simple example:
   => "Hello, World!\n"
 ```
 Using logger:
+
 ```ruby
   irb(main):001:0> require 'schroot'
   => true

data/lib/schroot.rb

@@ -2,8 +2,9 @@ require 'open3'
 require 'logger'
 
 SCHROOT_BASE="/var/lib/schroot"
-BASE_CONF = "/etc/schroot/schroot.conf"
-CONF_D = "/etc/schroot/chroot.d/"
+BASE_CONF="/etc/schroot/schroot.conf"
+CONF_D="/etc/schroot/chroot.d/"
+CONF_D_PREFIX="99ruby-"
 
 class SchrootError < StandardError
 end
@@ -15,39 +16,40 @@ class SchrootConfig
     chroots = {}
     files = [BASE_CONF]
     Dir.entries(CONF_D).each do |file|
-      files << (CONF_D+file) unless ['.','..'].include? file
+      files << (CONF_D+CONF_D_PREFIX+file) unless ['.','..'].include? file
     end
     files.each do |file|
       stream = File.open(file,"r")
       current = nil
       while (line = stream.gets)
-        if validate_name(line)
-          current = validate_name(line)[1]
+        if match_name(line)
+          current = match_name(line)[1]
           chroots[current.strip] = {"source" => file}
-        elsif current and validate_param(line)
-          param, value = validate_param(line)[1],validate_param(line)[2]
+        elsif current and match_param(line)
+          param, value = match_param(line)[1],match_param(line)[2]
           chroots[current][param.strip] = value.strip if current
         end
       end
+      stream.close
     end
     return chroots
   end
 
-  def validate_name(name)
+  def self.match_name(name)
     return /^\s*\[([a-z0-9A-Z\-\_]+)\]/.match(name)
   end
 
-  def validate_param(param)
+  def self.match_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"})
+  #   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
@@ -55,7 +57,7 @@ class SchrootConfig
   # @return [Bool] true if operation has completed successfully
   def self.add(name, kwargs = {}, force=false)
     chroots = readconf()
-    filename = CONF_D+name
+    filename = CONF_D+CONF_D_PREFIX+name
     if (chroots[name] or File.exists?(filename)) and !force
       return false
     else
@@ -77,15 +79,15 @@ class SchrootConfig
   # Removes chroot from .../chroot.d/ directory
   #
   # @example
-  # SchrootConfig.remove("testing", true)
-  #   => true
+  #   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
+    filename = CONF_D+CONF_D_PREFIX+name
     if (File.exists?(filename) and chroots[name]) or force
       File.delete(filename)
       return true
@@ -200,4 +202,4 @@ class Schroot
 
   private :safe_run, :command
   attr_reader :session, :location, :chroot, :logger
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: schroot
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Daniil Guzanov