local_pac 0.1.13 → 0.2.0

data/config.ru

@@ -1,14 +1,31 @@
-$LOAD_PATH << File.expand_path('../lib/', __FILE__)
-
-#require 'rack/contrib'
+$LOAD_PATH <<::File.expand_path('../lib/', __FILE__)
 
 require 'local_pac'
 
 require File.expand_path('../app/controllers/application_controller.rb', __FILE__)
-Dir.glob(File.expand_path('../app/controllers/*.rb', __FILE__)).each { |f| require f }
-#
-#logger = LocalPac::AccessLogger.new ENV['ACCESS_LOG'] || File.expand_path(File.join(LocalPac.config.access_log))
-#use Rack::CommonLogger, logger
+Dir.glob(::File.expand_path('../app/controllers/*.rb', __FILE__)).each { |f| require f }
+
+LocalPac.ui_logger.level = ::Logger::INFO
+
+trap LocalPac.config.reload_config_signal do
+  begin
+    LocalPac.ui_logger.warn 'Reload of configuration requested'
+    LocalPac::Actions::ReloadConfiguration.new.run
+    LocalPac.ui_logger.info 'Reload of configuration successful'
+  rescue => e
+    LocalPac.ui_logger.fatal "Reload of configuration failed: #{e.message}"
+  end
+end
+
+trap LocalPac.config.reload_storage_signal do
+  begin
+    LocalPac.ui_logger.warn 'Reload of local storage requested'
+    LocalPac::Actions::ReloadLocalStorage.new([LocalPac::App::FileServeController, LocalPac::App::LookupController]).run
+    LocalPac.ui_logger.info 'Reload of local storage successful'
+  rescue => e
+    LocalPac.ui_logger.fatal "Reload of local storage failed: #{e.message}"
+  end
+end
 
 map '/' do
   run LocalPac::App::FileServeController

data/features/initializer.feature

@@ -7,16 +7,16 @@ Feature: Initialize environment
     Given a file named "config.yaml" with:
     """
     pid_file: 'run/pid'
-    local_storage: 'storage'
-    log_sink: 'log'
+    local_storage: 'data/storage.git'
+    access_log: 'log/access_log'
     executable: 'bin/local_pac'
     """
     When I successfully run `local_pac init --config-file config.yaml`
     Then the following directories should exist:
       | directory |
       | 'run' |
-      | 'storage/cache.git' |
+      | 'data/storage.git' |
       | 'log' |
     And the following files should exist:
       | file |
-      | 'storage/cache.git/hooks/pre-receive' |
+      | 'data/storage.git/hooks/pre-receive' |

data/features/show_status.feature

@@ -9,7 +9,7 @@ Feature: Show status
     """
     pid_file: 'run/pid'
     local_storage: 'storage'
-    log_sink: 'log'
+    access_log: 'log/access.log'
     executable: 'bin/local_pac'
     """
     When I successfully run `local_pac status`
@@ -17,6 +17,6 @@ Feature: Show status
     """
     pid_file: 'run/pid'
     local_storage: 'storage'
-    log_sink: 'log'
+    access_log: 'log/access.log'
     executable: 'bin/local_pac'
     """

data/files/config.yaml

@@ -1,5 +1,5 @@
 ---
-:log_sink: ~/.local/share/local_pac/log
-:local_storage: ~/.local/share/local_pac/data
+:local_storage: ~/.local/share/local_pac/data/storage.git
 :pid_file: ~/.local/share/local_pac/run/pid
 :access_log: ~/.local/share/local_pac/log/access.log
+:config_file: ~/.config/local_pac/config.yaml

data/files/example-config.erb

@@ -1,16 +1,14 @@
-
 ---
-# You might want to copy the following output to one of the searched config
-# file paths - in the given order.
+# You might want to copy the following output to one of the allowed config
+# file paths - in the given order. But be aware that at 
+# <%= lookup('config_file') -%>, there might be a 
+# config file created during initialization.
 <% Array(lookup('allowed_config_file_paths')).each do |p| -%>
-# <%= p %>
-<% end -%>
-:gem_path: 
-<% Array(lookup('gem_path')).collect { |p| File.expand_path(p) }.each do |p| -%>
-  - <%= p %>
+# * <%= p %>
 <% end -%>
-:log_sink: <%= File.expand_path(lookup('log_sink')) %>
-:local_storage: <%= File.expand_path(lookup('local_storage')) %>
-:executable: <%= File.expand_path(lookup('executable')) %>
-:pid_file: <%= File.expand_path(lookup('pid_file')) %>
+
+:access_log: <%=::File.expand_path(lookup('access_log')) %>
+:local_storage: <%=::File.expand_path(lookup('local_storage')) %>
+:pid_file: <%=::File.expand_path(lookup('pid_file')) %>
+:sass_cache: <%=::File.expand_path(lookup('sass_cache')) %>
 

