lxc 0.3.0 → 0.3.1

data/Gemfile

@@ -1,5 +1,6 @@
 source 'https://rubygems.org'
 
 gem "json" if (RUBY_VERSION == "1.8.7")
+gem "activesupport", "< 4.0.0" if (RUBY_VERSION < "1.9.3")
 
 gemspec

data/lib/lxc/container.rb

@@ -259,17 +259,16 @@ class LXC
 
       ZTK::RescueRetry.try(:tries => 5, :on => ContainerError) do
         tempfile = Tempfile.new("bootstrap")
-        bootstrap_tempfile = File.join("/", "tmp", File.basename(tempfile.path))
+        lxc_tempfile  = File.join("/", "tmp", File.basename(tempfile.path))
+        host_tempfile = File.join(self.fs_root, lxc_tempfile)
 
-        self.exec(<<-SCRIPT)
-  cat <<-EOF | tee #{bootstrap_tempfile}
-  #{content}
-  EOF
-        SCRIPT
+        self.lxc.runner.file(:target => host_tempfile, :chmod => '0755', :chown => 'root:root') do |file|
+          file.puts(content)
+        end
 
-        output = self.lxc.attach(%(-- /bin/bash #{bootstrap_tempfile}))
+        output = self.attach(%(-- /bin/bash #{lxc_tempfile}))
 
-        if !(output =~ /#{bootstrap_tempfile}: No such file or directory/).nil?
+        if !(output =~ /#{lxc_tempfile}: No such file or directory/).nil?
           raise ContainerError, "We could not find the bootstrap file!"
         end
       end

data/lib/lxc/runners/shell.rb

@@ -65,6 +65,38 @@ class LXC
         output.join.strip
       end
 
+      # File I/O Wrapper
+      #
+      # This method renders the supplied *content* to the file named *name* on
+      # the LXC host.
+      #
+      # @param [Hash] options The options hash.
+      # @option options [String] :target The target file on the remote host.
+      # @option options [String] :chown A user:group representation of who
+      #   to change ownership of the target file to (i.e. 'root:root').
+      # @option options [String] :chmod An octal file mode which to set the
+      #   target file to (i.e. '0755').
+      # @return [Boolean] True if successful.
+      def file(name, options={}, &block)
+        flags  = (options[:flags] || 'w')
+        mode   = (options[:mode]  || nil)
+
+        target = options[:target]
+        chown  = options[:chown]
+        chmod  = options[:chmod]
+
+        target.nil? and raise SSHError, "You must supply a target file!"
+        !block_given? and raise SSHError, "You must supply a block!"
+
+        File.open(target, flags, mode) do |file|
+          yield(file)
+          file.respond_to?(:flush) and file.flush
+        end
+
+        chown.nil? or self.exec(%(chown -v #{chown} #{target}))
+        chmod.nil? or self.exec(%(chmod -v #{chmod} #{target}))
+      end
+
       # Provides a concise string representation of the class
       # @return [String]
       def inspect

data/lib/lxc/runners/ssh.rb

@@ -22,12 +22,24 @@ class LXC
       # @param [Hash] options Options hash.
       # @option options [Boolean] :use_sudo (false) Whether or not to prefix all
       #   commands with 'sudo'.
+      # @option options [ZTK::SSH,Net::SSH] :ssh (nil) The SSH object to use for
+      #   remote connections.
+      # @option options [ZTK::SSH,Net::SFTP] :sftp (nil) The SFTP object to use
+      #   for remote file options.
       def initialize(options={})
         @ui       = (options[:ui]       || ZTK::UI.new)
         @use_sudo = (options[:use_sudo] || true)
         @ssh      = (options[:ssh])
+        @sftp     = (options[:sftp])
+
+        # If the @ssh object is an instance of ZTK::SSH then use it for our
+        # SFTP object as well.
+        if @ssh.is_a?(ZTK::SSH)
+          @sftp = @ssh
+        end
 
         @ssh.nil? and raise SSHError, "You must supply a ZTK::SSH or Net::SSH instance!"
+        @sftp.nil? and raise SSHError, "You must supply a ZTK::SSH or Net::SFTP instance!"
       end
 
       # Linux container command execution wrapper
@@ -66,6 +78,40 @@ class LXC
         output.join.strip
       end
 
+      # File I/O Wrapper
+      #
+      # This method renders the supplied *content* to the file named *name* on
+      # the LXC host.
+      #
+      # @param [Hash] options The options hash.
+      # @option options [String] :target The target file on the remote host.
+      # @option options [String] :chown A user:group representation of who
+      #   to change ownership of the target file to (i.e. 'root:root').
+      # @option options [String] :chmod An octal file mode which to set the
+      #   target file to (i.e. '0755').
+      # @return [Boolean] True if successful.
+      def file(options={}, &block)
+        if !@sftp.is_a?(ZTK::SSH)
+          # Massage for Net::SSH
+          flags  = (options[:flags] || 'w')
+          mode   = (options[:mode]  || nil)
+
+          target = options[:target]
+          chown  = options[:chown]
+          chmod  = options[:chmod]
+
+          @sftp.file.open(target, flags, mode) do |file|
+            yield(file)
+          end
+
+          chown.nil? or self.exec(%(chown -v #{chown} #{target}))
+          chmod.nil? or self.exec(%(chmod -v #{chmod} #{target}))
+        else
+          # Pass-through for ZTK:SSH
+          @sftp.file(options, &block)
+        end
+      end
+
       # Provides a concise string representation of the class
       # @return [String]
       def inspect

data/lib/lxc/version.rb

@@ -2,7 +2,7 @@ class LXC
 
   unless const_defined?(:VERSION)
     # LXC Gem Version
-    VERSION = "0.3.0"
+    VERSION = "0.3.1"
   end
 
 end

data/spec/lxc_spec.rb

@@ -191,7 +191,7 @@ describe LXC do
                 :keys => File.join(ENV['HOME'], '.ssh', 'id_rsa'),
                 :keys_only => true
               )
-              runner = ::LXC::Runner::SSH.new(:ssh => connection.ssh)
+              runner = ::LXC::Runner::SSH.new(:ssh => connection)
 
               LXC.new(:runner => runner)
             }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lxc
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors: