schroot 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 360e830115b4cb4068f260942452b45c4c064752
-  data.tar.gz: 0ac8b4afcb132b04a561e55211fefbdaf966deed
+  metadata.gz: 0736aa3c2bf393670a231765da40367d4e33c50d
+  data.tar.gz: 81aca34c23f3f9c8f245acf8d51e93d47e84f14f
 SHA512:
-  metadata.gz: 5bf309ce86c4c7277d7a836d3160359035d7bf53ce6533aca5a73e0b5d760de1e93b7d32396cbd9144cbfaff133ca61512d577b1c6bf7bd6653656bfc40b61f1
-  data.tar.gz: cb7abbeff9362b59b39737f0d6cff71b0b3a20dd2779389a3f68c5397c59d41dbfcdb5a8bdf8be35549be615ed6dafd149363ccbcb79cf1ee9d5b21ef29084c5
+  metadata.gz: 14390f1cd286f513c1e8f0c38d2112c7c0576d102e8991032570714ea868eaa8de96dec33971f250f889fc4220da35354923772369adbdda91951c5fce03a5f1
+  data.tar.gz: 27da31f097bf5ddf2789a2e012669e1260ba1b3cf784904f83d5c58c8eb87f015ce052482fbb4c3166d01989c88f44b8e69122124402d7d8ed6014aa39b5d1da

data/README.md

@@ -42,36 +42,37 @@ Examples
 Simple example:
      
 ```ruby
-irb(main):005:0> require 'schroot'
-=> true
-irb(main):006:0> my_session = Schroot.new('sid')
-=> #<Schroot:0x8ba789c @chroot="sid", @session="sid-19131ba0-84ba-42e5-a2fb-d2d375d61750", @location="/var/lib/schroot/mount/sid-19131ba0-84ba-42e5-a2fb-d2d375d61750">
-irb(main):007:0> stdin, stdout, stderr = my_session.run("echo Hello, World!")
-=> [#<IO:fd 22>, #<IO:fd 24>, #<IO:fd 26>]
-irb(main):008:0> stdout.gets
-=> "Hello, World!\n"
+  irb(main):005:0> require 'schroot'
+  => true
+  irb(main):006:0> my_session = Schroot.new('sid')
+  => #<Schroot:0x8ba789c @chroot="sid", @session="sid-19131ba0-84ba-42e5-a2fb-d2d375d61750", @location="/var/lib/schroot/mount/sid-19131ba0-84ba-42e5-a2fb-d2d375d61750">
+  irb(main):007:0> stdin, stdout, stderr = my_session.run("echo Hello, World!")
+  => [#<IO:fd 22>, #<IO:fd 24>, #<IO:fd 26>]
+  irb(main):008:0> stdout.gets
+  => "Hello, World!\n"
 ```
 Using logger:
 ```ruby
-irb(main):001:0> require 'schroot'
-=> true
-irb(main):002:0> my_logger = Logger.new(STDOUT)
-=> #<Logger:0x0000000199b460 @progname=nil, @level=0, @default_formatter=#<Logger::Formatter:0x0000000199b438 @datetime_format=nil>, @formatter=nil, @logdev=#<Logger::LogDevice:0x0000000199b3c0 @shift_size=nil, @shift_age=nil, @filename=nil, @dev=#<IO:<STDOUT>>, @mutex=#<Logger::LogDevice::LogDeviceMutex:0x0000000199b370 @mon_owner=nil, @mon_count=0, @mon_mutex=#<Mutex:0x0000000199b2f8>>>>
-irb(main):003:0> session = Schroot.new('default') do
-irb(main):004:1*   log my_logger
-irb(main):005:1> end
-D, [2014-05-06T19:49:15.497952 #3084] DEBUG -- : Hello there!
-D, [2014-05-06T19:49:15.498035 #3084] DEBUG -- : Starting chroot session
-I, [2014-05-06T19:49:15.498069 #3084]  INFO -- : Executing schroot -b -c default
-I, [2014-05-06T19:49:15.584809 #3084]  INFO -- : Done!
-I, [2014-05-06T19:49:15.584939 #3084]  INFO -- : Executing schroot --location -c session:sid-7cefa94f-4bea-4d30-b4a9-d3008c255360
-I, [2014-05-06T19:49:15.591380 #3084]  INFO -- : Done!
-D, [2014-05-06T19:49:15.591504 #3084] DEBUG -- : Session sid-7cefa94f-4bea-4d30-b4a9-d3008c255360 with default started in /var/lib/schroot/mount/sid-7cefa94f-4bea-4d30-b4a9-d3008c255360
-=> #<Schroot:0x000000019acda0 @logger=#<Logger:0x0000000199b460 @progname=nil, @level=0, @default_formatter=#<Logger::Formatter:0x0000000199b438 @datetime_format=nil>, @formatter=nil, @logdev=#<Logger::LogDevice:0x0000000199b3c0 @shift_size=nil, @shift_age=nil, @filename=nil, @dev=#<IO:<STDOUT>>, @mutex=#<Logger::LogDevice::LogDeviceMutex:0x0000000199b370 @mon_owner=nil, @mon_count=0, @mon_mutex=#<Mutex:0x0000000199b2f8>>>>, @chroot="default", @session="sid-7cefa94f-4bea-4d30-b4a9-d3008c255360", @location="/var/lib/schroot/mount/sid-7cefa94f-4bea-4d30-b4a9-d3008c255360">
-irb(main):006:0> stream = session.run('uname -a')
-I, [2014-05-06T19:50:35.057816 #3084]  INFO -- : Executing schroot -r -c sid-7cefa94f-4bea-4d30-b4a9-d3008c255360 -- uname -a
-I, [2014-05-06T19:50:35.251893 #3084]  INFO -- : Done!
-=> [#<IO:fd 13>, #<IO:fd 15>, #<IO:fd 17>]
-irb(main):007:0> stream[1].gets
-=> "Linux dan-desktop 3.13-1-amd64 #1 SMP Debian 3.13.7-1 (2014-03-25) x86_64 GNU/Linux\n"
+  irb(main):001:0> require 'schroot'
+  => true
+  irb(main):002:0> my_logger = Logger.new(STDOUT)
+  => #<Logger:0x0000000199b460 @progname=nil, @level=0, @default_formatter=#<Logger::Formatter:0x0000000199b438 @datetime_format=nil>, @formatter=nil, @logdev=#<Logger::LogDevice:0x0000000199b3c0 @shift_size=nil, @shift_age=nil, @filename=nil, @dev=#<IO:<STDOUT>>, @mutex=#<Logger::LogDevice::LogDeviceMutex:0x0000000199b370 @mon_owner=nil, @mon_count=0, @mon_mutex=#<Mutex:0x0000000199b2f8>>>>
+  irb(main):003:0> session = Schroot.new('default') do
+  irb(main):004:1*   log my_logger
+  irb(main):005:1> end
+  D, [2014-05-06T19:49:15.497952 #3084] DEBUG -- : Hello there!
+  D, [2014-05-06T19:49:15.498035 #3084] DEBUG -- : Starting chroot session
+  I, [2014-05-06T19:49:15.498069 #3084]  INFO -- : Executing schroot -b -c default
+  I, [2014-05-06T19:49:15.584809 #3084]  INFO -- : Done!
+  I, [2014-05-06T19:49:15.584939 #3084]  INFO -- : Executing schroot --location -c session:sid-7cefa94f-4bea-4d30-b4a9-d3008c255360
+  I, [2014-05-06T19:49:15.591380 #3084]  INFO -- : Done!
+  D, [2014-05-06T19:49:15.591504 #3084] DEBUG -- : Session sid-7cefa94f-4bea-4d30-b4a9-d3008c255360 with default started in /var/lib/schroot/mount/sid-7cefa94f-4bea-4d30-b4a9-d3008c255360
+  => #<Schroot:0x000000019acda0 @logger=#<Logger:0x0000000199b460 @progname=nil, @level=0, @default_formatter=#<Logger::Formatter:0x0000000199b438 @datetime_format=nil>, @formatter=nil, @logdev=#<Logger::LogDevice:0x0000000199b3c0 @shift_size=nil, @shift_age=nil, @filename=nil, @dev=#<IO:<STDOUT>>, @mutex=#<Logger::LogDevice::LogDeviceMutex:0x0000000199b370 @mon_owner=nil, @mon_count=0, @mon_mutex=#<Mutex:0x0000000199b2f8>>>>, @chroot="default", @session="sid-7cefa94f-4bea-4d30-b4a9-d3008c255360", @location="/var/lib/schroot/mount/sid-7cefa94f-4bea-4d30-b4a9-d3008c255360">
+  irb(main):006:0> stream = session.run('uname -a')
+  I, [2014-05-06T19:50:35.057816 #3084]  INFO -- : Executing schroot -r -c sid-7cefa94f-4bea-4d30-b4a9-d3008c255360 -- uname -a
+  I, [2014-05-06T19:50:35.251893 #3084]  INFO -- : Done!
+  => [#<IO:fd 13>, #<IO:fd 15>, #<IO:fd 17>]
+  irb(main):007:0> stream[1].gets
+  => "Linux dan-desktop 3.13-1-amd64 #1 SMP Debian 3.13.7-1 (2014-03-25) x86_64 GNU/Linux\n"
 ```
