trinidad_sandbox_extension 0.4.2 → 1.0.0

data/lib/trinidad_sandbox_extension/app/model/application_context.rb

@@ -1,7 +1,8 @@
 require 'delegate'
 require 'cgi'
+require 'trinidad'
 
-require File.expand_path('../../helpers/sandbox', __FILE__)
+require File.expand_path('../../helpers/context', __FILE__)
 
 module Trinidad
   module Sandbox
@@ -10,9 +11,12 @@ module Trinidad
 
       def self.all
         apps = host ? host.find_children : []
-        apps.select {|app| app.name != sandbox_context.name }.
+        a = apps.select {|app| app.name != sandbox_context.name }.
           map {|app| ApplicationContext.new(app) }.
           sort {|app1, app2| app1.slug <=> app2.slug }
+
+        a = a.select {|app| app.name != 'default'} unless enable_default?
+        a
       end
 
       def self.find(name)
@@ -25,6 +29,39 @@ module Trinidad
         ApplicationContext.new(context) if context
       end
 
+      def self.find_by_doc_base(base)
+        if (apps = host.find_children)
+          apps.select {|app| app.doc_base == File.basename(base)}.first
+        end
+      end
+
+      def self.create(url, path)
+        web_app = Trinidad::WebApp.create({
+          :jruby_min_runtimes => 1,
+          :jruby_max_runtimes => 1
+        }, {
+          :context_path => (url == 'default' ? '' : "/#{url}"),
+          :web_app_dir => File.basename(path),
+          :environment => 'production'
+        })
+
+        context = Trinidad::Tomcat::StandardContext.new
+        context.path = web_app.context_path
+        context.doc_base = web_app.web_app_dir
+
+        context.add_lifecycle_listener Trinidad::Tomcat::Tomcat::DefaultWebXmlListener.new
+
+        config = Trinidad::Tomcat::ContextConfig.new
+        config.default_web_xml = 'org/apache/catalin/startup/NO_DEFAULT_XML'
+        context.add_lifecycle_listener config
+
+        context.add_lifecycle_listener Trinidad::Lifecycle::Default.new(web_app)
+
+        host.add_child context
+
+        ApplicationContext.new(context)
+      end
+
       def initialize(context)
         super(context)
       end
@@ -49,12 +86,19 @@ module Trinidad
         [
           {:rel => 'start', :href => "#{self_path}/start"},
           {:rel => 'stop', :href => "#{self_path}/stop"},
-          {:rel => 'redeploy', :href => "#{self_path}/redeploy"}
+          {:rel => 'restart', :href => "#{self_path}/restart"}
         ]
       end
 
       def parameters
-        @parameters ||= find_parameters
+        @parameters ||= begin
+          parameters = {}
+          find_parameters.each do |param|
+            value = find_parameter(param)
+            parameters[param] = value if !value.nil? && !value.empty?
+          end
+          parameters
+        end
       end
     end
   end

data/lib/trinidad_sandbox_extension/app/public/css/sandbox.css

@@ -0,0 +1,187 @@
+ul {
+  padding: 0px;
+}
+
+li {
+  list-style: none;
+  margin: 0px;
+  padding: 0px;
+  display: list-item;
+}
+
+/* End: Reset */
+
+body {
+  font-family: 'Lucida Grande', Verdana, Arial, Sans-Serif;
+  font-size:10.5pt;
+  margin: 0;
+}
+
+h1 {
+  color: #383838;
+}
+
+a {
+  color: silver;
+  font-weight: bold;
+  text-decoration: none;
+}
+
+a:hover {
+  color: #383838;
+}
+
+p {
+  color: #383838;
+  font-size: 1.5em;
+  padding-left: .5em;
+}
+
+.site {
+  width: 50em;
+  margin: 0 auto;
+  padding: 2em 5em;
+}
+
+nav {
+  position: relative;
+}
+
+nav h1 {
+  font-size: 4em;
+}
+
+#nav {
+  position: absolute;
+  text-align: right;
+  right: 0em;
+  top: 2.8em;
+}
+
+#nav a {
+  padding-left: .8em;
+}
+
+span.nav {
+  color: #383838;
+  font-weight: bold;
+  padding-left: .8em;
+}
+
+
+.container {
+  border: 1px solid silver;
+  background: #EEE;
+  padding: .3em;
+}
+
+#applications li {
+  position: relative;
+}
+
+.application {
+  padding: 0em 1em;
+}
+
+.actions {
+  position: absolute;
+  top: 1.3em;
+  right: 2em;
+  text-align: right;
+}
+
+.actions form {
+  display: inline;
+}
+
+.app {
+  margin-bottom: 1em;
+  padding: 1em;
+}
+
+.header {
+  color: #383838;
+  font-size: 1.5em;
+}
+
+
+.started {
+  border: 1px solid #32cd32;
+  background: #D0EDC7;
+}
+
+.stopped {
+  border: 1px solid #b22222;
+  background: #E6BCB5;
+}
+
+.detail {
+  border: 1px solid #383838;
+  margin-top: .6em;
+  background: #silver;
+  color: #383838;
+}
+
+.detail ul {
+  margin: .5em;
+}
+
+.detail ul li {
+  line-height: 1.2em;
+  margin: .3em;
+}
+
+.detail ul li.reset {
+  margin-top: -4.3em;
+}
+
+
+.detail ul li.column1 {
+  margin-left: .3em;
+}
+
+.detail ul li.column2 {
+  margin-left: 22em;
+}
+
+#git-hook {
+  margin-top: 1em;
+  border: 1px solid #FF9900;
+  background: #FFFF99;
+}
+
+#git-hook p {
+  padding-left: 2em;
+  font-size: .8em;
+}
+
+#git-hook p span {
+  font-weight: bold;
+  font-style: italic;
+}
+
+form div {
+  padding: .5em 1em;
+}
+
+label {
+  color: #383838;
+  display:block;
+  font-size: 1.5em;
+}
+
+input {
+  background: silver;
+  font-size: 2.5em;
+  padding: .5em;
+  border: 1px solid grey;
+  color: #383838;
+}
+
+#flash {
+  border: 1px solid #b22222;
+  background: #E6BCB5;
+  color: #383838;
+  padding: 1em 1.5em;
+  margin-bottom: 1em;
+}

data/lib/trinidad_sandbox_extension/app/sandbox.rb

@@ -1,70 +1,68 @@
 require 'rubygems'
 require 'sinatra'
 require 'haml'
-require File.expand_path('../helpers/sandbox', __FILE__)
+require File.expand_path('../helpers/auth', __FILE__)
+require File.expand_path('../helpers/context', __FILE__)
+require File.expand_path('../helpers/deploy', __FILE__)
+require File.expand_path('../helpers/view', __FILE__)
 require File.expand_path('../model/application_context', __FILE__)
 require 'sinatra/respond_to'
 require 'sinatra/flash'
 
+include Trinidad::Sandbox
+
 enable :sessions
 
 set :views, File.expand_path('../views', __FILE__)
 
 Sinatra::Application.register Sinatra::RespondTo
 
-helpers {
-  include Trinidad::Sandbox::Helpers::Auth
-  include Trinidad::Sandbox::Helpers::Context
-}
-before { login_required }
+helpers do
+  include Helpers::Auth
+  include Helpers::Context
+  include Helpers::Deploy
+  include Helpers::View
+end
+
+before do
+  login_required if !readonly? && basic_auth_required?(request)
+
+  render_readonly if readonly? &&
+    (!request.get? || request.path =~ /deploy$/)
+end
 
 get '/' do
   redirect sandbox_context.path + '/apps'
 end
 
 get '/apps' do
-  @applications = Trinidad::Sandbox::ApplicationContext.all
-
-  respond_to do |wants|
-    wants.html  { haml :index }
-    wants.xml   { haml :index }
-  end
-end
-
-get '/apps/:name' do
-  @app = Trinidad::Sandbox::ApplicationContext.find(params[:name])
-  context_not_found(params[:name]) unless @app
+  @applications = ApplicationContext.all
+  @page_id = 'applications'
 
   respond_to do |wants|
-    wants.html { haml :app }
-    wants.xml { haml :app }
+    wants.html  { haml :applications }
+    wants.xml   { haml :applications }
   end
 end
 
 post '/apps/:name/stop' do
-  context = Trinidad::Sandbox::ApplicationContext.find(params[:name])
+  context = ApplicationContext.find(params[:name])
 
   context_not_found(params[:name]) unless context
 
-  if context.name == sandbox_context.name
-    $servet_context.log "can't stop the sandbox application"
-    respond_to do |wants|
-      wants.html { redirect sandbox_context.path }
-      wants.xml { status 500 }
-    end
+  unless available_context?(context)
+    $servet_context.log "can't stop the application"
+    redirect_to_home 500
   end
 
   context.stop
   $servlet_context.log "#{context.name} stopped"
 
-  respond_to do |wants|
-    wants.html { redirect sandbox_context.path }
-    wants.xml { status 204 }
-  end
+  redirect_to_home 204
 end
 
 post '/apps/:name/start' do
-  context = Trinidad::Sandbox::ApplicationContext.find(params[:name])
+  context = ApplicationContext.find(params[:name])
 
   context_not_found(params[:name]) unless context
 
@@ -75,21 +73,40 @@ post '/apps/:name/start' do
     $servlet_context.log "#{context.name} start failed"
   end
 
-  respond_to do |wants|
-    wants.html { redirect sandbox_context.path }
-    wants.xml { status 204 }
-  end
+  redirect_to_home 204
 end
 
-post '/apps/:name/redeploy' do
-  context = Trinidad::Sandbox::ApplicationContext.find(params[:name])
+post '/apps/:name/restart' do
+  context = ApplicationContext.find(params[:name])
 
   context_not_found(params[:name]) unless context
 
+  unless available_context?(context)
+    $servet_context.log "can't restart the application"
+    redirect_to_home 500
+  end
+
   context.reload
 
+  redirect_to_home 204
+end
+
+get '/deploy' do
+  @page_id = 'deploy'
+
   respond_to do |wants|
-    wants.html { redirect sandbox_context.path }
-    wants.xml { status 204 }
+    wants.html { haml :deploy }
+  end
+end
+
+post '/deploy' do
+  token_required(params)
+
+  if params['payload']
+    deploy_from_web_hook(params)
+  elsif params['repo']
+    deploy_from_form(params)
+  else
+    redirect_to_home 204
   end
 end

data/lib/trinidad_sandbox_extension/app/views/actions.html.haml

@@ -1,9 +1,9 @@
 .actions
   - if app.available
+    %form(method="post" action="#{app.self_path}/restart")
+      %button(type="submit") Restart
     %form(method="post" action="#{app.self_path}/stop")
       %button(type="submit") Stop
-    %form(method="post" action="#{app.self_path}/redeploy")
-      %button(type="submit") Redeploy
   - else
     %form(method="post" action="#{app.self_path}/start")
       %button(type="submit") Start

data/lib/trinidad_sandbox_extension/app/views/applications.html.haml

@@ -0,0 +1,17 @@
+%div(id="applications" class="container")
+  - unless @applications.empty?
+    %ul
+      - @applications.each do |app|
+        %li(class="application")
+          %div(class="app #{app.state.to_s.downcase}")
+            %a(class="header" href="#{app.path}")= app.name
+            - unless readonly?
+              = haml :actions, :locals => {:app => app}, :layout => false
+            - unless app.parameters.empty?
+              .detail
+                %ul(class="parameters")
+                  = render_parameters(app.parameters)
+  - else
+    %p It seems there're not applications running on Trinidad.
+    - unless readonly?
+      %p You can use Git to #{link_to_deploy} them without stopping the server.