platform1 0.0.3 → 0.0.4

data/bin/platform1

@@ -27,26 +27,81 @@ class Platform1Command < Clamp::Command
 
   end
 
-  subcommand "start", "Start Passenger Standalone." do
+  module Warnings
+
+    extend Clamp::Option::Declaration
+
+    option "--no-warn", :flag, "don't print warnings"
+
+    def warn(message)
+      $stderr.puts(message) unless no_warn?
+    end
+
+  end
+
+  subcommand "start", "Start the server." do
+
+    self.description = %{
+      Start Passenger Standalone, as a daemon process.
+
+      Succeeds, with a warning, if the server is already running.
+    }
+
+    include Warnings
 
     def execute
-      sh("passenger start -p #{passenger_port} -d")
+      if pid = passenger_pid
+        warn "already UP (pid #{pid})"
+      else
+        sh("passenger start -p #{passenger_port} -d")
+      end
     end
 
   end
 
-  subcommand "stop", "Stop Passenger Standalone." do
+  subcommand "stop", "Stop the server." do
+
+    self.description = %{
+      Stop Passenger Standalone.
+
+      Succeeds, with a warning, if the server is not running.
+    }
+
+    include Warnings
 
     def execute
-      sh("passenger stop -p #{passenger_port}")
+      if passenger_pid
+        sh("passenger stop -p #{passenger_port}")
+      else
+        warn "already DOWN"
+      end
     end
 
   end
 
   subcommand "status", "Show Passenger status." do
 
+    self.description = %{
+      Show status of the Passenger Standalone server.
+
+      Prints "UP", plus the server pid, if the server is running.
+      Otherwise, prints "DOWN".
+    }
+
+    def execute
+      if pid = passenger_pid
+        puts "UP (pid #{pid})"
+      else
+        puts "DOWN"
+      end
+    end
+
+  end
+
+  subcommand "run", "Run Passenger Standalone." do
+
     def execute
-      sh("passenger status -p #{passenger_port}")
+      sh("passenger start -p #{passenger_port}")
     end
 
   end
@@ -54,7 +109,7 @@ class Platform1Command < Clamp::Command
   subcommand "open", "Open app in a browser." do
 
     parameter "[PATH]", "a path to append to the app url"
-    
+
     def execute
       Launchy.open(url(path))
     end
@@ -62,13 +117,13 @@ class Platform1Command < Clamp::Command
   end
 
   subcommand "url", "Print application url." do
-        
+
     def execute
       puts application_url
     end
 
   end
-  
+
   subcommand "restart", "Ask app to restart" do
 
     def execute
@@ -78,13 +133,28 @@ class Platform1Command < Clamp::Command
   end
 
   private
-  
+
   def passenger_port
     configuration["port"] || signal_usage_error("port not defined: please run 'init' first")
   end
 
+  def passenger_pid
+    return nil unless File.exists?(passenger_pid_file)
+    pid = Integer(File.read(passenger_pid_file))
+    begin
+      Process.kill(0, pid) # check that it's actually running
+      pid
+    rescue Errno::ESRCH
+      nil
+    end
+  end
+
+  def passenger_pid_file
+    "tmp/pids/passenger.#{passenger_port}.pid"
+  end
+
   def application_url
-    "http://127.0.0.1:#{passenger_port}/"
+    "http://localhost:#{passenger_port}/"
   end
 
   def url(path = nil)
@@ -94,7 +164,7 @@ class Platform1Command < Clamp::Command
     end
     url
   end
-  
+
   def sh(command)
     system(command) || raise("Error running: #{command.inspect}")
   end

data/platform1.gemspec

@@ -2,17 +2,17 @@
 $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |gem|
-  
+
   gem.name        = "platform1"
-  gem.version     = "0.0.3"
+  gem.version     = "0.0.4"
   gem.platform    = Gem::Platform::RUBY
-  
+
   gem.authors     = ["Mike Williams"]
   gem.email       = ["mdub@dogbiscuit.org"]
 
   gem.summary     = %q{Simple and speedy Rails/Rack development server.}
   gem.description = %q{A thin wrapper around Passenger Standalone.}
-  
+
   gem.files         = `git ls-files`.split("\n")
   gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }

metadata

@@ -1,95 +1,86 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: platform1
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.0.4
   prerelease: 
-  version: 0.0.3
 platform: ruby
-authors: 
+authors:
 - Mike Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-04-21 00:00:00 +10:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-02-23 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: clamp
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70256246804980 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.1.8
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: passenger
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70256246804980
+- !ruby/object:Gem::Dependency
+  name: passenger
+  requirement: &70256246804200 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "3.0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: launchy
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70256246804200
+- !ruby/object:Gem::Dependency
+  name: launchy
+  requirement: &70256246803720 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.4.0
   type: :runtime
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: *70256246803720
 description: A thin wrapper around Passenger Standalone.
-email: 
+email:
 - mdub@dogbiscuit.org
-executables: 
+executables:
 - p1
 - platform1
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - Rakefile
 - bin/p1
 - bin/platform1
 - platform1.gemspec
-has_rdoc: true
 homepage: 
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Simple and speedy Rails/Rack development server.
 test_files: []
-