nginxtra 1.8.0.11 → 1.8.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca12f5a209d5ce4786a62949d3d7c008eff95ddb
-  data.tar.gz: 3c2cc4e4ba9512ba14a7f826fc34a531392c4d58
+  metadata.gz: 99f107b601dfcabd1f825d8f14aad06edd048f55
+  data.tar.gz: 824ea02e092be12cf8f22f39a1cf21a867494034
 SHA512:
-  metadata.gz: 01a24bbabfcc70c7b6b2d5a1a92edc16c800e1dcb7e9df13ff853b4c25e10beb3a54d0e11ffe299b8758bf2a811b105431111bc15bdd8b6310a8ef2c2f32d269
-  data.tar.gz: 0d2d617b91b6ec4df08cbe0e8cf116be72d0a385c1242260cdd7e5a8d68958f864851abe0ea63a63aaa08d3aef48489863c00110cd3dabd3792d39cd138be239
+  metadata.gz: e67268dddd754316d87fab9a51a2ce94884fbe801ffa4e95ffd4784ca86db5548428219682b0f8e79936dddd1ffcef803cc8acfff0d551f6582a5dc235076408
+  data.tar.gz: 124f0029c2f3fbac24f1882e9c894c804ea4a808f98c44b3450aeba39a398f02c1fcb831e6298a74b758424fd32f4409b0373fb5dafd746db777b27b953ceb48

data/bin/nginxtra

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 require "rubygems"
-gem "nginxtra", "= 1.8.0.11"
+gem "nginxtra", "= 1.8.1.12"
 gem "thor", "~> 0.16"
 require "nginxtra"
 Nginxtra::CLI.start

data/bin/nginxtra_rails

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 require "rubygems"
-gem "nginxtra", "= 1.8.0.11"
+gem "nginxtra", "= 1.8.1.12"
 gem "thor", "~> 0.16"
 require "nginxtra"
 Nginxtra::Rails::CLI.start

data/lib/nginxtra/action.rb

@@ -1,7 +1,5 @@
 module Nginxtra
   module Action
-    @@ignore_force = false
-
     def initialize(thor, config)
       @thor = thor
       @config = config
@@ -14,20 +12,21 @@ module Nginxtra
     end
 
     private
+
     def run!(command)
       @thor.run command
-      raise Nginxtra::Error::RunFailed.new("The last run command failed") unless $?.success?
+      raise Nginxtra::Error::RunFailed, "The last run command failed" unless $?.success? # rubocop:disable Style/SpecialGlobalVars
     end
 
     def without_force
-      @@ignore_force = true
+      Nginxtra::Action.ignore_force = true
       yield
     ensure
-      @@ignore_force = false
+      Nginxtra::Action.ignore_force = false
     end
 
     def force?
-      return false if @@ignore_force
+      return false if Nginxtra::Action.ignore_force
       @thor.options["force"]
     end
 
@@ -42,5 +41,9 @@ module Nginxtra
     def sudo(force = false)
       "sudo " if (force || (@config && @config.require_root?)) && Process.uid != 0
     end
+
+    class << self
+      attr_accessor :ignore_force
+    end
   end
 end

data/lib/nginxtra/actions/convert.rb

@@ -8,13 +8,14 @@ module Nginxtra
       def convert
         @streams_to_close = []
         converter = Nginxtra::ConfigConverter.new output
-        converter.convert :config => config, :binary_status => binary_status
+        converter.convert config: config, binary_status: binary_status
         save_if_necessary!
       ensure
         close_streams!
       end
 
       private
+
       def output
         if @thor.options["output"]
           STDOUT
@@ -43,24 +44,24 @@ module Nginxtra
       def binary_status
         return if @thor.options["ignore-nginx-bin"]
 
-        if @thor.options["nginx-bin"]
-          binary = @thor.options["nginx-bin"]
-        else
-          binary = etc_nginx_binary
-        end
+        binary = if @thor.options["nginx-bin"]
+                   @thor.options["nginx-bin"]
+                 else
+                   etc_nginx_binary
+                 end
 
-        @thor.run "#{binary} -V 2>&1", :capture => true
+        @thor.run "#{binary} -V 2>&1", capture: true
       end
 
       def etc_nginx_binary
