web_server_config_generator 0.1.2 → 0.1.3

data/lib/web_server_config_generator/generator.rb

@@ -4,17 +4,17 @@ module WebServerConfigGenerator
       options.each do |opt, val|
         instance_variable_set("@#{opt}", val)
       end
-
+      
       @starting_port = options[:starting_port] || 40000
       @port_pool_size = options[:port_pool_size] || 10000
-
+      
       @environment_map = Hash.new(options[:environments]) if options[:environments]
 
       setup_config_dir
-
+      
       @project_or_projects_dir ||= projects_dir
     end
-
+    
     def write_conf_files
       FileUtils.cd projects_dir do
         # generate files for each proj/env
@@ -24,7 +24,7 @@ module WebServerConfigGenerator
             list_of_conf_files << write_conf_file(p, env)
           end
         end
-
+        
         sub_uri_projects.each do |p|
           create_sub_uri_links_dir p
           list_of_conf_files << write_conf_file(p, p.env)
@@ -38,10 +38,10 @@ module WebServerConfigGenerator
         web_server_vhost_nginx_conf.write(new_lines.join)
       end
     end
-
+    
     def create_sub_uri_links_dir(sub_uri_project)
       env = sub_uri_project.env
-
+      
       web_server_sub_uri_apps_dir.mkdir unless web_server_sub_uri_apps_dir.exist?
       links_dir = web_server_sub_uri_apps_dir + sub_uri_project.server_name
       links_dir.mkdir unless links_dir.exist?
@@ -56,7 +56,7 @@ module WebServerConfigGenerator
     def server_names
       projects.map { |p| p.server_names }.flatten.uniq
     end
-
+    
     def delete_ghost_entries
       global_config[:hosts].each do |host|
         Host.delete host
@@ -64,7 +64,7 @@ module WebServerConfigGenerator
       global_config[:hosts] = []
       save_global_config(global_config)
     end
-
+    
     def add_ghost_entries
       current_hosts = Host.list
       already_correct = []
@@ -88,18 +88,18 @@ module WebServerConfigGenerator
           end
         end
       end
-
+      
       if already_correct.size > 0
         puts "\n#{already_correct.size} hosts were already setup correctly"
         puts
       end
-
+      
       if added.size > 0
         puts "The following hostnames were added for 127.0.0.1:"
         puts added.map { |h| "  #{h.name}\n" }
         puts
       end
-
+      
       if present_but_incorrect.size > 0
         puts "The following hostnames were present, but didn't map to 127.0.0.1:"
         pad = present_but_incorrect.max{|a,b| a.to_s.length <=> b.to_s.length }.to_s.length
@@ -107,7 +107,7 @@ module WebServerConfigGenerator
         puts
       end
     end
-
+    
     def setup_config_dir
       unless File.exist?(config_dir)
         unless dir = $PROJECTS_DIRECTORY
@@ -120,13 +120,13 @@ module WebServerConfigGenerator
           end
           puts "setting up config dir"
         end
-
+        
         FileUtils.mkdir_p config_dir
         initial_config = { :projects_dirs => [File.expand_path(dir)]}
         save_global_config(initial_config)
       end
     end
-
+    
     def symlink(link_target, link_name)
       if File.exist?(link_name)
         if FileTest.symlink?(link_name)
@@ -140,7 +140,7 @@ module WebServerConfigGenerator
         File.symlink link_target, link_name
       end
     end
-
+    
     def setup_webserver_links_dir
       web_server_links_dir.mkpath
       environments.each do |e|
@@ -148,7 +148,7 @@ module WebServerConfigGenerator
         symlink(projects_dir, link_name)
       end
     end
-
+    
     def app_projects
       @app_projects ||=
         begin
@@ -156,7 +156,7 @@ module WebServerConfigGenerator
           @app_projects
         end
     end
-
+    
     def sub_uri_projects
       return @sub_uri_projects if @sub_uri_projects
       server_name_env_project_map = {}
@@ -178,19 +178,19 @@ module WebServerConfigGenerator
         WebServerConfigGenerator::SubUriProject.new(server_name, env_and_projects, self)
       end
     end
-
+    
     def projects
       app_projects + sub_uri_projects
     end
-
+    
     def environments
       @environments ||= environment_map.values.flatten.uniq
     end
-
+    
     def web_server_vhost_nginx_conf
       web_server_vhost_nginx_dir + "projects.conf"
     end
-
+    
     def check_nginx_conf
       unless nginx_conf =~ /include.*#{web_server_vhost_nginx_conf}/
         puts "\nWarning: You'll need to make sure this line is in your nginx config, in the http block:"
@@ -202,31 +202,31 @@ module WebServerConfigGenerator
         puts "  server_names_hash_bucket_size 128;"
       end
     end
-
+    
     def prompt_to_restart_nginx
       puts
       if $RESTART_NGINX || ($RESTART_NGINX.nil? && agree("Restart nginx? [Y/n]") { |q| q.default = "Y"})
         puts "Restarting nginx..."
-        cmd = "sudo killall nginx; sleep 1 && sudo #{nginx}"
+        cmd = "sudo #{nginx} -s quit; sleep 1 && sudo #{nginx}"
         puts "running: #{cmd}"
         system cmd
       end
     end
-
+    
     def web_server_links_dir
       config_dir + "links"
     end
-
+    
     def projects_dir
       WebServerConfigGenerator::Pathname.new(global_config[:projects_dirs].first).expand_path
     end
-
+    
     def web_server_sub_uri_apps_dir
       config_dir + "sub_uri_apps"
     end
-
+    
     private
-
+    
     def config_dir
       @config_dir ||=
         begin
@@ -236,29 +236,29 @@ module WebServerConfigGenerator
                                    end
         end
     end
-
+    
     def global_config(reload = false)
       @global_config = nil if reload
       @global_config ||= YAML.load_file(global_config_path)
     end
-
+    
     def save_global_config(config)
       @global_config = config
       File.open(global_config_path, "w") { |f| f.write config.to_yaml }
     end
-
+    
     def global_config_path
       File.join(config_dir, "global_config.yml")
     end
-
+    
     def web_server_vhost_dir
       config_dir + "vhost"
     end
-
+    
     def web_server_vhost_nginx_dir
       web_server_vhost_dir + "nginx"
     end
-
+    
     def find_project_and_symlink_dirs
       @app_projects ||= []
 
@@ -266,7 +266,7 @@ module WebServerConfigGenerator
         @app_projects = [WebServerConfigGenerator::ProjectDirectory.new(@project_or_projects_dir, self)]
         return
       end
-
+      
       [
        Dir[File.join(projects_dir, "*", ".webconfig.yml")],
        Dir[File.join(projects_dir, "*", "*", ".webconfig.yml")],
@@ -275,15 +275,15 @@ module WebServerConfigGenerator
         @app_projects << WebServerConfigGenerator::ProjectDirectory.new(path, self)
       end
     end
-
+    
     def projects_environment_map
       app_projects.inject({}) { |map, p| map[p] = p.environments; map }
     end
-
+    
     def symlinks_environment_map
       sub_uri_projects.inject({}) { |map, p| map[p] = p.env.to_s; map }
     end
-
+    
     def environment_map
       @environment_map ||= projects_environment_map.merge(symlinks_environment_map)
     end
@@ -307,12 +307,12 @@ module WebServerConfigGenerator
 #       end
       project_env_vhost_filename.expand_path
     end
-
+    
     def nginx_conf_path
       m = `#{nginx} -t 2>&1`.match /the configuration file (.*) syntax is ok/
       m[1]
     end
-
+    
     def nginx_conf
       @nginx_conf ||= begin
                         File.read(nginx_conf_path)
@@ -329,7 +329,6 @@ module WebServerConfigGenerator
                            ]
       nginx_path_options.detect { |p| system "which #{p} &> /dev/null" }
     end
-
+    
   end
 end
-

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Expected Behavior
@@ -14,8 +14,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-21 00:00:00 -04:00
-default_executable: 
+date: 2010-04-14 00:00:00 -04:00
+default_executable: web_server_setup
 dependencies: []
 
 description: automatically generate web server config files for you projects directory
@@ -33,6 +33,8 @@ files:
 - lib/web_server_config_generator/pathname.rb
 - lib/web_server_config_generator/project_directory.rb
 - lib/web_server_config_generator/sub_uri_project.rb
+- bin/web_server_setup
+- README
 has_rdoc: true
 homepage: http://github.com/expectedbehavior/web_server_config_generator
 licenses: []