appserver 0.0.1 → 0.0.2

data/test/unit/test_logrotate.rb

@@ -0,0 +1,14 @@
+require 'helper'
+
+class TestLogrotate < Test::Unit::TestCase
+
+  def test_write_config
+    in_server_dir do |server_dir|
+      create_app('rack-simple', 'apps/hello')
+      create_app('rack-simple', 'apps/hello2')
+      assert !File.exist?('logrotate.conf')
+      Appserver::Logrotate.write_config(server_dir)
+      assert File.exist?('logrotate.conf')
+    end
+  end
+end

data/test/unit/test_monit.rb

@@ -0,0 +1,13 @@
+require 'helper'
+
+class TestMonit < Test::Unit::TestCase
+
+  def test_write_config
+    in_server_dir do |server_dir|
+      create_app('rack-simple', 'apps/hello')
+      assert !File.exist?('monitrc')
+      Appserver::Monit.write_config(server_dir)
+      assert File.exist?('monitrc')
+    end
+  end
+end

data/test/unit/test_nginx.rb

@@ -0,0 +1,13 @@
+require 'helper'
+
+class TestNginx < Test::Unit::TestCase
+
+  def test_write_config
+    in_server_dir do |server_dir|
+      create_app('rack-simple', 'apps/hello')
+      assert !File.exist?('nginx.conf')
+      Appserver::Nginx.write_config(server_dir)
+      assert File.exist?('nginx.conf')
+    end
+  end
+end

data/test/unit/test_repository.rb

@@ -0,0 +1,50 @@
+require 'helper'
+
+class TestRepository < Test::Unit::TestCase
+
+  def setup
+    # FIXME: This is currently needed to silence appserver output during tests :(
+    Appserver::Repository.any_instance.stubs(:puts)
+  end
+
+  def test_valid
+    in_server_dir do |server_dir|
+      create_app_repo 'rack-simple', 'hello.git'
+      repo = Appserver::Repository.new(server_dir, 'hello.git', {})
+      assert repo.valid?
+    end
+  end
+
+  def test_install_hook
+    in_server_dir do |server_dir|
+      create_app_repo 'rack-simple', 'hello.git'
+      repo = Appserver::Repository.new(server_dir, 'hello.git', {})
+      repo.install_hook
+      assert File.executable?('hello.git/hooks/update')
+      assert File.readlines('hello.git/hooks/update').grep(/appserver.*deploy/).size == 1
+      repo.install_hook # Try it a second time
+    end
+  end
+
+  def test_deploy
+    in_server_dir do |server_dir|
+      create_app_repo 'rack-simple', 'hello.git'
+      repo = Appserver::Repository.new(server_dir, 'hello.git', {})
+      assert !server_dir.app('hello').exist?
+      repo.deploy
+      assert server_dir.app('hello').exist? && server_dir.app('hello').rack?
+      repo.deploy # Try it a second time
+    end
+  end
+
+  def test_deploy_with_gemfile
+    in_server_dir do |server_dir|
+      create_app_repo 'sinatra', 'hello.git'
+      repo = Appserver::Repository.new(server_dir, 'hello.git', {})
+      repo.expects(:system).with { |cmd| cmd =~ /bundle install/ }.at_least_once
+      repo.deploy
+      assert File.exist?(server_dir.app('hello').gem_file)
+      repo.deploy # Try it a second time
+    end
+  end
+end

data/test/unit/test_server_dir.rb

