proxy_pac_rb 0.3.4 → 0.3.6

data/lib/proxy_pac_rb.rb

@@ -1,10 +1,12 @@
+require 'active_support/core_ext/object/blank'
+require 'active_support/core_ext/string/strip'
 require 'addressable/uri'
 require 'ipaddr'
+require 'open-uri'
+require 'optparse'
+require 'ostruct'
 require 'resolv'
 require 'time'
-require 'open-uri'
-require 'active_support/core_ext/string/strip'
-require 'active_support/core_ext/object/blank'
 
 require 'proxy_pac_rb/version'
 require 'proxy_pac_rb/encoding'
@@ -17,3 +19,5 @@ require 'proxy_pac_rb/runtimes/rubyrhino'
 require 'proxy_pac_rb/runtimes'
 require 'proxy_pac_rb/parser'
 require 'proxy_pac_rb/proxy_pac_js'
+require 'proxy_pac_rb/cli_validator'
+require 'proxy_pac_rb/cli'

data/proxy_pac_rb.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.authors     = ['Dennis Günnewig']
   spec.email       = ['dg1@vrnetze.de']
   spec.homepage    = 'https://github.com/dg-vrnetze/proxy_pac_rb'
-  spec.summary     = %q{gem to parse proxy auto-config files.}
+  spec.summary     = 'gem to parse proxy auto-config files.'
   spec.description = <<-DESC
 This gem 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:

data/script/ci

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

data/script/test_web

@@ -5,9 +5,10 @@ Bundler.require :default, :test, :development
 
 require 'sinatra/base'
 
+# Test server
 class Server < Sinatra::Base
   get '/:name' do
-    root_directory = Pathname.new(File.expand_path('../../tmp/aruba', __FILE__))
+    root_directory = Pathname.new(File.expand_path('../../tmp/cucumber', __FILE__))
     File.read(File.join(root_directory, params[:name]))
   end
 end

data/spec/environment_spec.rb

@@ -6,66 +6,66 @@ describe ProxyPacRb::Environment do
     Environment.new(client_ip: '127.0.0.1', time: Time.now)
   end
 
-  describe "#isResolvable()" do
-    it "should return true for localhost" do
-      expect(environment.isResolvable("localhost")).to be_true
+  describe '#isResolvable()' do
+    it 'should return true for localhost' do
+      expect(environment.isResolvable('localhost')).to be true
     end
 
-    it "should return false for unexist.domain.localdomain" do
-      expect(environment.isResolvable('unexist.domain.localdomain')).to be_false
+    it 'should return false for unexist.domain.localdomain' do
+      expect(environment.isResolvable('unexist.domain.localdomain')).to be false
     end
   end
 
   describe '#isPlainHostName' do
     it 'returns true for google' do
       result = environment.isPlainHostName('google')
-      expect(result).to be_true
+      expect(result).to be true
     end
 
     it 'returns false for google.com' do
       result = environment.isPlainHostName('google.com')
-      expect(result).to be_false
+      expect(result).to be false
     end
   end
 
   describe '#dnsDomainIs' do
     it 'returns true for maps.google.com' do
       result = environment.dnsDomainIs('maps.google.com', '.google.com')
-      expect(result).to be_true
+      expect(result).to be true
     end
 
     it 'returns false for maps.ms.com' do
       result = environment.dnsDomainIs('maps.ms.com', '.google.com')
-      expect(result).to be_false
+      expect(result).to be false
     end
   end
 
   describe '#localHostOrDomainIs' do
     it 'returns true for maps.google.com' do
       result = environment.localHostOrDomainIs('maps.google.com', 'maps.google.com')
-      expect(result).to be_true
+      expect(result).to be true
     end
 
     it 'returns true for maps' do
       result = environment.localHostOrDomainIs('maps', 'maps.google.com')
-      expect(result).to be_true
+      expect(result).to be true
     end
 
     it 'returns false for maps.ms.com' do
       result = environment.dnsDomainIs('maps.ms.com', '.google.com')
-      expect(result).to be_false
+      expect(result).to be false
     end
   end
 
   describe '#isInNet' do
     it 'returns true for 127.0.0.1' do
       result = environment.isInNet('127.0.0.1', '127.0.0.0', '255.255.255.0')
-      expect(result).to be_true
+      expect(result).to be true
     end
 
     it 'returns false for 10.0.0.1' do
       result = environment.isInNet('10.0.0.1', '127.0.0.0', '255.255.255.0')
-      expect(result).to be_false
+      expect(result).to be false
     end
 
     it 'resolves host name' do
@@ -126,12 +126,12 @@ describe ProxyPacRb::Environment do
   describe '#shExpMatch' do
     it 'returns true for maps.google.com' do
       result = environment.shExpMatch('maps.google.com', '*.com')
-      expect(result).to be_true
+      expect(result).to be true
     end
 
     it 'returns false for maps.ms.com' do
       result = environment.shExpMatch('maps.ms.com', '*.de')
-      expect(result).to be_false
+      expect(result).to be false
     end
   end
 
@@ -150,13 +150,13 @@ describe ProxyPacRb::Environment do
       string = ''
       environment.prepare(string)
 
-      %w[
-      myIpAddress
-      weekdayRange
-      dateRange
-      timeRange
-      ].each { |f| expect(string).to include(f) }
-      
+      %w(
+        myIpAddress
+        weekdayRange
+        dateRange
+        timeRange
+      ).each { |f| expect(string).to include(f) }
+
     end
   end
 end

data/spec/file_spec.rb

@@ -2,7 +2,7 @@
 require 'spec_helper'
 
 describe File do
-  let(:simple) do 
+  let(:simple) do
     <<-EOS.strip_heredoc
       function FindProxyForURL(url, host) {
         return "DIRECT";
@@ -10,7 +10,7 @@ describe File do
     EOS
   end
 
-  let(:client_ip_pac) do 
+  let(:client_ip_pac) do
     <<-EOS.strip_heredoc
       function FindProxyForURL(url, host) {
         if ( myIpAddress() == '127.0.0.2' ) {
@@ -22,7 +22,7 @@ describe File do
     EOS
   end
 
-  let(:time_pac) do 
+  let(:time_pac) do
     <<-EOS.strip_heredoc
       function FindProxyForURL(url, host) {
         if ( timeRange(8, 18) ) {
@@ -37,9 +37,9 @@ describe File do
   context '#find' do
     it 'returns result of proxy.pac' do
       javascript = double('javascript')
-      expect(javascript).to receive(:call).with("FindProxyForURL", "http://localhost", "localhost")
+      expect(javascript).to receive(:call).with('FindProxyForURL', 'http://localhost', 'localhost')
 
-      ProxyPacRb::File.new(javascript).find("http://localhost")
+      ProxyPacRb::File.new(javascript).find('http://localhost')
     end
   end
 end

data/spec/parser_spec.rb

@@ -2,30 +2,33 @@
 require 'spec_helper'
 
 describe ProxyPacRb::Parser do
-  let(:sample_pac) do 
-    create_file 'sample.pac', <<-EOS.strip_heredoc
+  before :each do
+    write_file 'sample.pac', <<-EOS.strip_heredoc
       function FindProxyForURL(url, host) {
         return "DIRECT";
       }
     EOS
   end
 
-  context ".read" do
-    it "should load a file from a path" do
+  let(:sample_pac) { absolute_path('sample.pac') }
+
+  context '.read' do
+    it 'should load a file from a path' do
       pac = ProxyPacRb::Parser.new.read(sample_pac)
       expect(pac).not_to be_nil
     end
   end
 
-  context ".source" do
-    let(:source) do <<-JS.strip_heredoc
+  context '.source' do
+    let(:source) do
+      <<-JS.strip_heredoc
         function FindProxyForURL(url, host) {
           return "DIRECT";
         }
       JS
     end
 
-    it "should load source" do
+    it 'should load source' do
       pac = ProxyPacRb::Parser.new.source(source)
       expect(pac).not_to be_nil
     end
@@ -76,17 +79,17 @@ describe ProxyPacRb::Parser do
       string = <<-EOS
       function FindProxyForURL(url, host) {
         if (timeRange(8, 18)) {
-          return "PROXY localhost:8080";                                                                                                          
+          return "PROXY localhost:8080";
         } else {
           return "DIRECT";
         }
       }
       EOS
-      
+
       environment = ProxyPacRb::Environment.new(time: Time.parse('2014-03-06 12:00'))
       file = ProxyPacRb::Parser.new(environment).source(string)
       expect(file.find('http://localhost')).to eq('PROXY localhost:8080')
-      
+
       environment = ProxyPacRb::Environment.new(time: Time.parse('2014-03-08 6:00'))
       file = ProxyPacRb::Parser.new(environment).source(string)
       expect(file.find('http://localhost')).to eq('DIRECT')
@@ -96,17 +99,17 @@ describe ProxyPacRb::Parser do
       string = <<-EOS
       function FindProxyForURL(url, host) {
         if (dateRange("JUL", "SEP")) {
-          return "PROXY localhost:8080";                                                                                                          
+          return "PROXY localhost:8080";
         } else {
           return "DIRECT";
         }
       }
       EOS
-      
+
       environment = ProxyPacRb::Environment.new(time: Time.parse('2014-07-06 12:00'))
       file = ProxyPacRb::Parser.new(environment).source(string)
       expect(file.find('http://localhost')).to eq('PROXY localhost:8080')
-      
+
       environment = ProxyPacRb::Environment.new(time: Time.parse('2014-03-08 6:00'))
       file = ProxyPacRb::Parser.new(environment).source(string)
       expect(file.find('http://localhost')).to eq('DIRECT')

data/spec/support/aruba.rb

@@ -0,0 +1,50 @@
+# encoding: utf-8
+require 'aruba/api'
+require 'aruba/reporting'
+
+# Spec Helpers
+module SpecHelper
+  # Helpers for aruba
+  module Aruba
+    include ::Aruba::Api
+
+    def dirs
+      @dirs ||= %w(tmp rspec)
+    end
+
+    def absolute_path(*args)
+      in_current_dir { File.expand_path File.join(*args) }
+    end
+
+    def _create_file(*args)
+      super
+
+      self
+    end
+
+    def create_dir(*args)
+      super
+
+      self
+    end
+
+    def touch_file(file_name)
+      in_current_dir do
+        file_name = File.expand_path(file_name)
+        _mkdir(File.dirname(file_name))
+        FileUtils.touch file_name
+      end
+
+      self
+    end
+  end
+end
+
+RSpec.configure do |c|
+  c.include SpecHelper::Aruba
+
+  c.before :each do
+    clean_current_dir
+    restore_env
+  end
+end

data/spec/support/rspec.rb

@@ -1,6 +1,20 @@
 # encoding: utf-8
-RSpec.configure do |c|
-  c.filter_run_including :focus => true
-  c.run_all_when_everything_filtered                = true
-  c.treat_symbols_as_metadata_keys_with_true_values = true
+RSpec.configure do |config|
+  config.filter_run :focus
+  config.run_all_when_everything_filtered = true
+
+  config.default_formatter = 'doc' if config.files_to_run.one?
+
+  config.profile_examples = 10
+  config.order = :random
+  Kernel.srand config.seed
+
+  config.expect_with :rspec do |expectations|
+    expectations.syntax = :expect
+  end
+
+  config.mock_with :rspec do |mocks|
+    mocks.syntax = :expect
+    mocks.verify_partial_doubles = true
+  end
 end

data/tmp/script.rb

@@ -20,5 +20,3 @@ puts(file.find('http://localhost'))
 environment = ProxyPacRb::Environment.new(client_ip: '127.0.0.2')
 file = ProxyPacRb::Parser.new(environment).source(string)
 puts(file.find('http://localhost'))
-
-

metadata

@@ -1,52 +1,47 @@
 --- !ruby/object:Gem::Specification
 name: proxy_pac_rb
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.6
 platform: ruby
 authors:
 - Dennis Günnewig
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-11 00:00:00.000000000 Z
+date: 2014-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: ! 'This gem 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:
-
+description: |
+  This gem 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, therubyrhino, johnson or mustang.
-
-'
 email:
 - dg1@vrnetze.de
 executables:
@@ -54,25 +49,37 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rdebugrc
-- .rspec
-- .simplecov
-- .travis.yml
-- .yardopts
+- ".gitignore"
+- ".rdebugrc"
+- ".rspec"
+- ".rubocop.yml"
+- ".simplecov"
+- ".travis.yml"
+- ".yardopts"
 - Gemfile
+- Gemfile.lock
 - LICENSE.md
 - README.md
 - Rakefile
 - bin/pprb
+- config/license_finder.yml
+- config/rubocop/exclude.yml
+- config/rubocop/include.yml
+- cucumber.yml
+- doc/dependencies/dependencies.db
 - features/.keep
 - features/resolve_proxy.feature
 - features/step_definitions.rb
+- features/support/aruba.rb
 - features/support/env.rb
+- features/support/fixtures.rb
+- features/support/reporting.rb
 - files/sample.pac
 - files/sample2.pac
 - files/sample3.pac
 - lib/proxy_pac_rb.rb
+- lib/proxy_pac_rb/cli.rb
+- lib/proxy_pac_rb/cli_validator.rb
 - lib/proxy_pac_rb/encoding.rb
 - lib/proxy_pac_rb/environment.rb
 - lib/proxy_pac_rb/exceptions.rb
@@ -96,11 +103,10 @@ files:
 - spec/file_spec.rb
 - spec/parser_spec.rb
 - spec/spec_helper.rb
-- spec/support/environment.rb
-- spec/support/filesystem.rb
+- spec/support/aruba.rb
 - spec/support/reporting.rb
 - spec/support/rspec.rb
-- spec/support/string.rb
+- spec/support/strip.rb
 - tmp/functions.js
 - tmp/functions.rb
 - tmp/sample.pac
@@ -115,17 +121,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: gem to parse proxy auto-config files.
@@ -133,14 +139,16 @@ test_files:
 - features/.keep
 - features/resolve_proxy.feature
 - features/step_definitions.rb
+- features/support/aruba.rb
 - features/support/env.rb
+- features/support/fixtures.rb
+- features/support/reporting.rb
 - spec/environment_spec.rb
 - spec/file_spec.rb
 - spec/parser_spec.rb
 - spec/spec_helper.rb
-- spec/support/environment.rb
-- spec/support/filesystem.rb
+- spec/support/aruba.rb
 - spec/support/reporting.rb
 - spec/support/rspec.rb
-- spec/support/string.rb
+- spec/support/strip.rb
 has_rdoc: