local_pac 0.3.0 → 0.4.0

data/lib/local_pac/git_repository.rb

@@ -27,12 +27,10 @@ module LocalPac
     end
 
     def add_content(path, content = '', mode = 0100644, commit_info = default_commit_info)
-      oid = repository.write(content, :blob)
       index = Rugged::Index.new
-      index.add(:path => path, :oid => oid, :mode => mode)
 
       unless repository.empty? 
-        root_commit  = @repository.lookup(@repository.head.target)
+        root_commit  = repository.lookup(repository.head.target)
 
         root_commit.tree.walk_blobs(:postorder) do |r, e| 
           e.merge!( { path: "#{r}#{e[:name]}" } )
@@ -42,6 +40,9 @@ module LocalPac
         end
       end
 
+      oid = repository.write(content, :blob)
+      index.add(:path => path, :oid => oid, :mode => mode)
+
       options              = {}
       options[:tree]       = index.write_tree(repository)
       options[:parents]    = repository.empty? ? [] : [ repository.head.target ].compact
@@ -51,6 +52,24 @@ module LocalPac
       Rugged::Commit.create(repository, options)
     end
 
+    def added_files(old_commit_id, new_commit_id)
+      begin
+        commit_old = repository.lookup(old_commit_id)
+      rescue Rugged::OdbError
+        LocalPac.ui_logger.warn "Invalid commit id \"#{old_commit_id}\". Object cannot be found in repository \"#{storage_path}\"."
+        raise Exceptions::CommitDoesNotExist
+      end
+
+      begin
+        commit_new = repository.lookup(new_commit_id)
+      rescue Rugged::OdbError
+        LocalPac.ui_logger.warn "Invalid commit id \"#{old_commit_id}\". Object cannot be found in repository \"#{storage_path}\"."
+        raise Exceptions::CommitDoesNotExist
+      end
+
+      commit_old.diff(commit_new).deltas.keep_if { |d| [:added, :modified].include?(d.status) }.collect { |d| File.new(d.new_file[:path], repository.lookup(d.new_file[:oid]).content) }
+    end
+
     def find_file(name)
       files.fetch(name, null_file)
     end

data/lib/local_pac/git_storage.rb

@@ -39,7 +39,7 @@ module LocalPac
     def pac_files
       LocalPac.ui_logger.debug "I'm using the following storage path: \"#{storage_path}\"."
       files = files_in_repository.keep_if { |f| f.extension? '.pac' }
-      LocalPac.ui_logger.debug "Found the following files: \"#{files.join(", ")}\"."
+      LocalPac.ui_logger.debug "Found the following files: #{files.collect { |f| "\"#{f.path}\"" }.join(", ")}."
 
       files
     end

data/lib/local_pac/initializer.rb

@@ -13,23 +13,35 @@ module LocalPac
     end
 
     def run
-      LocalPac.ui_logger.info "Creating pid directory: #{::File.dirname(config.pid_file)}"
-      Actions::CreateDirectory.new(::File.dirname(config.pid_file), force: options[:force]).run
+      if options[:create_pid_directory]
+        LocalPac.ui_logger.info "Creating pid directory: #{::File.dirname(config.pid_file)}"
+        Actions::CreateDirectory.new(::File.dirname(config.pid_file), force: options[:force]).run
+      end
 
-      LocalPac.ui_logger.info "Creating log directory: #{::File.dirname(config.access_log)}"
-      Actions::CreateDirectory.new(::File.dirname(config.access_log), force: options[:force]).run
+      if options[:create_log_directory]
+        LocalPac.ui_logger.info "Creating log directory: #{::File.dirname(config.access_log)}"
+        Actions::CreateDirectory.new(::File.dirname(config.access_log), force: options[:force]).run
+      end
 
-      LocalPac.ui_logger.info "Creating sass cache #{config.sass_cache}"
-      Actions::CreateDirectory.new(config.sass_cache, force: options[:force]).run
+      if options[:create_sass_cache]
+        LocalPac.ui_logger.info "Creating sass cache #{config.sass_cache}"
+        Actions::CreateDirectory.new(config.sass_cache, force: options[:force]).run
+      end
 
-      LocalPac.ui_logger.info "Creating local storage: #{config.local_storage}"
-      Actions::CreateRepository.new(config.local_storage, bare: true, force: options[:force]).run
+      if options[:create_local_storage]
+        LocalPac.ui_logger.info "Creating local storage: #{config.local_storage}"
+        Actions::CreateRepository.new(config.local_storage, bare: true, force: options[:force]).run
+      end
 
