local_pac 0.4.0 → 0.5.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    local_pac (0.3.0)
+    local_pac (0.4.0)
       activesupport
       addressable
       bootstrap-sass

data/lib/local_pac/actions/show_available_proxy_pac_files.rb

@@ -0,0 +1,34 @@
+# encoding: utf-8
+module LocalPac
+  module Actions
+    class ShowAvailableProxyPacFiles
+      private
+
+      attr_reader :repo, :options, :vcs_engine, :storage_path, :validator
+
+      public
+
+      def initialize(storage_path, options = {}, vcs_engine = GitStorage, validator = PacFileValidator.new)
+        @options      = options
+        @vcs_engine   = vcs_engine
+        @storage_path = storage_path
+        @validator    = validator
+      end
+
+      def run
+        begin
+          @repo = vcs_engine.new(storage_path)
+        rescue Rugged::OSError
+          raise Exceptions::RepositoryDoesNotExist, "Sorry, but the repository at #{storage_path} does not exist" unless ::Dir.exists? storage_path
+        end
+
+        printf "%20s | %-20s | %-10s\n", 'Name', 'Path', 'Valid?'
+        printf "%20s-+-%-20s-+-%-10s\n", '-' * 20, '-' * 20, '-' * 10
+
+        repo.each_pac_file do |f|
+          printf "%20s | %-20s | %-10s\n", f.name, f.path, validator.valid?(f) 
+        end
+      end
+    end
+  end
+end

data/lib/local_pac/application_status.rb

@@ -23,6 +23,9 @@ module LocalPac
       @actions << Actions::PrintNewline.new(2)
       @actions << Actions::PrintTitle.new('Process Information')
       @actions << Actions::ShowProcessInformation.new(config.pid_file)
+      @actions << Actions::PrintNewline.new(2)
+      @actions << Actions::PrintTitle.new('Available Proxy.Pac-Files')
+      @actions << Actions::ShowAvailableProxyPacFiles.new(config.local_storage)
     end
 
     def show

data/lib/local_pac/git_repository.rb

@@ -75,11 +75,11 @@ module LocalPac
     end
 
     def all_files
-      files
+      files.collect { |_,f| f }
     end
 
     def each_file(&block)
-      files.each(&block)
+      all_files.each(&block)
     end
 
     private

data/lib/local_pac/git_storage.rb

@@ -3,20 +3,19 @@ module LocalPac
   class GitStorage
     private
 
-    attr_reader :storage_path, :data, :repository, :file_creator, :null_file
+    attr_reader :storage_path, :data, :repository, :file_creator, :null_file, :vcs_engine
 
     public
 
-    def initialize(storage_path, compressor_engine = JavaScriptCompressor, file_creator = LocalPac::File, null_file = LocalPac::NullFile.new)
+    def initialize(storage_path, compressor_engine = JavaScriptCompressor, vcs_engine = GitRepository, null_file = LocalPac::NullFile.new)
       @storage_path = ::File.expand_path(storage_path)
-      @file_creator = file_creator
       @null_file    = null_file
+      @vcs_engine   = vcs_engine
 
       begin
-        @repository = Rugged::Repository.new(storage_path)
-      rescue Rugged::RepositoryError
-        GitRepository.create(storage_path)
-        @repository = Rugged::Repository.new(storage_path)
+        @repository = vcs_engine.new(storage_path)
+      rescue Exceptions::RepositoryDoesNotExist
+        @repository = vcs_engine.create(storage_path)
       end
 
       mutex = Mutex.new
@@ -34,27 +33,18 @@ module LocalPac
       data.fetch(key, null_file)
     end
 
+    def each_pac_file(&block)
+      pac_files.each(&block)
+    end
+
     private
 
     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' }
+      files = repository.all_files.keep_if { |f| f.extension? '.pac' }
       LocalPac.ui_logger.debug "Found the following files: #{files.collect { |f| "\"#{f.path}\"" }.join(", ")}."
 
       files
     end
-
-    def files_in_repository
-      head_commit = repository.lookup(repository.head.target)
-
-      files = []
-      head_commit.tree.walk_blobs(:postorder) do |root, entry| 
-        files << file_creator.new("#{root}#{entry[:name]}", repository.lookup(entry[:oid]).content ) 
-      end
-
-      files
-    rescue Rugged::ReferenceError
-      []
-    end
   end
 end

data/lib/local_pac/initializer.rb

@@ -13,41 +13,55 @@ module LocalPac
     end
 
     def 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
