cmds 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3f2767abdf674497cad3cfc8913da88fddcf6cbc
-  data.tar.gz: cd2458c8f02672b9e66d060557e7b996cfc1c8dc
+  metadata.gz: d08e416bc459776d37657d008c179166f451c196
+  data.tar.gz: 4e74d4eef712368c163114a5f10871820dff7125
 SHA512:
-  metadata.gz: 52d88272291712ae57550d0822ae406d9723433866116a2f2802ac65c34423366eef8d1aeb6cb5e6aa778d46abaac3ed830fb96e1060e023f475b9bb4ac86727
-  data.tar.gz: c1125b57ebc1036bec4480bf7b3db332ed75305b65c73933e738a400e85892a0b9dafbb4fe49790042d053f14f4b2ab541e48ec631f80952afca81a744b1ba9e
+  metadata.gz: 347c9989f03c843dec1db86153e2850be3c404879dd08cd68eca284433773609d24442cb0001939f49fdc6bdac2bee531cddb31bee4cdbdb307b0f728cab6f10
+  data.tar.gz: 5e235a6b41d0956cfd3bed4c56425a70a65abbe1163ffff02d14b922c234c25100a37100977b2567d1a1e797ac5a1fde32c368a32ce8a5206dee343ce8980c81

data/lib/cmds/cmd.rb

@@ -1,3 +1,7 @@
+# deps
+require 'nrser'
+
+# project
 require 'cmds/debug'
 require 'cmds/util'
 require 'cmds/spawn'
@@ -109,6 +113,7 @@ module Cmds
       @assert = opts[:assert] || false
       @env = opts[:env] || {}
       @format = opts[:format] || :squish
+      @env_mode = opts[:env_mode] || :inline
     end # #initialize
     
     
@@ -141,8 +146,17 @@ module Cmds
     def render *args, **kwds
       context = Cmds::ERBContext.new((@args + args), @kwds.merge(kwds))
       erb = Cmds::ShellEruby.new Cmds.replace_shortcuts(@template)
-
-      erb.result(context.get_binding)
+      rendered = NRSER.dedent erb.result(context.get_binding)
+      
+      if @env_mode == :inline && !@env.empty?
+        rendered = @env.sort_by {|name, value|
+          name
+        }.map {|name, value|
+          "#{ name }=#{ Cmds.esc value }"
+        }.join("\n\n") + "\n\n" + rendered
+      end
+      
+      rendered
     end
     
     
@@ -165,7 +179,11 @@ module Cmds
         kwds: kwds,
         io_block: io_block
       
-      Cmds.spawn prepare(*args, **kwds), @input, @env, &io_block
+      Cmds.spawn  prepare(*args, **kwds),
+                  @input,
+                  # include env if mode is spawn argument
+                  (@env_mode == :spawn_arg ? @env : {}),
+                  &io_block
     end # #stream
     
     
@@ -210,7 +228,13 @@ module Cmds
 
       Cmds.debug "calling Cmds.spawn..."
       
-      status = Cmds.spawn cmd, nil, @env do |io|
+      status = Cmds.spawn(
+        cmd,
+        # we deal with input in the block
+        nil,
+        # include env if mode is spawn argument
+        (@env_mode == :spawn_arg ? @env : {}),
+      ) do |io|
         # send the input to stream, which sends it to spawn
         io.in = input
 

data/lib/cmds/util.rb

@@ -44,11 +44,17 @@ module Cmds
   end
   
   def self.pretty_format string
+    string = string.gsub(/\n(\s*\n)+\n/, "\n\n")
+    
     string.lines.map {|line|
       line = line.rstrip
       
       if line.end_with? '\\'
         line
+      elsif line == ''
+        '\\'
+      elsif line =~ /\s$/
+        line + '\\'
       else
         line + ' \\'
       end

data/lib/cmds/version.rb

@@ -1,3 +1,3 @@
 module Cmds
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cmds
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - nrser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-03 00:00:00.000000000 Z
+date: 2017-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nrser