quick_and_ruby 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2dacf0eef4670a10a60a03ada40d2e0e5d4e30c60b0fc23fdcd3fdbd45e38d82
-  data.tar.gz: e503dd59874a398565fea49086327d7734bfdab6b62fca095b42b146eeff3fd5
+  metadata.gz: 5e695692e69fbbe9d843e3b31fe830ab5db5b9310ec914a29fe1b57bebac5b49
+  data.tar.gz: dd2f04a4330b3e1442fcac6b6eaa3fb28511818b7e7ef0affd6d884468b24d08
 SHA512:
-  metadata.gz: a6bc4542f31f16d60ff9a4e8c5b777eec857b0032e8b3dd26ecee55148776bd8f7fc04dc5220fd9f856944260a2bbbeaae63b54296cf39bab43de8e909f4b23e
-  data.tar.gz: e5606a498d3fbf8c4a09cf222ac82e3e8ed3b3501920db1f7dc48542587d2ac3ad918d6ca65b2cb10f106fca0728ae470442d190e2094b839686ca3a023cd923
+  metadata.gz: d94125e0cb6710267077f820264d547da8400b8914106d39061982a2c6b81bd67f65ccbc739999e5a973db28176cc13fcc9e5bdc3a2926397d62f29fdb87226c
+  data.tar.gz: 765193d18ccf0db661daa0301004867144db799883e016d2e4ebcd07f6e7545fb78dc4faad5604bb968b5ce09194d46d4c3dcfe859cbc7a99c47e786df908907

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    quick_and_ruby (0.1.0)
+    quick_and_ruby (0.2.0)
 
 GEM
   remote: https://rubygems.org/

data/exe/proxy

@@ -3,5 +3,7 @@
 
 require 'quick_and_ruby'
 
-options = QuickAndRuby::Proxy::ArgParser.new(ARGV).parse
-QuickAndRuby::Proxy::Proxy.new(options).start
+env_options = QuickAndRuby::Proxy::EnvParser.new.parse
+arg_options = QuickAndRuby::Proxy::ArgParser.new(ARGV).parse
+QuickAndRuby::Proxy::Proxy.new(env_options.merge(arg_options))
+                          .start

data/lib/quick_and_ruby.rb

@@ -1,5 +1,6 @@
 require 'quick_and_ruby/version'
 require 'quick_and_ruby/proxy/arg_parser'
+require 'quick_and_ruby/proxy/env_parser'
 require 'quick_and_ruby/proxy/proxy'
 
 module QuickAndRuby

data/lib/quick_and_ruby/proxy/arg_parser.rb

@@ -2,9 +2,6 @@ require 'optparse'
 require 'optparse/time'
 require 'ostruct'
 
-# Usage is
-# --dowstream
-# -v --verbose
 module QuickAndRuby
   module Proxy
     # service
@@ -13,11 +10,9 @@ module QuickAndRuby
     class ArgParser
       def initialize(argv)
         @argv = argv
-        @options = OpenStruct.new(
-          verbose: false,
-          bind: '0.0.0.0',
-          port: 8080
-        )
+        @options = { verbose: false,
+                     bind: '0.0.0.0',
+                     port: 8080 }
       end
 
       def parse
@@ -37,32 +32,32 @@ module QuickAndRuby
           opts.separator 'Options:'
 
           opts.on('-v', '--[no-]verbose', 'Run verbosely') do |v|
-            options.verbose = v
+            options[:verbose] = v
           end
 
           opts.on('-u', '--user USER:PASSWORD',
                   'specify USER') do |user|
-            options.user = user
+            options[:user] = user
           end
 
           opts.on('-H', '--proxy-host HOST',
                   'specify proxy HOST to use') do |host|
-            options.proxy_host = host
+            options[:proxy_host] = host
           end
 
           opts.on('-P', '--proxy-port PORT',
                   'specify proxy PORT to use') do |port|
-            options.proxy_port = port
+            options[:proxy_port] = port
           end
 
           opts.on('-b', '--bind IP',
                   'specify IP to bind on') do |ip|
-            options.bind = ip
+            options[:bind] = ip
           end
 
           opts.on('-p', '--port PORT',
                   'specify PORT to listen on') do |port|
-            options.port = port
+            options[:port] = port
           end
 
           opts.on_tail('-h', '--help', 'Show this message') do

data/lib/quick_and_ruby/proxy/env_parser.rb

@@ -0,0 +1,40 @@
+require 'uri'
+
+module QuickAndRuby
+  module Proxy
+    # service
+    # parse env for proxy exe
+    class EnvParser
+      INDEX_TO_KEY = { 3 => :user,
+                       4 => :proxy_host,
+                       5 => :proxy_port }.freeze
+
+      def initialize(env = ENV)
+        @env = env
+      end
+
+      def parse
+        parsed = _parsed_proxy
+        return {} unless parsed
+
+        INDEX_TO_KEY.each_with_object({}) do |(index, key), options|
+          options[key] = parsed[index] if parsed[index]
+        end
+      end
+
+      private
+
+      attr_reader :env
+
+      def _http_proxy
+        env['HTTP_PROXY'] || env['http_proxy']
+      end
+
+      def _parsed_proxy
+        return unless _http_proxy
+
+        _http_proxy.match(URI::DEFAULT_PARSER.make_regexp)
+      end
+    end
+  end
+end

data/lib/quick_and_ruby/proxy/proxy.rb

@@ -40,16 +40,16 @@ module QuickAndRuby
       end
 
       def base_proxy_options
-        { BindAddress: options.bind,
-          Port: options.port }
+        { BindAddress: options[:bind],
+          Port: options[:port] }
       end
 
       def remote_proxy_options
-        if options.proxy_host
+        if options[:proxy_host]
           uri = OpenStruct.new(
-            userinfo: options.user,
-            host: options.proxy_host,
-            port: options.proxy_port
+            userinfo: options[:user],
+            host: options[:proxy_host],
+            port: options[:proxy_port]
           )
           return { ProxyURI: uri }
         end

data/lib/quick_and_ruby/version.rb

@@ -1,3 +1,3 @@
 module QuickAndRuby
-  VERSION = '0.1.0'.freeze
+  VERSION = '0.2.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: quick_and_ruby
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - ttych
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-06 00:00:00.000000000 Z
+date: 2019-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -88,6 +88,7 @@ files:
 - exe/proxy
 - lib/quick_and_ruby.rb
 - lib/quick_and_ruby/proxy/arg_parser.rb
+- lib/quick_and_ruby/proxy/env_parser.rb
 - lib/quick_and_ruby/proxy/proxy.rb
 - lib/quick_and_ruby/version.rb
 - quick_and_ruby.gemspec