trinidad_sandbox_extension 0.1.0 → 0.2.0

data/History.txt

@@ -0,0 +1,9 @@
+== 0.2.0 (2010-07-31)
+
+* Support for redeploy applications
+* Upgrade to Tomcat 7
+
+== 0.1.0 (2010-05-30)
+
+* Initial release
+* Support for start/stop applications

data/README

@@ -3,16 +3,46 @@ Trinidad sandbox extension
 
 # DESCRIPTION
 
-Extension to allow manage the applications deployed on Trinidad, ala Tomcat manager.
+Trinidad's management console and REST api.
 
-This extension is in an early development stage and right now just shows you a
-list of the applications loaded on Trinidad.
+This extension adds a management console to a Trinidad's instance moreover a rest api to access the applications running on top of it.
 
-# TODO
 
-sorted by priorities
+# INSTALL
+
+jruby -S gem install trinidad_sandbox_extension
+
+# CONFIGURATION
+
+The extension has to be added within the section "extensions" into the Trinidad's configuration file:
+
+---
+  extensions:
+    sandbox:
+
+This extension is also a Sinatra web application running on top of Trinidad, so any application configuration parameter is also valid here.
+For instance, we can modify the context path where is running the console:
+
+---
+  extensions:
+    sandbox:
+      context_path: management # by default the context path is sandbox
+
+It also supports basic authentication, we'll have to specify the username and password within our section:
+
+---
+  extensions:
+    sandbox:
+      username: manager
+      password: XXXXXXX
+
+# FEATURES
+
+The console as well as the REST api allow to list all the applications managed by that Trinidad's instance and start/stop them.
+By security reasons the sandbox application is not listed nor can be stopped.
+
+
+# TODO
 
-* Buttons to start/stop applications
-* UI
-* REST api
-* Capistrano recipes to do hot deploys
+This can be the starting point to a real management console, we could modify application parameters, show statistics...
+Any improvement or redesign in the UI is welcome.

data/lib/trinidad_sandbox_extension.rb

@@ -6,7 +6,7 @@ require File.expand_path('../../trinidad-libs/trinidad-sandbox-extension', __FIL
 module Trinidad
   module Extensions
     class SandboxServerExtension < ServerExtension
-      VERSION = '0.1.0'
+      VERSION = '0.2.0'
 
       def configure(tomcat)
         opts = prepare_options

data/lib/trinidad_sandbox_extension/app/sandbox.rb

@@ -80,3 +80,31 @@ post '/apps/:name/start' do
     wants.xml { status 204 }
   end
 end
+
+post '/apps/:name/redeploy' do
+  context = Trinidad::Sandbox::ApplicationContext.find(params[:name])
+  
+  context_not_found(params[:name]) unless context
+
+  web_app_dir = params[:web_app_dir]
+  if web_app_dir.nil?
+    flash[:warning] = "No web_app_dir param provided. Can not redeploy."
+    $servlet_context.log "No web_app_dir param provided. Can not redeploy."
+    respond_to do |wants|
+      wants.html { redirect sandbox_context.path }
+      wants.xml { status 404 }
+    end
+  end
+
+  context.stop
+  $servlet_context.log "#{context.name} stopped"
+  context.setDocBase(web_app_dir)
+  $servlet_context.log "#{context.name} web_app_dir set to #{web_app_dir}"
+  context.start
+  $servlet_context.log "#{context.name} started successfully"
+
+  respond_to do |wants|
+    wants.html { redirect sandbox_context.path }
+    wants.xml { status 204 }
+  end
+end

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

@@ -1,7 +1,7 @@
 %html
   %head
     %title Trinidad's sandbox
-    %link(rel="stylesheet" href="/sandbox/css/main.css" type="text/css")
+    %link(rel="stylesheet" href="#{sandbox_context.path}/css/main.css" type="text/css")
   %body
     .site
       #title

data/trinidad_sandbox_extension.gemspec

@@ -13,8 +13,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'trinidad_sandbox_extension'
-  s.version           = '0.1.0'
-  s.date              = '2010-05-31'
+  s.version           = '0.2.0'
+  s.date              = '2010-07-31'
   s.rubyforge_project = 'trinidad_sandbox_extension'
 
   ## Make sure your summary is short. The description may be as long
@@ -40,7 +40,7 @@ Gem::Specification.new do |s|
 
   ## List your runtime dependencies here. Runtime dependencies are those
   ## that are needed for an end user to actually USE your code.
-  ['sinatra', 'sinatra-authorization', 'sinatra-respond_to', 'sinatra-flash'].each do |dep|
+  ['sinatra', 'sinatra-authorization', 'sinatra-respond_to', 'sinatra-flash', 'haml'].each do |dep|
     s.add_dependency(dep)
   end
 
@@ -54,6 +54,7 @@ Gem::Specification.new do |s|
   ## THE MANIFEST COMMENTS, they are used as delimiters by the task.
   # = MANIFEST =
   s.files = %w[
+    History.txt
     LICENSE
     README
     Rakefile

metadata

@@ -1,12 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: trinidad_sandbox_extension
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - David Calavera
@@ -14,81 +9,79 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-31 00:00:00 +02:00
+date: 2010-07-31 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sinatra
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
-  type: :runtime
-  version_requirements: *id001
+    version: 
 - !ruby/object:Gem::Dependency 
   name: sinatra-authorization
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
-  type: :runtime
-  version_requirements: *id002
+    version: 
 - !ruby/object:Gem::Dependency 
   name: sinatra-respond_to
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
-  type: :runtime
-  version_requirements: *id003
+    version: 
 - !ruby/object:Gem::Dependency 
   name: sinatra-flash
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: haml
   type: :runtime
-  version_requirements: *id004
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 - !ruby/object:Gem::Dependency 
   name: rspec
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
-  type: :development
-  version_requirements: *id005
+    version: 
 - !ruby/object:Gem::Dependency 
   name: mocha
-  prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
-  type: :development
-  version_requirements: *id006
+    version: 
 description: Sandox console for Trinidad. It allows to manage the applications deployed on Trinidad.
 email: calavera@apache.org
 executables: []
@@ -99,6 +92,7 @@ extra_rdoc_files:
 - README
 - LICENSE
 files: 
+- History.txt
 - LICENSE
 - README
 - Rakefile
@@ -132,20 +126,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
+  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
+  version: 
 requirements: []
 
 rubyforge_project: trinidad_sandbox_extension
-rubygems_version: 1.3.6
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 2
 summary: Sandbox console for Trinidad