devserver 0.0.4 → 0.0.5

data/lib/devserver/cli.rb

@@ -90,6 +90,21 @@ module Devserver
         end
       end
       
+      # exits with error if the specified web server gem is not available
+      def gem_error(server)
+        if(!server.command_available?)
+          puts "ERROR: The #{server.server} gem does not appear to be installed"
+          exit(1)
+        end
+      end
+      
+      # prints out a warning message if the specified web server gem is not available
+      def gem_warning(server)
+        if(!server.command_available?)
+          puts "WARNING:  The #{server.server} gem does not appear to be installed"
+        end
+      end
+      
       def print_defaults
         puts "default_settings:\n"
         config_keys = @@default_settings.keys.map{|k|k.to_s}
@@ -121,6 +136,7 @@ module Devserver
     def start
       rails_error
       the_server = Devserver::CommandManager.new(options)
+      gem_error(the_server)
       if(the_server.is_port_open?)
         puts "Another process is running on Port: #{the_server.port}"
         puts "Running stop command: #{the_server.command('stop')}"
@@ -138,6 +154,7 @@ module Devserver
     def debug
       rails_error
       the_server = Devserver::CommandManager.new(options)
+      gem_error(the_server)
       if(the_server.is_port_open?)
         puts "Another process is running on Port: #{the_server.port}"
         puts "Running stop command: #{the_server.command(stop)}"
@@ -150,7 +167,9 @@ module Devserver
     method_option :pid_file,:default => @@default_settings[:pid_file], :aliases => "-P", :desc => "Web server pid file"
     def stop
       rails_error
+      gem_error(the_server)
       the_server = Devserver::CommandManager.new(options)
+      gem_error(the_server)
       the_server.stop_devserver      
     end
     
@@ -166,6 +185,7 @@ module Devserver
     def command
       rails_warning
       the_server = Devserver::CommandManager.new(options)
+      gem_warning(the_server)
       if(options[:start])
         puts "start command: #{the_server.command('start')}"
       end

data/lib/devserver/command_manager.rb

@@ -11,6 +11,7 @@
 #   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #   See the License for the specific language governing permissions and
 #   limitations under the License.
+require 'rubygems'
 require 'socket'
 require 'timeout'
 
@@ -111,6 +112,22 @@ module Devserver
         raise DevserverError, "Unrecognized mode: #{mode}"
       end
     end
+    
+    # returns true/false if the gem corresponding to self.server is installed
+    #
+    # @return [Boolean] whether the gem is installed or not
+    def command_available?
+      case self.server
+      when 'passenger'
+        Gem.available?('passenger')
+      when 'thin'
+        Gem.available?('thin')
+      when 'mongrel'
+        Gem.available?('mongrel')
+      else
+        raise DevserverError, "Unrecognized web server: #{self.server}"
+      end
+    end
 
     # check to see if anything is still running on @port
     #
@@ -132,11 +149,15 @@ module Devserver
     end
   
     def start_devserver(mode = self.mode)
-      system("#{self.start_command(mode)}")
+      if(self.command_available?)
+        system("#{self.start_command(mode)}")
+      end
     end
     
     def stop_devserver
-      system("#{self.stop_command}")
+      if(self.command_available?)
+        system("#{self.stop_command}")
+      end
     end
   
   end

data/lib/devserver/version.rb

@@ -12,5 +12,5 @@
 #   See the License for the specific language governing permissions and
 #   limitations under the License.
 module Devserver
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: devserver
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Jason Adam Young
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-07 00:00:00 -05:00
+date: 2011-01-16 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency