miasma-lxd 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 768837675895e46e18d2454a8755dabf7a643689
-  data.tar.gz: 3696866fc4fae82a6c807826927acb6bd727dac2
+  metadata.gz: ba646017086951faed7f23359b872ae84c1f8baf
+  data.tar.gz: 6ab50e243b95ca6f3ac766175ca239554a57b7c7
 SHA512:
-  metadata.gz: 9b76ccc003a7a69d5a83f1d4d0fc683ae344a7e4b9c80e121d81f05271306a7a62c89287a0dfa1cc3739380edcae548c627999a776fb9354d65799ff0cd7248e
-  data.tar.gz: 3c7c6f533d4c53855a5106118745356a9e77dfc060af697b18d1907d051b4fe83515b707622d9867d7753c2c6c61ca5dd9af5b4ca3a85f692ac3ffa9cd60d94f
+  metadata.gz: 39daf7fd1c6bd5e1d6f334de2aa4cc40595431ea25a53d46758bfd1972ce7530a18913c8a1b07dffd3214ca61b71b154a07ebe46bd48f268cfe7f9e4cedc24fd
+  data.tar.gz: c1607129c66022cbad4960c779b994a31d7210fc3295eb24bea8c49e8cc97caf558e31d7cec7d0a23948babc669919fbe9808f8b3f53ab85d816369678f4b728

data/CHANGELOG.md

@@ -1,2 +1,9 @@
+# v0.1.2
+* Allow timeout configuration on exec waiter
+* Do not automatically close connection on EOF
+* Stream uploads instead of full read then write
+* Allow return of status code
+* Support sending custom environment variables
+
 # v0.1.0
 * Initial release

data/lib/miasma/contrib/lxd/compute.rb

@@ -16,6 +16,9 @@ module Miasma
           'stopped' => :stopped
         )
 
+        # @return [Integer]
+        DEFAULT_EXEC_TIMEOUT = 20
+
         # Reload a server model's data
         #
         # @param server [Miasma::Models::Compute::Server]
@@ -161,7 +164,6 @@ module Miasma
         # @param io [IO-ish]
         # @param remote_path [String]
         # @return [TrueClass]
-        # @todo update to write in chunks when over `n` size
         def server_put_file(server, io, remote_path, options={})
           request(
             :method => :post,
@@ -169,8 +171,9 @@ module Miasma
             :params => {
               :path => remote_path
             },
-            :body => io.read,
+            :body => io,
             :headers => {
+              'Transfer-Encoding' => 'chunked',
               'X-LXD-uid' => options.fetch(:uid, 0),
               'X-LXD-gid' => options.fetch(:gid, 0),
               'X-LXD-mode' => options.fetch(:mode, 0700)
@@ -185,7 +188,9 @@ module Miasma
         # @param command [String]
         # @param options [Hash]
         # @option options [IO] :stream write command output
-        # @return [TrueClass, FalseClass] command was successful
+        # @option options [Integer] :return_exit_code
+        # @option options [Integer] :timeout
+        # @return [TrueClass, FalseClass, Integer] command was successful
         def server_execute(server, command, options={})
           result = request(
             :method => :post,
@@ -194,7 +199,8 @@ module Miasma
             :json => Smash.new(
               :command => Shellwords.shellwords(command),
               :interactive => true,
-              'wait-for-websocket' => true
+              'wait-for-websocket' => true,
+              :environment => options.fetch(:environment, {})
             )
           )
           dest = URI.parse(api_endpoint)
@@ -225,12 +231,16 @@ module Miasma
               ]
             end
           ]
-          wait_for_operation(operation, options.fetch(:timeout, 20))
+          wait_for_operation(operation, options.fetch(:timeout, DEFAULT_EXEC_TIMEOUT))
           websockets.map(&:last).map(&:close)
           result = request(
             :path => "operations/#{operation}"
           )
-          result.get(:body, :metadata, :metadata, :return) == 0
+          if(options[:return_exit_code])
+            result.get(:body, :metadata, :metadata, :return)
+          else
+            result.get(:body, :metadata, :metadata, :return) == 0
+          end
         end
 
         protected
@@ -240,13 +250,13 @@ module Miasma
         # @param op_uuid [String]
         # @param timeout [Integer]
         # @return [TrueClass]
-        def wait_for_operation(op_uuid, timeout=20)
+        def wait_for_operation(op_uuid, timeout=DEFAULT_EXEC_TIMEOUT)
           op_uuid = op_uuid.sub("/#{version}/operations/", '')
           request(
             :path => "operations/#{op_uuid}/wait",
             :params => {
               :status_code => 200,
-              :timeout => 20
+              :timeout => timeout
             }
           )
           true

data/lib/miasma-lxd/version.rb

@@ -1,4 +1,4 @@
 module MiasmaLxd
   # Current library version
-  VERSION = Gem::Version.new('0.1.0')
+  VERSION = Gem::Version.new('0.1.2')
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: miasma-lxd
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-05 00:00:00.000000000 Z
+date: 2015-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bogo-websocket