@@ -0,0 +1,121 @@
+require 'helper'
+
+class TestServerDir < Test::Unit::TestCase
+
+  def test_discover_raises_error_if_not_found
+    in_empty_dir do
+      assert_raise Appserver::NotInitializedError do
+        Appserver::ServerDir.discover
+      end
+    end
+  end
+
+  def test_discover_finds_current_dir
+    in_empty_dir do
+      Appserver::ServerDir.init('.', :force => true)
+      server_dir = Appserver::ServerDir.discover
+      assert_kind_of Appserver::ServerDir, server_dir
+      assert_equal Dir.pwd, server_dir.path
+    end
+  end
+
+  def test_discover_finds_parent_dir
+    in_empty_dir do
+      Appserver::ServerDir.init('.', :force => true)
+      Dir.mkdir('foo')
+      Dir.chdir('foo') do
+        server_dir = Appserver::ServerDir.discover
+        assert_kind_of Appserver::ServerDir, server_dir
+        assert_equal File.expand_path('..'), server_dir.path
+      end
+    end
+  end
+
+  def test_init_creates_config_file_and_subdirs
+    in_empty_dir do
+      assert_kind_of Appserver::ServerDir, Appserver::ServerDir.init('.', :force => true)
+      assert File.exist?(Appserver::ServerDir::CONFIG_FILE_NAME)
+      assert File.directory?('apps')
+      assert File.directory?('tmp')
+      assert File.directory?('log')
+    end
+  end
+
+  def test_init_creates_directory
+    in_empty_dir do
+      assert_kind_of Appserver::ServerDir, Appserver::ServerDir.init('foo/bar/somewhere')
+      assert File.exist?("foo/bar/somewhere/#{Appserver::ServerDir::CONFIG_FILE_NAME}")
+      assert File.directory?('foo/bar/somewhere/apps')
+    end
+  end
+
+  def test_init_fails_if_directory_exists
+    in_empty_dir do
+      Dir.mkdir('foo')
+      assert_raise Appserver::DirectoryAlreadyExistError do
+        Appserver::ServerDir.init('foo')
+      end
+    end
+  end
+
+  def test_init_works_if_directory_exists_but_forced
+    in_empty_dir do
+      Appserver::ServerDir.init('foo')
+      assert_nothing_raised do
+        assert_kind_of Appserver::ServerDir, Appserver::ServerDir.init('foo', :force => true)
+      end
+    end
+  end
+
+  def test_new_works_with_non_existing_directory
+    in_empty_dir do
+      assert_nothing_raised do
+        Appserver::ServerDir.new('foo/bar')
+        assert !File.exist?('foo')
+      end
+    end
+  end
+
+  def test_new_works_with_empty_config_file
+    in_empty_dir do
+      FileUtils.touch Appserver::ServerDir::CONFIG_FILE_NAME
+      assert_nothing_raised do
+        Appserver::ServerDir.new('.')
+      end
+    end
+  end
+
+  def test_app_creates_the_named_app_only_once
+    in_server_dir do |server_dir|
+      Appserver::App.expects(:new).returns(stub('App')).once
+      assert_not_nil server_dir.app('foo')
+      assert_not_nil server_dir.app('foo')
+    end
+  end
+
+  def test_apps_returns_apps_for_every_normal_dir
+    in_server_dir do |server_dir|
+      ['apps/foo', 'apps/bar', 'apps/bar.old', 'apps/bar.new', 'apps/junk'].each do |path|
+        create_app('rack-simple', path)
+      end
+      assert_equal ['bar', 'foo', 'junk'], server_dir.apps.map { |app| app.name }.sort
+    end
+  end
+
+  def test_repository_creates_the_named_repository_only_once
+    in_server_dir do |server_dir|
+      Appserver::Repository.expects(:new).returns(stub('Repository')).once
+      assert_not_nil server_dir.repository('/var/git/foo.git')
+      assert_not_nil server_dir.repository('/var/git/foo.git')
+    end
+  end
+
+  def test_write_configs
+    in_server_dir do |server_dir|
+      Appserver::Monit.expects(:write_config).with(server_dir)
+      Appserver::Nginx.expects(:write_config).with(server_dir)
+      Appserver::Logrotate.expects(:write_config).with(server_dir)
+      server_dir.write_configs
+    end
+  end
+end

data/test/unit/test_unicorn_conf.rb

