proxy_pac_rb 0.2.6 → 0.3.0

data/Gemfile

@@ -35,6 +35,7 @@ gem 'fedux_org-stdlib', group: [:development, :test], require: false
 gem 'bundler', '~> 1.3', group: [:development, :test], require: false
 gem 'erubis', group: [:development, :test]
 gem 'versionomy', group: [:development, :test], require: false
+gem 'sinatra', group: [:development, :test], require: 'sinatra/base'
 gem 'activesupport', '~> 4.0.0', group: [:development, :test], require: false
 
 gem 'awesome_print', group: [:development, :test], require: 'ap'

data/README.md

@@ -55,7 +55,7 @@ After installing the `proxy_pac_rb` gem you must install a JavaScript runtime. C
 curl -L -o sample.pac https://github.com/dg-vrnetze/proxy_pac_rb/raw/master/files/sample.pac
 
 # Parse pac
-parsepac -c 127.0.0.1 -t "2014-03-09 12:00:00" -p sample.pac https://github.com
+pprb -c 127.0.0.1 -t "2014-03-09 12:00:00" -p sample.pac https://github.com
 
 # =>                url: result
 # => https://github.com: DIRECT

data/bin/pprb

@@ -6,6 +6,8 @@ require 'proxy_pac_rb'
 require 'ostruct'
 require 'ipaddr'
 require 'optparse'
+require 'addressable/uri'
+require 'open-uri'
 
 module ProxyPacRb
   class Cli
@@ -52,7 +54,7 @@ module ProxyPacRb
       Validator.new(cli.options).validate
 
       environment = ProxyPacRb::Environment.new(client_ip: cli.options.client_ip, time: cli.options.time)
-      file = ProxyPacRb::Parser.new(environment).read(cli.options.proxy_pac_file)
+      file = ProxyPacRb::Parser.new(environment).source(cli.options.proxy_pac_file)
 
       $stderr.printf("%30s: %-s\n", 'url', 'result')
       cli.options.urls.each do |u| 
@@ -83,8 +85,14 @@ module ProxyPacRb
           options.time = Time.parse(t)
         end
 
-        opts.on('-p', '--proxy-pac FILE', 'Proxy.pac-file') do |f|
-          options.proxy_pac_file = ::File.expand_path(::File.join(Dir.getwd, f))
+        opts.on('-p', '--proxy-pac FILE|URL', 'Proxy.pac-file') do |f|
+          uri = Addressable::URI.parse(f)
+
+          if uri.host.nil?
+            uri.path = ::File.expand_path(uri.path)
+          end
+
+          options.proxy_pac_file = open(uri, { proxy: false }).read
         end
 
         opts.on_tail("-h", "--help", "Show this message") do

data/features/resolve_proxy.feature

@@ -30,6 +30,19 @@ Feature: Resolve proxy
     PROXY localhost:3128
     """
 
+  Scenario: Existing proxy.pac with url
+    Given a file named "proxy.pac" with:
+    """
+    function FindProxyForURL(url, host) {
+      return 'PROXY localhost:3128';
+    }
+    """
+    When I successfully run `pprb -p http://127.0.0.1:4567/proxy.pac www.example.org`
+    Then the output should contain:
+    """
+    PROXY localhost:3128
+    """
+
   Scenario: Non-Existing proxy.pac
     When I run `pprb -p proxy.pac www.example.org`
     Then the output should contain:

data/lib/proxy_pac_rb/version.rb

@@ -1,4 +1,4 @@
 #main ProxyPacRb
 module ProxyPacRb
-  VERSION = '0.2.6'
+  VERSION = '0.3.0'
 end

data/script/acceptance_test

@@ -1,4 +1,7 @@
 #!/bin/sh
+bundle exec script/test_web &
 
 bundle exec cucumber
-bundle exec rspec spec/features
+
+pkill -P $$
+

data/script/ci

@@ -1,3 +1,7 @@
 #!/bin/sh
 
+bundle exec script/test_web &
+
 bundle exec rake test:coveralls
+
+pkill -P $$

data/script/test_web

@@ -0,0 +1,15 @@
+#!/usr/bin/env ruby
+
+require 'bundler'
+Bundler.require :default, :test, :development
+
+require 'sinatra/base'
+
+class Server < Sinatra::Base
+  get '/:name' do
+    root_directory = Pathname.new(File.expand_path('../../tmp/aruba', __FILE__))
+    File.read(File.join(root_directory, params[:name]))
+  end
+end
+
+Server.run!

data/script/unit_test

@@ -1,3 +1,7 @@
 #!/bin/sh
+bundle exec script/test_web &
 
 bundle exec rspec
+
+pkill -P $$
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: proxy_pac_rb
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -55,7 +55,6 @@ description: ! 'This gem uses a JavaScript runtime to evaulate a proxy auto-conf
 email:
 - dg1@vrnetze.de
 executables:
-- parsepac
 - pprb
 extensions: []
 extra_rdoc_files: []
@@ -70,7 +69,6 @@ files:
 - LICENSE.md
 - README.md
 - Rakefile
-- bin/parsepac
 - bin/pprb
 - features/.keep
 - features/resolve_proxy.feature
@@ -97,6 +95,7 @@ files:
 - script/ci
 - script/console
 - script/release
+- script/test_web
 - script/unit_test
 - spec/environment_spec.rb
 - spec/file_spec.rb
@@ -107,7 +106,6 @@ files:
 - spec/support/reporting.rb
 - spec/support/rspec.rb
 - spec/support/string.rb
-- tmp/aruba/.keep
 - tmp/functions.js
 - tmp/functions.rb
 - tmp/sample.pac

data/bin/parsepac

@@ -1,110 +0,0 @@
-#!/usr/bin/env ruby
-
-$LOAD_PATH << File.expand_path('../../lib', __FILE__)
-
-require 'proxy_pac_rb'
-require 'ostruct'
-require 'ipaddr'
-require 'optparse'
-
-module ProxyPacRb
-  class Cli
-
-    class Validator
-      private
-
-      attr_reader :options
-
-      public
-
-      def initialize(options)
-        @options = options
-      end
-
-      def validate
-        exit_with_message 'You need to provide at least one url. Multiple urls need to be separated by a space.' if empty_url? 
-        exit_with_message 'You need to provide a proxy pac file.' if empty_pac_file? 
-      end
-
-      private
-
-      def empty_url?
-        options.urls.empty?
-      end
-
-      def empty_pac_file?
-        options.proxy_pac_file.nil?
-      end
-
-      def exit_with_message(msg)
-        $stderr.puts msg
-        exit 1
-      end
-      
-    end
-
-    attr_accessor :options
-
-    def self.start(argv = $*)
-      cli = new
-      cli.parse(argv)
-
-      Validator.new(cli.options).validate
-
-      environment = ProxyPacRb::Environment.new(client_ip: cli.options.client_ip, time: cli.options.time)
-      file = ProxyPacRb::Parser.new(environment).read(cli.options.proxy_pac_file)
-
-      $stderr.printf("%30s: %-s\n", 'url', 'result')
-      cli.options.urls.each do |u| 
-        begin
-          $stderr.printf("%30s: %-s\n", u, file.find(u))
-        rescue Exceptions::UrlInvalid
-          $stderr.puts "You provide an invalid url \"#{u}\". Please use a correct one."
-        end
-      end
-    end
-
-    def initialize
-      @options = OpenStruct.new
-
-      @options.client_ip = IPAddr.new('127.0.0.1')
-      @options.time      = Time.now
-    end
-
-    def parse(argv)
-      parser = OptionParser.new do |opts|
-        opts.banner = "Usage: parsepac [options] url1 [url2..urln]"
-
-        opts.on('-c', '--client-ip IP', 'Client ip address') do |i|
-          options.client_ip = IPAddr.new(i)
-        end
-
-        opts.on('-t', '--time YYYY-MM-DD HH:MM:SS', 'Time to use during lookup url') do |t|
-          options.time = Time.parse(t)
-        end
-
-        opts.on('-p', '--proxy-pac FILE', 'Proxy.pac-file') do |f|
-          options.proxy_pac_file = ::File.expand_path(::File.join(Dir.getwd, f))
-        end
-
-        opts.on_tail("-h", "--help", "Show this message") do
-          $stderr.puts opts
-          exit
-        end
-
-        opts.on_tail("--version", "Show version") do
-          $stderr.puts ProxyPacRb::VERSION
-          exit
-        end
-      end
-
-      $stderr.puts parser.help if argv.empty?
-
-      parser.parse!(argv)
-      options.urls = argv
-    end
-  end
-end
-
-ProxyPacRb::Cli.start
-exit 0