ginst 2.0.1 → 2009.11.23

data/app/views/tasks/_task_item.html.erb

@@ -0,0 +1,22 @@
+<% content_tag_for(:li, task_item, :class=> "#{task_item.status} ") do %>
+<pre><%= link_to task_item.name, project_task_path(@project, task_item) %></pre>
+  <p><%= simple_format(h(truncate(task_item.output))) %></p>
+  <dl>
+    <dt>Command:</dt>
+    <dd><%= truncate(task_item.code,:length => 35) %></dd>
+
+    <dt>created_at</dt>
+    <dd><%= show_time(task_item.created_at) %></dd>
+    <dt>started_at</dt>
+    <dd><%= show_time(task_item.started_at) %></dd>
+    
+    <dt>ended_At</dt>
+    <dd><%= show_time(task_item.ended_at) %></dd>
+    
+    <dt>status</dt>
+    <dd><%= task_item.status %></dd>
+    
+  </dl>
+
+<% end %>
+      

data/app/views/tasks/index.html.erb

@@ -1,10 +1,11 @@
 <% content_for :submenu do %>
-<ul class="tabs">
+<ul class="submenu">
   <li><%= link_to_unless params[:scope]=='prepared', 'Waiting', "?scope=prepared" %></li>
   <li><%= link_to_unless params[:scope]=='finished', 'Finished', "?scope=finished" %></li>
   <li><%= link_to_unless params[:scope]=='building', 'Building', "?scope=building" %></li>
 </ul>
 <% end %>
+
 <ul>
-<%= render :partial => 'task', :collection => @tasks %>
+<%= render :partial => 'task_item', :collection => @tasks %>
 </ul>

data/app/views/tasks/show.html.erb

@@ -10,49 +10,4 @@
   <% end %>
 <% end %>
 
-<% content_tag_for :div, @task, :class=> @task.status do %>
-  <h1><%= @task.name %></h1>
-  <p class="status <%= @task.status %>">Build status: <%= @task.status %></p>
-
-  <div class='task_description'>
-  <% if @task.prepared? %>
-    <p>This tasks is prepared to be run. Please wait other tasks finish.</p>
-    <pre id="output"><%= @task.parsed_output %></pre>
-    
-  <% else  %>
-    <dl>
-      <dt>Started at:</dt>
-      <dd><%= show_time(@task.started_at) %></dd>
-  
-    <% if @task.building? %>
-      <dt>Elapsed time</dt>
-      <dd class="elapsed_time"><%= show_elapsed(@task.build_duration) %></dd>
-      <dt>Pid</dt>
-      <dd><%= @task.pid %>
-        <% form_for @task, :url => project_task_path(@project,@task) do |f| %>  
-        <%= hidden_field_tag :kill, 'INT' %>
-        <%= f.submit 'INT' %>
-        <% end %>
-      
-        <% form_for @task, :url => project_task_path(@project,@task) do |f| %>  
-        <%= hidden_field_tag :kill, 'QUIT' %>
-        <%= f.submit 'QUIT' %>
-        <% end %>
-        
-        <% form_for @task, :url => project_task_path(@project,@task) do |f| %>  
-        <%= hidden_field_tag :kill, 'KILL' %>
-        <%= f.submit 'QUIT' %>
-        <% end %>
-      
-      </dd>
-    <% else %>  
-      <dt>Ended at:</dt>
-      <dd><%= show_time(@task.ended_at) %> 
-        <span><%= show_elapsed(@task.build_duration) %></span></dd>
-    <% end %>
-    <%= link_to 'raw', project_task_path(@project,@task, 'text'), :class => 'raw_link' %>
-    </dl>
-    <pre id="output"><%= @task.parsed_output %></pre>
-  <% end %>
-  </div>
-<% end %>
+<%= render :partial => 'tasks/task', :locals => {:task => @task} %>

data/config/database.yml

@@ -10,7 +10,7 @@ development:
 # Warning: The database defined as "test" will be erased and
 # re-generated from your development database when you run "rake".
 # Do not set this db to the same as development or production.
-test:
+test: &TEST
   adapter: mysql
   encoding: utf8
   database: ginst_test
@@ -27,3 +27,6 @@ production:
   username: root
   password: 
   socket: /tmp/mysql.sock
+
+cucumber:
+  <<: *TEST

data/config/environment.rb

@@ -21,15 +21,15 @@ Rails::Initializer.run do |config|
   config.gem 'daemons'
   config.gem 'templater'
 
-  config.database_configuration_file = Ginst.data_dir+'/database.yml'
-  config.log_path = Ginst.data_dir+'/log/ginst.rails.log'
-  config.plugin_paths = [RAILS_ROOT+'/vendor/plugins', Ginst.data_dir+'/plugins']
+  config.database_configuration_file = Ginst.data_dir+'/database.yml' if Ginst.data_dir
+  config.log_path = Ginst.data_dir+'/log/ginst.rails.log' if Ginst.data_dir
+  config.plugin_paths = [RAILS_ROOT+'/vendor/plugins', Ginst.data_dir+'/plugins'] if Ginst.data_dir
 
   config.reload_plugins = true if RAILS_ENV == 'development'
 
   config.plugins = [ :authlogic, :grit, :slugify, :all ]
 
-  config.load_paths += [Ginst.data_dir+'/lib']
+  config.load_paths += [Ginst.data_dir+'/lib'] if Ginst.data_dir
 
   config.time_zone = 'UTC'
 

data/config/routes.rb

@@ -12,11 +12,7 @@ ActionController::Routing::Routes.draw do |map|
 
 
   map.resource :status, :controller => :status
-  map.resource :user_session
-  map.root :controller => "user_sessions", :action => "new" # optional, this just sets the root route
-  map.resource :account, :controller => "users"
-  map.resources :users
-
+  map.root :controller => "projects", :action => "index" 
 
   # The priority is based upon order of creation: first created -> highest priority.
 

data/ginst.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ginst}
-  s.version = "2.0.1"
+  s.version = "2009.11.23"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Guillermo \303\201lvarez Fern\303\241ndez"]
-  s.date = %q{2009-11-10}
+  s.date = %q{2009-11-24}
   s.default_executable = %q{ginst}
   s.description = %q{GINST is the new integration system}
   s.email = %q{guillermo@cientifico.net}
@@ -58,6 +58,7 @@ Gem::Specification.new do |s|
      "app/views/status/show.html.erb",
      "app/views/tasks/_task.html.erb",
      "app/views/tasks/_task_command.html.erb",
+     "app/views/tasks/_task_item.html.erb",
      "app/views/tasks/building.html.erb",
      "app/views/tasks/index.html.erb",
      "app/views/tasks/show.html.erb",
@@ -86,14 +87,12 @@ Gem::Specification.new do |s|
      "db/migrate/20091025165305_create_tasks.rb",
      "db/migrate/20091025165330_create_commands.rb",
      "db/schema.rb",
-     "features/ginst.feature",
-     "features/step_definitions/ginst_steps.rb",
-     "features/support/env.rb",
      "ginst.gemspec",
      "lib/ginst.rb",
      "lib/ginst/builder.rb",
      "lib/ginst/cli.rb",
      "lib/ginst/configuration.rb",
+     "lib/ginst/console.rb",
      "lib/ginst/console_to_html.rb",
      "lib/ginst/ginst_template/database.ymlt",
      "lib/ginst/ginst_template/plugins/simple_build/app/controllers/simple_builds_controller.rb",
@@ -107,6 +106,8 @@ Gem::Specification.new do |s|
      "lib/ginst/ginst_template/plugins/simple_build/config/build.yml",
      "lib/ginst/ginst_template/plugins/simple_build/config/routes.rb",
      "lib/ginst/ginst_template/plugins/simple_build/init.rb",
+     "lib/ginst/ginst_template/webserver.ymlt",
+     "lib/ginst/logger.rb",
      "lib/ginst/plugin.rb",
      "lib/ginst/ssh.rb",
      "lib/ginst/template.rb",
@@ -162,9 +163,11 @@ Gem::Specification.new do |s|
      "script/process/spawner",
      "script/runner",
      "script/server",
-     "spec/ginst_spec.rb",
-     "spec/spec.opts",
-     "spec/spec_helper.rb",
+     "tmp/.gittouch",
+     "tmp/cache/.gittouch",
+     "tmp/pids/.gittouch",
+     "tmp/sessions/.gittouch",
+     "tmp/sockets/.gittouch",
      "vendor/gems/daemons-1.0.10/.specification",
      "vendor/gems/daemons-1.0.10/LICENSE",
      "vendor/gems/daemons-1.0.10/README",
@@ -4225,28 +4228,24 @@ Gem::Specification.new do |s|
   s.rubyforge_project = %q{ginst}
   s.rubygems_version = %q{1.3.5}
   s.summary = %q{Git Integration System}
-  s.test_files = [
-    "spec/ginst_spec.rb",
-     "spec/spec_helper.rb"
-  ]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
-      s.add_development_dependency(%q<cucumber>, [">= 0"])
       s.add_runtime_dependency(%q<sys-proctable>, [">= 0"])
