tomahawk 0.0.4 → 0.0.5

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 28d52482bb38d14c3b4afd0b304c9971b4bcac2b
+  data.tar.gz: 7764226f5dbd0ac2eb73d34818671cf42a596373
+SHA512:
+  metadata.gz: a55c7f7762b1cc6995f8e5b404caed5576aa0a06b3af342b1689a4648f248d72614bff1c39d8382c5dd709292b2f7832dc7368bbad13869d2bb7bd602bcd207c
+  data.tar.gz: d830a6c4cb45e48feb5489f3c294887ff1cbad3a31324ee64c148b0b565e8d643fa44b391b91b39ff2888447184f5898e9e3607aad84b8935f81721f07ed0ec7

data/apache2.conf

@@ -0,0 +1,233 @@
+#
+# Based upon the NCSA server configuration files originally by Rob McCool.
+#
+# This is the main Apache server configuration file.  It contains the
+# configuration directives that give the server its instructions.
+# See http://httpd.apache.org/docs/2.2/ for detailed information about
+# the directives.
+#
+# Do NOT simply read the instructions in here without understanding
+# what they do.  They're here only as hints or reminders.  If you are unsure
+# consult the online docs. You have been warned.  
+#
+# The configuration directives are grouped into three basic sections:
+#  1. Directives that control the operation of the Apache server process as a
+#     whole (the 'global environment').
+#  2. Directives that define the parameters of the 'main' or 'default' server,
+#     which responds to requests that aren't handled by a virtual host.
+#     These directives also provide default values for the settings
+#     of all virtual hosts.
+#  3. Settings for virtual hosts, which allow Web requests to be sent to
+#     different IP addresses or hostnames and have them handled by the
+#     same Apache server process.
+#
+# Configuration and logfile names: If the filenames you specify for many
+# of the server's control files begin with "/" (or "drive:/" for Win32), the
+# server will use that explicit path.  If the filenames do *not* begin
+# with "/", the value of ServerRoot is prepended -- so "foo.log"
+# with ServerRoot set to "/etc/apache2" will be interpreted by the
+# server as "/etc/apache2/foo.log".
+#
+
+### Section 1: Global Environment
+#
+# The directives in this section affect the overall operation of Apache,
+# such as the number of concurrent requests it can handle or where it
+# can find its configuration files.
+#
+
+#
+# ServerRoot: The top of the directory tree under which the server's
+# configuration, error, and log files are kept.
+#
+# NOTE!  If you intend to place this on an NFS (or otherwise network)
+# mounted filesystem then please read the LockFile documentation (available
+# at <URL:http://httpd.apache.org/docs/2.2/mod/mpm_common.html#lockfile>);
+# you will save yourself a lot of trouble.
+#
+# Do NOT add a slash at the end of the directory path.
+#
+#ServerRoot "/etc/apache2"
+
+#
+# The accept serialization lock file MUST BE STORED ON A LOCAL DISK.
+#
+LockFile ${APACHE_LOCK_DIR}/accept.lock
+
+#
+# PidFile: The file in which the server should record its process
+# identification number when it starts.
+# This needs to be set in /etc/apache2/envvars
+#
+PidFile ${APACHE_PID_FILE}
+
+#
+# Timeout: The number of seconds before receives and sends time out.
+#
+Timeout 15
+
+#
+# KeepAlive: Whether or not to allow persistent connections (more than
+# one request per connection). Set to "Off" to deactivate.
+#
+KeepAlive On
+
+#
+# MaxKeepAliveRequests: The maximum number of requests to allow
+# during a persistent connection. Set to 0 to allow an unlimited amount.
+# We recommend you leave this number high, for maximum performance.
+#
+MaxKeepAliveRequests 10
+
+#
+# KeepAliveTimeout: Number of seconds to wait for the next request from the
+# same client on the same connection.
+#
+KeepAliveTimeout 2
+
+##
+## Server-Pool Size Regulation (MPM specific)
+## 
+
+# prefork MPM
+# StartServers: number of server processes to start
+# MinSpareServers: minimum number of server processes which are kept spare
+# MaxSpareServers: maximum number of server processes which are kept spare
+# MaxClients: maximum number of server processes allowed to start
+# MaxRequestsPerChild: maximum number of requests a server process serves
+<IfModule mpm_prefork_module>
+    StartServers          5
+    MinSpareServers       5
+    MaxSpareServers      10
+    MaxClients          90
+    MaxRequestsPerChild  200 
+</IfModule>
+
+# worker MPM
+# StartServers: initial number of server processes to start
+# MaxClients: maximum number of simultaneous client connections
+# MinSpareThreads: minimum number of worker threads which are kept spare
+# MaxSpareThreads: maximum number of worker threads which are kept spare
+# ThreadLimit: ThreadsPerChild can be changed to this maximum value during a
+#              graceful restart. ThreadLimit can only be changed by stopping
+#              and starting Apache.
+# ThreadsPerChild: constant number of worker threads in each server process
+# MaxRequestsPerChild: maximum number of requests a server process serves
+<IfModule mpm_worker_module>
+    StartServers          2
+    MinSpareThreads      25
+    MaxSpareThreads      75 
+    ThreadLimit          64
+    ThreadsPerChild      25
+    MaxClients          100
+    MaxRequestsPerChild   0
+</IfModule>
+
+# event MPM
+# StartServers: initial number of server processes to start
+# MaxClients: maximum number of simultaneous client connections
+# MinSpareThreads: minimum number of worker threads which are kept spare
+# MaxSpareThreads: maximum number of worker threads which are kept spare
+# ThreadsPerChild: constant number of worker threads in each server process
+# MaxRequestsPerChild: maximum number of requests a server process serves
+<IfModule mpm_event_module>
+    StartServers          2
+    MaxClients          150
+    MinSpareThreads      25
+    MaxSpareThreads      75 
+    ThreadLimit          64
+    ThreadsPerChild      25
+    MaxRequestsPerChild   0
+</IfModule>
+
+# These need to be set in /etc/apache2/envvars
+User ${APACHE_RUN_USER}
+Group ${APACHE_RUN_GROUP}
+
+#
+# AccessFileName: The name of the file to look for in each directory
+# for additional configuration directives.  See also the AllowOverride
+# directive.
+#
+
+AccessFileName .htaccess
+
+#
+# The following lines prevent .htaccess and .htpasswd files from being 
+# viewed by Web clients. 
+#
+<Files ~ "^\.ht">
+    Order allow,deny
+    Deny from all
+    Satisfy all
+</Files>
+
+#
+# DefaultType is the default MIME type the server will use for a document
+# if it cannot otherwise determine one, such as from filename extensions.
+# If your server contains mostly text or HTML documents, "text/plain" is
+# a good value.  If most of your content is binary, such as applications
+# or images, you may want to use "application/octet-stream" instead to
+# keep browsers from trying to display binary files as though they are
+# text.
+#
+DefaultType text/plain
+
+
+#
+# HostnameLookups: Log the names of clients or just their IP addresses
+# e.g., www.apache.org (on) or 204.62.129.132 (off).
+# The default is off because it'd be overall better for the net if people
+# had to knowingly turn this feature on, since enabling it means that
+# each client request will result in AT LEAST one lookup request to the
+# nameserver.
+#
+HostnameLookups Off
+
+# ErrorLog: The location of the error log file.
+# If you do not specify an ErrorLog directive within a <VirtualHost>
+# container, error messages relating to that virtual host will be
+# logged here.  If you *do* define an error logfile for a <VirtualHost>
+# container, that host's errors will be logged there and not here.
+#
+ErrorLog ${APACHE_LOG_DIR}/error.log
+
+#
+# LogLevel: Control the number of messages logged to the error_log.
+# Possible values include: debug, info, notice, warn, error, crit,
+# alert, emerg.
+#
+LogLevel warn
+
+# Include module configuration:
+Include mods-enabled/*.load
+Include mods-enabled/*.conf
+
+# Include ports listing
+Include ports.conf
+
+#
+# The following directives define some format nicknames for use with
+# a CustomLog directive (see below).
+# If you are behind a reverse proxy, you might want to change %h into %{X-Forwarded-For}i
+#
+LogFormat "%v:%p %h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" vhost_combined
+LogFormat "%h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" combined
+LogFormat "%h %l %u %t \"%r\" %>s %O" common
+LogFormat "%{Referer}i -> %U" referer
+LogFormat "%{User-agent}i" agent
+
+# Include of directories ignores editors' and dpkg's backup files,
+# see README.Debian for details.
+
+# Include generic snippets of statements
+Include conf.d/
+
+# Include the virtual host configurations:
+Include sites-enabled/
+
+
+#UseCanonicalName Off
+#VirtualDocumentRoot /websites/%-2.0.%-1/
+
+ExtendedStatus On

data/lib/tomahawk/config_parser.rb

@@ -14,10 +14,10 @@ module Tomahawk
     private
 
     def parse
-      
+
       directive_groups = [Tomahawk::DirectiveGroups::HTTPd.new]
 
-      @config_lines.each do |line|
+      @config_lines.grep(/^\s*[^#]/).each do |line|
 
         is_end_tag?(line) do
           directive_groups.pop
@@ -72,4 +72,4 @@ module Tomahawk
       false
     end
   end
-end
+end

data/lib/tomahawk/directive_groups.rb

@@ -2,6 +2,7 @@ require_relative 'directive_groups/base'
 require_relative 'directive_groups/httpd'
 require_relative 'directive_groups/virtual_host'
 require_relative 'directive_groups/directory'
+require_relative 'directive_groups/generic_directive_group'
 
 module Tomahawk
   module DirectiveGroups
@@ -11,6 +12,10 @@ module Tomahawk
       directive_group_name = String(directive_group_name)
 
       Tomahawk::DirectiveGroups.const_get(directive_group_name)
+    rescue NameError
+      Class.new(Tomahawk::DirectiveGroups::GenericDirectiveGroup) do
+        define_method(:name) { directive_group_name }
+      end
     end
   end
-end
+end

data/lib/tomahawk/directive_groups/base.rb

@@ -23,6 +23,10 @@ module Tomahawk
       rescue
         false
       end
+
+      def name
+        self.class.name.split('::').last
+      end
     end
   end
-end
+end

data/lib/tomahawk/directive_groups/generic_directive_group.rb

@@ -0,0 +1,13 @@
+module Tomahawk
+  module DirectiveGroups
+    class GenericDirectiveGroup < Base
+      def to_str(generator = Generators::GenericDirectiveGroup)
+        generator.new(self).to_s
+      end
+
+      def name
+        raise NameError, "Generic directive group found, but no name set – don't know how to proceed"
+      end
+    end
+  end
+end

data/lib/tomahawk/generators.rb

@@ -2,6 +2,7 @@ require_relative 'generators/base'
 require_relative 'generators/httpd'
 require_relative 'generators/virtual_host'
 require_relative 'generators/directory'
+require_relative 'generators/generic_directive_group'
 
 module Tomahawk
   module Generators
@@ -9,4 +10,4 @@ module Tomahawk
       "\n %s %s" % [directive.to_s.split('_').map(&:capitalize).join, value]
     end
   end
-end
+end

data/lib/tomahawk/generators/base.rb

@@ -11,7 +11,7 @@ module Tomahawk
         config = "\n<#{directive_group_name} #{@directive_group.parameters}>\n"
 
         @directive_group.directives.each do |directive, value|
-          config += generate_directive(directive, value) 
+          config += generate_directive(directive, value)
         end
 
         @directive_group.groups.each do |group|
@@ -25,7 +25,7 @@ module Tomahawk
     end
 
     def directive_group_name
-      @directive_group.class.name.split('::').last
+      @directive_group.name
     end
   end
-end
+end

data/lib/tomahawk/generators/generic_directive_group.rb

@@ -0,0 +1,9 @@
+module Tomahawk
+  module Generators
+    class GenericDirectiveGroup < Base
+      def directive_group_name
+        @directive_group.name
+      end
+    end
+  end
+end

data/lib/tomahawk/version.rb

@@ -1,3 +1,3 @@
 module Tomahawk
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/spec/lib/tomahawk/directive_groups_spec.rb

@@ -1,9 +1,13 @@
 require 'spec_helper'
 
 describe Tomahawk::DirectiveGroups do
-  describe '.DirectiveGroup' do 
+  describe '.DirectiveGroup' do
     it 'returns corresponding DirectiveGroup if String given' do
       expect(Tomahawk::DirectiveGroups.DirectiveGroup('VirtualHost')).to eq(Tomahawk::DirectiveGroups::VirtualHost)
     end
+
+    it "returns GenericDirectiveGroup if directive group is unknown" do
+      expect(Tomahawk::DirectiveGroups.DirectiveGroup('Foobar').ancestors).to include(Tomahawk::DirectiveGroups::GenericDirectiveGroup)
+    end
   end
-end
+end

metadata

@@ -1,62 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: tomahawk
 version: !ruby/object:Gem::Version
-  version: 0.0.4
-  prerelease: 
+  version: 0.0.5
 platform: ruby
 authors:
 - Christian Schell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-11 00:00:00.000000000 Z
+date: 2016-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 10.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 10.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: ''
@@ -66,25 +59,28 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .ruby-version
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".ruby-version"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
+- apache2.conf
 - lib/tomahawk.rb
 - lib/tomahawk/config.rb
 - lib/tomahawk/config_parser.rb
 - lib/tomahawk/directive_groups.rb
 - lib/tomahawk/directive_groups/base.rb
 - lib/tomahawk/directive_groups/directory.rb
+- lib/tomahawk/directive_groups/generic_directive_group.rb
 - lib/tomahawk/directive_groups/httpd.rb
 - lib/tomahawk/directive_groups/virtual_host.rb
 - lib/tomahawk/generators.rb
 - lib/tomahawk/generators/base.rb
 - lib/tomahawk/generators/directory.rb
+- lib/tomahawk/generators/generic_directive_group.rb
 - lib/tomahawk/generators/httpd.rb
 - lib/tomahawk/generators/virtual_host.rb
 - lib/tomahawk/version.rb
@@ -100,27 +96,26 @@ files:
 homepage: https://github.com/Sophisticates/tomahawk
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.4.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Tomahawk parses and generates Apache 2 configuration files.
 test_files:
 - spec/lib/tomahawk/config_parser_spec.rb
@@ -131,3 +126,4 @@ test_files:
 - spec/lib/tomahawk/generators/httpd_spec.rb
 - spec/lib/tomahawk_spec.rb
 - spec/spec_helper.rb
+has_rdoc: