trinidad_sandbox_extension 0.4.2 → 1.0.0

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

@@ -0,0 +1,13 @@
+%applications
+  - @applications.each do |app|
+    %application
+      %name= app.name
+      %path= app.path
+      %available= app.available
+      - unless readonly?
+        - app.actions.each do |action|
+          %link(rel = "#{action[:rel]}" href = "#{action[:href]}.xml")
+      - if app.parameters
+        %context-parameters
+          - app.parameters.each do |param_name|
+            %parameter(name = "#{param_name}" value = "#{app.find_parameter(param_name)}")

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

@@ -0,0 +1,16 @@
+%div(id="deploy" class="container")
+  %form(action="#{sandbox_context.path}/deploy" method="post")
+    %input(type="hidden" name="deploy_token" value="#{render_deploy_token}")
+    %div
+      %label(for = "repo") Repository url
+      %input(type="text" name="repo" id="repo" size="38")
+    %div
+      %label(for = "branch") Branch
+      %input(type="text" name="branch" id="branch" size="38")
+    %div
+      %label(for = "path") Application path
+      %input(type="text" name="path" id="path" size="38")
+    %div
+      %button(type="submit" data-disable-with="Please wait...") Deploy
+#git-hook
+  %p Use <span>http://#{render_host_name}/sandbox/deploy?deploy_token=#{render_deploy_token}</span> as a Post-Receive URL on Github.

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

@@ -1,12 +1,16 @@
 %html
   %head
     %title Trinidad's sandbox
-    %link(rel="stylesheet" href="#{sandbox_context.path}/css/main.css" type="text/css")
+    %link(rel="stylesheet" href="#{sandbox_context.path}/css/sandbox.css" type="text/css")
   %body
+    #ribbon
+      %a(href="http://github.com/calavera/trinidad_sandbox_extension")
+        %img(style="position: absolute; top: 0; right: 0; border: 0;" src="https://assets2.github.com/img/71eeaab9d563c2b3c590319b398dd35683265e85?repo=&url=http%3A%2F%2Fs3.amazonaws.com%2Fgithub%2Fribbons%2Fforkme_right_gray_6d6d6d.png&path=" alt="Fork me on GitHub")
     .site
-      #title
-        %h1 Trinidad's sandbox
-      #content
+      %nav
         %div
-          = styled_flash
-          = yield
+          %h1 Trinidad
+          = haml :navigation, :layout => false
+      = styled_flash
+      %div
+        = yield

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

@@ -0,0 +1,10 @@
+#nav
+  - unless readonly?
+    - if @page_id == 'deploy'
+      %a(class="nav" href="apps") Applications
+      %span(class="nav") Deploy
+    - else
+      %span(class="nav") Applications
+      %a(class="nav" href="deploy") Deploy
+  - else
+    %span(class="nav") Applications

data/spec/trinidad_sandbox_extension_spec.rb

@@ -51,7 +51,17 @@ describe Trinidad::Extensions::SandboxServerExtension do
 
     app_ctx = ext.create_application_context(@tomcat, opts)
 
-    app_ctx.servlet_context.getAttribute('sandbox_username').should == 'foo'
-    app_ctx.servlet_context.getAttribute('sandbox_password').should == 'bar'
+    app_ctx.servlet_context.get_attribute('sandbox_username').should == 'foo'
+    app_ctx.servlet_context.get_attribute('sandbox_password').should == 'bar'
+  end
+
+  it 'stores the deploy token to use it for git deployment' do
+    opts = subject.prepare_options
+    opts[:deploy_token] = 'foobar'
+
+    ext = Trinidad::Extensions::SandboxServerExtension.new(opts)
+
+    app_ctx = ext.create_application_context(@tomcat, opts)
+    app_ctx.servlet_context.get_attribute('deploy_token').should == 'foobar'
   end
 end

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.4.2'
-  s.date              = '2010-12-21'
+  s.version           = '1.0.0'
+  s.date              = '2011-03-17'
   s.rubyforge_project = 'trinidad_sandbox_extension'
 
   ## Make sure your summary is short. The description may be as long
@@ -41,7 +41,8 @@ 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.
   s.add_dependency('trinidad', '>=1.0.1')
-  ['sinatra', 'sinatra-authorization', 'sinatra-respond_to', 'sinatra-flash', 'haml'].each do |dep|
+  ['sinatra', 'sinatra-authorization', 'sinatra-respond_to', 
+    'sinatra-flash', 'haml', 'grit', 'json'].each do |dep|
     s.add_dependency(dep)
   end
 
@@ -55,21 +56,27 @@ Gem::Specification.new do |s|
   ## THE MANIFEST COMMENTS, they are used as delimiters by the task.
   # = MANIFEST =
   s.files = %w[
+    Gemfile
+    Gemfile.lock
     History.txt
     LICENSE
     README
     Rakefile
+    git-hooks/post-commit
     lib/trinidad_sandbox_extension.rb
-    lib/trinidad_sandbox_extension/app/helpers/sandbox.rb
+    lib/trinidad_sandbox_extension/app/helpers/auth.rb
+    lib/trinidad_sandbox_extension/app/helpers/context.rb
+    lib/trinidad_sandbox_extension/app/helpers/deploy.rb
+    lib/trinidad_sandbox_extension/app/helpers/view.rb
     lib/trinidad_sandbox_extension/app/model/application_context.rb
-    lib/trinidad_sandbox_extension/app/public/css/main.css
+    lib/trinidad_sandbox_extension/app/public/css/sandbox.css
     lib/trinidad_sandbox_extension/app/sandbox.rb
     lib/trinidad_sandbox_extension/app/views/actions.html.haml
-    lib/trinidad_sandbox_extension/app/views/app.html.haml
-    lib/trinidad_sandbox_extension/app/views/app.xml.haml
-    lib/trinidad_sandbox_extension/app/views/index.html.haml
-    lib/trinidad_sandbox_extension/app/views/index.xml.haml
+    lib/trinidad_sandbox_extension/app/views/applications.html.haml
+    lib/trinidad_sandbox_extension/app/views/applications.xml.haml
+    lib/trinidad_sandbox_extension/app/views/deploy.html.haml
     lib/trinidad_sandbox_extension/app/views/layout.html.haml
+    lib/trinidad_sandbox_extension/app/views/navigation.html.haml
     lib/trinidad_sandbox_extension/config.ru
     spec/spec.opts
     spec/spec_helper.rb

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: trinidad_sandbox_extension
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-    - 0
-    - 4
-    - 2
-  version: 0.4.2
+  prerelease: 
+  version: 1.0.0
 platform: ruby
 authors: 
   - David Calavera
@@ -14,20 +10,17 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-21 00:00:00 +01:00
+date: 2011-03-17 00:00:00 -07:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: trinidad
     prerelease: false
     requirement: &id001 !ruby/object:Gem::Requirement 
+      none: false
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
-            segments: 
-              - 1
-              - 0
-              - 1
             version: 1.0.1
     type: :runtime
     version_requirements: *id001
@@ -35,11 +28,10 @@ dependencies:
     name: sinatra
     prerelease: false
     requirement: &id002 !ruby/object:Gem::Requirement 
+      none: false
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
-            segments: 
-              - 0
             version: "0"
     type: :runtime
     version_requirements: *id002
@@ -47,11 +39,10 @@ dependencies:
     name: sinatra-authorization
     prerelease: false
     requirement: &id003 !ruby/object:Gem::Requirement 
+      none: false
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
-            segments: 
-              - 0
             version: "0"
     type: :runtime
     version_requirements: *id003
@@ -59,11 +50,10 @@ dependencies:
     name: sinatra-respond_to
     prerelease: false
     requirement: &id004 !ruby/object:Gem::Requirement 
+      none: false
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
-            segments: 
-              - 0
             version: "0"
     type: :runtime
     version_requirements: *id004
@@ -71,11 +61,10 @@ dependencies:
     name: sinatra-flash
     prerelease: false
     requirement: &id005 !ruby/object:Gem::Requirement 
+      none: false
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
-            segments: 
-              - 0
             version: "0"
     type: :runtime
     version_requirements: *id005
@@ -83,39 +72,57 @@ dependencies:
     name: haml
     prerelease: false
     requirement: &id006 !ruby/object:Gem::Requirement 
+      none: false
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
-            segments: 
-              - 0
             version: "0"
     type: :runtime
     version_requirements: *id006
   - !ruby/object:Gem::Dependency 
-    name: rspec
+    name: grit
     prerelease: false
     requirement: &id007 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: "0"
+    type: :runtime
+    version_requirements: *id007
+  - !ruby/object:Gem::Dependency 
+    name: json
+    prerelease: false
+    requirement: &id008 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: "0"
+    type: :runtime
+    version_requirements: *id008
+  - !ruby/object:Gem::Dependency 
+    name: rspec
+    prerelease: false
+    requirement: &id009 !ruby/object:Gem::Requirement 
+      none: false
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
-            segments: 
-              - 2
-              - 2
             version: "2.2"
     type: :development
-    version_requirements: *id007
+    version_requirements: *id009
   - !ruby/object:Gem::Dependency 
     name: mocha
     prerelease: false
-    requirement: &id008 !ruby/object:Gem::Requirement 
+    requirement: &id010 !ruby/object:Gem::Requirement 
+      none: false
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
-            segments: 
-              - 0
             version: "0"
     type: :development
-    version_requirements: *id008
+    version_requirements: *id010
 description: Sandox console for Trinidad. It allows to manage the applications deployed on Trinidad.
 email: calavera@apache.org
 executables: []
@@ -126,21 +133,27 @@ extra_rdoc_files:
   - README
   - LICENSE
 files: 
+  - Gemfile
+  - Gemfile.lock
   - History.txt
   - LICENSE
   - README
   - Rakefile
+  - git-hooks/post-commit
   - lib/trinidad_sandbox_extension.rb
-  - lib/trinidad_sandbox_extension/app/helpers/sandbox.rb
+  - lib/trinidad_sandbox_extension/app/helpers/auth.rb
+  - lib/trinidad_sandbox_extension/app/helpers/context.rb
+  - lib/trinidad_sandbox_extension/app/helpers/deploy.rb
+  - lib/trinidad_sandbox_extension/app/helpers/view.rb
   - lib/trinidad_sandbox_extension/app/model/application_context.rb
-  - lib/trinidad_sandbox_extension/app/public/css/main.css
+  - lib/trinidad_sandbox_extension/app/public/css/sandbox.css
   - lib/trinidad_sandbox_extension/app/sandbox.rb
   - lib/trinidad_sandbox_extension/app/views/actions.html.haml
-  - lib/trinidad_sandbox_extension/app/views/app.html.haml
-  - lib/trinidad_sandbox_extension/app/views/app.xml.haml
-  - lib/trinidad_sandbox_extension/app/views/index.html.haml
-  - lib/trinidad_sandbox_extension/app/views/index.xml.haml
+  - lib/trinidad_sandbox_extension/app/views/applications.html.haml
+  - lib/trinidad_sandbox_extension/app/views/applications.xml.haml
+  - lib/trinidad_sandbox_extension/app/views/deploy.html.haml
   - lib/trinidad_sandbox_extension/app/views/layout.html.haml
+  - lib/trinidad_sandbox_extension/app/views/navigation.html.haml
   - lib/trinidad_sandbox_extension/config.ru
   - spec/spec.opts
   - spec/spec_helper.rb
@@ -157,23 +170,21 @@ rdoc_options:
 require_paths: 
   - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-          - 0
         version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-          - 0
         version: "0"
 requirements: []
 
 rubyforge_project: trinidad_sandbox_extension
-rubygems_version: 1.3.6
+rubygems_version: 1.5.1
 signing_key: 
 specification_version: 2
 summary: Sandbox console for Trinidad

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

@@ -1,137 +0,0 @@
-/* Reset */
-
-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;
-  color:#222222;
-  background: #333333;
-  margin: 0;
-}
-
-a {
-  color: #617fc3;
-  font-weight: bold;
-  text-decoration: none;
-}
-
-a:hover {
-  color: #395490;
-}
-
-h1 {
-  font-family: Helvetica, Arial, Sans-Serif;
-  letter-spacing: -0.03em;
-  color:#CCCCCC;
-  font-size:3em;
-  margin-top:2em;
-  margin-bottom:0;
-}
-
-h2 {
-  color:#CCCCCC;
-  font-size: 3em;
-}
-
-#title {
-  font-family: Helvetica, Arial, Sans-Serif;
-  letter-spacing:-0.07em;
-  text-align: left;
-  font-size:1.7em;
-  margin-left: .7em;
-  margin-bottom: 1.5em;
-  color:#666666;
-}
-
-#title h1 {
-  font-size:3em;
-  line-height:0.5em;
-  margin: 0;
-  margin-bottom: -0.05em;
-}
-
-#content {
-  line-height: 1.5em;
-  margin-bottom: 1em;
-  margin-right:-0.5em;
-}
-
-.site {
-  width:45em;
-  margin: 0 auto;
-  padding: 5em 5em;
-  background: #F5F5F5;
-}
-
-#parameters {
-  background: black;
-  color: white;
-  font-size: 0.9em;
-  max-height: 50em;
-  overflow: auto;
-  margin: 0.5em;
-  padding: 0.5em;
-  line-height: 2em;
-}
-
-.ack {
-  padding-top: 1em;
-  float: right;
-  font-size: 9pt;
-}
-
-.note {
-  background-color: #ffffcc;
-  border: solid 1px #ffff76;
-  
-  padding: 1em;
-}
-
-#content #applications {
-  margin: 1em 0px 2em;
-  border-top: 1px solid silver;
-}
-
-#content #applications li {
-  border-bottom: 1px solid silver;
-  position: relative;
-}
-
-.app_name {
-  display: block;
-  font-size: 2em;
-  font-weight: bold;
-  line-height: 1.2;
-  padding: 0.25em;
-}
-
-.actions {
-  font-size: 0.8em;
-  position: absolute;
-  right: 0.6em;
-  text-align: right;
-  top: 1.5em;
-}
-
-.actions form {
-  display: inline;
-}
-
-.application {
-  border-top: 1px solid silver;
-  border-bottom: 1px solid silver;
-  position: relative;
-}