-        raise Nginxtra::Error::ConvertFailed.new("Cannot find nginx binary", :header => "Cannot find nginx binary!", :message => "Either point to it via --nginx-bin or ignore the binary with --ignore-nginx-bin") unless File.exists? "/etc/init.d/nginx"
+        raise Nginxtra::Error::NginxInitScriptMissing unless File.exist? "/etc/init.d/nginx"
         binary = File.read("/etc/init.d/nginx")[/\s*DAEMON\s*=\s*(.*?)\s*$/, 1]
-        raise Nginxtra::Error::ConvertFailed.new("Cannot determine nginx binary", :header => "Cannot find nginx binary!", :message => "The binary location of nginx cannot be determined from /etc/init.d/nginx.  Either point to it via --nginx-bin or ignore the binary with --ignore-nginx-bin") unless binary
+        raise Nginxtra::Error::UndeterminedNginxBinary unless binary
         binary
       end
 
       def open_file(path)
-        raise Nginxtra::Error::ConvertFailed.new("Missing config file #{path}") unless File.exists? path
+        raise Nginxtra::Error::ConvertFailed, "Missing config file #{path}" unless File.exist? path
 
         File.open(path, "r").tap do |stream|
           @streams_to_close << stream
@@ -68,7 +69,7 @@ module Nginxtra
       end
 
       def close_streams!
-        @streams_to_close.each &:close
+        @streams_to_close.each(&:close)
       end
     end
   end

data/lib/nginxtra/actions/install.rb

@@ -17,25 +17,26 @@ module Nginxtra
       # Look for nginx installation and fail if it exists (unless
       # --ignore-nginx-check is passed).
       def check_if_nginx_is_installed
-        return unless File.exists?("/etc/init.d/nginx")
+        return unless File.exist?("/etc/init.d/nginx")
 
         if @thor.options["ignore-nginx-check"]
           @thor.say @thor.set_color("Detected nginx install, but ignoring!", :red, true)
           return
         end
 
-        raise Nginxtra::Error::NginxDetected.new("Uninstall nginx before installing nginxtra", :header => "It appears nginx is already installed!", :message => "Since /etc/init.d/nginx exists, you might have an existing nginx installation that will conflict with nginxtra.  If you want to install nginxtra alongside nginx (at your own risk), please include the --ignore-nginx-check option to bypass this check.")
+        raise Nginxtra::Error::NginxDetected
       end
 
       # Create a script in the base directory which be symlinked to
       # /etc/init.d/nginxtra and then used to start and stop nginxtra
       # via update-rc.d.
+      # rubocop:disable Metrics/AbcSize, Metrics/LineLength
       def create_etc_script
         filename = "etc.init.d.nginxtra"
         workingdir = File.expand_path "."
 
         @thor.inside Nginxtra::Config.base_dir do
-          @thor.create_file filename, %{#!/bin/sh
+          @thor.create_file filename, %(#!/bin/sh
 
 ### BEGIN INIT INFO
 # Provides:          nginxtra
@@ -50,14 +51,15 @@ module Nginxtra
 export GEM_HOME="#{ENV["GEM_HOME"]}"
 export GEM_PATH="#{ENV["GEM_PATH"]}"
 #{Nginxtra::Config.ruby_path} "#{File.join Nginxtra::Config.gem_dir, "bin/nginxtra"}" "$1" --basedir="#{Nginxtra::Config.base_dir}" --config="#{Nginxtra::Config.loaded_config_path}" --workingdir="#{workingdir}" --non-interactive
-}, :force => true
+), force: true
           @thor.chmod filename, 0755
         end
 