-      LocalPac.ui_logger.info "Creating pre-receive hook in local storage \"#{config.local_storage}\"."
-      Actions::CreateFile.new(:'git-hook', ::File.join(config.local_storage, 'hooks', 'pre-receive'), Data.new(config), force: options[:force], executable: true).run
+      if options[:create_pre_receive_hook]
+        LocalPac.ui_logger.info "Creating pre-receive hook in local storage \"#{config.local_storage}\"."
+        Actions::CreateFile.new(:'git-hook.rb', ::File.join(config.local_storage, 'hooks', 'pre-receive'), Data.new(config), force: options[:force], executable: true).run
+      end
 
-      LocalPac.ui_logger.info "Creating config file at \"#{config.config_file}\"."
-      Actions::CreateFile.new(:'example-config', config.config_file, Data.new(config), force: options[:force], create_directories: true).run
+      if options[:create_config_file]
+        LocalPac.ui_logger.info "Creating config file at \"#{config.config_file}\"."
+        Actions::CreateFile.new(:'example-config', config.config_file, Data.new(config), force: options[:force], create_directories: true).run
+      end
 
       if options[:pre_seed]
         LocalPac.ui_logger.info "Adding examples to repository at #{config.local_storage}/examples"

data/lib/local_pac/local_storage.rb

@@ -14,7 +14,10 @@ module LocalPac
     def find(name)
       name = name.sub(/.pac$/, '').camelize.downcase.to_sym
       LocalPac.ui_logger.debug "Using the following name to find pac file: \":#{name}\"."
-      storage[name]
+      file = storage[name]
+      LocalPac.ui_logger.debug "Returning the following file: \"#{file.path || 'not found' }\"."
+
+      file
     end
   end
 end

data/lib/local_pac/main.rb

@@ -1,60 +1,22 @@
 # encoding: utf-8
 module LocalPac
-  @config_semaphore = Mutex.new
-  @logger_semaphore = Mutex.new
-  @routing_semaphore = Mutex.new
+  @config    = LocalPac::Config.new
+  @ui_logger = LocalPac::UiLogger.new
 
   class << self
-    attr_reader :config_semaphore
-    attr_reader :logger_semaphore
-    attr_reader :routing_semaphore
-    attr_accessor :debug_mode
+    attr_accessor :debug_mode, :config, :ui_logger
 
-    def config
-      config_semaphore.synchronize do
-        @config ||= LocalPac::Config.new
-      end
-    end
-
-    def config=(config)
-      @config = config
-    end
+    def enable_debug_mode
+      LocalPac.ui_logger.info "Activating debug mode."
 
-    def ui_logger(local_logger = LocalPac::UiLogger.new)
-      logger_semaphore.synchronize do
-        @ui_logger ||= local_logger
-      end
+      require 'pry'
+      require 'debugger'
+    rescue LoadError
+      LocalPac.ui_logger.error "You tried to enable debug-mode, but either 'pry'- or 'debugger'-gem are not installed. Please fix that before using the debug-switch again."
     end
 
     def error_id
       SecureRandom.hex
     end
-
-    def routing
-      routing_semaphore.synchronize do
-        @routing ||= Rack::Builder.new do
-          require_relative ::File.expand_path('../../../app/controllers/application_controller.rb', __FILE__)
-          Dir.glob(::File.expand_path('../../../app/controllers/*.rb', __FILE__)).each { |f| require_relative f }
-
-          map '/' do
-            run LocalPac::App::FileServeController
-          end
-
-          map '/v1/pac/' do
-            run LocalPac::App::FileServeController
-          end
-
-          map '/v1/lookup/' do
-            run LocalPac::App::LookupController
-          end
-
-          map LocalPac::App::ApplicationController.assets_prefix do
-            run LocalPac::App::ApplicationController.assets
-          end
-        end
-      end
-    end
   end
-
-
 end

data/lib/local_pac/pac_file_validator.rb

@@ -2,10 +2,11 @@
 module LocalPac
   class PacFileValidator
     def valid?(file)
-      PAC.source(file.content) 
+      pac = PAC.source(file.content) 
+      pac.find('http://www.example.com')
 
       true
-    rescue
+    rescue StandardError
       false
     end
   end

data/lib/local_pac/ui_logger.rb

@@ -4,6 +4,25 @@ module LocalPac
       @logger = ::Logger.new($stderr)
     end
 
