jesus 0.0.2 → 0.0.3

data/.gitignore

@@ -1,5 +1,6 @@
 *.kpf
 *.tmproj
+pkg/*
 .DS_Store
 vendor/gems/*
 bin/*

data/Gemfile

@@ -3,7 +3,6 @@ source "http://gemcutter.org"
 # Required on every environment
 #
 gem "sinatra"
-gem "sinatra_more"
 gem "god"
 
 #

data/LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2009 Damien MATHIEU
+ 
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+ 
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+ 
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/{README.textile → README.md}

@@ -1,44 +1,51 @@
-h1. Jesus
+Jesus
+=====
 
-Jesus is a web interface to "god":http://github.com/mojombo/god
+Jesus is a web interface to [god](http://github.com/mojombo/god)
 It allows you to see the process and monitor/unmonitor them.
 
-!http://cloud.github.com/downloads/dmathieu/jesus/jesus-0.0.1.thumb.png(Screenshot 0.0.1)!:http://cloud.github.com/downloads/dmathieu/jesus/jesus-0.0.1.png
+[![Jesus Screenshot](http://cloud.github.com/downloads/dmathieu/jesus/jesus-0.0.1.thumb.png)](http://cloud.github.com/downloads/dmathieu/jesus/jesus-0.0.1.png)
 
-h2. Installation
+Installation
+------------
 
 To install the application you first need to have "bundler":http://github.com/wycats/bundler installed on your machine.
 Once that is done, clone the project in the directory of your choice.
 
-    @git clone git://github.com/dmathieu/jesus.git@
+    git clone git://github.com/dmathieu/jesus.git
+
+Or using the gem.
+
+    gem install jesus --source http://gemcutter.org
 
 Then you should install the dependencies.
 
-    @gem bundle@
+    gem bundle
 
 You now have Jesus available on your machine. Start your god process.
 And start Jesus.
 
-    @god -c /path/to/your/god.config@
-    
-    @rackup@
+    god -c /path/to/your/god.config
+    rackup
 
 Note: Jesus and God should be started with the same user. Otherwise, Jesus won't be able to get access to the God informations.
 
-Go to "localhot:9292":http://localhost:9292 to watch the process monitored by god.
+Go to [localhot:9292](http://localhost:9292) to watch the process monitored by god.
 
-h2. Contributing
+Contributing
+------------
 
 If you think Jesus is great but can be improved, feel free to contribute.
 To do so, you can :
 
-* "Fork":http://help.github.com/forking/ the project
+* [Fork](http://help.github.com/forking/) the project
 * Do your changes and commit them to your repository
 * Test your changes. We won't accept any untested contributions (except if they're not testable).
-* Create an "issue":http://help.github.com/forking/ with a link to your commits.
+* Create an [issue](http://help.github.com/forking/) with a link to your commits.
 
 And that's it! We'll soon take a look at your issue and review your changes.
 
-h2. Author
+Author
+------
 
 Damien MATHIEU :: 42 (AT|CHEZ) dmathieu.com

data/Rakefile

@@ -13,7 +13,7 @@ begin
     gemspec.email = "42@dmathieu.com"
     gemspec.homepage = "http://github.com/dmathieu/jesus"
     gemspec.authors = ["Damien MATHIEU"]
-    gemspec.version = '0.0.2'
+    gemspec.version = '0.0.3'
   end
 rescue LoadError
   puts "Jeweler not available. Install it with:"
@@ -30,4 +30,13 @@ desc "Run all specs"
 Spec::Rake::SpecTask.new('spec') do |t|
   t.spec_files = FileList['spec/**/*.rb']
   t.spec_opts = ['-cfs']
+end
+
+#
+# SDoc
+#
+begin
+  require 'sdoc_helpers'
+rescue LoadError
+  puts "sdoc support not enabled. Please gem install sdoc-helpers."
 end

data/cruise_config.rb

@@ -0,0 +1,4 @@
+Project.configure do |project|
+  # We need to bundle the gems before to do the build
+  project.build_command = 'gem bundle && rake'
+end

data/lib/jesus/server.rb

@@ -1,12 +1,10 @@
 require 'sinatra/base'
-require 'sinatra_more/render_plugin'
 require 'jesus/interface'
 require 'jesus/server/helpers'
 
 module Jesus
   class Server < Sinatra::Base
     dir = File.dirname(File.expand_path(__FILE__))
-    register SinatraMore::RenderPlugin
     include Jesus::Helpers
     
     set :views, "#{dir}/server/views"
@@ -20,7 +18,7 @@ module Jesus
     #
     get '/' do
       @status = Jesus::Interface.new.status
-      erb_template @status.nil? ? :error : :home
+      show @status.nil? ? :error : :home
     end
     
     #
@@ -28,7 +26,7 @@ module Jesus
     #
     get '/logs/:process' do
       @log = Jesus::Interface.new.log(params[:process])
-      erb_template @log.nil? ? :error : :log
+      show @log.nil? ? :error : :log
     end
     
     #
@@ -42,8 +40,9 @@ module Jesus
     #
     # Executes a command (start, restart, stop, quit or terminate) on the server
     #
-    post '/command/:command/:process' do
+    get '/command/:command/:process' do
       @command = Jesus::Interface.new.command(params[:command], params[:process])
+      flash(:notice, 'The command ' + params[:command] + ' has successfully been executed. It might take a few seconds before the status process effectively changes.')
       redirect '/'
     end
   end

data/lib/jesus/server/helpers.rb

@@ -1,18 +1,56 @@
 module Jesus
   module Helpers
+    #
+    # Is this menu link the current page ?
+    #
     def class_if_current(link)
       link = '^/$' if link == '/'
       'class="current"' if request.path_info =~ Regexp.new(link)
     end
+    #
+    # The menu link li
+    #
     def tab(name, link)
       "<li #{class_if_current(link)}><a href='#{link}'>#{name}</a></li>"
     end
     
+    #
+    # The flash message tag
+    #
     def flash_tag(type)
       "<div id='flash'>#{session.delete(type)}</div>" unless session[type].nil?
     end
+    #
+    # Defines a flash message
+    #
     def flash(type, message)
       session[type] = message
     end
+    #
+    # A confirmation, to be included in a link
+    #
+    def confirm(message='Are you sure you want to do this ?')
+      return "javascript:return confirm('" + message + "');"
+    end
+    
+    #
+    # Displays an erb page
+    #
+    def show(page, layout = true)
+      erb page.to_sym, {:layout => layout}
+    end
+    
+    #
+    # Displays the actions links for a process
+    #
+    def process_action(process)
+      case process[1][:state]
+        when :up
+          return '<li><a href="/command/stop/' + process[0] + '" onclick="' + confirm + '">Stop Process</a></li>' +
+                  '<li><a href="/command/restart/' + process[0] + '" onclick="' + confirm + '">Restart Process</a></li>'
+      when :unmonitored
+          return '<li><a href="/command/start/' + process[0] + '">Start Process</a></li>'
+      end
+    end
   end
 end

data/lib/jesus/server/views/home.erb

@@ -15,6 +15,7 @@
             <%= process[0] %>
             
             <ul class="links">
+                <%= process_action(process) %>
                 <li><a href="/logs/<%= process[0] %>">View Logs</a></li>
             </ul>
         </li>

data/spec/server/home_spec.rb

@@ -21,7 +21,7 @@ describe "The home page" do
   end
   
   it 'should execute the command' do
-    post '/command/start/jesus'
+    get '/command/start/jesus'
     last_response.should be_redirect
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jesus
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Damien MATHIEU
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-19 00:00:00 +01:00
+date: 2009-12-01 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -17,23 +17,23 @@ description: A web interface for god to speak with mankind
 email: 42@dmathieu.com
 executables: 
 - autospec
-- rake2thor
-- sinatra_gen
 - spec
 - rackup
 - god
 - rake
-- thor
 extensions: []
 
 extra_rdoc_files: 
-- README.textile
+- LICENSE
+- README.md
 files: 
 - .gitignore
 - Gemfile
-- README.textile
+- LICENSE
+- README.md
 - Rakefile
 - config.ru
+- cruise_config.rb
 - lib/jesus/interface.rb
 - lib/jesus/server.rb
 - lib/jesus/server/helpers.rb