vhost 1.1.4 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a27db3605a2ab07093455c7ae95a39bc60e38372
-  data.tar.gz: 4ba7454add6f822ae2f3595c6ac84da9fc8e098d
+  metadata.gz: 5e72cf3506c17a59bf1dedfaa3c87ac9a5600de4
+  data.tar.gz: b995f164b7b6ac112c0a8f486e305c74b2162899
 SHA512:
-  metadata.gz: 573f1531bc2120cd63e7b559d86927e74df8827ea8348b3655b89381c4d712b763ea7adb3d6af4aa0456c1ded0738ff484dc1f71d6a71f5e3a7eacdfac479a82
-  data.tar.gz: d809941d1581fe2392abc43641fd00122f295e310f1b1c494d20b2063c86c7d2eb2c8e9279cbfb848e37f88e5a7362802f0d43160a65749b27be500efd314ccf
+  metadata.gz: b0fd7c18203e0e4355dbbc3c037fa5697452ebe0069d05cada71d4c95ceb363a66b3bb458d79fab3ee8cd690da166b38d1af4c0416b4455f3463d25439ec8cac
+  data.tar.gz: 2d612a67504fbadf73754cd08d75a21dcd0d3a649cb56573bdb24559b267c2a3f52c28bc8b7d3c9d7574c62ef71ee371122547b21b688b618fa8b69bbf12cab5

data/bin/vhost

@@ -98,7 +98,15 @@ end
 
 vhost = Vhost.find(ARGV[0])
 abort "#{ARGV[0]} doesn't exist" unless vhost
-abort "#{vhost.basename} exists" if options.empty? and not ARGV[0].nil?
+
+if options.empty? and not ARGV[0].nil?
+  # abort "#{vhost.basename} exists"
+  puts "  Name: #{vhost.name}"
+  print "Status: "
+  puts vhost.enabled? ? "Enabled".green : "Disabled".red
+  puts "  Path: #{vhost.path}"
+  puts "Folder: #{vhost.folder}"
+end
 
 if options[:delete]
   print "Really delete #{vhost.basename}? [y/n]: "
@@ -140,18 +148,22 @@ if options[:disable]
 end
 
 if options[:list]
-  puts "Sites available:"
-  system "ls", File.join(Vhost.conf['server_conf'], 'sites-available')
-  puts "\nSites enabled:"
-  system "ls", File.join(Vhost.conf['server_conf'], 'sites-enabled')
+  Vhost.all.sort { |v1,v2| v1 <=> v2 }.each do |v|
+    puts v.enabled? ? " Enabled: #{File.basename(v.path)}".green : "Disabled: #{File.basename(v.path)}".red
+  end
 end
 
 if options[:lista]
-  system "ls", File.join(Vhost.conf['server_conf'], 'sites-available')
+  Vhost.all.each do |v|
+    puts v.path
+  end
 end
 
 if options[:liste]
-  system "ls", File.join(Vhost.conf['server_conf'], 'sites-enabled')
+  # system "ls", File.join(Vhost.conf['server_conf'], 'sites-enabled')
+  Vhost.all.each do |v|
+    puts v.path if v.enabled?
+  end
 end
 
 if options[:info]

data/lib/vhost.rb

@@ -9,7 +9,7 @@ class Vhost
   require 'erubis'
   require 'yaml'
   
-  VERSION = "1.1.4"
+  VERSION = "1.1.5"
   CONF_NAME = "vhosts.yml"
   CONFIG_PATHS = [
     'vhosts-conf',
@@ -76,11 +76,11 @@ class Vhost
   end
   
   def self.available
-    Dir[File.join(@@available_path, '*')]
+    Dir[File.join(@@available_path, '*')].keep_if { |v| File.basename(v) =~ /\A[^\.].*[^\#\~]\Z/ }
   end
   
   def self.enabled
-    Dir[File.join(@@enabled_path, '*')]
+    Dir[File.join(@@enabled_path, '*')].keep_if { |v| File.basename(v) =~ /\A[^\.].*[^\#\~]\Z/ }
   end
   
   def self.all
@@ -133,6 +133,14 @@ class Vhost
     File.basename(@name, ".conf")
   end
   
+  def path
+    @paths[:available]
+  end
+  
+  def folder
+    @paths[:folder]
+  end
+  
   def enabled?
     File.exist? @paths[:enabled]
   end
@@ -156,4 +164,11 @@ class Vhost
     basename
   end
   
+  def <=> (other)
+    return -1 if self.enabled? and not other.enabled?
+    return self.name <=> other.name if (self.enabled? and other.enabled?) or (not self.enabled? and not other.enabled?)
+    return 1 if not self.enabled? and other.enabled?
+    nil
+  end
+  
 end

data/vhosts-conf/templates/apache.conf.erb

@@ -2,10 +2,9 @@
 <% site_name = vhost %>
 <% error_log = File.join(conf['sites_folder'], vhost, "log", "apache-error.log") %>
 <% access_log = File.join(conf['sites_folder'], vhost, "log", "apache-access.log") %>
-
 <VirtualHost *:80>
 	ServerName <%= site_name %>
 	DocumentRoot "<%= site_root %>"
 	ErrorLog "<%= error_log %>"
-	CustomLog "<%= access_log %>"
+	CustomLog "<%= access_log %>" common
 </VirtualHost>

data/vhosts-conf/templates/nginx.conf.erb

@@ -2,7 +2,6 @@
 <% site_name = vhost %>
 <% error_log = File.join(conf['sites_folder'], vhost, "log", "nginx-error.log") %>
 <% access_log = File.join(conf['sites_folder'], vhost, "log", "nginx-access.log") %>
-
 server {
 	listen 80;
 	
@@ -16,7 +15,7 @@ server {
 	location / {
 		# include /usr/local/etc/nginx/conf.d/php-fpm; # enable php
 		# passenger_enabled on # enabled passenger for rack based apps
-		# autoindex on; # just for development
+		# autoindex on; # show index of pages
 	}
 	
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vhost
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.5
 platform: ruby
 authors:
 - Alex Clink
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-21 00:00:00.000000000 Z
+date: 2015-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -57,6 +57,7 @@ metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
+- lib
 - vhosts-conf
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements: