proxy_pac_rb 0.6.8 → 0.6.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6218053a32fc112fbc21d3d13dcf321133f7330e
-  data.tar.gz: 5d6a5658d3de402b187a42f97e6a5860f123a1c6
+  metadata.gz: e91fc474b42767f3467a68ee3d5c5ce8856f06f6
+  data.tar.gz: 77927902a99dcc26026e0381f2692815690235b6
 SHA512:
-  metadata.gz: 41b9301f4bbc85cc42838873f2bccce8004c7d32ac8055f2264a36191e1c50c35243027d4f059634cd99480c9887f0f009a2e50718db541039fa27d4172bf8dd
-  data.tar.gz: 0585895de55f8fd9634d204818b96fc042551cbb8d2c67c20624074e615eaf04226b3fc37955037a6d22b108c6f06d65ea319ae600a8dccc115d38e098c7dc1d
+  metadata.gz: 267f300d1b5aaa5abfc8c3717c359341f70904266880eed6ff84526f0909a0a70eacb706bdf2c143aa94f926ad7dc9f17cd3a7812f01a590d0f4f405c14811b6
+  data.tar.gz: 5067d0c9c78254aa7576f8c46e7ea953239ff91d713878de2b45c658a7757fc6bd9b0b10e3b1eb29a8856add226d67461209486c140faf91e8f1cbb4c4cf36f1

data/README.md

@@ -52,12 +52,13 @@ After installing the `proxy_pac_rb` gem you must install a JavaScript runtime. C
 *Use*
 
 ```bash
-# Download pac
+# Download via curl and parse pac
 curl -L -o sample.pac https://github.com/fedux-org/proxy_pac_rb/raw/master/files/sample.pac
-
-# Parse pac
 pprb find proxy -c 127.0.0.1 -t "2014-03-09 12:00:00" -p sample.pac -u https://github.com
 
+# Or download via pprb directly and parse pac #2
+pprb find proxy -c 127.0.0.1 -t "2014-03-09 12:00:00" -p https://github.com/fedux-org/proxy_pac_rb/raw/master/files/sample.pac -u https://github.com
+
 # =>                url: result
 # => https://github.com: DIRECT
 ```

data/lib/proxy_pac_rb/cli/find_proxy.rb

@@ -9,6 +9,7 @@ module ProxyPacRb
       class_option :time, default: Time.now.to_s, desc: 'Time to use during lookup url', aliases: '-t'
       class_option :proxy_pac, desc: 'Proxy.pac-file', aliases: '-p', required: true
       class_option :urls, type: :array, desc: 'URLs to check against proxy pac', aliases: '-u', required: true
+      class_option :use_proxy, default: false, type: :boolean, desc: 'Use proxy to download proxy pac (default false)'
 
       def pre_init
         enable_debug_mode
@@ -22,6 +23,8 @@ module ProxyPacRb
           time: Time.parse(options[:time])
         )
 
+        remove_proxy_environment_variables unless options[:use_proxy]
+
         file = ProxyPacRb::Parser.new(environment: environment).parse(options[:proxy_pac])
 
         return if file.blank?

data/lib/proxy_pac_rb/cli/shared.rb

@@ -7,6 +7,18 @@ module ProxyPacRb
       def enable_debug_mode
         ProxyPacRb.enable_debug_mode if options[:debug_mode] == true
       end
+
+      # Remove proxy variables
+      def remove_proxy_environment_variables
+        %w(
+          http_proxy
+          https_proxy
+          HTTP_PROXY
+          HTTPS_PROXY
+        ).each do |v|
+          ENV.delete(v)
+        end
+      end
     end
   end
 end

data/lib/proxy_pac_rb/proxy_pac_loader.rb

@@ -84,10 +84,8 @@ module ProxyPacRb
   # Load proxy pac from url
   class ProxyPacUriLoader
     def load(proxy_pac)
-      content = Net::HTTP.get(URI(proxy_pac.source.to_s)).chomp
-
-      proxy_pac.content = content
-      proxy_pac.type = :url
+      proxy_pac.content = download_proxy_pac(proxy_pac.source.to_s)
+      proxy_pac.type    = :url
     end
 
     def suitable_for?(proxy_pac)
@@ -104,28 +102,9 @@ module ProxyPacRb
 
     private
 
-    def with_proxy_environment_variables
-      backup = []
-
-      %w(
-        http_proxy
-        https_proxy
-        HTTP_PROXY
-        HTTPS_PROXY
-      ).each do |v|
-        backup << ENV.delete(v)
-      end
-
-      yield
-    ensure
-      %w(
-        http_proxy
-        https_proxy
-        HTTP_PROXY
-        HTTPS_PROXY
-      ).each do |v|
-        ENV[v] = backup.shift
-      end
+    def download_proxy_pac(url)
+      Excon.defaults[:middlewares] << Excon::Middleware::RedirectFollower
+      Excon.get(url).body.chomp
     end
   end
 end

data/lib/proxy_pac_rb/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 # ProxyPacRb
 module ProxyPacRb
-  VERSION = '0.6.8'
+  VERSION = '0.6.9'
 end

data/lib/proxy_pac_rb.rb

@@ -9,7 +9,7 @@ require 'uglifier'
 require 'optparse'
 require 'ostruct'
 require 'resolv'
