kommando 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d3521e56231b4dc2100fce519d440157005c3f7
-  data.tar.gz: 382b63f80f81059847e56cb51a0fcc62366ee2f0
+  metadata.gz: da77c3f809cd0a9d9fdf6ae89c929d6e1ab457f9
+  data.tar.gz: 2e4815740c38be873a97f4f64d278489e18232f3
 SHA512:
-  metadata.gz: 1c5673c728d2a97ac292e4a03918bf8d2a65eb0a4f6f47d1c53fdbf658775de5d5f41063d8cb595483961ed001d4c59bb769c0c6943f7c26196c6cd1fbc4e229
-  data.tar.gz: 33b3dbbce80ba81ce23c1a4777b4233540582c06958347f1605ee1064a4585cfd76afcbcf97f09b8c94aad0276b8c515428658a26e21e52370589ab9b098fe5a
+  metadata.gz: d5ab9ed6a24dd357a3fd86e104723034da942147d7e203f44634fdab52736c2dd59d319cb3432a9742721b975ca79abbc6d1c4c840f86547d95e7021835ce433
+  data.tar.gz: 8e83c297b5706403481eebab8c02a30afff4e7bced1b506ce0733c68c6d4f167584da75ca1e34cb16882ea93940526d3203d2005c8f738645a62729b64057cbf

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # CHANGELOG
 
+## 0.0.10
+ENV variable interpolation.
+
+ - FEAT: Support for ENV variables like `Kommando.new "$ echo $HELLO", { env: { HELLO: "world" } }`
+ - EXAMPLES: `env` added.
+
 ## 0.0.9
 Support for shell (bash) commands.
 

data/examples/env.rb

@@ -0,0 +1,12 @@
+require "./lib/kommando"
+
+k = Kommando.new "$ echo $KOMMANDO_ENV1 $KOMMANDO_ENV2", {
+  env: {
+    KOMMANDO_ENV1: "hello",
+    KOMMANDO_ENV2: "world"
+  }
+}
+k.run
+
+raise "err" unless k.out == "hello world"
+puts k.out

data/lib/kommando/version.rb

@@ -1,3 +1,3 @@
 class Kommando
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

data/lib/kommando.rb

@@ -24,6 +24,8 @@ class Kommando
     @timeout_happened = false
     @kill_happened = false
 
+    @env = opts[:env] || {}
+
     @code = nil
     @executed = false
 
@@ -52,16 +54,45 @@ class Kommando
 
     command, *args = if @cmd.start_with? "$"
       @shell = true
-      trash, line = @cmd.split "$"
+      trash, line = @cmd.split "$", 2
       line.lstrip!
       ["bash", "-c", line]
     else
-      #command, *args = @cmd.split " "
       @cmd.split " "
     end
 
+    @env.each_pair do |k,v|
+      ENV[k.to_s] = v
+    end
+
+    interpolated_args = []
+    if @shell
+      interpolated_args << args.shift
+      shell_line = args[0]
+
+      to_be_interpolated = shell_line.scan(/\$[^\s]*/)
+      to_be_interpolated.each do |to_interpolate|
+        if ENV[to_interpolate]
+          shell_line.gsub!("${to_interpolate}", ENV[to_interpolate])
+        else
+          shell_line.gsub!("${to_interpolate}", "")
+        end
+      end
+
+      interpolated_args << shell_line
+    else
+      args.each do |arg|
+        interpolated_args << if arg.start_with? "$"
+          env_name = arg.split("$")[1]
+          ENV[env_name]
+        else
+          arg
+        end
+      end
+    end
+
     begin
-      PTY.spawn(command, *args) do |stdout, stdin, pid|
+      PTY.spawn(command, *interpolated_args) do |stdout, stdin, pid|
         if @retry && stdout.eof?
           @executed = false
           return run

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kommando
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Matti Paksula
@@ -105,6 +105,7 @@ files:
 - bin/stress
 - bin/version
 - examples/async.rb
+- examples/env.rb
 - examples/exit.rb
 - examples/kill.rb
 - examples/live_output.rb