curl-spawn 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7676051058f1b4763f5a22e603b71561f1ccb6b3
-  data.tar.gz: 8f1a5765a4d41861aaa1660801e1e0c55c19f1af
+  metadata.gz: b7121cb56a7c138875506f87858ad808ab22005f
+  data.tar.gz: 980bc5a685ad3ec9a07631c1154b22b79a2e6349
 SHA512:
-  metadata.gz: a50aed177c4f47f3a0fb3e93ed3c170f5a9d29c9f5f89747a995cb742bfe4aae4dc904a49af982651a367b65d9e93ddd0a4dd76e27c72c43d49b0f9ad4c60eeb
-  data.tar.gz: 0fa807255c489c528d8d479fdbf4288aa7648d36ef6ba31bc82fb63577c5dffa6d1f2c431b7304a7ed2be65ec05371a748f4a82b77bd81628f96cc8e2befce68
+  metadata.gz: c7e764cc43584cb15998584773c004ef2177289887e7b6d0ae871845eaeffb45f72d2f2a908636d99123f849d8e2aa867a732b7f28ff2e58a4f941bc193e6122
+  data.tar.gz: 9a93410f827113d423fcfd52b27d75365450cd26d68d772202b78a3b8b2a627dbef9eb429954a00373e761688d9fcb3d694c24e2023e534816d8cd68557fc3ec

data/lib/curl/spawn.rb

@@ -1,6 +1,7 @@
 require "curl/spawn/version"
 require "curl/spawn/args_builder"
 require 'erb'
+require 'uri'
 
 module Curl
   module Spawn
@@ -9,31 +10,60 @@ module Curl
       builder.instance_eval(&block) if block
       builder.build!
     end
-  end
 
-  def self.spawn(*supplied_argv, &block)
-    built_args = Curl::Spawn.build_args(&block)
+    def self.merge_args(supplied_argv, built_args)
+      normalized_argv = []
 
-    normalized_argv = []
+      supplied_opt = supplied_argv.last.kind_of?(Hash) ? supplied_argv.pop : {}
+      supplied_env = supplied_argv.first.kind_of?(Hash) ? supplied_argv.shift : {}
 
-    supplied_opt = supplied_argv.last.kind_of?(Hash) ? supplied_argv.pop : {}
+      # Merge the argv contents
+      built_args.argv.each do |arg|
+        normalized_argv.push(arg.to_s)
+      end
 
-    # Merge the argv contents
-    built_args.argv.each do |arg|
-      normalized_argv.push(arg.to_s)
-    end
+      supplied_argv.each do |arg|
+        normalized_argv.push(arg.to_s)
+      end
 
-    supplied_argv.each do |arg|
-      normalized_argv.push(arg.to_s)
-    end
+      # Merge the spawn options hash argument
+      normalized_argv.push(supplied_opt.merge(built_args.opt))
 
-    # Merge the spawn options hash argument
-    normalized_argv.push(supplied_opt.merge(built_args.opt))
+      # Merge the env options hash argument
+      normalized_argv.unshift(supplied_env.merge(built_args.env))
 
+      normalized_argv
+    end
+  end
+
+  # Synopsis: Curses.spawn([spawn_env_hash,] *positional_args [, spawn_options_hash])
+  # Note: If only one hash is supplied, it is assumed to be an options hash, not
+  #       an environment hash (see Kernel.spawn).
+  def self.spawn(*supplied_argv, &block)
+    built_args = Curl::Spawn.build_args(&block)
+    normalized_argv = Curl::Spawn.merge_args(supplied_argv, built_args)
     Kernel.spawn(*normalized_argv)
   end
 
-  def self.url_encode(str)
+  def self.encode_url(str)
     ERB::Util.url_encode(str)
   end
+  class << self
+    alias url_encode encode_url
+  end
+
+  def self.encode_form(form)
+    URI.encode_www_form(form)
+  end
+  class << self
+    alias form_encode encode_form
+    alias encode_www_form encode_form
+  end
+
+  def self.encode_form_component(str, enc=nil)
+    URL.encode_www_form_component(str, enc)
+  end
+  class << self
+    alias encode_www_form_component encode_form_component
+  end
 end

data/lib/curl/spawn/args_builder.rb

@@ -17,6 +17,13 @@ module Spawn
       @queries = {}
       @headers = {}
       @data = nil
+
+      @show_headers = false
+      @verbose = false
+    end
+
+    def url_encode(str)
+      Curl.url_encode(str)
     end
 
     def user(user)
@@ -87,6 +94,17 @@ module Spawn
     alias content data
     alias content= data
 
+    def dump_headers(v=true)
+      @show_headers = v
+    end
+    alias dump_headers= dump_headers
+    alias show_headers dump_headers
+    alias show_headers= dump_headers
+
+    def verbose
+      @verbose = true
+    end
+
     def build!
       args = ::Curl::Spawn::Args.new
 
@@ -121,6 +139,14 @@ module Spawn
         args.opt[:in] = @data
       end
 
+      if @show_headers
+        args.argv.push('-i')
+      end
+
+      if @verbose
+        args.argv.push('-v')
+      end
+
       args.argv = args.argv.reject { |arg| arg.nil? || arg.empty? }.map { |arg| arg.to_s }
 
       args

data/lib/curl/spawn/version.rb

@@ -1,5 +1,5 @@
 module Curl
   module Spawn
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: curl-spawn
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - jbreeden
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-24 00:00:00.000000000 Z
+date: 2016-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler