webroar 0.3.1 → 0.4.0

data/test/spec/webroar_command_spec.rb

@@ -63,4 +63,27 @@ describe "Webroar command" do
     op.should =~ /WebROaR-\d[.]\d[.]\d/
   end
   
+  it "should remove application" do
+    cmd = "#{File.join(WEBROAR_ROOT,'bin','webroar')} remove test_app"
+    system("#{cmd} >>#{TEST_RUN_LOG} 2>>#{TEST_RUN_LOG}")
+    sleep(5)
+    res = @http.start{ |http| http.get('/test_app/')}
+    res.class.should == Net::HTTPNotFound
+  end
+  
+  it "should add application" do
+    cmd = "#{File.join(WEBROAR_ROOT,'bin','webroar')} add test_app -R /test_app -D #{TEST_APP_PATH} -U #{RUN_AS_USER} -N 1 -X 2 -E test"
+    system("#{cmd} >>#{TEST_RUN_LOG} 2>>#{TEST_RUN_LOG}")
+    sleep(60)
+    res = @http.start{ |http| http.get('/test_app/')}
+    res.class.should == Net::HTTPOK
+  end
+  
+  it "should respond during application restart" do
+    cmd = "#{File.join(WEBROAR_ROOT,'bin','webroar')} restart test_app"
+    system("#{cmd} >>#{TEST_RUN_LOG} 2>>#{TEST_RUN_LOG}")    
+    res = @http.start{ |http| http.get('/test_app/')}
+    res.class.should == Net::HTTPOK
+    sleep(60)
+  end
 end

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: webroar
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
+  hash: 15
+  prerelease: false
+  segments: 
+  - 0
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Aditya Babbar
@@ -11,79 +17,120 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-22 00:00:00 +05:30
+date: 2010-08-09 00:00:00 +05:30
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: calendar_date_select
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 17
+        segments: 
+        - 1
+        - 15
         version: "1.15"
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: rack
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 21
+        segments: 
+        - 1
+        - 0
+        - 1
         version: 1.0.1
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rake
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 61
+        segments: 
+        - 0
+        - 8
+        - 1
         version: 0.8.1
-    version: 
+  type: :runtime
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: rspec
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 1
+        - 2
+        - 2
         version: 1.2.2
-    version: 
+  type: :runtime
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: sqlite3-ruby
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 1
+        - 2
+        - 3
         version: 1.2.3
-    version: 
+  type: :runtime
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: starling
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 55
+        segments: 
+        - 0
+        - 10
+        - 0
         version: 0.10.0
-    version: 
+  type: :runtime
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: will_paginate
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 2
+        - 3
+        - 12
         version: 2.3.12
-    version: 
+  type: :runtime
+  version_requirements: *id007
 description: WebROaR is an application server that makes deployments of ruby web applications extremely simple. It provides an integrated solution to view the run time performance numbers and email notifications in case any exceptions occur in any of the deployed applications. It is 5 to 55% faster than all other comparable deployment stacks for Ruby on Rails applications. Check out http://webroar.in for more details.
 email: 
 - aditya.babbar@webroar.in
@@ -150,9 +197,7 @@ files:
 - src/ruby_lib/profiler/instrumentation/instrumentation.rb
 - src/ruby_lib/profiler/webroar_profiling.rb
 - src/ruby_lib/profiler/message_dispatcher.rb
-- src/ruby_lib/mailer/smtp_tls.rb
 - src/ruby_lib/mailer/smtpmail.rb
-- src/ruby_lib/mailer/action_mailer_tls.rb
 - src/ruby_lib/ruby_interface/deflater.rb
 - src/ruby_lib/ruby_interface/request_body.rb
 - src/ruby_lib/ruby_interface/constants.rb
@@ -163,7 +208,6 @@ files:
 - src/ruby_lib/ruby_interface/utils.rb
 - src/ruby_lib/ruby_interface/adapter.rb
 - src/ruby_lib/ruby_interface/ruby_interface.rb
-- src/head/wr_config.h
 - src/head/wr_resolver.h
 - src/head/wr_configurator.h
 - src/head/wr_configurator.c
@@ -295,12 +339,12 @@ files:
 - src/admin_panel/app/helpers/admin_helper.rb
 - src/admin_panel/app/helpers/exceptions_helper.rb
 - src/admin_panel/app/views/mail_specification/_sendmail_form.html.erb
+- src/admin_panel/app/views/mail_specification/_current_spec.html.erb
 - src/admin_panel/app/views/mail_specification/_smtp_form.html.erb
 - src/admin_panel/app/views/admin/home.html.erb
 - src/admin_panel/app/views/admin/_application_table.html.erb
 - src/admin_panel/app/views/admin/configuration.html.erb
 - src/admin_panel/app/views/admin/change_password_form.html.erb
-- src/admin_panel/app/views/admin/_add_div.html.erb
 - src/admin_panel/app/views/admin/index.html.erb
 - src/admin_panel/app/views/graph/_query_date.html.erb
 - src/admin_panel/app/views/graph/_get_url_data.html.erb
@@ -321,11 +365,15 @@ files:
 - src/admin_panel/app/views/graph/_get_url_breakup_data.html.erb
 - src/admin_panel/app/views/graph/_query_period.html.erb
 - src/admin_panel/app/views/graph/_get_throughput_data.html.erb
+- src/admin_panel/app/views/headers/_add_expires_text_box.html.erb
+- src/admin_panel/app/views/headers/_expires_by_type_form.html.erb
+- src/admin_panel/app/views/headers/_headers_table.html.erb
 - src/admin_panel/app/views/layouts/application.html.erb
 - src/admin_panel/app/views/layouts/index.html.erb
 - src/admin_panel/app/views/application_specification/_application_specification_form.html.erb
 - src/admin_panel/app/views/application_specification/edit_application_form.html.erb
 - src/admin_panel/app/views/application_specification/add_application_form.html.erb
+- src/admin_panel/app/views/server_specification/_add_div.html.erb
 - src/admin_panel/app/views/server_specification/_ssl_support_form.html.erb
 - src/admin_panel/app/views/exceptions/_link_partial.html.erb
 - src/admin_panel/app/views/exceptions/_exception_list_partial.html.erb
@@ -338,10 +386,12 @@ files:
 - src/admin_panel/app/controllers/exceptions_controller.rb
 - src/admin_panel/app/controllers/application_controller.rb
 - src/admin_panel/app/controllers/admin_controller.rb
+- src/admin_panel/app/controllers/headers_controller.rb
 - src/admin_panel/app/controllers/server_specification_controller.rb
 - src/admin_panel/app/models/url_breakup_time_sample.rb
 - src/admin_panel/app/models/app_time_sample.rb
 - src/admin_panel/app/models/pseudo_model.rb
+- src/admin_panel/app/models/headers.rb
 - src/admin_panel/app/models/application_specification.rb
 - src/admin_panel/app/models/resource_usage.rb
 - src/admin_panel/app/models/user.rb
@@ -2006,12 +2056,6 @@ files:
 - src/admin_panel/vendor/rails/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/attachments.rb
 - src/admin_panel/vendor/rails/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/require_arch.rb
 - src/admin_panel/vendor/rails/actionmailer/lib/action_mailer/vendor/tmail-1.2.3/tmail/stringio.rb
-- src/admin_panel/vendor/plugins/action_mailer_optional_tls/README
-- src/admin_panel/vendor/plugins/action_mailer_optional_tls/Rakefile
-- src/admin_panel/vendor/plugins/action_mailer_optional_tls/test/tls_test.rb
-- src/admin_panel/vendor/plugins/action_mailer_optional_tls/init.rb
-- src/admin_panel/vendor/plugins/action_mailer_optional_tls/lib/smtp_tls.rb
-- src/admin_panel/vendor/plugins/action_mailer_optional_tls/lib/action_mailer_tls.rb
 - src/admin_panel/vendor/plugins/open_flash_chart_2/MIT-LICENSE
 - src/admin_panel/vendor/plugins/open_flash_chart_2/README
 - src/admin_panel/vendor/plugins/open_flash_chart_2/tasks/open_flash_chart_tasks.rake
@@ -2054,8 +2098,10 @@ files:
 - src/admin_panel/script/dbconsole
 - src/admin_panel/script/plugin
 - src/helper/wr_util.h
