nginxtra 1.2.2.3 → 1.2.2.4

data/bin/nginxtra

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 require "rubygems"
-gem "nginxtra", "= 1.2.2.3"
+gem "nginxtra", "= 1.2.2.4"
+gem "thor", "~> 0.15.0"
 require "nginxtra"
 Nginxtra::CLI.start

data/bin/nginxtra_rails

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+require "rubygems"
+gem "nginxtra", "= 1.2.2.4"
+gem "thor", "~> 0.15.0"
+require "nginxtra"
+Nginxtra::Rails::CLI.start

data/lib/nginxtra.rb

@@ -7,8 +7,11 @@ require "nginxtra/actions/restart"
 require "nginxtra/actions/start"
 require "nginxtra/actions/status"
 require "nginxtra/actions/stop"
+require "nginxtra/actions/rails/server"
 require "nginxtra/cli"
 require "nginxtra/config"
 require "nginxtra/config_converter"
 require "nginxtra/error"
+require "nginxtra/rails/cli"
 require "nginxtra/status"
+require "nginxtra/version"

data/lib/nginxtra/actions/compile.rb

@@ -19,7 +19,7 @@ module Nginxtra
 
       # Copy the nginx source directory to the base directory.
       def copy_to_base
-        @thor.directory "src/nginx", Nginxtra::Config.src_dir
+        @thor.directory "vendor/nginx", Nginxtra::Config.src_dir
       end
 
       # Configure nginx with the specified compile options.

data/lib/nginxtra/actions/install.rb

@@ -22,6 +22,7 @@ module Nginxtra
         check_if_nginx_is_installed
         create_etc_script
         remember_config_location
+        remember_working_directory
         update_last_install
       end
 
@@ -43,6 +44,7 @@ module Nginxtra
       # via update-rc.d.
       def create_etc_script
         filename = "etc.init.d.nginxtra"
+        workingdir = File.expand_path "."
 
         @thor.inside Nginxtra::Config.base_dir do
           @thor.create_file filename, %{#!/bin/sh
@@ -59,7 +61,7 @@ module Nginxtra
 
 export GEM_HOME="#{ENV["GEM_HOME"]}"
 export GEM_PATH="#{ENV["GEM_PATH"]}"
-#{Nginxtra::Config.ruby_path} "#{File.join Nginxtra::Config.gem_dir, "bin/nginxtra"}" "$1" --basedir="#{Nginxtra::Config.base_dir}" --config="#{Nginxtra::Config.loaded_config_path}" --non-interactive
+#{Nginxtra::Config.ruby_path} "#{File.join Nginxtra::Config.gem_dir, "bin/nginxtra"}" "$1" --basedir="#{Nginxtra::Config.base_dir}" --config="#{Nginxtra::Config.loaded_config_path}" --workingdir="#{workingdir}" --non-interactive
 }, :force => true
           @thor.chmod filename, 0755
         end
@@ -88,6 +90,12 @@ export GEM_PATH="#{ENV["GEM_PATH"]}"
         Nginxtra::Status[:remembered_config] = Nginxtra::Config.loaded_config_path.to_s
       end
 
+      # Remember the last working directory, and use it unless the
+      # working direcotry is explicitly passed in.
+      def remember_working_directory
+        Nginxtra::Status[:remembered_workingdir] = File.expand_path "."
+      end
+
       # Mark the last installed version and last installed time (the
       # former being used to determine if nginxtra has been installed
       # yet).

data/lib/nginxtra/actions/rails/server.rb