+    def level=(l)
+      @logger.level = case l.to_s.to_sym
+                      when :unknown
+                        ::Logger::UNKNOWN
+                      when :fatal
+                        ::Logger::FATAL
+                      when :error
+                        ::Logger::ERROR
+                      when :warn
+                        ::Logger::WARN
+                      when :info
+                        ::Logger::INFO
+                      when :debug
+                        ::Logger::DEBUG
+                      else
+                        ::Logger::ERROR
+                      end
+    end
+
     def method_missing(method, *args, &block)
       @logger.public_send method, *args
     end

data/lib/local_pac/version.rb

@@ -1,4 +1,4 @@
 #main LocalPac
 module LocalPac
-  VERSION = '0.3.0'
+  VERSION = '0.4.0'
 end

data/lib/local_pac.rb

@@ -1,5 +1,19 @@
+require 'sass'
+require 'haml'
+require 'i18n'
+require 'i18n/backend/fallbacks'
+require 'rack/contrib/locale'
+require 'rack/contrib/nested_params'
+require 'rack/contrib/post_body_content_type_parser'
+require 'sprockets-helpers'
+require 'sinatra'
+require 'sinatra/param'
+require "sinatra/json"
+require 'json'
+
 require 'thor'
 require 'sys/proctable'
+require 'set'
 require 'facter'
 require 'fileutils'
 require 'pathname'
@@ -16,22 +30,19 @@ require 'thread'
 require 'open3'
 require 'addressable/uri'
 require 'securerandom'
-#require 'fedux_org/stdlib/filesystem'
 
 require 'active_support/cache'
 require 'active_support/core_ext/string/inflections'
 
 require 'local_pac/exceptions'
+require 'local_pac/config'
+require 'local_pac/ui_logger'
 require 'local_pac/main'
 require 'local_pac/access_logger'
 require 'local_pac/null_access_logger'
-require 'local_pac/ui_logger'
-
-LocalPac.ui_logger.level = ::Logger::UNKNOWN
 
 require 'local_pac/git_repository'
 require 'local_pac/git_storage'
-require 'local_pac/config'
 require 'local_pac/runner'
 require 'local_pac/erb_generator'
 require 'local_pac/data'

data/local_pac.gemspec

@@ -1,4 +1,4 @@
-# coding: utf-8
+# encoding: utf-8
 lib = ::File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'local_pac/version'
@@ -40,6 +40,8 @@ EOS
   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/spec/actions/add_examples_to_local_storage_spec.rb

@@ -34,7 +34,7 @@ describe Actions::AddExamplesToLocalStorage do
       action.run
 
       result = capture(:stderr) do
-        LocalPac.ui_logger.level = ::Logger::INFO
+        LocalPac.ui_logger.level = :info
         action.run
       end
 

data/spec/actions/create_directory_spec.rb

@@ -24,7 +24,7 @@ describe Actions::CreateDirectory do
       action = Actions::CreateDirectory.new(::File.join(working_directory, 'repo'))
 
       result = capture(:stderr) do
-        LocalPac.ui_logger.level = ::Logger::INFO
+        LocalPac.ui_logger.level = :info
         action.run
       end
 
@@ -37,7 +37,7 @@ describe Actions::CreateDirectory do
       action = Actions::CreateDirectory.new(::File.join(working_directory, 'repo'), force: true)
 
       result = capture(:stderr) do
-        LocalPac.ui_logger.level = ::Logger::INFO
+        LocalPac.ui_logger.level = :info
         action.run
       end
 

data/spec/actions/create_file_spec.rb

@@ -79,7 +79,7 @@ describe Actions::CreateFile do
       file = create_file('file')
       action = Actions::CreateFile.new(:template, file, data, {}, engine_klass, repository)
       result = capture(:stderr) do
-        LocalPac.ui_logger.level = ::Logger::INFO
+        LocalPac.ui_logger.level = :info
         action.run
       end
 
@@ -104,7 +104,7 @@ describe Actions::CreateFile do
       action = Actions::CreateFile.new(:template, file, data, { force: true }, engine_klass, repository)
 
       result = capture(:stderr) do
-        LocalPac.ui_logger.level = ::Logger::INFO
+        LocalPac.ui_logger.level = :info
         action.run
       end
 

data/spec/actions/create_repository_spec.rb

@@ -24,7 +24,7 @@ describe Actions::CreateRepository do
       action = Actions::CreateRepository.new(::File.join(working_directory, 'repo'))
 
       result = capture(:stderr) do
-        LocalPac.ui_logger.level = ::Logger::INFO
+        LocalPac.ui_logger.level = :info
         action.run
       end
 
@@ -37,7 +37,7 @@ describe Actions::CreateRepository do
       action = Actions::CreateRepository.new(::File.join(working_directory, 'repo'), force: true)
 
       result = capture(:stderr) do
-        LocalPac.ui_logger.level = ::Logger::INFO
+        LocalPac.ui_logger.level = :info
         action.run
       end
 

data/spec/actions/send_signal_spec.rb

@@ -45,7 +45,7 @@ describe Actions::SendSignal do
     end
 
     it 'logs a warning if pid file does not exist' do
-      LocalPac.ui_logger.level = ::Logger::WARN
+      LocalPac.ui_logger.level = :warn
 
       result = capture(:stderr) do
         Actions::SendSignal.new(:USR1, 'pid_file').run

data/spec/features/check_git_push_spec.rb

@@ -0,0 +1,105 @@
+# encoding: utf-8
+require 'spec_helper'
+require 'spec_helper_features'
+
+describe 'Lookup proxy for url' do
+  context '/v1/githook' do
+    let(:valid_pac_file1) do <<-EOS.strip_heredoc.chomp
+                           function FindProxyForURL(url, host) {
+                             return "DIRECT";
+                           }
+                           EOS
+    end
+
+    let(:valid_pac_file2) do <<-EOS.strip_heredoc.chomp
+                           function FindProxyForURL(url, host) {
+                             return "PROXY 127.0.0.1:3128";
+                           }
+                           EOS
+    end
+
+    let(:valid_pac_file3) do <<-EOS.strip_heredoc.chomp
+                           function FindProxyForURL(url, host) {
+                             return "PROXY 10.0.0.1:3128";
+                           }
+                           EOS
+    end
+
+    let(:git_repo_path) { File.join(working_directory, 'git_repo.git') }
+    let(:git_repo) { GitRepository.create(git_repo_path) }
+
+    before :each do
+      config = Class.new do
+        include FeduxOrg::Stdlib::Filesystem
+
+        def root_directory
+          ::File.expand_path('../../../', __FILE__)
+        end
+
+        def local_storage
+          ::File.join(working_directory, 'git_repo.git')
+        end
+
+        def api_key
+          SecureRandom.hex
+        end
+      end.new
+
+      LocalPac.config = config
+      Capybara.app = LocalPac::App::GitHookController
+    end
+
+    context 'checks proxy.pac' do
+      it 'succeeds on valid proxy pac' do
+        oid1 = git_repo.add_content('file1.pac', valid_pac_file1)
+        oid2 = git_repo.add_content('file2.pac', valid_pac_file2)
+
+        repo = Rugged::Repository.new(git_repo_path)
+        commit1 = repo.lookup(oid1)
+        commit2 = repo.lookup(oid2)
+
+        params = {
+          old_commit_id: commit1.oid,
+          new_commit_id: commit2.oid,
+          reference: 'refs/heads/master',
+          api_key: LocalPac.config.api_key
+        }
+
+        response = page.driver.post('/pre-receive', params )
+        result = JSON.parse(response.body)['result']
+
+        expect(result).to eq('success')
+      end
+
+      it 'fails on invalid proxy.pac' do
+        oid1 = git_repo.add_content('file1.pac', valid_pac_file1)
+        oid2 = git_repo.add_content('dir/file2.pac', 'asdf()')
+        oid3 = git_repo.add_content('dir/file3.pac', valid_pac_file3)
+
+        repo = Rugged::Repository.new(git_repo_path)
+        commit1 = repo.lookup(oid1)
+        commit2 = repo.lookup(oid2)
+        commit3 = repo.lookup(oid3)
+
+        params = {
+          old_commit_id: commit1.oid,
+          new_commit_id: commit3.oid,
+          reference: 'refs/heads/master',
+          api_key: LocalPac.config.api_key
+        }
+
+        response = page.driver.post('/pre-receive', params )
+        result = JSON.parse(response.body)['error_summary']
+
+        expect(result).to eq('Invalid PAC-file...')
+        expect(response.status).to eq(403)
+      end
+    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')
+    end
+  end
+end

data/spec/features/lookup_proxy_spec.rb

@@ -18,13 +18,6 @@ describe 'Lookup proxy for url' do
                            EOS
     end
 
-    let(:invalid_pac_file) do <<-EOS.strip_heredoc.chomp
-                           function FindProxyForURL(url, host) {
-                           asdfasdf();
-                           }
-                           EOS
-    end
-
     let(:git_repo) { File.join(working_directory, 'git_repo.git') }
 
     before :each do

data/spec/git_repository_spec.rb

@@ -61,4 +61,68 @@ 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')
+      Rugged::Repository.init_at(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.txt', 'asdf1')
+      repo.add_content('file2.txt', 'asdf2')
+      oid3 = repo.add_content('file3.txt', 'asdf3')
+
+      result = repo.added_files(oid1, oid3)
+      expect(result.size).to eq(2)
+      expect(result.first.path).to eq('file2.txt')
+    end
+
+    it 'returns empty array on invalid commit ids' do
+      repo_path = File.join(working_directory, 'git_repo')
+      Rugged::Repository.init_at(repo_path)
+
+      file_creator = double('file_creator')
+      null_file    = double('null_file')
+
+      repo = GitRepository.new(repo_path, file_creator, null_file)
+      expect {
+        result = repo.added_files('00000000000', '00000000000')
+      }.to raise_error Exceptions::CommitDoesNotExist
+    end
+
+    it 'returns an empty array if nothing has changed' do
+      repo_path = File.join(working_directory, 'git_repo')
+      Rugged::Repository.init_at(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.txt', 'asdf1')
+      repo.add_content('file1.txt', 'asdf1')
+      oid3 = repo.add_content('file1.txt', 'asdf1')
+
+      result = repo.added_files(oid1, oid3)
+      expect(result).to eq([])
+    end
+
+    it 'returns all modified and added files' do
+      repo_path = File.join(working_directory, 'git_repo')
+      Rugged::Repository.init_at(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.txt', 'asdf1')
+      repo.add_content('file1.txt', 'asdf2')
+      oid3 = repo.add_content('file3.txt', 'asdf3')
+
+      result = repo.added_files(oid1, oid3)
+      expect(result.size).to eq(2)
+      expect(result.first.path).to eq('file1.txt')
+    end
+  end
 end

data/spec/initializer_spec.rb

@@ -14,23 +14,31 @@ describe Initializer do
         :config_file: #{File.join(working_directory, 'config', 'config.yaml')}
         :gem_path: []
       EOS
-        config_file = create_file('config_spec.yaml', config_string)
 
-        config = LocalPac::Config.new(config_file)
-        initializer = Initializer.new({}, config)
-        result = capture(:stdout) do
-          silence(:stderr) do
-            initializer.run
-          end
+      config_file = create_file('config_spec.yaml', config_string)
+
+      config = LocalPac::Config.new(config_file)
+      initializer = Initializer.new({
+          create_pid_directory: true,
+          create_log_directory: true,
+          create_sass_cache: true,
+          create_local_storage: true,
+          create_pre_receive_hook: true,
+          create_config_file: true,
+      }, config)
+      result = capture(:stdout) do
+        silence(:stderr) do
+          initializer.run
         end
+      end
 
-        expect(path_exists?('log')).to be_true
-        expect(path_exists?('config/config.yaml')).to be_true
-        expect(path_exists?('cache/sass')).to be_true
-        expect(path_exists?('data/storage.git')).to be_true
-        expect(path_exists?(::File.join('data', 'storage.git', 'hooks', 'pre-receive'))).to be_true
-        expect(path_exists?('run')).to be_true
-        expect(result).to include("access_log: #{File.expand_path(::File.join(working_directory, 'log', 'access.log'))}")
+      expect(path_exists?('log')).to be_true
+      expect(path_exists?('config/config.yaml')).to be_true
+      expect(path_exists?('cache/sass')).to be_true
+      expect(path_exists?('data/storage.git')).to be_true
+      expect(path_exists?(::File.join('data', 'storage.git', 'hooks', 'pre-receive'))).to be_true
+      expect(path_exists?('run')).to be_true
+      expect(result).to include("access_log: #{File.expand_path(::File.join(working_directory, 'log', 'access.log'))}")
     end
 
     it 'adds examples on request' do
@@ -46,7 +54,10 @@ describe Initializer do
         config_file = create_file('config_spec.yaml', config_string)
 
         config = LocalPac::Config.new(config_file)
-        initializer = Initializer.new({pre_seed: true}, config)
+        initializer = Initializer.new({
+          pre_seed: true,
+          create_local_storage: true,
+        }, config)
         silence(:stdout) do
           silence(:stderr) do
             initializer.run