+- src/helper/wr_config.h
 - src/helper/wr_helper.h
 - src/helper/wr_msg_queue_client.c
+- src/helper/wr_config.c
 - src/helper/wr_yaml_parser.c
 - src/helper/wr_macro.h
 - src/helper/wr_logger.c
@@ -2127,6 +2173,82 @@ files:
 - tasks/compile.rake
 - tasks/gem.rake
 - tasks/test.rake
+- test/unit/queue_test.c
+- test/unit/yaml_test.c
+- test/unit/util_test.c
+- test/unit/scgi_test.c
+- test/unit/test.c
+- test/unit/ut_test.c
+- test/unit/ut_test.h
+- test/unit/test.h
+- test/unit/config/config4.yml
+- test/unit/config/config3.yml
+- test/unit/config/config2.yml
+- test/unit/config/config1.yml
+- test/unit/config/config5.yml
+- test/spec/test_app/config/database.yml
+- test/spec/access_log_spec.rb
+- test/spec/content_encoding_spec.rb
+- test/spec/analytics_spec.rb
+- test/spec/http_request_parser_spec.rb
+- test/spec/connection_keep_alive_spec.rb
+- test/spec/upload_helper.rb
+- test/spec/webroar_command_spec.rb
+- test/spec/host_name_spec.rb
+- test/spec/http_spec.rb
+- test/spec/conditional_spec.rb
+- test/spec/spec_helper.rb
+- test/spec/heart_beat_spec.rb
+- test/spec/test_app/db/migrate/20090602102438_create_users.rb
+- test/spec/test_app/app/helpers/application_helper.rb
+- test/spec/test_app/app/helpers/users_helper.rb
+- test/spec/test_app/app/helpers/test_helper.rb
+- test/spec/test_app/app/controllers/test_controller.rb
+- test/spec/test_app/app/controllers/application_controller.rb
+- test/spec/test_app/app/controllers/users_controller.rb
+- test/spec/test_app/app/models/user.rb
+- test/spec/test_app/config/environment.rb
+- test/spec/test_app/config/initializers/session_store.rb
+- test/spec/test_app/config/initializers/inflections.rb
+- test/spec/test_app/config/initializers/backtrace_silencers.rb
+- test/spec/test_app/config/initializers/new_rails_defaults.rb
+- test/spec/test_app/config/initializers/mime_types.rb
+- test/spec/test_app/config/routes.rb
+- test/spec/test_app/config/boot.rb
+- test/spec/test_app/config/environments/test.rb
+- test/spec/test_app/config/environments/development.rb
+- test/spec/test_app/config/environments/production.rb
+- test/load_test.rb
+- test/spec/test_app/public/javascripts/application.js
+- test/spec/test_app/public/javascripts/dragdrop.js
+- test/spec/test_app/public/javascripts/controls.js
+- test/spec/test_app/public/javascripts/prototype.js
+- test/spec/test_app/public/javascripts/effects.js
+- test/spec/test_app/public/stylesheets/scaffold.css
+- test/spec/test_app/public/422.html
+- test/spec/test_app/public/404.html
+- test/spec/test_app/public/index.html
+- test/spec/test_app/public/500.html
+- test/spec/test_app/public/robots.txt
+- test/spec/test_app/app/views/layouts/users.html.erb
+- test/spec/test_app/app/views/users/show.html.erb
+- test/spec/test_app/app/views/users/index.html.erb
+- test/spec/test_app/app/views/users/new.html.erb
+- test/spec/test_app/app/views/users/edit.html.erb
+- test/spec/test_app/app/views/test/upload_file.html.erb
+- test/spec/test_app/app/views/test/post_data.html.erb
+- test/spec/test_app/script/about
+- test/spec/test_app/script/runner
+- test/spec/test_app/script/console
+- test/spec/test_app/script/server
+- test/spec/test_app/script/destroy
+- test/spec/test_app/script/performance/profiler
+- test/spec/test_app/script/performance/benchmarker
+- test/spec/test_app/script/generate
+- test/spec/test_app/script/dbconsole
+- test/spec/test_app/script/plugin
+- test/spec/test_app/vendor/.placeholder
+- test/spec/test_app/Rakefile
 has_rdoc: true
 homepage: http://webroar.in
 licenses: []
@@ -2137,21 +2259,29 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 61
+      segments: 
+      - 1
+      - 8
+      - 5
       version: 1.8.5
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: webroar
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A ruby application server.

data/src/admin_panel/vendor/plugins/action_mailer_optional_tls/README

@@ -1,34 +0,0 @@
-= action_mailer_optional_tls
-  
-Allows Google Mail SMTP to be used with Ruby on Rails' ActionMailer.
-
-== Install
-  ./script/plugin install git://github.com/collectiveidea/action_mailer_optional_tls.git
-
-== Configure
-
-Add the following to your environment.rb file:
-
- ActionMailer::Base.smtp_settings = {
-    :tls => true,
-    :address => "smtp.gmail.com",
-    :port => "587",
-    :domain => "YOURDOMAIN",
-    :authentication => :plain,
-    :user_name => "GOOGLEUSERNAME",
-    :password => "GOOGLEPASSWORD" 
-  }
-
-== Webified Documentation
-
-http://douglasfshearer.com/blog/gmail-smtp-with-ruby-on-rails-and-actionmailer
-
-== Credits
-
-This useful plugin is hosted at http://douglasfshearer.com as a public service, due to the continued downtime of http://kylemaxwell.com
-
-Douglas F Shearer is neither the creator nor maintainer of this work, so if it's broke, it's broke.
-
-Created by Kyle Maxwell - http://kylemaxwell.com/
-
-Forked and adjusted by Nathan L. Walls - http://wallscorp.us/ to resolve the issue describe here: http://blog.inspired.no/smtp-error-while-using-gmail-in-rails-271 and satisfy differences between Ruby 1.8.6 and Ruby 1.8.7. Note: this is brittle, but solves a need.

data/src/admin_panel/vendor/plugins/action_mailer_optional_tls/Rakefile

@@ -1,13 +0,0 @@
-require 'rake'
-require 'rake/testtask'
-require 'rake/rdoctask'
-
-desc 'Default: run unit tests.'
-task :default => :test
-
-desc 'Test the plugin.'
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = true
-end

data/src/admin_panel/vendor/plugins/action_mailer_optional_tls/init.rb

@@ -1,5 +0,0 @@
-# Cobbled together from miscellaneous code from Stephen Chu and the ruby-talk list.
-#
-
-require 'smtp_tls'
-require 'action_mailer_tls'

data/src/admin_panel/vendor/plugins/action_mailer_optional_tls/lib/action_mailer_tls.rb

@@ -1,16 +0,0 @@
-require "rubygems"
-require "action_mailer"
-
-ActionMailer::Base.class_eval do
-  private
-  def perform_delivery_smtp(mail)
-    destinations = mail.destinations
-    mail.ready_to_send
-
-    Net::SMTP.start(smtp_settings[:address], smtp_settings[:port], smtp_settings[:domain], 
-        smtp_settings[:user_name], smtp_settings[:password], smtp_settings[:authentication],
-        smtp_settings[:tls], smtp_settings[:ssl]) do |smtp|
-      smtp.sendmail(mail.encoded, mail.from, destinations)
-    end
-  end
-end

data/src/admin_panel/vendor/plugins/action_mailer_optional_tls/lib/smtp_tls.rb

@@ -1,123 +0,0 @@
-require "openssl"
-require "net/smtp"
-
-Net::SMTP.class_eval do
-  
-  def self.start( address, port = nil,
-                  helo = 'localhost.localdomain',
-                  user = nil, secret = nil, authtype = nil, use_tls = false,
-                  use_ssl = false, &block) # :yield: smtp
-    new(address, port).start(helo, user, secret, authtype, use_tls, use_ssl, &block)
-  end
-
-  def start( helo = 'localhost.localdomain',
-             user = nil, secret = nil, authtype = nil, use_tls = false, use_ssl = false ) # :yield: smtp
-    start_method = use_tls ? :do_tls_start : use_ssl ? :do_ssl_start : :do_start
-    if block_given?
-      begin
-        send start_method, helo, user, secret, authtype
-        return yield(self)
-      ensure
-        do_finish
-      end
-    else
-      send start_method, helo, user, secret, authtype
-      return self
-    end
-  end
-
-  private
-  
-  def do_tls_start(helodomain, user, secret, authtype)
-    raise IOError, 'SMTP session already started' if @started
-    
-    if VERSION == '1.8.6'
-      check_auth_args user, secret, authtype if user or secret
-    elsif VERSION == '1.8.7'
-      check_auth_args user, secret
-    end
-
-    sock = timeout(@open_timeout) { TCPSocket.open(@address, @port) }
-    @socket = Net::InternetMessageIO.new(sock)
-    @socket.read_timeout = 60 #@read_timeout
-    @socket.debug_output = STDERR #@debug_output
-
-    check_response(critical { recv_response() })
-    do_helo(helodomain)
-
-    raise 'openssl library not installed' unless defined?(OpenSSL)
-    starttls
-    ssl = OpenSSL::SSL::SSLSocket.new(sock)
-    ssl.sync_close = true
-    ssl.connect
-    @socket = Net::InternetMessageIO.new(ssl)
-    @socket.read_timeout = 60 #@read_timeout
-    @socket.debug_output = STDERR #@debug_output
-    do_helo(helodomain)
-
-    authenticate user, secret, authtype if user
-    @started = true
-  ensure
-    unless @started
-      # authentication failed, cancel connection.
-        @socket.close if not @started and @socket and not @socket.closed?
-      @socket = nil
-    end
-  end
-
-  def do_ssl_start(helodomain, user, secret, authtype)
-    raise IOError, 'SMTP session already started' if @started
-    check_auth_args user, secret, authtype if user or secret
-
-    sock = timeout(@open_timeout) { TCPSocket.open(@address, @port) }
-    raise 'openssl library not installed' unless defined?(OpenSSL)
-    ssl = OpenSSL::SSL::SSLSocket.new(sock)
-    ssl.sync_close = true
-    ssl.connect
-    @socket = Net::InternetMessageIO.new(ssl)
-    @socket.read_timeout = 60 #@read_timeout
-    @socket.debug_output = STDERR #@debug_output
-
-    check_response(critical { recv_response() })
-    do_helo(helodomain)
-
-    do_helo(helodomain)
-
-    authenticate user, secret, authtype if user
-    @started = true
-  ensure
-    unless @started
-      # authentication failed, cancel connection.
-        @socket.close if not @started and @socket and not @socket.closed?
-      @socket = nil
-    end
-  end
-
-  def do_helo(helodomain)
-     begin
-      if @esmtp
-        ehlo helodomain
-      else
-        helo helodomain
-      end
-    rescue Net::ProtocolError
-      if @esmtp
-        @esmtp = false
-        @error_occured = false
-        retry
-      end
-      raise
-    end
-  end
-
-  def starttls
-    getok('STARTTLS')
-  end
-
-  def quit
-    begin
-      getok('QUIT')
-    rescue EOFError, OpenSSL::SSL::SSLError
-    end
-  end
-end

data/src/admin_panel/vendor/plugins/action_mailer_optional_tls/test/tls_test.rb

@@ -1,42 +0,0 @@
-require "rubygems"
-require 'test/unit'
-gem "actionpack"
-gem "actionmailer"
-gem "activesupport"
-require "active_support"
-require "action_pack"
-require "action_mailer"
-require "init"
-
-class Emailer < ActionMailer::Base
-	def email(h)
-		recipients   h[:recipients]
-		subject      h[:subject]
-		from         h[:from]
-		body         h[:body]
-		content_type "text/plain"
-	end
-end
-
-class TlsTest < Test::Unit::TestCase
-  # Replace this with your real tests.
-  def setup
-    ActionMailer::Base.smtp_settings = {
-      :address => "smtp.gmail.com",
-      :port => 587,
-      :user_name => ENV['EMAIL'],
-      :password => ENV['PASSWORD'],
-      :authentication => :plain,
-      :tls => true
-    }
-  end
-  
-  def test_send_mail
-    Emailer.deliver_email(
-      :recipients => ENV["EMAIL"],
-      :subject => "SMTP/TLS test",
-      :from => ENV["EMAIL"],
-      :body => "This email was sent at #{Time.now.inspect}"
-    )
-  end
-end