cmds 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 60b5fda411ade202d896d087b4104e4db35c3429
-  data.tar.gz: 4bffbff9d0590beb514ace34ab9bf5c1728b6f81
+  metadata.gz: 319129e56b13805451ef585ce44e9aef1029df19
+  data.tar.gz: dab4a172aa3f8dcee5f7d73b86b797cccd3e51c6
 SHA512:
-  metadata.gz: 0e4a2812bce9c3614664ca89da4145e1fdf01cc4db396095a964af7f9c4a95576dd1b28e209063484aea690b97b011b6e26461dbe3646dcb5907e823615def01
-  data.tar.gz: 03a78326ea5c2dbd4789513cdcd3b2bf3d94b0b9e6c6b9e3391f61f644a5c155769ea024ca2cc8074998900059719444eaa7bd671ae114c7783c1edd885cd4e7
+  metadata.gz: 321c3539eb6b193c3226426aeedeb4cd61088335c20bc247193f7c1b89bd45a9cf20e9f2da88826dd8627dfa15a67632a07e4770107990c01d43a8b9a475d738
+  data.tar.gz: 8ac9702dda8dca0f53e1f1f80a64c73ac246d4763d23227ecb3605f82d81a1a74208f64dc83bc97b22990fa6cb572419239abc301af8d4e28f45ae9a3f220544

data/lib/cmds/cmd.rb

@@ -79,6 +79,12 @@ module Cmds
     attr_reader :format
     
     
+    # directory to run the command in.
+    # 
+    # @return [nil | String]
+    attr_reader :chdir
+    
+    
     # construct a Cmd.
     # 
     # @param [String] template
@@ -101,6 +107,9 @@ module Cmds
     # @option opts [:squish, :pretty] :format
     #   sets the {#format} attribute.
     # 
+    # @option opts [nil | String] :chdir
+    #   sets the {#chdir} attribute.
+    # 
     def initialize template, **opts
       Cmds.debug "Cmd constructing...",
         template: template,
@@ -114,6 +123,7 @@ module Cmds
       @env = opts[:env] || {}
       @format = opts[:format] || :squish
       @env_mode = opts[:env_mode] || :inline
+      @chdir = opts[:chdir] || nil
     end # #initialize
     
     
@@ -126,6 +136,7 @@ module Cmds
         assert: @assert,
         env: @env,
         format: @format,
+        chdir: @chdir,
       }
     end
     
@@ -180,9 +191,10 @@ module Cmds
         io_block: io_block
       
       Cmds.spawn  prepare(*args, **kwds),
-                  @input,
+                  input: @input,
                   # include env if mode is spawn argument
-                  (@env_mode == :spawn_arg ? @env : {}),
+                  env: (@env_mode == :spawn_arg ? @env : {}),
+                  chdir: @chdir,
                   &io_block
     end # #stream
     
@@ -230,10 +242,9 @@ module Cmds
       
       status = Cmds.spawn(
         cmd,
-        # we deal with input in the block
-        nil,
         # include env if mode is spawn argument
-        (@env_mode == :spawn_arg ? @env : {}),
+        env: (@env_mode == :spawn_arg ? @env : {}),
+        chdir: @chdir
       ) do |io|
         # send the input to stream, which sends it to spawn
         io.in = input

data/lib/cmds/spawn.rb

@@ -45,11 +45,15 @@ module Cmds
   # @raise [ArgumentError]
   #   if `&io_block` has arity greater than 1.
   # 
-  def self.spawn cmd, input = nil, env = {}, &io_block
-    Cmds.debug "entering Cmds#really_stream",
+  def self.spawn cmd, **opts, &io_block
+    Cmds.debug "entering Cmds#spawn",
       cmd: cmd,
-      input: input,
+      opts: opts,
       io_block: io_block
+    
+    env = opts[:env] || {}
+    input = opts[:input]
+    chdir = opts[:chdir]
 
     # create the handler that will be yielded to the input block
     handler = Cmds::IOHandler.new
@@ -80,6 +84,9 @@ module Cmds
 
     # hash of options that will be passed to `spawn`
     spawn_opts = {}
+    
+    # add chdir if provided
+    spawn_opts[:chdir] = chdir if chdir
 
     Cmds.debug "looking at input...",
       input: input

data/lib/cmds/version.rb

@@ -1,3 +1,3 @@
 module Cmds
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/spec/cmds/env_spec.rb

@@ -1,18 +1,20 @@
 require 'spec_helper'
 
 describe "Cmds ENV vars" do
+  r_echo_cmd = %{ruby -e "puts ENV['BLAH']"}
+  
   it "sets basic (path-like) string ENV var" do
-    cmd = Cmds::Cmd.new 'echo "${BLAH}"', env: {BLAH: "x:y:z"}
+    cmd = Cmds::Cmd.new r_echo_cmd, env: {BLAH: "x:y:z"}
     expect(cmd.chomp!).to eq "x:y:z"
   end
   
   it "sets a string with spaces in it correctly" do
-    cmd = Cmds::Cmd.new 'echo "${BLAH}"', env: {BLAH: "hey there"}
+    cmd = Cmds::Cmd.new r_echo_cmd, env: {BLAH: "hey there"}
     expect(cmd.chomp!).to eq "hey there"
   end
   
   it "accepts string keys" do
-    cmd = Cmds::Cmd.new 'echo "${BLAH}"', env: {
+    cmd = Cmds::Cmd.new r_echo_cmd, env: {
       'BLAH' => [
         "/usr/local/bin",
         "/usr/bin",

metadata

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