sys_cmd 0.3.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 01dda967130fa079c9737dc1b506855dff005337
-  data.tar.gz: ff4830b731167310c474fc62ee986efe9f09aae1
+  metadata.gz: 0abba95b366a7cea45fc88aed525ce584b7210c1
+  data.tar.gz: 3b46e79596aaf87f60869895ed7b203cb9efbc34
 SHA512:
-  metadata.gz: 928a7ee0a1a7073afb4cdf638646c4081963889362fd0b327f85d8f20946b208261f9d70640bd07f0f312ede928e362b28c28dde0c3104820b797129023ce27a
-  data.tar.gz: bc9c4e8fe7fd332812ab6b409913c7aeb6e913ef5dfd097d5d522c6e967055d26b086d047eb8fcb2cd7018231a6e049cabb63e3232ff18b6b8cd1ba65a6e95bc
+  metadata.gz: 27a762ff57a7dc59365329bb486c076da0ac3b3bde8f525bc118dc19853a0eaca23acfc2188ad4d1bca89388aa0a377c99ee59e6b71423f06a509e152c2e80b1
+  data.tar.gz: eb1a4ac756232ab6488791331bf72bc69b74181107b3ac4eba0e95e49b47752eb73284df264ac52a77bdf3340fcb87721acb4b2e9841a9799f46b925d9384003

data/lib/sys_cmd.rb

@@ -24,19 +24,26 @@ module SysCmd
       @command = ''
       @command << (@options[command] || command)
       @last_arg = :command
+      @stdin_data = nil
     end
 
-    attr_reader :command, :shell
+    attr_reader :command, :shell, :stdin_data
 
     def to_s
       command
     end
 
-    # Add an option. If the option is nor prefixed by - or /
+    # Add an option to the command.
+    #
+    #     option '-x'    # flag-style option
+    #     option '--y'   # long option
+    #     option '/z'    # Windows-style option
+    #     options 'abc'  # unprefixed option
+    #
+    # If the option +:os_prefix+ is true
     # then the default system option switch will be used.
     #
-    #     option 'x' # will produce -x or /x
-    #     option '-x' # will always produce -x
+    #     option 'x', os_prefix: true # will produce -x or /x
     #
     # A value can be given as an option and will be space-separated from
     # the option name:
@@ -66,7 +73,7 @@ module SysCmd
       raise "Invalid number of arguments (0 or 1 expected)" if args.size > 1
       return unless @shell.applicable?(options)
       value = args.shift || options[:value]
-      if /\A[a-z]/i =~ option
+      if options[:os_prefix]
         option = @shell.option_switch + option
       else
         option = option.dup
@@ -88,6 +95,14 @@ module SysCmd
       @last_arg = :option
     end
 
+    # An +os_option+ has automatically a OS-dependent prefix
+    def os_option(option, *args)
+      options = args.pop if args.last.is_a?(Hash)
+      options ||= {}
+      args.push options.merge(os_prefix: true)
+      option option, *args
+    end
+
     # Add a filename to the command.
     #
     #     file 'path/output'
@@ -170,6 +185,14 @@ module SysCmd
       @last_arg = :argument
     end
 
+    # Define data to be passed as standard input to the command
+    def input(data)
+      if @stdin_data
+        @stdin_data += data.to_s
+      else
+        @stdin_data = data.to_s
+      end
+    end
   end
 
   # An executable system command
@@ -178,9 +201,11 @@ module SysCmd
       if command.respond_to?(:shell)
         @command = command.command
         @shell = command.shell
+        @stdin_data = command.stdin_data
       else
         @command = command
         @shell = Shell.new(options)
+        @stdin_data = options[:stdin_data]
       end
       @output = nil
       @status = nil
@@ -239,8 +264,9 @@ module SysCmd
       else
         command = [@command]
       end
-      if options[:stdin_data]
-        command << { stdin_data: options[:stdin_data] }
+      stdin_data = options[:stdin_data] || @stdin_data
+      if stdin_data
+        command << { stdin_data: stdin_data }
       end
       begin
         case options[:error_output]
@@ -263,6 +289,8 @@ module SysCmd
         @output
       when :error_output
         @error_output
+      when :command
+        self
       else
         @error ? nil : @status.success? ? true : false
       end

data/lib/sys_cmd/version.rb

@@ -1,3 +1,3 @@
 module SysCmd
-  VERSION = "0.3.0"
+  VERSION = "1.0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sys_cmd
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Javier Goizueta
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-07-20 00:00:00.000000000 Z
+date: 2015-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: os