-        run! %{#{sudo true}rm /etc/init.d/nginxtra} if File.exists? "/etc/init.d/nginxtra"
-        run! %{#{sudo true}ln -s "#{File.join Nginxtra::Config.base_dir, filename}" /etc/init.d/nginxtra}
-        run! %{#{sudo true}update-rc.d nginxtra defaults}
+        run! %(#{sudo true}rm /etc/init.d/nginxtra) if File.exist? "/etc/init.d/nginxtra"
+        run! %(#{sudo true}ln -s "#{File.join Nginxtra::Config.base_dir, filename}" /etc/init.d/nginxtra)
+        run! %(#{sudo true}update-rc.d nginxtra defaults)
       end
+      # rubocop:enable Metrics/AbcSize, Metrics/LineLength
 
       # Notify the user that installation should be up to date.
       def up_to_date

data/lib/nginxtra/actions/rails/server.rb

@@ -19,15 +19,11 @@ module Nginxtra
         end
 
         def ensure_in_rails_app
-          unless in_rails_app?
-            raise Nginxtra::Error::IllegalState.new "You must be in a rails root directory to run nginxtra_rails."
-          end
+          raise Nginxtra::Error::IllegalState, "You must be in a rails root directory to run nginxtra_rails." unless in_rails_app?
         end
 
         def ensure_server_gem_installed
-          unless passenger_installed?
-            raise Nginxtra::Error::IllegalState.new "Please 'gem install passenger' to continue."
-          end
+          raise Nginxtra::Error::IllegalState, "Please 'gem install passenger' to continue." unless passenger_installed?
         end
 
         def start_nginxtra
@@ -35,10 +31,10 @@ module Nginxtra
           environment = @thor.options["environment"]
           @thor.empty_directory "tmp" unless File.directory? "tmp"
           @thor.empty_directory "tmp/nginxtra" unless File.directory? "tmp/nginxtra"
-          @thor.create_file config_path, %{nginxtra.simple_config do
-  rails :port => #{port}, :environment => "#{environment}"
+          @thor.create_file config_path, %(nginxtra.simple_config do
+  rails port: #{port}, environment: "#{environment}"
 end
-}, :force => true
+), force: true
           @thor.invoke Nginxtra::CLI, ["start"], :basedir => basedir, :config => config_path, :workingdir => workingdir, :"non-interactive" => true
           @thor.say "Listening on http://localhost:#{port}/"
           @thor.say "Environment: #{environment}"
@@ -73,8 +69,8 @@ end
         end
 
         def in_rails_app?
-          return true if File.exists? "script/rails"
-          File.exists?("script/server") && File.exists?("app")
+          return true if File.exist? "script/rails"
+          File.exist?("script/server") && File.exist?("app")
         end
 
         def start_verbose_output
@@ -88,16 +84,17 @@ end
           @verbose_run = false
         end
 
+        # rubocop:disable Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
         def verbose_thread
           environment = @thor.options["environment"]
           log_path = "log/#{environment}.log"
 
-          if File.exists? log_path
+          if File.exist? log_path
             log = File.open log_path, "r"
             log.seek 0, IO::SEEK_END
           else
             while @verbose_run
-              if File.exists? log_path
+              if File.exist? log_path
                 log = File.open log_path, "r"
                 break
               end
@@ -112,7 +109,7 @@ end
 
             if line
               puts line
-              puts line while(line = log.gets)
+              puts line while (line = log.gets)
             end
 
             sleep 0.1
@@ -120,6 +117,7 @@ end
         ensure
           log.close if log
         end
+        # rubocop:enable Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
       end
     end
   end

data/lib/nginxtra/actions/start.rb

@@ -28,11 +28,11 @@ module Nginxtra
       # Save nginx config files to the proper config file path.
       def save_config_files
         files = @config.files
-        raise Nginxtra::Error::InvalidConfig.new("Missing definition for nginx.conf", :header => "Missing definition for nginx.conf!", :message => "You must define your nginx.conf configuration in your nginxtra.conf.rb file.") unless files.include? "nginx.conf"
+        raise Nginxtra::Error::MissingNginxConfig unless files.include? "nginx.conf"
 
         @thor.inside Nginxtra::Config.config_dir do
           files.each do |filename|
-            @thor.create_file filename, @config.file_contents(filename), :force => true
+            @thor.create_file filename, @config.file_contents(filename), force: true
           end
         end
       end

data/lib/nginxtra/cli.rb

@@ -4,13 +4,13 @@ module Nginxtra
   class CLI < Thor
     include Thor::Actions
 
-    class_option "force", :type => :boolean, :banner => "Force a task to happen, regardless of what nginxtra thinks", :aliases => "-f"
-    class_option "trace", :type => :boolean, :banner => "Output stack traces on error"
-    class_option "non-interactive", :type => :boolean, :banner => "If nginxtra would ask a question, it instead proceeds as if 'no' were the answer", :aliases => "-I"
-    class_option "ignore-nginx-check", :type => :boolean, :banner => "Ignore the nginx check if installing"
-    class_option "config", :type => :string, :banner => "Specify the configuration file to use", :aliases => "-c"
-    class_option "basedir", :type => :string, :banner => "Specify the directory to store nginx files", :aliases => "-b"
-    class_option "workingdir", :type => :string, :banner => "Specify the working directory", :aliases => "-w"
+    class_option "force", type: :boolean, banner: "Force a task to happen, regardless of what nginxtra thinks", aliases: "-f"
+    class_option "trace", type: :boolean, banner: "Output stack traces on error"
+    class_option "non-interactive", type: :boolean, banner: "If nginxtra would ask a question, it instead proceeds as if 'no' were the answer", aliases: "-I"
+    class_option "ignore-nginx-check", type: :boolean, banner: "Ignore the nginx check if installing"
+    class_option "config", type: :string, banner: "Specify the configuration file to use", aliases: "-c"
+    class_option "basedir", type: :string, banner: "Specify the directory to store nginx files", aliases: "-b"
+    class_option "workingdir", type: :string, banner: "Specify the working directory", aliases: "-w"
 
     map "-v" => "version"
 
@@ -25,11 +25,11 @@ module Nginxtra
       options to be ignored (and the defaults will be used in the resulting
       nginxtra.conf.rb).  The result will be output to nginxtra.conf.rb in the current
       directory, unless an override value is specified with the --config option."
-    method_option "nginx-bin", :type => :string, :banner => "Point to the compiled nginx to retrieve compile options", :aliases => "-n"
-    method_option "nginx-conf", :type => :string, :banner => "Point to the nginx.conf file to retrieve the existing configuration", :aliases => "-F", :default => "nginx.conf"
-    method_option "ignore-nginx-bin", :type => :boolean, :banner => "Ignore the nginx binary, and assume default compile time options", :aliases => "-N"
-    method_option "output", :type => :boolean, :banner => "Output to standard out instead of to a file", :aliases => "-o"
-    method_option "input", :type => :boolean, :banner => "Read nginx.conf from standard in instead of a file", :aliases => "-i"
+    method_option "nginx-bin", type: :string, banner: "Point to the compiled nginx to retrieve compile options", aliases: "-n"
+    method_option "nginx-conf", type: :string, banner: "Point to the nginx.conf file to retrieve the existing configuration", aliases: "-F", default: "nginx.conf"
+    method_option "ignore-nginx-bin", type: :boolean, banner: "Ignore the nginx binary, and assume default compile time options", aliases: "-N"
+    method_option "output", type: :boolean, banner: "Output to standard out instead of to a file", aliases: "-o"
+    method_option "input", type: :boolean, banner: "Read nginx.conf from standard in instead of a file", aliases: "-i"
     def convert
       Nginxtra::Error.protect self do
         Nginxtra::Actions::Convert.new(self, nil).convert
@@ -42,9 +42,9 @@ module Nginxtra
       --file is provided, something other than nginx.conf can be output.  The --list
       option can be provided to list known config files.  The --compile-options option
       can be provided to list compile time options being passed to nginx."
-    method_option "compile-options", :type => :boolean, :banner => "Show compile options being used", :aliases => "-C"
-    method_option "file", :type => :string, :banner => "The config file that is printed", :aliases => "-F", :default => "nginx.conf"
-    method_option "list", :type => :boolean, :banner => "List known files", :aliases => "-l"
+    method_option "compile-options", type: :boolean, banner: "Show compile options being used", aliases: "-C"
+    method_option "file", type: :string, banner: "The config file that is printed", aliases: "-F", default: "nginx.conf"
+    method_option "list", type: :boolean, banner: "List known files", aliases: "-l"
     def print
       Nginxtra::Error.protect self do
         set_working_dir!
@@ -141,6 +141,7 @@ module Nginxtra
     end
 
     private
+
     def prepare_config!
       Nginxtra::Config.base_dir = options["basedir"]
       result = Nginxtra::Config.require! options["config"]
@@ -149,9 +150,7 @@ module Nginxtra
     end
 
     def set_working_dir!
-      if options["workingdir"]
-        Dir.chdir options["workingdir"]
-      end
+      Dir.chdir options["workingdir"] if options["workingdir"]
     end
 
     class << self

data/lib/nginxtra/config.rb

@@ -6,19 +6,16 @@ module Nginxtra
     FILENAME = "nginxtra.conf.rb".freeze
     NGINX_CONF_FILENAME = "nginx.conf".freeze
     NGINX_PIDFILE_FILENAME = ".nginx_pid".freeze
-    @@last_config = nil
 
-    def initialize(*args)
+    def initialize(*_args)
       @requires_root = false
       @compile_options = []
       @partial_paths = []
       @file_paths = []
       @files = {}
-      @@last_config = self
+      Nginxtra::Config.last_config = self
 
-      if block_given?
-        yield self
-      end
+      yield self if block_given?
     end
 
     # Define an additional directory where partials can be found.  The
@@ -50,7 +47,7 @@ module Nginxtra
     # gem partials.
     def partial_paths
       [].tap do |result|
-        result.push *@partial_paths
+        result.push(*@partial_paths)
         result.push File.join(Nginxtra::Config.template_dir, "partials")
         result.push File.join(Nginxtra::Config.gem_template_dir, "partials")
       end
@@ -63,7 +60,7 @@ module Nginxtra
     # file templates.
     def file_paths
       [].tap do |result|
-        result.push *@file_paths
+        result.push(*@file_paths)
         result.push File.join(Nginxtra::Config.template_dir, "files")
         result.push File.join(Nginxtra::Config.gem_template_dir, "files")
       end
@@ -75,7 +72,7 @@ module Nginxtra
     #     ...
     #   end
     def config(&block)
-      instance_eval &block
+      instance_eval(&block)
       self
     end
 
@@ -106,9 +103,9 @@ module Nginxtra
     # add a Wno-error compilation option, and add the passenger module
     # to the proper passenger path.
     def require_passenger!
-      compile_option %{--with-http_gzip_static_module}
-      compile_option %{--with-cc-opt=-Wno-error}
-      compile_option %{--add-module="#{Nginxtra::Config.passenger_config_dir}"}
+      compile_option %(--with-http_gzip_static_module)
+      compile_option %(--with-cc-opt=-Wno-error)
+      compile_option %(--add-module="#{Nginxtra::Config.passenger_config_dir}")
     end
 
     # Obtain the compile options that have been configured.
@@ -130,10 +127,10 @@ module Nginxtra
     #   end
     def compile_option(opt)
       opt = "--#{opt}" unless opt =~ /^--/
-      raise Nginxtra::Error::InvalidConfig.new("Invalid compilation option --prefix", :header => "Invalid compilation option --prefix", :message => "The --prefix compile option is not allowed with nginxtra.  It is reserved so nginxtra can control where nginx is compiled and run from.") if opt =~ /--prefix=/
-      raise Nginxtra::Error::InvalidConfig.new("Invalid compilation option --sbin-path", :header => "Invalid compilation option --sbin-path", :message => "The --sbin-path compile option is not allowed with nginxtra.  It is reserved so nginxtra can control what binary is used to run nginx.") if opt =~ /--sbin-path=/
-      raise Nginxtra::Error::InvalidConfig.new("Invalid compilation option --conf-path", :header => "Invalid compilation option --conf-path", :message => "The --conf-path compile option is not allowed with nginxtra.  It is reserved so nginxtra can control the configuration entirely via #{Nginxtra::Config::FILENAME}.") if opt =~ /--conf-path=/
-      raise Nginxtra::Error::InvalidConfig.new("Invalid compilation option --pid-path", :header => "Invalid compilation option --pid-path", :message => "The --pid-path compile option is not allowed with nginxtra.  It is reserved so nginxtra can control where the pid file is created.") if opt =~ /--pid-path=/
+      raise Nginxtra::Error::InvalidCompilationOption, "prefix" if opt =~ /--prefix=/
+      raise Nginxtra::Error::InvalidCompilationOption, "sbin-path" if opt =~ /--sbin-path=/
+      raise Nginxtra::Error::InvalidCompilationOption, "conf-path" if opt =~ /--conf-path=/
+      raise Nginxtra::Error::InvalidCompilationOption, "pid-path" if opt =~ /--pid-path=/
       @compile_options << opt
     end
 
@@ -155,10 +152,7 @@ module Nginxtra
     end
 
     class << self
-      # Obtain the last Nginxtra::Config object that was created.
-      def last_config
-        @@last_config
-      end
+      attr_accessor :last_config
 
       # Obtain the config file path based on the current directory.
       # This will be the path to the first nginxtra.conf.rb found
@@ -169,41 +163,40 @@ module Nginxtra
       def path
         path = File.absolute_path "."
         config = File.join path, FILENAME
-        return config if File.exists? config
+        return config if File.exist? config
         config = File.join path, "config", FILENAME
-        return config if File.exists? config
+        return config if File.exist? config
         path = File.dirname path
 
-        begin
+        loop do
           config = File.join path, FILENAME
-          return config if File.exists? config
+          return config if File.exist? config
           path = File.dirname path
-        end until path == "/"
+          break if path == "/"
+        end
 
         config = File.join path, FILENAME
-        config if File.exists? config
+        config if File.exist? config
       end
 
       # Retrieve the path to the config file that was loaded.
-      def loaded_config_path
-        @loaded_config_path
-      end
+      attr_reader :loaded_config_path
 
       # Determine where the config file is and require it.  Return the
       # resulting config loaded by the path.
       # Nginxtra::Error::MissingConfig will be raised if the config
       # file cannot be found.
       def require!(config_path = nil)
-        if config_path
-          config_path = File.absolute_path config_path
-        else
-          config_path = path
-        end
-
-        raise Nginxtra::Error::MissingConfig.new("Cannot find #{FILENAME} to configure nginxtra!") unless config_path
-        raise Nginxtra::Error::MissingConfig.new("Missing file #{config_path} to configure nginxtra!") unless File.exists?(config_path)
+        config_path = if config_path
+                        File.absolute_path config_path
+                      else
+                        path
+                      end
+
+        raise Nginxtra::Error::MissingConfig, "Cannot find #{FILENAME} to configure nginxtra!" unless config_path
+        raise Nginxtra::Error::MissingConfig, "Missing file #{config_path} to configure nginxtra!" unless File.exist?(config_path)
         require config_path
-        raise Nginxtra::Error::InvalidConfig.new("No configuration is specified in #{config_path}!") unless last_config
+        raise Nginxtra::Error::NoConfigSpecified, config_path unless last_config
         @loaded_config_path = config_path
         last_config
       end
@@ -298,7 +291,7 @@ module Nginxtra
       # be found.
       def passenger_spec
         @passenger_spec ||= Gem::Specification.find_by_name("passenger").tap do |spec|
-          raise InvalidConfig.new("Missing passenger gem", :header => "Missing passenger gem!", :message => "You cannot reference passenger unless the passenger gem is installed!") if spec.nil?
+          raise Nginxtra::Error::MissingPassengerGem if spec.nil?
         end
       end
 
@@ -308,7 +301,7 @@ module Nginxtra
 
       # Determine if nginx is running, based on the pidfile.
       def nginx_running?
-        return false unless File.exists? nginx_pidfile
+        return false unless File.exist? nginx_pidfile
         pid = File.read(nginx_pidfile).strip
         Process.getpgid pid.to_i
         true
@@ -372,9 +365,9 @@ module Nginxtra
       def initialize(filename, config, &block)
         @filename = filename
         @config = config
-        @indentation = Nginxtra::Config::Indentation.new :indent_size => 4
+        @indentation = Nginxtra::Config::Indentation.new indent_size: 4
         @file_contents = []
-        instance_eval &block
+        instance_eval(&block)
       end
 
       # The file contents that were defined for this config file.
@@ -435,9 +428,9 @@ module Nginxtra
         empty_config_line unless @file_contents.empty? || @begin_of_block
         bare_config_line "#{name} {"
         @begin_of_block = true
-        @indentation + 1
+        @indentation.increment
         yield if block_given?
-        @indentation - 1
+        @indentation.decrement
         bare_config_line "}"
         @end_of_block = true
       end
@@ -478,14 +471,14 @@ module Nginxtra
       # in will be invoked (if given) if the template invokes yield.
       def process_template!(template, options = {}, yielder = nil)
         if template.respond_to? :call
-          block = Proc.new { instance_eval &yielder if yielder }
+          block = proc { instance_eval(&yielder) if yielder }
           instance_exec options, block, &template
         else
           process_template_with_yields! template do |x|
             if x
               options[x.to_sym]
-            else
-              instance_eval &yielder if yielder
+            elsif yielder
+              instance_eval(&yielder)
             end
           end
         end
@@ -522,45 +515,50 @@ module Nginxtra
       # Output the passenger_root line, including the proper passenger
       # gem path.
       def passenger_root!
-        config_line %{passenger_root #{Nginxtra::Config.passenger_spec.gem_dir}}
+        config_line %(passenger_root #{Nginxtra::Config.passenger_spec.gem_dir})
       end
 
       # Output the passenger_ruby, including the proper ruby path.
       def passenger_ruby!
-        config_line %{passenger_ruby #{Nginxtra::Config.ruby_path}}
+        config_line %(passenger_ruby #{Nginxtra::Config.ruby_path})
       end
 
       # Output that passenger is enabled in this block.
       def passenger_on!
-        config_line %{passenger_enabled on}
+        config_line %(passenger_enabled on)
       end
 
       private
+
+      def full_partial_paths(partial_name)
+        @config.partial_paths.lazy.map do |path|
+          File.join path, @filename, "#{partial_name}.rb"
+        end
+      end
+
       def partial?(partial_name)
         return true if Nginxtra::Config::Extension.partial? @filename, partial_name
 
-        @config.partial_paths.any? do |path|
-          File.exists? File.join(path, "#{@filename}/#{partial_name}.rb")
+        full_partial_paths(partial_name).any? do |path|
+          File.exist? path
         end
       end
 
       def invoke_partial(partial_name, args, block)
-        if Nginxtra::Config::Extension.partial? @filename, partial_name
-          partial_path = Nginxtra::Config::Extension.partial @filename, partial_name
-        else
-          partial_path = @config.partial_paths.map do |path|
-            File.join path, "#{@filename}/#{partial_name}.rb"
-          end.find do |path|
-            File.exists? path
-          end
-        end
+        partial_path = if Nginxtra::Config::Extension.partial? @filename, partial_name
+                         Nginxtra::Config::Extension.partial @filename, partial_name
+                       else
+                         full_partial_paths(partial_name).find do |path|
+                           File.exist? path
+                         end
+                       end
 
         if args.empty?
           partial_options = {}
-        elsif args.length == 1 && args.first.kind_of?(Hash)
+        elsif args.length == 1 && args.first.is_a?(Hash)
           partial_options = args.first
         else
-          raise InvalidConfig.new("Invalid partial arguments", :header => "Invalid partial arguments!", :message => "You can only pass 0 arguments or 1 hash to a partial!")
+          raise Nginxtra::Error::InvalidPartialArguments
         end
 
         process_template! partial_path, partial_options, block
@@ -592,9 +590,9 @@ module Nginxtra
         end
 
         config_files = file_options.map(&:keys).inject([], &:+).uniq.map do |x|
-          file_options.select do |option|
+          file_options.find do |option|
             option.include? x
-          end.first[x]
+          end[x]
         end
 
         process_files! config_files
@@ -608,13 +606,10 @@ module Nginxtra
       def find_config_files!(path)
         files_hash = {}
 
-        Dir["#{path}/**/*.rb"].select do |x|
-          File.file? x
-        end.map do |x|
-          file_name = x.sub /^#{Regexp.quote "#{path}"}\/(.*)\.rb$/, "\\1"
-          { :path => x, :config_file => file_name }
-        end.each do |x|
-          files_hash[x[:config_file]] = x
+        Dir["#{path}/**/*.rb"].each do |x|
+          next unless File.file? x
+          file_name = x.sub %r{^#{Regexp.quote path.to_s}/(.*)\.rb$}, "\\1"
+          files_hash[file_name] = { path: x, config_file: file_name }
         end
 
         files_hash
@@ -653,19 +648,25 @@ module Nginxtra
         @value == 0
       end
 
-      def -(amount)
-        self + (-amount)
+      def decrement
+        adjust(-1)
       end
 
-      def +(amount)
-        @value += amount
-        raise Nginxtra::Error::ConvertFailed.new("Missing block end!") if @value < 0
-        @value
+      def increment
+        adjust(1)
       end
 
       def to_s
         " " * indent_size * @value
       end
+
+      private
+
+      def adjust(amount)
+        @value += amount
+        raise Nginxtra::Error::ConvertFailed, "Missing block end!" if @value < 0
+        @value
+      end
     end
   end
 end
@@ -677,5 +678,5 @@ end
 #     ...
 #   end
 def nginxtra(*args, &block)
-  Nginxtra::Config.new *args, &block
+  Nginxtra::Config.new(*args, &block)
 end