adminix 0.1.18 → 0.1.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '098faef5106b7eec94da11777d482614f3f4b6b7'
-  data.tar.gz: d2250cdb502b8e7d02860469a7acfbcaed6917d5
+  metadata.gz: 9618c1c55b36600d0e1a0f343b82ec8339debca4
+  data.tar.gz: b76246588879ea4227e86440aed83c8f203ab42e
 SHA512:
-  metadata.gz: ddb363ea10e351f81bed935ddd699ea4c5b7b7caf4a8f18d9fd294fd9e76fe4cc6b5c22b88fe5fb4d24ce6e00f621a9ce3256e02a497a5cf89b1b28650b5a778
-  data.tar.gz: '08aa9659933b35a968dac35def0b4a0e4edd156f747cd40c3162ba30b6fe008ff6e8928f121da59b9ce38022f6859c6e478bb3675c082ab8cb0bc12ca27ca43e'
+  metadata.gz: 24ce033ce8da30a13c1aaf8a864f1d09a5a595ec69b8a3abf2c3f06ae537e367b2943358182aad726eccb323231ad36b6dbdf715d7390fe2381610b5efd424b2
+  data.tar.gz: c3d654188bf001755b0ef712d5609336178049c97faf1efac70adb6fcd8d4299070848157964591dd38878cfd27723e13e0c21af5b87d9f12f56eb03ce524674

data/lib/adminix/service.rb

@@ -38,6 +38,28 @@ module Adminix
     end
 
     def options_to_envs
+      data = fetch_options
+
+      data['result'].each do |o|
+        puts "export #{o['key'].upcase}=#{o['value']}" 
+      end
+
+      puts "# Run this command to configure your shell:\n" +
+        "# eval $(adminix env)"
+    end
+    
+    def options_to_envs_inline
+      data = fetch_options
+      str = 'export '
+
+      data['result'].each do |o|
+        str << " #{o['key'].upcase}=#{o['value']}" 
+      end
+
+      str
+    end
+
+    def fetch_options
       uri = URI.parse("#{config.host}/v1/services/#{id}/options")
       request = Net::HTTP::Get.new(uri)
       request["Authorization"] = "Bearer #{config.secret_key}"
@@ -46,13 +68,7 @@ module Adminix
         http.request(request)
       end
  
-      data = JSON.parse(response.body)
-      data['result'].each do |o|
-        puts "export #{o['key'].upcase}=#{o['value']}" 
-      end
-
-      puts "# Run this command to configure your shell:\n" +
-        "# eval $(adminix env)"
+      JSON.parse(response.body)
     end
 
     def restart!
@@ -81,8 +97,18 @@ module Adminix
       # TODO frontend fix attribute args
       args.each { |hs| script.gsub!("%{#{hs[0]}}", hs[1]) }
 
+      export_envs = options_to_envs_inline
+      script = "#{export_envs} && #{script}"
+
+      system.log "Executing command: "
+      system.log "-----------------------------------"
+      system.log script
+      system.log "-----------------------------------"
+      
       output = system.eval(script)
+      
       system.log "Command execution output: "
+      system.log "-----------------------------------"
       system.log output
       system.log "-----------------------------------"
 

data/lib/adminix/version.rb

@@ -1,3 +1,3 @@
 module Adminix
-  VERSION = "0.1.18"
+  VERSION = "0.1.19"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: adminix
 version: !ruby/object:Gem::Version
-  version: 0.1.18
+  version: 0.1.19
 platform: ruby
 authors:
 - Christian Dyl
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-19 00:00:00.000000000 Z
+date: 2017-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine