cyclid-lxd-plugin 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e80ccc304ef0f78bf3f751b3ecbf54e2643ded81
-  data.tar.gz: f84ddd8155cbb87826aca0053b7059d3e025568c
+  metadata.gz: 7aedf3aba54742b5b8bc41a4b0273f9cfe6e5a58
+  data.tar.gz: 090f443460169555421d913004bec49ac821ce04
 SHA512:
-  metadata.gz: cb140871d9551c64dc377f410b9a0c7c5f9c833ed83050a5ce67fc40d1741a7958aa066ae28590ff27b2adc15374203729dfd5bf7c1c3e5f597d4d8c2e12ad69
-  data.tar.gz: 8e2e30db75e1623140300e5650c0e082c6dd8df306bd29a15c8530cf0410d3dfdbb18b9f1c4ada5658563be6bf23b9740b626d5b577ab6c22dbe94f9c2cc2e39
+  metadata.gz: 6b31ecd9e7b5f8fd9e0de9e5233923d26ce47d3d3c869351e8a5a50ce401e5fc4f4962e4d737d9b32416aeea02b08c042655919601dc9ca44ccbc801c272f698
+  data.tar.gz: 3de1a041fc55f6e7182d107507905737b3060d22bea95cdd66916927bf044a1f1c6393e1455a9f26f964182626a2c433617a8413c5b480141376da6a79b4980b

data/lib/cyclid/plugins/builder/lxd.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Copyright 2016 Liqwyd Ltd.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -109,9 +110,9 @@ module Cyclid
           raise 'the LXD API URL must be provided' \
             unless lxd_config.key? :api
 
-          lxd_config[:client_cert] = File.join(%w(/ etc cyclid lxd_client.crt)) \
+          lxd_config[:client_cert] = File.join(%w[/ etc cyclid lxd_client.crt]) \
             unless lxd_config.key? :client_cert
-          lxd_config[:client_key] = File.join(%w(/ etc cyclid lxd_client.key)) \
+          lxd_config[:client_key] = File.join(%w[/ etc cyclid lxd_client.key]) \
             unless lxd_config.key? :client_key
 
           lxd_config[:verify_ssl] = false \

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Copyright 2016 Liqwyd Ltd.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -55,8 +56,11 @@ module Cyclid
         end
 
         # Execute a command via. the LXD API
-        def exec(cmd, path = nil)
-          command = build_command(cmd, path)
+        def exec(cmd, args = {})
+          sudo = args[:sudo] || false
+          path = args[:path]
+
+          command = build_command(cmd, sudo, path)
           Cyclid.logger.debug "command=#{command}"
 
           # Ensure some important variables are set, like HOME & TERM
@@ -145,9 +149,9 @@ module Cyclid
           raise 'the LXD API URL must be provided' \
             unless lxd_config.key? :api
 
-          lxd_config[:client_cert] = File.join(%w(/ etc cyclid lxd_client.crt)) \
+          lxd_config[:client_cert] = File.join(%w[/ etc cyclid lxd_client.crt]) \
             unless lxd_config.key? :client_cert
-          lxd_config[:client_key] = File.join(%w(/ etc cyclid lxd_client.key)) \
+          lxd_config[:client_key] = File.join(%w[/ etc cyclid lxd_client.key]) \
             unless lxd_config.key? :client_key
 
           lxd_config[:verify_ssl] = false \
@@ -156,13 +160,15 @@ module Cyclid
           lxd_config
         end
 
-        def build_command(cmd, path = nil)
+        def build_command(cmd, sudo, path = nil)
           command = []
           command << "cd #{path}" if path
           command << if @username == 'root'
                        cmd
+                     elsif sudo
+                       "sudo -E -n $SHELL -l -c '#{cmd}'"
                      else
-                       "sudo -E #{cmd}"
+                       cmd
                      end
           "sh -l -c '#{command.join(';')}'"
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cyclid-lxd-plugin
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Kristian Van Der Vliet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-27 00:00:00.000000000 Z
+date: 2017-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hyperkit
@@ -44,15 +44,15 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
-description: Creates LXD container basedt build hosts
+        version: '0.4'
+description: Creates LXD container based build hosts
 email: contact@cyclid.io
 executables: []
 extensions: []