-
-      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
-
-      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
-
-      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
-
-      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
-
-      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"
-        Actions::AddExamplesToLocalStorage.new(config.local_storage).run
-      end
+      create_pid_directory if options[:create_pid_directory]
+      create_log_directory if options[:create_log_directory]
+      create_sass_cache if options[:create_sass_cache]
+      create_local_storage if options[:create_local_storage]
+      create_pre_receive_hook if options[:create_pre_receive_hook]
+      create_config_file if options[:create_config_file]
+      pre_seed if options[:pre_seed]
 
+      show_example_config
+    end
+
+    private
+
+    def 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
+
+    def 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
+
+    def create_sass_cache
+      LocalPac.ui_logger.info "Creating sass cache #{config.sass_cache}"
+      Actions::CreateDirectory.new(config.sass_cache, force: options[:force]).run
+    end
+
+    def 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
+
+    def 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
+
+    def 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
+
+    def pre_seed
+      LocalPac.ui_logger.info "Adding examples to repository at #{config.local_storage}/examples"
+      Actions::AddExamplesToLocalStorage.new(config.local_storage).run
+    end
+
+    def show_example_config
       LocalPac.ui_logger.info "Showing the configuration of local_pac on your system."
       Actions::CreateOutput.new(:'example-config', $stdout, Data.new(config)).run
     end

data/lib/local_pac/version.rb

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

data/lib/local_pac.rb

@@ -53,6 +53,7 @@ require 'local_pac/java_script_compressor'
 require 'local_pac/template_repository'
 require 'local_pac/template_file'
 require 'local_pac/pac_file_validator'
+require 'local_pac/actions/show_available_proxy_pac_files'
 require 'local_pac/actions/get_system_information'
 require 'local_pac/actions/send_signal'
 require 'local_pac/actions/create_repository'

data/spec/actions/show_available_proxy_pac_files_spec.rb

@@ -0,0 +1,69 @@
+# encoding: utf-8
+require 'spec_helper'
+
+describe Actions::ShowAvailableProxyPacFiles 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::ShowAvailableProxyPacFiles.new(working_directory)
+      }.not_to raise_error
+    end
+  end
+
+  context '#run' do
+    it 'shows proxy.pac files in repo' do
+      repo = GitRepository.create(working_directory)
+      repo.add_content('proxy.pac', 'asdf()')
+      repo.add_content('proxy1.pac', 'asd1f()')
+
+      action = Actions::ShowAvailableProxyPacFiles.new(working_directory)
+
+      result = capture(:stdout) do
+        LocalPac.ui_logger.level = :info
+        action.run
+      end
+
+      expect(result).to include('proxy.pac')
+    end
+
+    it 'checks if pac file is valid' do
+      repo = GitRepository.create(working_directory)
+      repo.add_content('proxy.pac', valid_pac_file)
+      repo.add_content('proxy1.pac', 'asd1f()')
+
+      action = Actions::ShowAvailableProxyPacFiles.new(working_directory)
+
+      result = capture(:stdout) do
+        LocalPac.ui_logger.level = :info
+        action.run
+      end
+
+      expect(result).to include('true')
+      expect(result).to include('false')
+    end
+
+    it 'ignores non-pac-files' do
+      repo = GitRepository.create(working_directory)
+      repo.add_content('proxy.pac', valid_pac_file)
+      repo.add_content('proxy1.txt', 'asd1f()')
+
+      action = Actions::ShowAvailableProxyPacFiles.new(working_directory)
+
+      result = capture(:stdout) do
+        LocalPac.ui_logger.level = :info
+        action.run
+      end
+
+      expect(result).not_to include('proxy1.txt')
+    end
+
+  end
+
+end

data/spec/application_status_spec.rb

@@ -2,6 +2,13 @@
 require 'spec_helper'
 
 describe ApplicationStatus do
