nginx-osx 0.2.1 → 0.2.2

data/HELP

@@ -1,7 +1,7 @@
 USAGE:
   nginx-osx [cmd]
 
-    install [--passenger]
+    install
       - install nginx via custom macports port file from crigor
     setup
       - setup the basic nginx.conf file and the vhost directories

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/lib/nginx-osx.rb

@@ -86,8 +86,20 @@ CMD
   end
 
   def current_config
-    puts current_config_path
-    exec "cat #{current_config_path}"
+    current_path = current_config_path
+    vhost_path = current_config_path(true)
+
+    path =  if File.exists? current_path
+              current_path
+            elsif File.exists? vhost_path
+               vhost_path
+            end
+    if path
+      puts path
+      exec "cat #{path}"
+    else
+      puts "no config found have you run 'nginx-osx add' ?"
+    end
   end
 
   def tail_error_log
@@ -99,8 +111,8 @@ CMD
     Dir.pwd.downcase.gsub(/^\//, '').gsub(/\.|\/|\s/, '-')
   end
 
-  def current_config_path
-    host ? "/opt/local/etc/nginx/vhosts/#{current_config_name}.conf" : "/opt/local/etc/nginx/configs/#{current_config_name}.conf"
+  def current_config_path(vhost=false)
+    host || vhost ? "/opt/local/etc/nginx/vhosts/#{current_config_name}.conf" : "/opt/local/etc/nginx/configs/#{current_config_name}.conf"
   end
 
   def usage

data/nginx-osx.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{nginx-osx}
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Gabe Varela"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: nginx-osx
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - Gabe Varela