schroot 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1cbd1e243c8faebe108938506ba91250bcda4a47
-  data.tar.gz: 95a0de9e53b9e1fbc5fe1fd8a5aa390044f02721
+  metadata.gz: 360e830115b4cb4068f260942452b45c4c064752
+  data.tar.gz: 0ac8b4afcb132b04a561e55211fefbdaf966deed
 SHA512:
-  metadata.gz: 19ec77eef2486c3c77704cd1edc62df255dabcceb2169946a98524ab23a72d650dd1c181facf3caf82ca9762aa9b22e9e15d77c33fff8651c5e2df9b7dfa405f
-  data.tar.gz: e983818aa490af8ff537aa15949fc3fb127fbeb4fb2df328f0ac32e4db2970d8eec2ea1a163141456a854d69a17a52d0b81081c32e162c7e046a522687b9db96
+  metadata.gz: 5bf309ce86c4c7277d7a836d3160359035d7bf53ce6533aca5a73e0b5d760de1e93b7d32396cbd9144cbfaff133ca61512d577b1c6bf7bd6653656bfc40b61f1
+  data.tar.gz: cb7abbeff9362b59b39737f0d6cff71b0b3a20dd2779389a3f68c5397c59d41dbfcdb5a8bdf8be35549be615ed6dafd149363ccbcb79cf1ee9d5b21ef29084c5

data/README.md

@@ -27,15 +27,19 @@ Little example:
 
 Library installation is pretty simple:
 
-     $ rake
-     $ gem install ./*.gem
+```bash
+$ rake
+$ gem install ./*.gem
+```
      
 or just
-
-     $ rake install
-     
+```bash
+$ rake install
+```  
 Examples
 ------
+
+Simple example:
      
 ```ruby
 irb(main):005:0> require 'schroot'
@@ -47,3 +51,27 @@ irb(main):007:0> stdin, stdout, stderr = my_session.run("echo Hello, World!")
 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"
+```

data/lib/schroot.rb

@@ -1,4 +1,5 @@
 require 'open3'
+require 'logger'
 
 SCHROOT_BASE="/var/lib/schroot"
 
@@ -7,15 +8,27 @@ end
 
 # Schroot session handler
 class Schroot
-  def initialize(chroot_name = 'default')
+  def initialize(chroot_name = 'default', &block)
+    @logger = Logger.new nil
+
+    if block_given?
+      if block.arity == 1
+        yield self
+      elsif block.arity == 0
+        instance_eval &block
+      end
+    end
+
     start(chroot_name)
   end
 
   def safe_run(cmd)
+    @logger.info("Executing %s" % cmd)
     stdin, stdout, stderr, wait_thr = Open3.popen3(cmd)
     if wait_thr.value != 0
       raise SchrootError, "\ncmd=\"%s\"\nreturn_code= %i\nstdout= \"%s\"" % [cmd, wait_thr.value, stdout.gets]
     end
+    @logger.info("Done!")
     return stdin, stdout, stderr
   end
 
@@ -60,6 +73,7 @@ class Schroot
   # @return [String] schroot session id
   # A string representing schroot session id.
   def start(chroot_name = 'default')
+    @logger.debug("Starting chroot session")
     stop if @session
     command = ['schroot', '-b', '-c', chroot_name]
     ObjectSpace.define_finalizer(self, proc { stop })
@@ -68,6 +82,7 @@ class Schroot
     @session = stdout.gets.strip
     stdin, stdout, stderr = safe_run("schroot --location -c session:%s" % @session)
     @location = stdout.gets.strip
+    @logger.debug("Session %s with %s started in %s" % [@session, @chroot, @location])
     return @session
   end
 
@@ -76,11 +91,20 @@ class Schroot
   # @param chroot_name [String] name of configured chroot
   # @return [nil] session_id of killed session (should be nil)
   def stop
+    @logger.debug("Stopping session %s with %s" % [@session, @chroot])
     stdin, stdout, stderr = safe_run("schroot -e -c %s" % @session)
+    @logger.debug("Session %s of %s should be stopped" % [@session, @chroot])
     @location = nil
     @session = nil
+
+  end
+
+  # Sets log object
+  def log(log=@logger)
+    @logger = log
+    @logger.debug("Hello there!")
   end
 
   private :safe_run, :command
-  attr_reader :session, :location, :chroot
+  attr_reader :session, :location, :chroot, :logger
 end

data/test/test_schroot.rb

@@ -17,9 +17,10 @@ class SchrootTest < Test::Unit::TestCase
     assert_not_nil test_clone.chroot
     assert_not_nil test_clone.location
 
-    assert_not_equal test.session, test_clone.session
-    assert_not_equal test.session, test_clone.location
-    assert_equal test.chroot, test_clone.chroot
+    assert_not_nil test.session
+    assert_not_nil test_clone.session
+    assert_not_nil test.location
+    assert_not_nil test_clone.location
 
     test.stop
     print_debug(test,:stopped)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: schroot
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Daniil Guzanov
@@ -20,7 +20,7 @@ files:
 - test/test_schroot.rb
 - README.md
 - Rakefile
-homepage: http://rubygems.org/gems/schroot
+homepage: https://github.com/melkor217/ruby-schroot
 licenses:
 - WTFPL
 metadata: {}