cyclid-lxd-plugin 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 28191bf50cd5de65833791d6de820ca8e16b5e9e
-  data.tar.gz: fee02e95b7031694e032d00b13aa58136f338951
+  metadata.gz: e80ccc304ef0f78bf3f751b3ecbf54e2643ded81
+  data.tar.gz: f84ddd8155cbb87826aca0053b7059d3e025568c
 SHA512:
-  metadata.gz: 792ea700154e73b4ded74ec0e31fe9d4270044fcc8f0c987dfba61694d4647866b7b700b1f20a827a871fa547a10858b44588bb850bdf5b9bc71774c43431467
-  data.tar.gz: 10995f857e821416149dfe18907e46539f5d98f0d13a8426b7673a7371711085c940af54177dc467a2a61baa291d4af1ff25d5c5edb14be8f0f8733e13bbf377
+  metadata.gz: cb140871d9551c64dc377f410b9a0c7c5f9c833ed83050a5ce67fc40d1741a7958aa066ae28590ff27b2adc15374203729dfd5bf7c1c3e5f597d4d8c2e12ad69
+  data.tar.gz: 8e2e30db75e1623140300e5650c0e082c6dd8df306bd29a15c8530cf0410d3dfdbb18b9f1c4ada5658563be6bf23b9740b626d5b577ab6c22dbe94f9c2cc2e39

data/lib/cyclid/plugins/transport/lxdapi.rb

@@ -46,9 +46,12 @@ module Cyclid
                                          client_key: @config[:client_key])
 
           # Grab some data from the context
+          Cyclid.logger.debug "lxdapi args=#{args.inspect}"
           ctx = args[:ctx]
           @base_env = { 'HOME' => ctx[:workspace],
                         'TERM' => 'xterm-mono' }
+
+          @username = ctx[:username]
         end
 
         # Execute a command via. the LXD API
@@ -79,9 +82,11 @@ module Cyclid
             ws.on :message do |msg|
               close if msg.data.empty?
               # Strip out any XTerm control characters and convert lint endings
-              data = msg.data.force_encoding('UTF-8')
-                        .gsub(/\r\n/, "\n")
-                        .gsub(/\r+/, "\n")
+              data = msg.data.encode('US-ASCII',
+                                     invalid: :replace,
+                                     undef: :replace,
+                                     universal_newline: true)
+                        .squeeze("\n")
                         .gsub(/\033\[(.?\d+\D?|\w+)/, '')
 
               log.write data
@@ -154,7 +159,11 @@ module Cyclid
         def build_command(cmd, path = nil)
           command = []
           command << "cd #{path}" if path
-          command << cmd
+          command << if @username == 'root'
+                       cmd
+                     else
+                       "sudo -E #{cmd}"
+                     end
           "sh -l -c '#{command.join(';')}'"
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cyclid-lxd-plugin
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Kristian Van Der Vliet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-15 00:00:00.000000000 Z
+date: 2016-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hyperkit
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: websocket-client-simple
   requirement: !ruby/object:Gem::Requirement