data/files/git-hook.erb

@@ -6,6 +6,7 @@ $LOAD_PATH.unshift '<%= p %>'
 
 require 'git_hook-pre_receive'
 require 'pac'
+require 'uri'
 
 class PacFileSyntaxChecker
   def check(files)

data/lib/local_pac.rb

@@ -1,7 +1,13 @@
-require 'sinatra'
+require 'thor'
+require 'sys/proctable'
+require 'facter'
 require 'fileutils'
+require 'pathname'
+require 'rugged'
+require 'timeout'
 require 'logger'
 require 'uglifier'
+require 'pager'
 require 'pac'
 require 'ostruct'
 require 'psych'
@@ -10,7 +16,7 @@ require 'thread'
 require 'open3'
 require 'addressable/uri'
 require 'securerandom'
-require 'fedux_org/stdlib/filesystem'
+#require 'fedux_org/stdlib/filesystem'
 
 require 'active_support/cache'
 require 'active_support/core_ext/string/inflections'
@@ -24,24 +30,35 @@ require 'local_pac/ui_logger'
 LocalPac.ui_logger.level = ::Logger::UNKNOWN
 
 require 'local_pac/git'
-require 'local_pac/git_file'
 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'
 require 'local_pac/version'
-require 'local_pac/pac_file'
-require 'local_pac/null_pac_file'
+require 'local_pac/file'
+require 'local_pac/null_file'
 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/get_system_information'
+require 'local_pac/actions/send_signal'
 require 'local_pac/actions/create_repository'
 require 'local_pac/actions/create_output'
 require 'local_pac/actions/create_directory'
 require 'local_pac/actions/create_file'
+require 'local_pac/actions/show_config'
+require 'local_pac/actions/print_newline'
+require 'local_pac/actions/show_process_information'
+require 'local_pac/actions/print_title'
+require 'local_pac/actions/reload_configuration'
+require 'local_pac/actions/reload_local_storage'
+require 'local_pac/cli/helper'
+require 'local_pac/cli/reload'
 require 'local_pac/initializer'
+require 'local_pac/application_status'
 require 'local_pac/local_storage'
 require 'local_pac/server'
 require 'local_pac/proxy_pac/html_table_style'

data/lib/local_pac/actions/create_directory.rb

@@ -9,7 +9,7 @@ module LocalPac
       public
 
       def initialize(path, options = {}, fs_engine = FileUtils)
-        @path      = File.expand_path(path)
+        @path      =::File.expand_path(path)
         @options   = options
         @fs_engine = fs_engine
       end
@@ -26,7 +26,7 @@ module LocalPac
       private
 
       def need_to_run?
-        !File.exists?(path)
+        !::File.exists?(path)
       end
     end
   end

data/lib/local_pac/actions/create_file.rb

@@ -10,7 +10,7 @@ module LocalPac
 
       def initialize(name, destination, data, options = {}, engine = ErbGenerator, repository = TemplateRepository.new)
         @name        = name
-        @destination = File.expand_path(destination)
+        @destination =::File.expand_path(destination)
         @data        = data
         @options     = options
         @engine      = engine
@@ -21,6 +21,8 @@ module LocalPac
         if need_to_run? || options[:force] == true
           LocalPac.ui_logger.warn "Creating file \"#{destination}\"."
 
+          create_directories if options[:create_directories] == true
+
           file = template(name, ::File.new(destination, 'w'), data)
           FileUtils.chmod('+x', file) if options[:executable] == true
         else
@@ -30,6 +32,10 @@ module LocalPac
 
       private
 
+      def create_directories
+        FileUtils.mkdir_p(::File.dirname(destination))
+      end
+
       def template(local_name, local_destination, local_data)
         template = repository.find(local_name)
 
@@ -42,7 +48,7 @@ module LocalPac
       end
 
       def need_to_run?
-        !File.exists?(destination)
+        !::File.exists?(destination)
       end
     end
   end

data/lib/local_pac/actions/create_repository.rb

@@ -8,8 +8,8 @@ module LocalPac
 
       public
 
-      def initialize(path, options = {}, vcs_engine = LocalPac::Git)
-        @path        = File.expand_path(path)
+      def initialize(path, options = {}, vcs_engine = GitRepository)
+        @path        =::File.expand_path(path)
         @options     = options
         @vcs_engine  = vcs_engine
       end
@@ -18,11 +18,9 @@ module LocalPac
         if need_to_run? || options[:force] == true
           LocalPac.ui_logger.warn "Creating repository \"#{path}\"."
 