+

data/Rakefile

@@ -4,7 +4,7 @@ Rake::TestTask.new do |t|
   t.libs << 'test'
 end
 
-task :build => :test do
+task :build do
   system "gem build schroot.gemspec"
 end
 

data/lib/schroot.rb

@@ -6,6 +6,69 @@ SCHROOT_BASE="/var/lib/schroot"
 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
+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
+    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
+        end
+      end
+    end
+  end
+
+  # Adds new chroot configuration to .../chroot.d/ directory
+  #
+  # @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)
+      return false
+    else
+      begin
+        stream = File.open(filename,"w")
+      rescue Errno::EACCES
+        raise SchrootError, "Cannot open #{filename} for writing"
+      end
+      stream.puts "# Generated automatically with ruby-schroot"
+      stream.puts "[#{name}]"
+      kwargs.each do |param, value|
+        stream.puts "#{param}=#{value}"
+      end
+    end
+    return true
+  end
+end
+
 # Schroot session handler
 class Schroot
   def initialize(chroot_name = 'default', &block)
@@ -24,9 +87,13 @@ class Schroot
 
   def safe_run(cmd)
     @logger.info("Executing %s" % cmd)
-    stdin, stdout, stderr, wait_thr = Open3.popen3(cmd)
+    begin
+      stdin, stdout, stderr, wait_thr = Open3.popen3(cmd)
+    rescue Errno::ENOENT
+      raise SchrootError, "Schroot binary is missing!"
+    end
     if wait_thr.value != 0
-      raise SchrootError, "\ncmd=\"%s\"\nreturn_code= %i\nstdout= \"%s\"" % [cmd, wait_thr.value, stdout.gets]
+      raise SchrootError, "`%s` execution failed with %i" % [cmd, wait_thr.value]
     end
     @logger.info("Done!")
     return stdin, stdout, stderr

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: schroot
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Daniil Guzanov
@@ -32,7 +32,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.8.6
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='