@@ -0,0 +1,58 @@
+require 'helper'
+require 'unicorn'
+require 'etc'
+
+class TestUnicornConf < Test::Unit::TestCase
+
+  def test_unicorn_configuration
+    in_server_dir do |server_dir|
+      create_app('rack-simple', 'apps/hello')
+      app = server_dir.app('hello')
+      Appserver::App.any_instance.expects(:user => Etc.getlogin).at_least_once
+      Appserver::App.any_instance.expects(:setup_env!)
+      Unicorn::Configurator.any_instance.expects(:working_directory).with(app.path)
+      Unicorn::Configurator.any_instance.expects(:stderr_path).with(app.server_log)
+      Unicorn::Configurator.any_instance.expects(:stdout_path).with(app.server_log)
+      Unicorn::Configurator.any_instance.expects(:pid).with(app.pid_file)
+      Unicorn::Configurator.any_instance.expects(:listen).with('unix:' + app.socket, :backlog => 64)
+      Unicorn::Configurator.any_instance.expects(:user).with(app.user, app.group)
+      Unicorn::Configurator.any_instance.expects(:worker_processes).with(app.instances)
+      Unicorn::Configurator.any_instance.expects(:preload_app).with(app.preload)
+      Unicorn::Configurator.any_instance.expects(:timeout).with(30)
+      Unicorn::Configurator.any_instance.expects(:before_fork)
+      Unicorn::Configurator.any_instance.expects(:after_fork)
+      Unicorn::HttpServer::START_CTX[:argv] = [app.rack_config]
+      Unicorn::HttpServer.new(Unicorn.builder(app.rack_config, {}), :config_file => app.unicorn_config)
+    end
+  end
+
+  def wait_unicorn_ready (app)
+    50.times do
+      return if File.exist?(app.server_log) && File.readlines(app.server_log).grep(/master process ready/)[0]
+      sleep 0.2
+    end
+    raise 'Unicorn did not become ready'
+  end
+
+  def assert_shutdown (pid)
+    assert_nothing_raised { Process.kill(:TERM, pid) }
+    status = nil
+    assert_nothing_raised { pid, status = Process.waitpid2(pid) }
+    assert status.success?, 'exited successfully'
+  end
+
+  def test_unicorn_server
+    in_server_dir do |server_dir|
+      create_app('rack-simple', 'apps/hello')
+      app = server_dir.app('hello')
+      pid = fork { app.start_server }
+      wait_unicorn_ready(app)
+      UNIXSocket.open(app.socket) do |s|
+        s.write "GET / HTTP/1.1\r\n\r\n"
+        response = s.readlines
+        assert_match /^HTTP\/1.1 200 /, response[0]
+      end
+      assert_shutdown(pid)
+    end
+  end
+end

data/test/unit/test_utils.rb

@@ -0,0 +1,36 @@
+require 'helper'
+require 'socket'
+
+class TestUtils < Test::Unit::TestCase
+
+  def test_find_in_path
+    Appserver::Utils.send(:const_set, :ENV, 'PATH' => '/some/where/bin:/no/where/bin:/home/foo/bin')
+    File.stubs(:executable?).returns(false)
+    File.expects(:executable?).with('/home/foo/bin/theapp').returns(true)
+    assert_equal '/home/foo/bin/theapp', Appserver::Utils.find_in_path('theapp')
+    Appserver::Utils.send(:remove_const, :ENV)
+  end
+
+  def test_find_in_path_fails
+    Appserver::Utils.send(:const_set, :ENV, 'PATH' => '/some/where/bin:/no/where/bin:/home/foo/bin')
+    File.expects(:executable?).returns(false).at_least_once
+    assert_nil Appserver::Utils.find_in_path('theapp')
+    Appserver::Utils.send(:remove_const, :ENV)
+  end
+
+  def test_system_hostname
+    Socket.expects(:gethostname).returns('foo.bar.net')
+    assert_equal 'foo.bar.net', Appserver::Utils.system_hostname
+  end
+
+  def test_system_domainname
+    Appserver::Utils.expects(:system_hostname).returns('foo.bar.net')
+    assert_equal 'bar.net', Appserver::Utils.system_domainname
+  end
+
+  def test_number_of_cpus
+    File.stubs(:exist?).with('/proc/cpuinfo').returns(true)
+    File.expects(:readlines).with('/proc/cpuinfo').returns(["processor : 0\n", "processor : 1\n"])
+    assert_equal 2, Appserver::Utils.number_of_cpus.to_i
+  end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Andreas Neuhaus
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-28 00:00:00 +02:00
+date: 2010-05-12 00:00:00 +02:00
 default_executable: appserver
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,7 +30,46 @@ dependencies:
         version: "0.97"
   type: :runtime
   version_requirements: *id001
-description: This little tool automatically generates server configs for Monit, Nginx and Unicorn to host your Rack-based (Rails) applications. Running it automatically in git post-receive hooks provides an automatic deployment of applications whenever the repository is updated on the server.
+- !ruby/object:Gem::Dependency 
+  name: git
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 2
+        version: "1.2"
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: bundler
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 9
+        - 24
+        version: 0.9.24
+  type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: mocha
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id004
+description: This tool automatically generates server configs for Monit, Nginx and Unicorn to host your Rack-based (Rails) applications. Running it automatically in git update hooks provides an automatic deployment of applications whenever the repository is updated on the server.
 email: zargony@gmail.com
 executables: 
 - appserver
@@ -40,17 +79,40 @@ extra_rdoc_files:
 - LICENSE
 - README.md
 files: 
+- .gitignore
 - LICENSE
 - README.md
+- Rakefile
 - bin/appserver
 - lib/appserver.rb
 - lib/appserver/app.rb
-- lib/appserver/appserver.yml
+- lib/appserver/appserver.conf.rb
 - lib/appserver/command.rb
+- lib/appserver/configurator.rb
+- lib/appserver/logrotate.rb
+- lib/appserver/monit.rb
+- lib/appserver/nginx.rb
 - lib/appserver/repository.rb
-- lib/appserver/server.rb
+- lib/appserver/server_dir.rb
 - lib/appserver/unicorn.conf.rb
 - lib/appserver/utils.rb
+- test/apps/rack-simple/config.ru
+- test/apps/sinatra/Gemfile
+- test/apps/sinatra/config.ru
+- test/apps/sinatra/hello.rb
+- test/apps/sinatra/views/index.erb
+- test/helper.rb
+- test/unit/test_app.rb
+- test/unit/test_appserver.rb
+- test/unit/test_command.rb
+- test/unit/test_configurator.rb
+- test/unit/test_logrotate.rb
+- test/unit/test_monit.rb
+- test/unit/test_nginx.rb
+- test/unit/test_repository.rb
+- test/unit/test_server_dir.rb
+- test/unit/test_unicorn_conf.rb
+- test/unit/test_utils.rb
 has_rdoc: true
 homepage: http://github.com/zargony/appserver
 licenses: []
@@ -75,12 +137,23 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 requirements: 
-- nginx v0.7.x or greater
-- monit v5.x or greater
+- a server with Monit, Nginx and Git
 rubyforge_project: 
 rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
-summary: Monit/nginx/unicorn application server configurator using deployment via git
-test_files: []
-
+summary: Monit/Nginx/Unicorn application server configurator using deployment via git
+test_files: 
+- test/apps/sinatra/hello.rb
+- test/helper.rb
+- test/unit/test_app.rb
+- test/unit/test_appserver.rb
+- test/unit/test_command.rb
+- test/unit/test_configurator.rb
+- test/unit/test_logrotate.rb
+- test/unit/test_monit.rb
+- test/unit/test_nginx.rb
+- test/unit/test_repository.rb
+- test/unit/test_server_dir.rb
+- test/unit/test_unicorn_conf.rb
+- test/unit/test_utils.rb