-          if options[:bare] == true
-            vcs_engine.init(path, true)
-          else
-            vcs_engine.init(path)
-          end
+          repo = vcs_engine.create(path)
+          repo.add_content('README.md', 'Please place your proxy.pac-files here.')
+
         else
           LocalPac.ui_logger.warn "Repository \"#{path}\" already exists. Do not create it again!."
         end
@@ -31,7 +29,7 @@ module LocalPac
       private
 
       def need_to_run?
-        !File.exists?(path)
+        !::File.exists?(path)
       end
     end
   end

data/lib/local_pac/actions/get_system_information.rb

@@ -0,0 +1,78 @@
+# encoding: utf-8
+module LocalPac
+  module Actions
+    class GetSystemInformation
+      private
+
+      attr_reader :options
+
+      public
+
+      def initialize(options = {})
+        @options = options
+      end
+
+      def run
+        printf( "%#{max_field_length}s | %s\n", 'Information', 'Value')
+        printf( "%s + %s\n", '-' * max_field_length, '-' * 40)
+        data.sort_by { |key, value| key }.each { |key, value| printf( "%#{max_field_length}s | %s\n", key, value) }
+      end
+
+      private
+
+      def data
+        Timeout::timeout(5) do
+          Facter.to_hash.keep_if { |key,_| fields.include?(key.to_s) }
+        end
+      rescue Timeout::Error
+        LocalPac.ui_logger.warn 'Getting environment information took to long. Please make sure the name resolver is avaiable. This might cause the latency.'
+        {}
+      end
+
+      def max_field_length
+        fields.inject(0) { |memo, f| memo = f.size if f.size > memo ; memo}
+      end
+
+      def fields
+        %w[
+            architecture 
+            filesystems 
+            hardwareisa 
+            hardwaremodel 
+            is_virtual 
+            kernel 
+            kernelmajversion 
+            kernelrelease 
+            kernelversion 
+            memoryfree 
+            memoryfree_mb 
+            memorysize 
+            memorysize_mb 
+            memorytotal 
+            operatingsystem 
+            operatingsystemrelease 
+            osfamily 
+            path 
+            physicalprocessorcount 
+            processor0 
+            processor1 
+            processorcount 
+            ps 
+            rubysitedir 
+            rubyversion 
+            selinux 
+            swapfree 
+            swapfree_mb 
+            swapsize 
+            swapsize_mb 
+            timezone 
+            uptime 
+            uptime_days 
+            uptime_hours 
+            uptime_seconds 
+            virtual 
+        ]
+      end
+    end
+  end
+end

data/lib/local_pac/actions/print_newline.rb

@@ -0,0 +1,19 @@
+module LocalPac
+  module Actions
+    class PrintNewline
+      private
+
+      attr_reader :count
+
+      public
+
+      def initialize(count = 1)
+        @count = count
+      end
+
+      def run
+        print "\n" * count
+      end
+    end
+  end
+end

data/lib/local_pac/actions/print_title.rb

@@ -0,0 +1,41 @@
+module LocalPac
+  module Actions
+    class PrintTitle
+      private
+
+      attr_reader :title, :width
+
+      public
+
+      def initialize(title, width = 0)
+        @title = title
+        @width = width
+      end
+
+      def run
+        puts long_line
+        puts full_title
+        puts long_line
+        print "\n"
+      end
+
+      private
+
+      def long_line
+        '#' * full_title.size 
+      end
+
+      def full_title
+        header + ' ' + title + ' ' + header
+      end
+
+      def header
+        if width > title.size
+          '#' * ((width - title.size) / 2)
+        else
+          '#'
+        end
+      end
+    end
+  end
+end

data/lib/local_pac/actions/reload_configuration.rb

@@ -0,0 +1,21 @@
+# encoding: utf-8
+module LocalPac
+  module Actions
+    class ReloadConfiguration
+
+      private
+
+      attr_reader :config
+
+      public
+
+      def initialize(config = Config.new)
+        @config = config
+      end
+
+      def run
+        LocalPac.config = config
+      end
+    end
+  end
+end

data/lib/local_pac/actions/reload_local_storage.rb

@@ -0,0 +1,22 @@
+# encoding: utf-8
+module LocalPac
+  module Actions
+    class ReloadLocalStorage
+
+      private
+
+      attr_reader :local_storage, :sinatra_apps
+
+      public
+
+      def initialize(sinatra_apps, local_storage = LocalStorage.new) 
+        @sinatra_apps   = Array(sinatra_apps)
+        @local_storage = local_storage
+      end
+
+      def run
+        sinatra_apps.each { |app| app.set :local_storage, local_storage }
+      end
+    end
+  end
+end