passenger 2.2.2 → 2.2.3

data/ext/common/FileChecker.h

@@ -1,112 +0,0 @@
-/*
- *  Phusion Passenger - http://www.modrails.com/
- *  Copyright (c) 2009 Phusion
- *
- *  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
- *
- *  Permission is hereby granted, free of charge, to any person obtaining a copy
- *  of this software and associated documentation files (the "Software"), to deal
- *  in the Software without restriction, including without limitation the rights
- *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- *  copies of the Software, and to permit persons to whom the Software is
- *  furnished to do so, subject to the following conditions:
- *
- *  The above copyright notice and this permission notice shall be included in
- *  all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- *  THE SOFTWARE.
- */
-#ifndef _PASSENGER_FILE_CHECKER_H_
-#define _PASSENGER_FILE_CHECKER_H_
-
-#include <string>
-
-#include <oxt/system_calls.hpp>
-
-#include <sys/stat.h>
-#include <errno.h>
-
-#include "CachedFileStat.h"
-#include "SystemTime.h"
-
-namespace Passenger {
-
-using namespace std;
-using namespace oxt;
-
-/**
- * Utility class for checking for file changes. Example:
- *
- * @code
- * FileChecker checker("foo.txt");
- * checker.changed();   // false
- * writeToFile("foo.txt");
- * checker.changed();   // true
- * checker.changed();   // false
- * @endcode
- *
- * FileChecker uses stat() to retrieve file information. FileChecker also
- * supports throttling in order to limit the number of stat() calls. This
- * can improve performance on systems where disk I/O is a problem.
- */
-class FileChecker {
-private:
-	CachedFileStat cstat;
-	time_t lastMtime;
-	time_t lastCtime;
-	
-public:
-	/**
-	 * Create a FileChecker object.
-	 *
-	 * @param filename The filename to check for.
-	 */
-	FileChecker(const string &filename)
-		: cstat(filename)
-	{
-		lastMtime = 0;
-		lastCtime = 0;
-		changed();
-	}
-	
-	/**
-	 * Checks whether the file's timestamp has changed or has been created
-	 * or removed since the last call to changed().
-	 *
-	 * @param throttleRate When set to a non-zero value, throttling will be
-	 *                     enabled. stat() will be called at most once per
-	 *                     throttleRate seconds.
-	 * @throws SystemException Something went wrong while retrieving the
-	 *         system time. stat() errors will <em>not</em> result in SystemException
-	 *         being thrown.
-	 * @throws boost::thread_interrupted
-	 */
-	bool changed(unsigned int throttleRate = 0) {
-		int ret;
-		time_t ctime, mtime;
-		bool result;
-		
-		ret = cstat.refresh(throttleRate);
-		if (ret == -1) {
-			ctime = 0;
-			mtime = 0;
-		} else {
-			ctime = cstat.info.st_ctime;
-			mtime = cstat.info.st_mtime;
-		}
-		result = lastMtime != mtime || lastCtime != ctime;
-		lastMtime = mtime;
-		lastCtime = ctime;
-		return result;
-	}
-};
-
-} // namespace Passenger
-
-#endif /* _PASSENGER_FILE_CHECKER_H_ */

data/test/FileCheckerTest.cpp

@@ -1,79 +0,0 @@
-#include "tut.h"
-#include "FileChecker.h"
-#include "SystemTime.h"
-#include <stdio.h>
-#include <utime.h>
-
-using namespace Passenger;
-using namespace std;
-
-namespace tut {
-	struct FileCheckerTest {
-		FileCheckerTest() {
-		}
-		
-		~FileCheckerTest() {
-			unlink("test.txt");
-			SystemTime::release();
-		}
-	};
-	
-	static void touch(const char *filename, time_t timestamp = 0) {
-		FILE *f = fopen(filename, "w");
-		fclose(f);
-		if (timestamp != 0) {
-			struct utimbuf buf;
-			buf.actime = timestamp;
-			buf.modtime = timestamp;
-			utime(filename, &buf);
-		}
-	}
-	
-	DEFINE_TEST_GROUP(FileCheckerTest);
-	
-	TEST_METHOD(1) {
-		// File is not changed if it didn't exist.
-		FileChecker checker("test.txt");
-		ensure(!checker.changed());
-	}
-	
-	TEST_METHOD(2) {
-		// File is not changed if its ctime and mtime didn't change.
-		touch("test.txt");
-		FileChecker checker("test.txt");
-		ensure(!checker.changed());
-	}
-	
-	TEST_METHOD(3) {
-		// File is changed if it didn't exist but has now been created.
-		FileChecker checker("test.txt");
-		touch("test.txt");
-		ensure(checker.changed());
-	}
-	
-	TEST_METHOD(4) {
-		// File is changed if its mtime changed.
-		touch("test.txt", time(NULL) - 5);
-		FileChecker checker("test.txt");
-		touch("test.txt");
-		ensure("First check: changed", checker.changed());
-		ensure("Second check: unchanged", !checker.changed());
-	}
-	
-	TEST_METHOD(5) {
-		// Throttling works.
-		SystemTime::force(5);
-		
-		FileChecker checker("test.txt");
-		checker.changed(3);
-		touch("test.txt");
-		ensure(!checker.changed(3));
-		
-		SystemTime::force(6);
-		ensure(!checker.changed(3));
-		
-		SystemTime::force(8);
-		ensure(checker.changed(3));
-		ensure(!checker.changed(3));
-	}
-}

data/test/stub/minimal-railsapp/README

@@ -1,3 +0,0 @@
-A dummy application that looks like a Rails application, but actually isn't.
-Its purpose is to test whether vendor/rails is properly supported, and to
-speed up the unit tests.

data/test/stub/minimal-railsapp/config/environment.rb

@@ -1,3 +0,0 @@
-$LOAD_PATH << File.dirname(__FILE__)
-RAILS_ROOT = File.dirname(__FILE__) unless defined?(RAILS_ROOT)
-RAILS_GEM_VERSION = '~> 1.2.0'

data/test/stub/minimal-railsapp/vendor/rails/actionpack/lib/action_controller.rb

@@ -1,10 +0,0 @@
-module ActionController
-	class Base
-		def self.page_cache_directory
-			nil
-		end
-
-		def self.page_cache_directory=(dir)
-		end
-	end
-end

data/test/stub/minimal-railsapp/vendor/rails/activerecord/lib/active_record.rb

@@ -1,7 +0,0 @@
-class ActiveRecord
-	class Base
-		def self.connected?
-			return false
-		end
-	end
-end

data/test/stub/minimal-railsapp/vendor/rails/activesupport/lib/active_support.rb

@@ -1,17 +0,0 @@
-class Object
-	def require_dependency(name)
-		require(name)
-	end
-end
-
-class NilClass
-	def blank?
-		return true
-	end
-end
-
-class String
-	def blank?
-		return strip.empty?
-	end
-end

data/test/stub/minimal-railsapp/vendor/rails/railties/lib/initializer.rb

@@ -1,8 +0,0 @@
-module Rails
-	module VERSION
-		MAJOR = 2
-		MINOR = 0
-		TINY = 0
-		STRING = [MAJOR, MINOR, TINY].join('.')
-	end
-end

data/test/stub/minimal-railsapp/vendor/rails/railties/lib/ruby_version_check.rb

@@ -1 +0,0 @@
-

data/test/stub/railsapp/app/controllers/application.rb

@@ -1,12 +0,0 @@
-# Filters added to this controller apply to all controllers in the application.
-# Likewise, all the methods added will be available for all controllers.
-
-class ApplicationController < ActionController::Base
-  helper :all # include all helpers, all the time
-
-  # See ActionController::RequestForgeryProtection for details
-  # Uncomment the :secret if you're not using the cookie session store
-  protect_from_forgery # :secret => 'cd5f8fbe429e4b3cca1f5bc1ee91d179'
-
-  session :off
-end

data/test/stub/railsapp/app/controllers/bar_controller.rb

@@ -1,5 +0,0 @@
-class BarController < ApplicationController
-	def index
-		render :text => 'bar 1!'
-	end
-end

data/test/stub/railsapp/app/controllers/bar_controller_1.txt

@@ -1,5 +0,0 @@
-class BarController < ApplicationController
-	def index
-		render :text => 'bar 1!'
-	end
-end

data/test/stub/railsapp/app/controllers/bar_controller_2.txt

@@ -1,5 +0,0 @@
-class BarController < ApplicationController
-	def index
-		render :text => 'bar 2!'
-	end
-end

data/test/stub/railsapp/app/controllers/foo_controller.rb

@@ -1,9 +0,0 @@
-class FooController < ActionController::Base
-	def new
-		render :text => 'hello world'
-	end
-
-	def pid
-		render :text => Process.pid.to_s
-	end
-end

data/test/stub/railsapp/app/helpers/application_helper.rb

@@ -1,3 +0,0 @@
-# Methods added to this helper will be available to all templates in the application.
-module ApplicationHelper
-end

data/test/stub/railsapp/config/boot.rb

@@ -1,108 +0,0 @@
-# Don't change this file!
-# Configure your app in config/environment.rb and config/environments/*.rb
-
-RAILS_ROOT = "#{File.dirname(__FILE__)}/.." unless defined?(RAILS_ROOT)
-
-module Rails
-  class << self
-    def boot!
-      unless booted?
-        preinitialize
-        pick_boot.run
-      end
-    end
-
-    def booted?
-      defined? Rails::Initializer
-    end
-
-    def pick_boot
-      (vendor_rails? ? VendorBoot : GemBoot).new
-    end
-
-    def vendor_rails?
-      File.exist?("#{RAILS_ROOT}/vendor/rails")
-    end
-
-    def preinitialize
-      load(preinitializer_path) if File.exist?(preinitializer_path)
-    end
-
-    def preinitializer_path
-      "#{RAILS_ROOT}/config/preinitializer.rb"
-    end
-  end
-
-  class Boot
-    def run
-      load_initializer
-      Rails::Initializer.run(:set_load_path)
-    end
-  end
-
-  class VendorBoot < Boot
-    def load_initializer
-      require "#{RAILS_ROOT}/vendor/rails/railties/lib/initializer"
-    end
-  end
-
-  class GemBoot < Boot
-    def load_initializer
-      self.class.load_rubygems
-      load_rails_gem
-      require 'initializer'
-    end
-
-    def load_rails_gem
-      if version = self.class.gem_version
-        gem 'rails', version
-      else
-        gem 'rails'
-      end
-    rescue Gem::LoadError => load_error
-      $stderr.puts %(Missing the Rails #{version} gem. Please `gem install -v=#{version} rails`, update your RAILS_GEM_VERSION setting in config/environment.rb for the Rails version you do have installed, or comment out RAILS_GEM_VERSION to use the latest version installed.)
-      exit 1
-    end
-
-    class << self
-      def rubygems_version
-        Gem::RubyGemsVersion if defined? Gem::RubyGemsVersion
-      end
-
-      def gem_version
-        if defined? RAILS_GEM_VERSION
-          RAILS_GEM_VERSION
-        elsif ENV.include?('RAILS_GEM_VERSION')
-          ENV['RAILS_GEM_VERSION']
-        else
-          parse_gem_version(read_environment_rb)
-        end
-      end
-
-      def load_rubygems
-        require 'rubygems'
-
-        unless rubygems_version >= '0.9.4'
-          $stderr.puts %(Rails requires RubyGems >= 0.9.4 (you have #{rubygems_version}). Please `gem update --system` and try again.)
-          exit 1
-        end
-
-      rescue LoadError
-        $stderr.puts %(Rails requires RubyGems >= 0.9.4. Please install RubyGems and try again: http://rubygems.rubyforge.org)
-        exit 1
-      end
-
-      def parse_gem_version(text)
-        $1 if text =~ /^[^#]*RAILS_GEM_VERSION\s*=\s*["']([!~<>=]*\s*[\d.]+)["']/
-      end
-
-      private
-        def read_environment_rb
-          File.read("#{RAILS_ROOT}/config/environment.rb")
-        end
-    end
-  end
-end
-
-# All that for this:
-Rails.boot!

data/test/stub/railsapp/config/database.yml

@@ -1,19 +0,0 @@
-# SQLite version 3.x
-#   gem install sqlite3-ruby (not necessary on OS X Leopard)
-development:
-  adapter: sqlite3
-  database: db/development.sqlite3
-  timeout: 5000
-
-# Warning: The database defined as 'test' will be erased and
-# re-generated from your development database when you run 'rake'.
-# Do not set this db to the same as development or production.
-test:
-  adapter: sqlite3
-  database: db/test.sqlite3
-  timeout: 5000
-
-production:
-  adapter: sqlite3
-  database: db/production.sqlite3
-  timeout: 5000