@@ -0,0 +1,78 @@
+module Nginxtra
+  module Actions
+    module Rails
+      class Server
+        include Nginxtra::Action
+
+        def server
+          ensure_in_rails_app
+          ensure_server_gem_installed
+
+          begin
+            start_nginxtra
+            wait_till_finished
+          ensure
+            stop_nginxtra
+          end
+        end
+
+        def ensure_in_rails_app
+          unless in_rails_app?
+            raise Nginxtra::Error::IllegalState.new "You must be in a rails root directory to run nginxtra_rails."
+          end
+        end
+
+        def ensure_server_gem_installed
+          unless passenger_installed?
+            raise Nginxtra::Error::IllegalState.new "Please 'gem install passenger' to continue."
+          end
+        end
+
+        def start_nginxtra
+          port = @thor.options["port"]
+          @thor.empty_directory "tmp" unless File.directory? "tmp"
+          @thor.empty_directory "tmp/nginxtra" unless File.directory? "tmp/nginxtra"
+          @thor.create_file config_path, %{nginxtra.simple_config do
+  rails :port => #{port}
+end
+}, :force => true
+          @thor.invoke Nginxtra::CLI, ["start"], :basedir => basedir, :config => config_path, :workingdir => workingdir, :"non-interactive" => true
+          @thor.say "Listening on http://localhost:#{port}/"
+        end
+
+        def wait_till_finished
+          @thor.say "Ctrl-C or Ctrl-D to shutdown server"
+          next until $stdin.getc.nil?
+          @thor.say "Captured Ctrl-D..."
+        rescue Interrupt
+          @thor.say "Captured Ctrl-C..."
+        end
+
+        def stop_nginxtra
+          @thor.invoke Nginxtra::CLI, ["stop"], :basedir => basedir, :config => config_path, :workingdir => workingdir, :"non-interactive" => true
+        end
+
+        def passenger_installed?
+          Gem::Specification.find_by_name("passenger")
+        end
+
+        def basedir
+          File.absolute_path "tmp/nginxtra"
+        end
+
+        def config_path
+          File.absolute_path "tmp/nginxtra.conf.rb"
+        end
+
+        def workingdir
+          File.absolute_path "."
+        end
+
+        def in_rails_app?
+          return true if File.exists? "script/rails"
+          File.exists?("script/server") && File.exists?("app")
+        end
+      end
+    end
+  end
+end

data/lib/nginxtra/cli.rb

@@ -10,6 +10,7 @@ module Nginxtra
     class_option "ignore-nginx-check", :type => :boolean, :banner => "Ignore the nginx check if installing"
     class_option "config", :type => :string, :banner => "Specify the configuration file to use", :aliases => "-c"
     class_option "basedir", :type => :string, :banner => "Specify the directory to store nginx files", :aliases => "-b"
+    class_option "workingdir", :type => :string, :banner => "Specify the working directory", :aliases => "-w"
 
     desc "convert", "Convert an nginx.conf file to an nginxtra.conf.rb"
     long_desc "
@@ -42,6 +43,7 @@ module Nginxtra
       with the --force option."
     def compile
       Nginxtra::Error.protect self do
+        set_working_dir!
         Nginxtra::Actions::Compile.new(self, prepare_config!).compile
       end
     end
@@ -70,6 +72,7 @@ module Nginxtra
       compile or install task should be invoked if those need to be forced."
     def start
       Nginxtra::Error.protect self do
+        set_working_dir!
         Nginxtra::Actions::Start.new(self, prepare_config!).start
       end
     end
@@ -81,6 +84,7 @@ module Nginxtra
       (which will cause it to run the stop command regardless of the pidfile)."
     def stop
       Nginxtra::Error.protect self do
+        set_working_dir!
         Nginxtra::Actions::Stop.new(self, prepare_config!).stop
       end
     end
@@ -88,6 +92,7 @@ module Nginxtra
     desc "restart", "Restart nginx"
     def restart
       Nginxtra::Error.protect self do
+        set_working_dir!
         Nginxtra::Actions::Restart.new(self, prepare_config!).restart
       end
     end
@@ -96,6 +101,7 @@ module Nginxtra
     desc "reload", "Reload nginx"
     def reload
       Nginxtra::Error.protect self do
+        set_working_dir!
         Nginxtra::Actions::Reload.new(self, prepare_config!).reload
       end
     end
@@ -103,6 +109,7 @@ module Nginxtra
     desc "status", "Check if nginx is running"
     def status
       Nginxtra::Error.protect self do
+        set_working_dir!
         Nginxtra::Actions::Status.new(self, prepare_config!).status
       end
     end
@@ -115,6 +122,14 @@ module Nginxtra
       result
     end
 
+    def set_working_dir!
+      if options["workingdir"]
+        Dir.chdir options["workingdir"]
+      elsif Nginxtra::Status[:remembered_workingdir]
+        Dir.chdir Nginxtra::Status[:remembered_workingdir]
+      end
+    end
+
     class << self
       def source_root
         File.absolute_path File.expand_path("../../..", __FILE__)

data/lib/nginxtra/config.rb

@@ -152,14 +152,9 @@ module Nginxtra
         last_config
       end
 
-      # The path to the VERSION file in the gem.
-      def version_file
-        File.join gem_dir, "VERSION"
-      end
-
       # The current version of nginxtra.
       def version
-        @version ||= File.read(version_file).strip
+        Nginxtra::Version.to_s
       end
 
       # The corresponding nginx version (based on the nginxtra

data/lib/nginxtra/error.rb

@@ -13,9 +13,14 @@ module Nginxtra
       end
     end
 
-    # Raised if config conversion fails
+    # Raised if config conversion fails.
     class ConvertFailed < Nginxtra::Error::Base; end
 
+    # Raised when something is in an illegal state, such as when
+    # running nginxtra_rails from a directory other than a rails root
+    # directory.
+    class IllegalState < Nginxtra::Error::Base; end
+
     # Raised when an invalid configuration is specified, such as the
     # --prefix compile option.
     class InvalidConfig < Nginxtra::Error::Base; end
@@ -26,7 +31,7 @@ module Nginxtra
     # Raised when installing and nginx is detected to be installed.
     class NginxDetected < Nginxtra::Error::Base; end
 
-    # Raised when a run command fails
+    # Raised when a run command fails.
     class RunFailed < Nginxtra::Error::Base; end
 
     class << self

data/lib/nginxtra/rails/cli.rb

@@ -0,0 +1,21 @@
+require "thor"
+
+module Nginxtra
+  module Rails
+    class CLI < Thor
+      include Thor::Actions
+
+      class_option "trace", :type => :boolean, :banner => "Output stack traces on error"
+
+      desc "server", "Start rails using nginxtra"
+      method_option "port", :type => :numeric, :banner => "Specify the port to use to run the server on", :aliases => "-p", :default => 3000
+      def server
+        Nginxtra::Error.protect self do
+          Nginxtra::Actions::Rails::Server.new(self, nil).server
+        end
+      end
+
+      default_task :server
+    end
+  end
+end

data/lib/nginxtra/version.rb

@@ -0,0 +1,9 @@
+module Nginxtra
+  class Version
+    class << self
+      def to_s
+        "1.2.2.4"
+      end
+    end
+  end
+end

data/templates/files/nginx.conf.rb

@@ -0,0 +1,14 @@
+worker_processes(yield(:worker_processes) || 1)
+
+events do
+  worker_connections(yield(:worker_connections) || 1024)
+end
+
+http do
+  include "mime.types"
+  default_type "application/octet-stream"
+  sendfile "on"
+  keepalive_timeout 65
+  gzip "on"
+  yield
+end

data/templates/partials/nginx.conf/rails.rb

@@ -0,0 +1,16 @@
+rails_server = yield(:server) || :passenger
+
+if rails_server == :passenger && !@passenger_requirements_done
+  @config.require_passenger!
+  passenger_root!
+  passenger_ruby!
+  @passenger_requirements_done = true
+end
+
+server do
+  listen(yield(:port) || 80)
+  server_name(yield(:server_name) || "localhost")
+  root File.join(File.absolute_path(File.expand_path(yield(:root) || ".")), "public")
+  gzip_static "on"
+  passenger_on! if rails_server == :passenger
+end

data/templates/partials/nginx.conf/static.rb

@@ -0,0 +1,8 @@
+@config.compile_option "--with-http_gzip_static_module"
+
+server do
+  listen(yield(:port) || 80)
+  server_name(yield(:server_name) || "localhost")
+  root File.absolute_path(File.expand_path(yield(:root) || "."))
+  gzip_static "on"
+end

data/templates/partials/nginx.conf/wordpress.rb

@@ -0,0 +1,36 @@
+raise Nginxtra::Error::InvalidConfig.new("The WordPress partial is currently an untested stub.")
+
+server do
+  listen(yield(:port) || 80)
+  server_name(yield(:server_name) || "localhost")
+  root File.absolute_path(File.expand_path(yield(:root) || "."))
+  index "index.php"
+  client_max_body_size "50m"
+
+  location "= /favicon.ico" do
+    log_not_found "off"
+    access_log "off"
+  end
+
+  location "= /robots.txt" do
+    allow "all"
+    log_not_found "off"
+    access_log "off"
+  end
+
+  location "/" do
+    try_files "$uri", "$uri/", "/index.php"
+  end
+
+  location "~ \.php$" do
+    # NOTE: You should have "cgi.fix_pathinfo = 0;" in php.ini
+    include "fastcgi.conf"
+    fastcgi_intercept_errors "on"
+    fastcgi_pass "unix:/var/run/php-fastcgi/php-fastcgi.socket"
+  end
+
+  location "~* \.(js|css|png|jpg|jpeg|gif|ico)$" do
+    expires "max"
+    log_not_found "off"
+  end
+end