passify 0.2.1 → 0.2.2

data/README.md

@@ -37,6 +37,10 @@ A list of all applications served with `passify` can be viewed by running
 
     passify list
 
+Open the configuration file for the current application if $EDITOR is set, otherwise show the path to the file.
+
+    passify conf
+
 Last but not least, `passify` can be removed from Apache by running
 
     passify uninstall
@@ -51,6 +55,11 @@ It makes sense to create a wrapper for `passify` if you are using multiple versi
     rvm wrapper 1.8.7 --no-prefix passify
 
 ## Changelog
+### 0.2.2 (25-11-2011)
+* added conf command to which opens the configuration file if $EDITOR is set, and shows the path otherwise
+* fixed small bug with `list`-command showing truncated paths for legacy apps
+* added well known shortcuts for several commands
+
 ### 0.2.1 (25-11-2011)
 * fix crash when environment command is called on legacy app
 

data/lib/passify/cli.rb

@@ -6,8 +6,12 @@ module Passify
   class CLI < Thor
     include Thor::Actions
     
-    map '-h' => 'help'
-    map '-v' => 'version'
+    map '-h'  => 'help'
+    map '-v'  => 'version'
+    map 'rm'  => 'remove'
+    map 'env' => 'environment'
+    map 'rr'  => 'restart'
+    map 'ls'  => 'list'
     
     APACHE_CONF = '/etc/apache2/httpd.conf'
     VHOSTS_DIR = '/private/etc/apache2/passenger_pane_vhosts'
@@ -15,7 +19,7 @@ module Passify
     desc "add", "Creates an application from the current working directory."
     def add(name = nil)
       check_for_passify
-      error("This directory can not be served with Passenger. Please create a `config.ru`-file.") unless is_valid_app?
+      error("This directory can not be served with passify. It has to be either a Rack application, a Rails 2.x application or a legacy (PHP/HTML) application.") unless is_valid_app?
       name = File.basename(pwd) if name.nil? || name.empty?
       name = urlify(name)
       host = "#{name}.local"
@@ -47,8 +51,8 @@ module Passify
       say "The application was successfully removed."
     end
     
-    desc "env", "Change the environment of the current app"
-    def env(env = nil)
+    desc "environment", "Change the environment of the current app"
+    def environment(env = nil)
       check_for_passify
       notice("This application is a legacy application. The environment can not be changed.") if !is_rack_app? && !is_rails2_app?
       host = find_host
@@ -123,6 +127,22 @@ module Passify
       system("open http://#{host}")
     end
     
+    desc "conf", "Opens the configuration file if $EDITOR is set, otherwise shows the path."
+    def conf
+      check_for_passify
+      host = find_host
+
+      success = false
+      if ENV['EDITOR']
+        Dir.chdir(VHOSTS_DIR) do
+          success = system("#{ENV['EDITOR']} #{vhost_file(host)}")
+        end
+      end
+      if !success
+        say vhost_file(host)
+      end
+    end
+    
     desc "version", "Shows the version"
     def version
        say "passify #{Passify::VERSION}"
@@ -175,16 +195,16 @@ module Passify
         end
       end
       
-      def is_rack_app?
-        File.exists?('config.ru')
+      def is_rack_app?(path = pwd)
+        File.exists?("#{path}/config.ru")
       end
       
-      def is_rails2_app?
-        system("grep 'RAILS_GEM_VERSION' config/environment.rb > /dev/null 2>&1")
+      def is_rails2_app?(path = pwd)
+        system("grep 'RAILS_GEM_VERSION' #{path}/config/environment.rb > /dev/null 2>&1")
       end
       
-      def is_legacy_app?
-        File.exists?('index.html') || File.exists?('index.php')
+      def is_legacy_app?(path = pwd)
+        File.exists?("#{path}/index.html") || File.exists?("#{path}/index.php")
       end
       
       def find_host
@@ -208,7 +228,8 @@ module Passify
       end
       
       def directory_for_host(host)
-        `grep 'DocumentRoot' #{vhost_file(host)}`.scan(/"([^"]*)"/).flatten[0][0..-8]
+        dir = `grep 'DocumentRoot' #{vhost_file(host)}`.scan(/"([^"]*)"/).flatten[0]
+        is_legacy_app?(dir) ? dir : dir[0..-8]
       end
       
       def find_line_in_conf(pattern)

data/lib/passify/version.rb

@@ -1,3 +1,3 @@
 module Passify
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: passify
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &2151877780 !ruby/object:Gem::Requirement
+  requirement: &2156002500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2151877780
+  version_requirements: *2156002500
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2151876700 !ruby/object:Gem::Requirement
+  requirement: &2156001520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151876700
+  version_requirements: *2156001520
 description: passify is a command line interface (CLI) for Phusion Passenger, equivalent
   to what powder and powify are for pow. passify is compatible with PassengerPane.
 email:
@@ -65,7 +65,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 408163153943326134
+      hash: 4385306381277198046
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -74,7 +74,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 408163153943326134
+      hash: 4385306381277198046
 requirements: []
 rubyforge_project: passify
 rubygems_version: 1.8.11