hyperkit 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 31c1d9b05f7078a592ef2e0fcfaee2715cd16484
-  data.tar.gz: 12e2f1eabed87b1691627e1c1a884eaaaaedc94f
+  metadata.gz: bf6274925427cf1c5670ea2af9eac26f7c959c3e
+  data.tar.gz: 2ba1e84fb843852eb70f07622b2a64b7407dd629
 SHA512:
-  metadata.gz: 7608210cba76349bf7530ef5ea62e05be8b4e4e4f17654e0bbf772cc38554a0d7caf69297b483eccdba2bf0a61a8747996ca535b1d40584efa8456621e9edf25
-  data.tar.gz: a38a4bd0fb00a4368d8d2919472e3e3378123cc358fe9dd3f58ffe70f8b6b4a7bd95b06a543e574ebdf6baa5997abf20cbd617da4dc88b98ab4575662aa6a78f
+  metadata.gz: d2387348bed823792209239144e5f46157aff3c470a12531956392cc1dab6c8b76badde557a36c5208eea70a8cbd695267cd753ec8a53ece6125bf7fbd0a9491
+  data.tar.gz: 7a82b8c65626199c48c9eff76834662d81b9822904f4f6e4f5abd60964096ec6831825797a3770df919fc3b0962144375824ccb5a2c8e6bc725ad1c664cdff1c

data/lib/hyperkit/client/containers.rb

@@ -284,6 +284,9 @@ module Hyperkit
       # @param options [Hash] Additional data to be passed
       # @option options [Hash] :environment Environment variables to set prior to command execution
       # @option options [Boolean] :sync If <code>false</code>, returns an asynchronous operation that must be passed to {Hyperkit::Client::Operations#wait_for_operation}.  If <code>true</code>, automatically waits and returns the result of the operation.  Defaults to value of {Hyperkit::Configurable#auto_sync}.
+      # @option options [Boolean] :wait_for_websocket If <code>true</code> block and wait for a websocket connection to start.
+      # @option options [Boolean] :interactive If <code>true</code>a single websocket is returned and is mapped to a pts device for stdin, stdout and stderr of the execed process. If false, three pipes will be setup, one for each of stdin, stdout and stderr.
+      # @option options [Boolean] :record_output If <code>true</code>, captures the output of stdout and stderr.
       # @return [Sawyer::Resource] Operation or result, depending value of <code>:sync</code> parameter and/or {Hyperkit::Client::auto_sync}
       #
       # @example Run a command (passed as a string) in container "test-container"
@@ -312,8 +315,9 @@ module Hyperkit
         response = post(File.join(container_path(container), "exec"), {
           command: command,
           environment: opts[:environment] || {},
-          "wait-for-websocket" => false,
-          interactive: false
+          "wait-for-websocket" => options[:wait_for_websocket] || false,
+          interactive: options[:interactive] || false,
+          "record-output" => options[:record_output] || false
         }).metadata
 
         handle_async(response, options[:sync])
@@ -832,24 +836,31 @@ module Hyperkit
       #
       # @param container [String] Container name
       # @param source_file [String] Full path to a file within the container
-      # @param dest_file [String] Full path of desired output file (will be created/overwritten)
+      # @param dest [String, IO] Full path of desired output file (will be created/overwritten), or an IO object to write to
       # @return [String] Full path to the local output file
       #
       # @example Copy /etc/passwd in container "test" to the local file /tmp/passwd
       #   Hyperkit.pull_file("test", "/etc/passwd", "/tmp/passwd") #=> "/tmp/passwd"
-      def pull_file(container, source_file, dest_file)
+      #
+      # @example Copy /etc/passwd in container "test" to a StringIO object
+      #   Hyperkit.pull_file("test", "/etc/passwd", StringIO.new) #=> <StringIO:0x007fd196061a70>
+      def pull_file(container, source_file, dest)
         contents = get(file_path(container, source_file), url_encode: false)
         headers = last_response.headers
 
-        File.open(dest_file, "wb") do |f|
-          f.write(contents)
-        end
+        if dest.respond_to? :write
+          dest.write(contents)
+        else
+          File.open(dest, "wb") do |f|
+            f.write(contents)
+          end
 
-        if headers["x-lxd-mode"]
-          File.chmod(headers["x-lxd-mode"].to_i(8), dest_file)
+          if headers["x-lxd-mode"]
+            File.chmod(headers["x-lxd-mode"].to_i(8), dest)
+          end
         end
 
-        dest_file
+        dest
 
       end
 
@@ -909,7 +920,7 @@ module Hyperkit
       #
       # @param container [String] Container name
       # @param source_file [String] Full path to a file within the container
-      # @param dest_file [String] Full path of desired output file (will be created/overwritten)
+      # @param dest [String, IO] Full path of desired output file (will be created/overwritten), or an IO object to write to
       # @param options [Hash] Additional data to be passed
       # @option options [Fixnum] :uid Owner to assign to the file
       # @option options [Fixnum] :gid Group to assign to the file
@@ -919,6 +930,9 @@ module Hyperkit
       # @example Copy /tmp/test.txt from the local system to /etc/passwd in the container
       #   Hyperkit.push_file("/tmp/test.txt", "test-container", "/etc/passwd")
       #
+      # @example Write the contents of a StringIO object to /etc/passwd in the container
+      #   Hyperkit.push_file(StringIO.new("test string"), "test-container", "/etc/passwd")
+      #
       # @example Assign uid, gid, and mode to a file:
       #   Hyperkit.push_file("/tmp/test.txt",
       #     "test-container",
@@ -927,10 +941,14 @@ module Hyperkit
       #     gid: 1000,
       #     mode: 0644
       #   )
-      def push_file(source_file, container, dest_file, options={})
+      def push_file(source, container, dest_file, options={})
 
         write_file(container, dest_file, options) do |f|
-          f.write File.read(source_file)
+          if source.respond_to? :read
+            f.write source.read
+          else
+            f.write File.read(source)
+          end
         end
 
       end

data/lib/hyperkit/version.rb

@@ -1,3 +1,3 @@
 module Hyperkit
-  VERSION = "1.0.2"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hyperkit
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Jeff Shantz
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-19 00:00:00.000000000 Z
+date: 2016-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -109,9 +109,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Hyperkit is a flat API wrapper for LXD, the next-generation hypervisor
 test_files: []
-has_rdoc: