local_pac 0.3.0 → 0.4.0

data/spec/local_storage_spec.rb

@@ -13,6 +13,7 @@ describe LocalStorage do
     it 'initializes storage' do
       file = double('File')
       allow(file).to receive(:name).and_return(:file1)
+      allow(file).to receive(:path).and_return('file1.pac')
       
       repo = double('GitRepository')
       expect(repo).to receive(:[]).and_return(file)
@@ -21,39 +22,44 @@ describe LocalStorage do
       file = storage.find('file1')
       expect(file.name).to eq(:file1)
     end
+  end
 
-    context '#find' do
-      it 'returns file if exists' do
-        file = double('GitFile')
-        allow(file).to receive(:name).and_return(:file1)
+  context '#find' do
+    it 'returns file if exists' do
+      file = double('File')
+      allow(file).to receive(:name).and_return(:file1)
+      allow(file).to receive(:path).and_return('file1.pac')
 
-        repo = double('GitRepository')
-        expect(repo).to receive(:[]).and_return(file)
+      repo = double('GitRepository')
+      expect(repo).to receive(:[]).and_return(file)
 
-        storage = LocalStorage.new(repo)
-        file = storage.find('file1')
-        expect(file.name).to eq(:file1)
-      end
+      storage = LocalStorage.new(repo)
+      file = storage.find('file1')
+      expect(file.name).to eq(:file1)
+    end
 
-      it 'returns file for pac in subdir' do
-        file = double('GitFile')
-        allow(file).to receive(:name).and_return(:'dir::file1')
+    it 'returns file for pac in subdir' do
+      file = double('File')
+      allow(file).to receive(:name).and_return(:'dir::file1')
+      allow(file).to receive(:path).and_return('dir/file1.pac')
 
-        repo = double('GitRepository')
-        expect(repo).to receive(:[]).and_return(file)
+      repo = double('GitRepository')
+      expect(repo).to receive(:[]).and_return(file)
 
-        storage = LocalStorage.new(repo)
-        file = storage.find('dir/file1')
-        expect(file.name).to eq(:'dir::file1')
-      end
+      storage = LocalStorage.new(repo)
+      file = storage.find('dir/file1')
+      expect(file.name).to eq(:'dir::file1')
+    end
 
-      it 'returns null file if does not exist' do
-        repo = double('GitRepository')
-        expect(repo).to receive(:[]).and_return(nil)
+    it 'returns null file if does not exist' do
+      file = double('File')
+      allow(file).to receive(:path).and_return(nil)
 
-        storage = LocalStorage.new(repo)
-        expect(storage.find('unexist')).to be_nil
-      end
+      repo = double('GitRepository')
+      expect(repo).to receive(:[]).and_return(file)
+
+      storage = LocalStorage.new(repo)
+      expect(storage.find('unexist').path).to be_nil
     end
   end
 end

data/spec/pac_file_validator_spec.rb

@@ -9,11 +9,18 @@ describe PacFileValidator do
                            EOS
     end
 
-    let(:invalid_pac_file) do <<-EOS.strip_heredoc
+    let(:invalid_pac_file1) do <<-EOS.strip_heredoc
                            function FindProxyForURL(url, host) {
                            EOS
     end
 
+    let(:invalid_pac_file2) do <<-EOS.strip_heredoc
+                           function FindProxyForURL(url, host) {
+                           asdf();
+                           }
+                           EOS
+    end
+
     it 'returns true if file is valid' do
       file = double('PacFile')
       expect(file).to receive(:content).and_return(valid_pac_file)
@@ -21,9 +28,16 @@ describe PacFileValidator do
       expect(validator.valid?(file)).to be_true
     end
 
-    it 'returns true if file is invalid' do
+    it 'returns false if file produces parsing error' do
+      file = double('PacFile')
+      expect(file).to receive(:content).and_return(invalid_pac_file1)
+      validator = PacFileValidator.new
+      expect(validator.valid?(file)).to be_false
+    end
+
+    it 'returns false if file uses invalid function' do
       file = double('PacFile')
-      expect(file).to receive(:content).and_return(invalid_pac_file)
+      expect(file).to receive(:content).and_return(invalid_pac_file2)
       validator = PacFileValidator.new
       expect(validator.valid?(file)).to be_false
     end

data/spec/proxy_pac/pac_engine_spec.rb

@@ -26,7 +26,9 @@ describe ProxyPac::PACEngine do
       parser = ProxyPac::PACEngine.new(file: file)
 
       expect do
-        parser.find(Addressable::URI.parse('http://example.org'))
+        silence(:stderr) do
+          parser.find(Addressable::URI.parse('http://example.org'))
+        end
       end.to raise_error Exceptions::PacFileInvalid
     end
   end

data/spec/server_spec.rb

@@ -18,55 +18,56 @@ describe Server do
     end
   end
 
-  context '#start' do
-    it 'starts the server' do
-      create_file 'app.rb', <<-EOS.strip_heredoc
-      require 'sinatra'
+  #context '#start' do
+  #  it 'starts the server' do
+  #    create_file 'app.rb', <<-EOS.strip_heredoc
+  #    require 'sinatra'
 
-      trap 'USR1' do
-        $stderr.puts "Exit"
-        Kernel.exit!
-      end
+  #    trap 'USR1' do
+  #      $stderr.puts "Exit"
+  #      Kernel.exit!
+  #    end
 
-      class App < Sinatra::Base
-        get '/' do
-          'Hello World'
-        end
-      end
-      EOS
+  #    class App < Sinatra::Base
+  #      get '/' do
+  #        'Hello World'
+  #      end
+  #    end
+  #    EOS
 
-      config_file = create_file 'config.ru', <<-EOS.strip_heredoc
-      $LOAD_PATH << File.expand_path('..', __FILE__)
+  #    config_file = create_file 'config.ru', <<-EOS.strip_heredoc
+  #    $LOAD_PATH << File.expand_path('..', __FILE__)
 
-      #$stderr = StringIO.new
-      #$stdout = StringIO.new
+  #    $stderr = StringIO.new
+  #    $stdout = StringIO.new
 
-      require 'app'
-      run App
-      EOS
+  #    require 'app'
+  #    run App
+  #    EOS
 
-      command = double('Command')
-      allow(command).to receive(:to_s).and_return("rackup -E development -o 127.0.0.1 -p 9999 #{config_file} 2>/dev/null >&1")
+  #    command = double('Command')
+  #    allow(command).to receive(:to_s).and_return("rackup -E development -o 127.0.0.1 -p 9999 #{config_file} 2>/dev/null >&1")
 
-      server = Server.new(command)
+  #    LocalPac.ui_logger.level = :unknown
+  #    server = Server.new(command)
 
-      unless child_pid = Kernel.fork
-        server.start
-      end
+  #    unless child_pid = Kernel.fork
+  #      server.start
+  #    end
 
-      begin
-        tries ||= 3
+  #    begin
+  #      tries ||= 3
 
-        response = with_environment({}, clear: true) do
-          Excon.get('http://127.0.0.1:9999')
-        end
-      rescue Excon::Errors::SocketError
-        sleep 1
-        retry unless (tries -= 1).zero?
-      end
+  #      response = with_environment({}, clear: true) do
+  #        Excon.get('http://127.0.0.1:9999')
+  #      end
+  #    rescue Excon::Errors::SocketError
+  #      sleep 1
+  #      retry unless (tries -= 1).zero?
+  #    end
 
-      Process.kill :USR1, child_pid
-      expect(response.body).to eq('Hello World')
-    end
-  end
+  #    expect(response.body).to eq('Hello World')
+  #    Process.kill 'USR1', child_pid
+  #  end
+  #end
 end

data/spec/support/reporting.rb

@@ -1 +1,3 @@
 require 'active_support/core_ext/kernel/reporting'
+
+LocalPac.ui_logger.level = :unknown

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: local_pac
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-03 00:00:00.000000000 Z
+date: 2014-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -331,6 +331,38 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sinatra-param
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sinatra-contrib
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rugged
   requirement: !ruby/object:Gem::Requirement
@@ -418,6 +450,7 @@ files:
 - app/controllers/application_controller.rb
 - app/controllers/assets_controller.rb
 - app/controllers/file_serve_controller.rb
+- app/controllers/git_hook_controller.rb
 - app/controllers/lookup_controller.rb
 - app/locales/de.yml
 - app/locales/en.yml
@@ -439,7 +472,7 @@ files:
 - files/examples/proxy-complex.pac.example
 - files/examples/proxy-function_demo.pac.example
 - files/examples/proxy.pac.example
-- files/git-hook.erb
+- files/git-hook.rb.erb
 - files/proxy.pac
 - lib/local_pac.rb
 - lib/local_pac/access_logger.rb
@@ -521,6 +554,7 @@ files:
 - spec/config_spec.rb
 - spec/data_spec.rb
 - spec/erb_generator_spec.rb
+- spec/features/check_git_push_spec.rb
 - spec/features/fetch_proxy_pac_spec.rb
 - spec/features/lookup_proxy_spec.rb
 - spec/file_spec.rb
@@ -603,6 +637,7 @@ test_files:
 - spec/config_spec.rb
 - spec/data_spec.rb
 - spec/erb_generator_spec.rb
+- spec/features/check_git_push_spec.rb
 - spec/features/fetch_proxy_pac_spec.rb
 - spec/features/lookup_proxy_spec.rb
 - spec/file_spec.rb

data/files/git-hook.erb

@@ -1,26 +0,0 @@
-#!/usr/bin/env ruby
-
-<% Array(lookup('gem_path')).each do |p| -%>
-$LOAD_PATH.unshift '<%= p %>'
-<% end -%>
-
-require 'git_hook-pre_receive'
-require 'pac'
-require 'uri'
-
-class PacFileSyntaxChecker
-  def check(files)
-    files.each do |f|
-      begin
-        pac = PAC.source f.content
-        pac.find('http://www.example.com')
-      rescue => e
-        $stderr.puts "Maybe I found a syntax error in file \"#{f.name}\". Please check files locally again, e.g with a pac file tester, fix the error and send update via git. The original error was: #{e.message}"
-        exit 1
-      end
-    end
-  end
-end
-
-parser = Git::PreReceiveHookParser.new($stdin.read)
-PacFileSyntaxChecker.new.check(parser.files)