+      s.add_runtime_dependency(%q<mime-types>, [">= 0"])
+      s.add_runtime_dependency(%q<mongrel>, [">= 0"])
     else
-      s.add_dependency(%q<rspec>, [">= 1.2.9"])
-      s.add_dependency(%q<cucumber>, [">= 0"])
       s.add_dependency(%q<sys-proctable>, [">= 0"])
+      s.add_dependency(%q<mime-types>, [">= 0"])
+      s.add_dependency(%q<mongrel>, [">= 0"])
     end
   else
-    s.add_dependency(%q<rspec>, [">= 1.2.9"])
-    s.add_dependency(%q<cucumber>, [">= 0"])
     s.add_dependency(%q<sys-proctable>, [">= 0"])
+    s.add_dependency(%q<mime-types>, [">= 0"])
+    s.add_dependency(%q<mongrel>, [">= 0"])
   end
 end
 

data/lib/ginst.rb

@@ -17,13 +17,16 @@ module Ginst
   autoload(:Configuration, 'ginst/configuration')
   autoload(:CLI, 'ginst/cli')
   autoload(:WebServer, 'ginst/web_server')
+  autoload(:Console, 'ginst/console')
+  autoload(:Logger, 'ginst/logger')
   
   def self.data_dir
     return @@data_dir if @@data_dir
     if ENV['GINST_DATA']
       @@data_dir = ENV['GINST_DATA']
     else
-      raise "Ginst need a directory to work on!!!\nPlease define GINST_DATA environment variable"
+      $stderr <<  "Ginst need a directory to work on!!!\nPlease define GINST_DATA environment variable"
+      @@data_dir = nil
     end
   end
   
@@ -31,7 +34,7 @@ module Ginst
     @@root
   end
   
-  VERSION = File.read(root+'/VERSION')
+  VERSION = File.read(root+'/VERSION').strip
 end
 
 # Add vendorized gems to load path

data/lib/ginst/builder.rb

@@ -27,6 +27,8 @@ class Ginst::Builder
   private
 
   def self.execute(command)
+    ENV["RAILS_ENV"] = Rails.env rescue "production"
+    
     script = Ginst.root+'/script/builder.rb'
 
     if command == 'status'

data/lib/ginst/cli.rb

@@ -1,27 +1,13 @@
+require('daemons')
 
-class Ginst::CLI
-  
-  require('daemons')
-  
+class Ginst::CLI  
   def initialize(argv)    
     parse_args(argv)
   end
   
   def run
-    
     if @install
-      puts("#{green('Installing ginst')} in: #{@dir}\n")
-      
-      ask_yes_or_exit("#{@dir} is a valid ginst install. Overwrite?") if(valid_dir?(@dir))   
-      launch_generator
-      launch_migrations
-      puts green("Ginst was installed")
-      puts green("Starting the server")
-      puts `#{$0} start -d #{@dir}`
-      sleep 4
-      `open http://localhost:3000 2> /dev/null`
-      puts "Use '#{$0} start -d #{@dir}' to start ginst."
-      
+      install
     elsif @daemon 
       if valid_dir?(@dir)
         daemon(@daemon,@dir)
@@ -35,13 +21,13 @@ class Ginst::CLI
   
   def parse_args(argv)
     @action = nil
-    @dir    = ENV["GINST_DATA"] || Dir.pwd
+    @dir    = File.expand_path(ENV["GINST_DATA"] || Dir.pwd)
     @daemon = false
     @install = false
     while(current_arg = ARGV.shift) do 
       case current_arg
       when '-d'
-        @dir = ARGV.shift
+        @dir = File.expand_path(ARGV.shift)
       when '-p'
         @port = ARGV.shift
       when '-a'
@@ -58,7 +44,7 @@ class Ginst::CLI
         @daemon = current_arg
       when 'install'
         @install = 'install'
-      when '-h', '--help'
+      when '--help'
         show_help_and_exit
       else
         error_and_exit("Invalid argument: #{current_arg}")
@@ -83,38 +69,29 @@ class Ginst::CLI
   end
   
   def daemon(action,dir)
-    script = Ginst.root+'/script/server'
-    options = {
-      :app_name => 'ginst',
-      :dir_mode => :normal,
-      :dir => File.expand_path(@dir+'/log'),
-      :monitor => false,
-      :log_output => true,
-      :mode => :exec,
-      :ARGV => [action]
-    }
-    
+    Dir.chdir @dir    
     case action
     when 'development'
       ENV['RAILS_ENV'] = 'development'
-      daemon('run',dir)
-    when 'status'
-      Daemons.run(script, options)
+      Ginst::WebServer.run
     when 'console'
       ENV['RAILS_ENV'] = 'development'
-      exec(Ginst.root+'/script/console')
+      Ginst::Console.start
     else
-      pid = fork do
-        Daemons.run(script, options)
-        exit
-      end
-      Process.waitpid2(pid)
-      sleep 2
-      daemon('status',dir)
-      exit
+      Ginst::WebServer.send(action.to_sym)
     end
   end
   
+  def install
+    puts("#{green('Installing ginst')} in: #{@dir}\n")
+    
+    ask_yes_or_exit("#{@dir} is a valid ginst install. Overwrite?") if(valid_dir?(@dir))   
+    launch_generator
+    launch_migrations
+    puts green("Ginst was installed")
+    puts "run '#{File.basename($0)} start -d #{@dir}' to start ginst."
+  end
+  
   def launch_migrations
     puts "#{green("Creating the database.")}"
     require 'open3'
@@ -147,7 +124,7 @@ class Ginst::CLI
          "   run     [-d dir]      # Run ginst in foreground\n"+
          "   development [-d dir]  # Start ginst in developer mode\n"+
          "   console [-d dir]      # Start ginst console\n\n"+
-         "   -h, --help            # Show this help\n\n")
+         "   --help                # Show this help\n\n")
     exit(-1)
   end
   

data/lib/ginst/console.rb

@@ -0,0 +1,9 @@
+
+module Ginst
+  class Console
+    
+    def self.start
+      exec(Ginst.root+'/script/console')
+    end
+  end
+end

data/lib/ginst/ginst_template/webserver.ymlt

@@ -0,0 +1,2 @@
+port: 9999
+address: 0.0.0.0

data/lib/ginst/logger.rb

@@ -0,0 +1,31 @@
+
+
+class Ginst::Logger 
+  
+  def initialize(file)
+    @filename = file
+    @file = File.open(file,'a')
+    @file.sync = true
+    
+    ObjectSpace.define_finalizer(self) do
+      puts self.class.to_s
+      puts 'Cerrando log file'
+      @file.close
+    end
+  end
+  
+  def log(msg,acaller = nil)
+    acaller ||= caller
+    msg = format_msg(msg,acaller)
+    @file.write(msg)
+    msg
+  end
+  
+    
+  def format_msg(msg, caller)
+    call = File.basename(caller.first).split(":")[0..1].join(":")
+    "[%s %s] %s\n" % [Time.now.to_s, call, msg]
+  end
+end
+  
+  

data/lib/ginst/template.rb

@@ -13,6 +13,7 @@ module Ginst::Template
     end
   
     template :database, 'database.yml'
+    template :config, 'webserver.yml'
 
     empty_directory :log, "log"
     empty_directory :projects, "projects"

data/lib/ginst/web_server.rb

@@ -1,7 +1,12 @@
 class Ginst::WebServer
   
   require('daemons')
+  require('yaml')
 
+  def self.development
+    execute('start')
+  end
+  
   def self.start
     execute('start')
   end
@@ -15,7 +20,7 @@ class Ginst::WebServer
   end
 
   def self.status
-    execute('status')
+    puts execute('status')
   end
 
   def self.run
@@ -25,8 +30,15 @@ class Ginst::WebServer
   private
 
   def self.execute(command)
-    script = Ginst.root+'/script/server'
-
+    script = 
+    if ['start','restart','run'].include? command
+      config = read_config
+      script = [Ginst.root+'/script/server', '-b',config["address"],'-p', config["port"].to_s].join(' ')
+    else
+      script = Ginst.root+'/script/server'
+    end
+    
+      
     if command == 'status'
       capture_output do
         Daemons.run(script, generate_options_for_command(command))      
@@ -51,15 +63,25 @@ class Ginst::WebServer
   end
 
   def self.generate_options_for_command(command)
-    options = {
+    argv = [command]
+    
+    {
       :app_name => 'ginst',
       :dir_mode => :normal,
       :dir => File.expand_path((Ginst.data_dir || ENV['GINST_DIR'])+'/tmp'),
       :monitor => false,
       :mode => :exec,
       :log_output => true,
-      :ARGV => [command]
-    }  
+      :ARGV => argv
+    }     
+  end
+  
+  def self.read_config
+    options = {"address" => '0.0.0.0', "port" => 3000}
+    config_file = Ginst.data_dir+"/webserver.yml"
+    config_options = YAML.load(File.read(config_file)) rescue {}
+    options.merge(config_options)
   end
+  
 end