schroot 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4afb334d0392c2fece917bd556b440fc9ad6d176
-  data.tar.gz: 75ddbcbf2e08d790a50d00d1a1def897a6ddcd2a
+  metadata.gz: 4a0c0b5f738ac94f2f9654bc3c28ff112cd9d418
+  data.tar.gz: a4911cd4cacb8733ea288ba98ee86bb5950e1751
 SHA512:
-  metadata.gz: 74f6c50acf2010df3c67fffcbc0ff6563db360af013b5a89f2be42cac3164370084682cbcbe8f7249a69d78acaff9eda2ad558626d4c6d78859234f910da7cf2
-  data.tar.gz: 9bc659b87783e2680e963dc694831827e333cbb93b1755d5b16d1dbfcdbcd291228212ce14904dac766cf2521ba352d36e4d1e07dd8b7607fe873f94282138d4
+  metadata.gz: 85f36a9bec55db7c30d6fcd59984b6ff0b4b0fdc68e8343c9b2fc88a51d38c435ad0252aa46724b87b0bb5ea003455768fa5d88499937adf742b8a9f71022cce
+  data.tar.gz: 5cff5dcd73a03e7a35743b2a72a9f6fd1a3ee83beec29b85274e38992becf20d09bd8e9c65e482251c289acafc642be4e5c5f0a0a14ea9803e2643e1c301fbc2

data/README.md

@@ -1,4 +1,4 @@
-# Schroot
+# Schroot [![Gem Version](https://badge.fury.io/rb/schroot.png)](http://badge.fury.io/rb/schroot) 
 
 Schroot gem allows to create `schroot` sessions and execute commands in the chroot environment from ruby code.
 

data/lib/schroot.rb

@@ -8,6 +8,7 @@ module Schroot
   CONF_D='/etc/schroot/chroot.d/'
   CONF_D_PREFIX='99ruby-'
 
+
   class SchrootError < StandardError
   end
 
@@ -16,7 +17,7 @@ module Schroot
     chroots = {}
     files = [BASE_CONF]
     Dir.entries(CONF_D).each do |file|
-      files << (CONF_D+CONF_D_PREFIX+file) unless %w(. ..).include? file
+      files << (CONF_D+file) unless %w(. ..).include? file
     end
     files.each do |file|
       stream = File.open(file, 'r')
@@ -76,6 +77,30 @@ module Schroot
     return true
   end
 
+  # Installs base Debian system, into chroot using debootstrap
+  #
+  # @example
+  #   bootstrap('my_chroot', 'testing', log: Logger.new(STDOUT))
+  # @param name [String] VM's name (should be defined in schroot config)
+  # @param release [String] Release to install (e.g. 'sid', 'jessie', 'stable')
+  # @param mirror [String] What debian mirror should we use
+  # @param log [Logger] Where should be put bootstrap logs
+  def self.bootstrap (name, release, mirror: 'http://http.debian.net/debian/', log: Logger.new(nil), &block)
+    chroots = read_config
+    directory = chroots[name]['directory']
+    if directory and ::File.exists? directory
+      command = "debootstrap #{release} #{directory} #{mirror}"
+      log.info 'Running `%s`' % command
+      Open3.popen2e(command) do |stdin, stdout_and_stderr, wait_thr|
+        log.info 'PID: %s' % wait_thr.pid
+        while line = stdout_and_stderr.gets do
+          log.debug line.strip
+        end
+        log.info 'Exited with %s' % wait_thr.value
+      end
+    end
+  end
+
   # Removes chroot from .../chroot.d/ directory
   #
   # @example
@@ -126,7 +151,7 @@ module Schroot
         raise SchrootError, 'Schroot binary is missing!'
       end
       @logger.info('Done!')
-      return stream
+      stream
     end
 
     def command(cmd, user, preserve_environment)
@@ -150,12 +175,13 @@ module Schroot
     #
     # @example
     #   session.run("uname -a",
-    #               :user => 'rainbowdash',
-    #               :preserve_environment => true) do |stdin, stdout, stderr, wait_thr|
+    #               user: 'rainbowdash',
+    #               preserve_environment: true) do |stdin, stdout, stderr, wait_thr|
     #     puts wait_thr.pid, wait_thr.value, stdout.read
     #   end
     # @param cmd [String] command to run
     # @param user [String] user
+    # @param preserve_environment [Bool] Should we preserve environment variables
     def run(cmd, user: nil, preserve_environment: nil, &block)
       safe_run(command(cmd, user, preserve_environment)) do |stdin, stout, stderr, wait_thr|
         if block_given?
@@ -165,6 +191,29 @@ module Schroot
       end
     end
 
+    # Copies file from or to the chroot
+    #
+    # @param what [String] Source path
+    # @param where [String] Destination path
+    # @param whence [Symbol] Defines where should we dst file: from host (:host) or from chroot (:chroot)
+    def copy(what, where, whence: :host, recursive: false)
+      if whence == :host
+        where = File.join(@location, where)
+      elsif whence == :chroot
+        what = File.join(@location, what)
+      else
+        return nil
+      end
+      flags = ''
+      if recursive
+        flags << '-r'
+      end
+
+      safe_run('cp %s %s %s' % [flags, cwhat, where]) do |stdin, stout, stderr, wait_thr|
+        wait_thr.value
+      end
+    end
+
     # Clones current session
     #
     # @return [Object] new session object
@@ -175,15 +224,15 @@ module Schroot
     # Starts the session of `chroot_name` chroot
     #
     # @param chroot_name [String] name of configured chroot
-    # @return [String] schroot session id
-    # A string representing schroot session id.
+    # @return [String] A string representing schroot session id.
     def start(chroot_name = 'default')
       @logger.debug('Starting chroot session')
       stop if @session
       ObjectSpace.define_finalizer(self, proc { stop })
-      state = safe_run('schroot -b -c %s' % chroot_name) do |stdin, stdout, stderr, wait_thr|
+      safe_run('schroot -b -c %s' % chroot_name) do |stdin, stdout, stderr, wait_thr|
         wait_thr.value
         @session = stdout.gets.strip
+        @session
       end
 
       @chroot = chroot_name
@@ -204,7 +253,6 @@ module Schroot
       @logger.debug('Session %s of %s should be stopped' % [@session, @chroot])
       @location = nil
       @session = nil
-
     end
 
     # Sets log object
@@ -216,5 +264,4 @@ module Schroot
     private :safe_run, :command
     attr_reader :session, :location, :chroot, :logger
   end
-
 end

data/lib/schroot/version.rb

@@ -1,3 +1,3 @@
 module Schroot
-  VERSION = "0.0.8"
+  VERSION = '0.0.9'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: schroot
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Daniil Guzanov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-20 00:00:00.000000000 Z
+date: 2014-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler