local_pac 0.5.0 → 0.6.1

data/lib/local_pac/version.rb

@@ -1,4 +1,4 @@
 #main LocalPac
 module LocalPac
-  VERSION = '0.5.0'
+  VERSION = '0.6.1'
 end

data/local_pac.gemspec

@@ -36,12 +36,10 @@ EOS
   spec.add_runtime_dependency 'sinatra'
   spec.add_runtime_dependency 'activesupport'
   spec.add_runtime_dependency 'pac'
-  spec.add_runtime_dependency 'git_hook-pre_receive', '~>0.1.0'
   spec.add_runtime_dependency 'facter'
   spec.add_runtime_dependency 'pager'
   spec.add_runtime_dependency 'sys-proctable'
   spec.add_runtime_dependency 'sinatra-param'
   spec.add_runtime_dependency 'sinatra-contrib'
   spec.add_runtime_dependency 'rugged'
-#  spec.add_runtime_dependency 'fedux_org-stdlib'
 end

data/script/acceptance_test

@@ -0,0 +1,4 @@
+#!/bin/sh
+
+bundle exec cucumber
+bundle exec rspec spec/features

data/script/bootstrap

@@ -0,0 +1,5 @@
+#!/bin/sh
+
+echo "Bootstrapping development environment for application.." >&2
+
+gem install bundler && bundle install

data/script/ci

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+bundle exec rake test:coveralls

data/script/release

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+bundle exec rake gem:release

data/script/unit_test

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+bundle exec rspec

data/spec/actions/handle_error_spec.rb

@@ -0,0 +1,29 @@
+# encoding: utf-8
+require 'spec_helper'
+
+describe Actions::HandleError do
+  context '#initialize' do
+    it 'requires an exception' do
+      expect {
+      Actions::HandleError.new(StandardError.new)
+      }.not_to raise_error
+    end
+  end
+
+  context '#run' do
+    it 'handles errors' do
+      action = Actions::HandleError.new(RuntimeError.new)
+
+      silence(:stderr) do
+        begin
+          action.run
+        rescue SystemExit => e
+          @err = e
+        end
+      end
+
+      expect(@err).to be_kind_of(SystemExit)
+      expect(@err.status).to be(99)
+    end
+  end
+end

data/spec/{initializer_spec.rb → actions/initialize_application_spec.rb}

@@ -1,7 +1,7 @@
 # encoding: utf-8
 require 'spec_helper'
 
-describe Initializer do
+describe Actions::InitializeApplication do
 
   context '#run' do
     it 'creates all files/directories neccessary to run local_pac' do
@@ -18,7 +18,7 @@ describe Initializer do
       config_file = create_file('config_spec.yaml', config_string)
 
       config = LocalPac::Config.new(config_file)
-      initializer = Initializer.new({
+      initializer = Actions::InitializeApplication.new({
           create_pid_directory: true,
           create_log_directory: true,
           create_sass_cache: true,
@@ -54,7 +54,7 @@ describe Initializer do
         config_file = create_file('config_spec.yaml', config_string)
 
         config = LocalPac::Config.new(config_file)
-        initializer = Initializer.new({
+        initializer = Actions::InitializeApplication.new({
           pre_seed: true,
           create_local_storage: true,
         }, config)

data/spec/{application_status_spec.rb → actions/show_application_status_spec.rb}

@@ -1,7 +1,7 @@
 # encoding: utf-8
 require 'spec_helper'
 
-describe ApplicationStatus do
+describe Actions::ShowApplicationStatus do
   let(:valid_pac_file) do <<-EOS.strip_heredoc.chomp
                            function FindProxyForURL(url, host) {
                              return "DIRECT";
@@ -12,18 +12,18 @@ describe ApplicationStatus do
   context '#initialize' do
     it 'has no special requirements' do
       expect {
-        ApplicationStatus.new
+        Actions::ShowApplicationStatus.new
       }.not_to raise_error
     end
 
     it 'let you deactivate paging' do
       expect {
-        ApplicationStatus.new(pager: false)
+        Actions::ShowApplicationStatus.new(pager: false)
       }.not_to raise_error
     end
   end
 
-  context '#show' do
+  context '#run' do
     it 'show application status' do
       git_repo = ::File.join(working_directory, 'data', 'storage.git')
 
@@ -41,7 +41,7 @@ describe ApplicationStatus do
       config = LocalPac::Config.new(config_file)
 
       result = capture(:stdout) do
-        ApplicationStatus.new(pager: false, config: config).show
+        Actions::ShowApplicationStatus.new(pager: false, config: config).run
       end
 
       expect(result).to include('osfamily')

data/spec/actions/show_pac_file_spec.rb

@@ -0,0 +1,36 @@
+# encoding: utf-8
+require 'spec_helper'
+
+describe Actions::ShowPacFile do
+  let(:valid_pac_file) do <<-EOS.strip_heredoc.chomp
+                           function FindProxyForURL(url, host) {
+                             return "DIRECT";
+                           }
+  EOS
+  end
+
+  context '#initialize' do
+    it 'requires a git repository' do
+      expect { 
+        Actions::ShowPacFile.new(working_directory, 'proxy.pac')
+      }.not_to raise_error
+    end
+  end
+
+  context '#run' do
+    it 'shows proxy.pac file' do
+      repo = GitRepository.create(working_directory)
+      repo.add_content('proxy.pac', 'asdf()')
+      repo.add_content('proxy1.pac', 'asd1f()')
+
+      action = Actions::ShowPacFile.new('proxy.pac', working_directory)
+
+      result = capture(:stdout) do
+        LocalPac.ui_logger.level = :info
+        action.run
+      end
+
+      expect(result).to include('asdf()')
+    end
+  end
+end

data/spec/actions/validate_pac_file_spec.rb

@@ -0,0 +1,62 @@
+# encoding: utf-8
+require 'spec_helper'
+
+describe Actions::ValidatePacFile do
+  let(:valid_pac_file) do <<-EOS.strip_heredoc.chomp
+                           function FindProxyForURL(url, host) {
+                             return "DIRECT";
+                           }
+  EOS
+  end
+
+  let(:invalid_pac_file) do <<-EOS.strip_heredoc.chomp
+                           function FindProxyForURL(url, host) {
+                             aasdf();
+                           }
+  EOS
+  end
+
+  context '#initialize' do
+    it 'requires a file' do
+      file = create_file 'pac_file', valid_pac_file
+
+      expect {
+        Actions::ValidatePacFile.new(file)
+      }.not_to raise_error
+    end
+  end
+
+  context '#run' do
+    it 'outputs an info if pac file is valid' do
+      file = create_file 'pac_file', valid_pac_file
+
+      action = Actions::ValidatePacFile.new(file)
+
+      result = capture(:stdout) do
+        action.run
+      end
+
+      expect(result).to include('is a valid pac file')
+    end
+
+    it 'outputs an warning if pac file is invalid' do
+      file = create_file 'pac_file', invalid_pac_file
+
+      action = Actions::ValidatePacFile.new(file)
+
+      result = capture(:stdout) do
+        action.run
+      end
+
+      expect(result).to include('is not a valid pac file')
+    end
+
+    it 'raises an error if path is not a file' do
+      action = Actions::ValidatePacFile.new(working_directory)
+
+      expect {
+        action.run
+      }.to raise_error Exceptions::PacFileInvalid
+    end
+  end
+end

data/spec/error_handler_spec.rb

@@ -0,0 +1,70 @@
+# encoding: utf-8
+require 'spec_helper'
+
+describe ErrorHandler do
+  let(:exception) { StandardError.new }
+
+  context '.create' do
+    it 'requires an exception class, a message and a exit code' do
+      expect {
+        ErrorHandler.create(
+          exception: StandardError,
+          message: 'This is a standard error',
+          exit_code: 1,
+        )
+      }.not_to raise_error
+    end
+  end
+
+  context '.find' do
+    it 'finds a suitable error handler' do
+      ErrorHandler.create(
+        exception: StandardError,
+        message: 'This is a standard error',
+        exit_code: 1,
+      )
+
+      expect(ErrorHandler.find(exception)).not_to be_nil
+    end
+
+    it 'returns a default exception if the requested one cannote be found' do
+      expect(ErrorHandler.find(RuntimeError.new).exception).to be(StandardError)
+    end
+  end
+
+  context '#exception' do
+    it 'returns the exception' do
+      handler = ErrorHandler.create(
+        exception: StandardError,
+        message: 'This is a standard error',
+        exit_code: 1,
+      )
+
+      expect(handler.exception).to eq(StandardError)
+    end
+  end
+
+  context '#run' do
+    it 'runs the error handler' do
+      handler = ErrorHandler.new(
+        exception: StandardError, 
+        message: 'This is a standard error',
+        exit_code: 1,
+      )
+      handler.original_message = 'blub'
+
+      LocalPac.ui_logger.level = :debug
+
+      result = capture(:stderr) do
+        begin
+          handler.run
+        rescue SystemExit => e
+          expect(e.status).to eq(1)
+        end
+      end
+
+      expect(result).to include('standard error')
+      expect(result).to include('blub')
+    end
+  end
+end

data/spec/features/check_git_push_spec.rb

@@ -40,8 +40,12 @@ describe 'Lookup proxy for url' do
           ::File.join(working_directory, 'git_repo.git')
         end
 
+        def reload_storage_signal
+          'USR2'
+        end
+
         def api_key
-          SecureRandom.hex
+          'THIS_IS_THE_API_KEY'
         end
       end.new
 
@@ -62,7 +66,7 @@ describe 'Lookup proxy for url' do
           old_commit_id: commit1.oid,
           new_commit_id: commit2.oid,
           reference: 'refs/heads/master',
-          api_key: LocalPac.config.api_key
+          api_key: 'THIS_IS_THE_API_KEY',
         }
 
         response = page.driver.post('/pre-receive', params )
@@ -85,7 +89,7 @@ describe 'Lookup proxy for url' do
           old_commit_id: commit1.oid,
           new_commit_id: commit3.oid,
           reference: 'refs/heads/master',
-          api_key: LocalPac.config.api_key
+          api_key: 'THIS_IS_THE_API_KEY',
         }
 
         response = page.driver.post('/pre-receive', params )
@@ -97,9 +101,33 @@ describe 'Lookup proxy for url' do
     end
 
     it 'returns a error message for an invalid url' do
-      visit('/blub-gith-hook')
-      expect(page).to have_content('Unknown git hook...')
-      expect(page).to have_content('/blub-gith-hook')
+      params = {
+        old_commit_id: 'asdf',
+        new_commit_id: 'asdf',
+        reference: 'refs/heads/master',
+        api_key: 'THIS_IS_THE_API_KEY',
+      }
+
+      response = page.driver.post('/blub-gith-hook', params )
+      json = JSON.parse(response.body)
+
+      expect(json['error_summary']).to eq('Unknown git hook...')
+      expect(json['error_details']).to include('/blub-gith-hook')
+    end
+
+    it 'fails on invalid api key' do
+      params = {
+        old_commit_id: 'asdf',
+        new_commit_id: 'asdf',
+        reference: 'refs/heads/master',
+        api_key: 'invalid',
+      }
+
+      response = page.driver.post('/pre-receive', params )
+      result = JSON.parse(response.body)['error_summary']
+
+      expect(result).to eq('Invalid API-key...')
+      expect(response.status).to eq(403)
     end
   end
 end

data/spec/git_repository_spec.rb

@@ -61,6 +61,7 @@ describe GitRepository do
       expect(f).to be(null_file)
     end
   end
+
   context '#added_files' do
     it 'returns all added files' do
       repo_path = File.join(working_directory, 'git_repo')

data/spec/git_storage_spec.rb

@@ -79,4 +79,37 @@ describe GitStorage do
       expect(result).to eq([pac_file])
     end
   end
+
+  context '#each_added_pac_file' do
+    it 'iterates over all added pac files' do
+      repo_path = File.join(working_directory, 'git_repo')
+      GitRepository.create(repo_path)
+
+      file_creator = double('file_creator')
+      null_file    = double('null_file')
+
+      repo = GitRepository.new(repo_path, file_creator, null_file)
+      oid1 = repo.add_content('file1.pac', 'asdf1')
+      repo.add_content('file2.pac', 'asdf2')
+      oid3 = repo.add_content('file3.txt', 'asdf3')
+
+      pac_file = double('pac_file')
+      allow(pac_file).to receive(:extension?).with('.pac').and_return(true)
+      allow(pac_file).to receive(:path).and_return('proxy.pac')
+      allow(pac_file).to receive(:name).and_return(:proxy)
+
+      vcs = double('vcs')
+      allow(vcs).to receive(:added_files).and_return([pac_file])
+
+      vcs_engine = double('vcs_engine')
+      allow(vcs_engine).to receive(:new).and_return(vcs)
+
+      storage = GitStorage.new(git_repo, compressor, vcs_engine)
+
+      result = []
+      storage.each_added_pac_file(oid1, oid3) { |file| result << file}
+
+      expect(result).to eq([pac_file])
+    end
+  end
 end

data/spec/pac_file_validator_spec.rb

@@ -1,26 +1,26 @@
 require 'spec_helper'
 
 describe PacFileValidator do
-  context '#valid?' do
-    let(:valid_pac_file) do <<-EOS.strip_heredoc
+  let(:valid_pac_file) do <<-EOS.strip_heredoc
                            function FindProxyForURL(url, host) {
                              return "DIRECT"
                            }
-                           EOS
-    end
+  EOS
+  end
 
-    let(:invalid_pac_file1) do <<-EOS.strip_heredoc
+  let(:invalid_pac_file1) do <<-EOS.strip_heredoc
                            function FindProxyForURL(url, host) {
-                           EOS
-    end
+  EOS
+  end
 
-    let(:invalid_pac_file2) do <<-EOS.strip_heredoc
+  let(:invalid_pac_file2) do <<-EOS.strip_heredoc
                            function FindProxyForURL(url, host) {
                            asdf();
                            }
-                           EOS
-    end
+  EOS
+  end
 
+  context '#valid?' do
     it 'returns true if file is valid' do
       file = double('PacFile')
       expect(file).to receive(:content).and_return(valid_pac_file)
@@ -42,4 +42,13 @@ describe PacFileValidator do
       expect(validator.valid?(file)).to be_false
     end
   end
+
+  context '#errors' do
+    it 'returns errors found during validation' do
+      file = double('PacFile')
+      expect(file).to receive(:content).and_return(invalid_pac_file2)
+      validator = PacFileValidator.new
+      expect(validator.errors(file)).to eq('asdf is not defined')
+    end
+  end
 end