-require 'net/http'
+require 'excon'
 require 'time'
 require 'timeout'
 require 'pathname'
@@ -29,7 +29,6 @@ require 'proxy_pac_rb/parser'
 require 'proxy_pac_rb/javascript'
 require 'proxy_pac_rb/proxy_pac_js'
 require 'proxy_pac_rb/proxy_pac_file'
-require 'proxy_pac_rb/proxy_pac_template'
 require 'proxy_pac_rb/proxy_pac_compressor'
 require 'proxy_pac_rb/proxy_pac_dumper'
 require 'proxy_pac_rb/proxy_pac_loader'

data/proxy_pac_rb.gemspec

@@ -9,9 +9,11 @@ Gem::Specification.new do |spec|
   spec.email       = ['dg1@vrnetze.de']
   spec.homepage    = 'https://github.com/dg-vrnetze/proxy_pac_rb'
   spec.summary     = 'Compress, lint and parse proxy auto-config files from commandline, rack-compatible applications and custom ruby code.'
+  # rubocop:disable Metrics/LineLength
   spec.description = <<-DESC
 "proxy_pac_rb" is a gem to compress, lint and parse proxy auto-config files. It comes with a cli program, some rack middlewares and can be used from within ruby scripts as well. "proxy_pac_rb" uses a JavaScript runtime to evaulate a proxy auto-config file the same way a browser does to determine what proxy (if any at all) should a program use to connect to a server. You must install on of the supported JavaScript runtimes: therubyracer or therubyrhino
 DESC
+  # rubocop:enable Metrics/LineLength
 
   spec.license       = 'MIT'
 
@@ -23,6 +25,7 @@ DESC
   spec.add_runtime_dependency 'addressable', '~>2.3.8'
   spec.add_runtime_dependency 'activesupport', '~>4.1'
   spec.add_runtime_dependency 'uglifier', '~> 2.7.1'
+  spec.add_runtime_dependency 'excon', '~> 0.45.3'
 
   spec.required_ruby_version = '~> 2.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: proxy_pac_rb
 version: !ruby/object:Gem::Version
-  version: 0.6.8
+  version: 0.6.9
 platform: ruby
 authors:
 - Dennis Günnewig
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.7.1
+- !ruby/object:Gem::Dependency
+  name: excon
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.45.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.45.3
 description: |
   "proxy_pac_rb" is a gem to compress, lint and parse proxy auto-config files. It comes with a cli program, some rack middlewares and can be used from within ruby scripts as well. "proxy_pac_rb" uses a JavaScript runtime to evaulate a proxy auto-config file the same way a browser does to determine what proxy (if any at all) should a program use to connect to a server. You must install on of the supported JavaScript runtimes: therubyracer or therubyrhino
 email:
@@ -117,7 +131,6 @@ files:
 - lib/proxy_pac_rb/proxy_pac_linter.rb
 - lib/proxy_pac_rb/proxy_pac_loader.rb
 - lib/proxy_pac_rb/proxy_pac_parser.rb
-- lib/proxy_pac_rb/proxy_pac_template.rb
 - lib/proxy_pac_rb/rack/proxy_pac_compressor.rb
 - lib/proxy_pac_rb/rack/proxy_pac_linter.rb
 - lib/proxy_pac_rb/rspec.rb

data/lib/proxy_pac_rb/proxy_pac_template.rb

@@ -1,72 +0,0 @@
-# encoding: utf-8
-module ProxyPacRb
-  # Template for proxy pac
-  class ProxyPacTemplate
-    private
-
-    attr_reader :path, :compressed_content
-
-    public
-
-    attr_writer :compressed_content
-
-    def initialize(path)
-      @path = path
-    end
-
-    def write
-      ::File.write(output_path, compressed_content)
-    end
-
-    def compress_me(compressor)
-      compressor.compress(self)
-    end
-
-    def raw_content
-      read_proxy_pac(input_path)
-    end
-
-    def input_path
-      if ::File.exist?(path.gsub(/#{in_extension}*$/, '') + in_extension)
-        return path.gsub(/#{in_extension}*$/, '') + in_extension
-      elsif ::File.exist? path
-        return path
-      else
-        fail Errno::ENOENT, "Both paths \"#{path.gsub(/#{in_extension}*$/, '') + in_extension}\" and \"#{path}\" do not exist."
-      end
-    end
-
-    private
-
-    def in_extension
-      '.in'
-    end
-
-    def out_extension
-      '.out'
-    end
-
-    def output_path
-      if ::File.exist?(path.gsub(/#{in_extension}*$/, '') + in_extension)
-        return path.gsub(/#{in_extension}*$/, '')
-      elsif ::File.exist? path
-        return path + out_extension
-      else
-        fail Errno::ENOENT, "Both paths \"#{path.gsub(/#{in_extension}*$/, '') + in_extension}\" and \"#{path}\" do not exist."
-      end
-    end
-
-    def read_proxy_pac(path)
-      uri = Addressable::URI.parse(path)
-
-      uri.path = ::File.expand_path(uri.path) if uri.host.nil?
-
-      ENV.delete 'HTTP_PROXY'
-      ENV.delete 'HTTPS_PROXY'
-      ENV.delete 'http_proxy'
-      ENV.delete 'https_proxy'
-
-      open(uri, proxy: false).read
-    end
-  end
-end