+  let(:valid_pac_file) do <<-EOS.strip_heredoc.chomp
+                           function FindProxyForURL(url, host) {
+                             return "DIRECT";
+                           }
+  EOS
+  end
+
   context '#initialize' do
     it 'has no special requirements' do
       expect {
@@ -18,8 +25,14 @@ describe ApplicationStatus do
 
   context '#show' do
     it 'show application status' do
+      git_repo = ::File.join(working_directory, 'data', 'storage.git')
+
+      repo = GitRepository.create(git_repo)
+      repo.add_content('proxy.pac', valid_pac_file) 
+
       config_string = <<-EOS.strip_heredoc
         :pid_file: #{::File.join(working_directory, 'run', 'pid')}
+        :local_storage: #{git_repo}
       EOS
 
       config_file = create_file('config.yaml', config_string)
@@ -35,6 +48,7 @@ describe ApplicationStatus do
       expect(result).to include('pid_file')
       expect(result).to include('pid_file')
       expect(result).to include('cmdline')
+      expect(result).to include('proxy.pac')
     end
   end
 end

data/spec/git_repository_spec.rb

@@ -125,4 +125,24 @@ describe GitRepository do
       expect(result.first.path).to eq('file1.txt')
     end
   end
+
+  context '#each_file' do
+    it 'iterates over all found files' do
+      repo_path = File.join(working_directory, 'git_repo')
+      Rugged::Repository.init_at(repo_path)
+
+      file = double('file')
+      allow(file).to receive(:name).and_return(:file1)
+
+      file_creator = double('file_creator')
+      allow(file_creator).to receive(:new).with('file1.pac', 'asdf1').and_return(file)
+
+      null_file    = double('null_file')
+
+      repo = GitRepository.new(repo_path, file_creator, null_file)
+      repo.add_content('file1.pac', 'asdf1')
+
+      repo.each_file { |file| file.name }
+    end
+  end
 end

data/spec/git_storage_spec.rb

@@ -26,13 +26,13 @@ describe GitStorage do
     end
   end
 
-  context '#files' do
-    it 'returns a list of files matching pattern' do
+  context '#[]' do
+    it 'finds by name' do
       repo = GitRepository.create(git_repo)
       repo.add_content('file1.txt', 'asdf')
       repo.add_content('file2.pac', 'data file2.pac')
 
-      storage = GitStorage.new(repo.storage_path, compressor, creator)
+      storage = GitStorage.new(repo.storage_path, compressor)
       expect(storage[:file2].content).to eq('data file2.pac')
     end
 
@@ -41,7 +41,7 @@ describe GitStorage do
       repo.add_content('file1.txt', 'asdf')
       repo.add_content('dir/file2.pac', 'data file2.pac')
 
-      storage = GitStorage.new(repo.storage_path, compressor, creator)
+      storage = GitStorage.new(repo.storage_path, compressor)
       expect(storage['dir::file2'.to_sym].content).to eq('data file2.pac')
     end
 
@@ -50,15 +50,33 @@ describe GitStorage do
       repo.add_content('file1.txt', 'asdf')
       repo.add_content('dir/dir1/file3.pac', 'data asdf.pac')
 
-      storage = GitStorage.new(repo.storage_path, compressor, creator)
+      storage = GitStorage.new(repo.storage_path, compressor)
       expect(storage['dir::dir1::file3'.to_sym].content).to eq('data asdf.pac')
     end
+  end
 
-    it 'handles a repo without a root commit' do
-      repo = GitRepository.create(git_repo)
+  context '#each_pac_file' do
+    it 'iterates over all found pac files' do
+      arbitrary_file = double('arbitrary file')
+      expect(arbitrary_file).to receive(:extension?).with('.pac').and_return(false)
+
+      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(:all_files).and_return([pac_file, arbitrary_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_pac_file { |file| result << file}
 
-      storage = GitStorage.new(repo.storage_path, compressor, creator)
-      expect(storage['dir::file2'.to_sym].content).to be_nil
+      expect(result).to eq([pac_file])
     end
   end
 end

data/spec/spec_helper.rb

@@ -6,6 +6,7 @@ $LOAD_PATH << ::File.expand_path('../../lib', __FILE__)
 ENV["RACK_ENV"] = "test"
 
 require 'simplecov'
+SimpleCov.command_name 'rspec'
 SimpleCov.start
 
 # Pull in all of the gems including those in the `test` group

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: local_pac
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -487,6 +487,7 @@ files:
 - lib/local_pac/actions/reload_configuration.rb
 - lib/local_pac/actions/reload_local_storage.rb
 - lib/local_pac/actions/send_signal.rb
+- lib/local_pac/actions/show_available_proxy_pac_files.rb
 - lib/local_pac/actions/show_config.rb
 - lib/local_pac/actions/show_process_information.rb
 - lib/local_pac/application_status.rb
@@ -548,6 +549,7 @@ files:
 - spec/actions/reload_configuration_spec.rb
 - spec/actions/reload_repository_spec.rb
 - spec/actions/send_signal_spec.rb
+- spec/actions/show_available_proxy_pac_files_spec.rb
 - spec/actions/show_config_spec.rb
 - spec/actions/show_process_information_spec.rb
 - spec/application_status_spec.rb
@@ -631,6 +633,7 @@ test_files:
 - spec/actions/reload_configuration_spec.rb
 - spec/actions/reload_repository_spec.rb
 - spec/actions/send_signal_spec.rb
+- spec/actions/show_available_proxy_pac_files_spec.rb
 - spec/actions/show_config_spec.rb
 - spec/actions/show_process_information_spec.rb
 - spec/application_status_spec.rb