ginst 0.1.3 → 0.2.2

data/lib/app/authorization.rb

@@ -5,7 +5,7 @@ module GINST
     @auth ||= Rack::Auth::Basic::Request.new(request.env)
   end
 
-  def unauthorized!(realm="myApp.com")
+  def unauthorized!(realm="Ginst Auth")
     header 'WWW-Authenticate' => %(Basic realm="#{realm}")
     throw :halt, [ 401, 'Authorization Required' ]
   end

data/lib/app/views/_commit.haml

@@ -0,0 +1,8 @@
+%li.commit{:class => commit.status }
+  %img{ :src => "http://www.gravatar.com/avatar/#{Digest::MD5.hexdigest(commit.author.email)}.jpg?s=42", :widht => 42, :height => 42}
+  .sha1
+    %a{ :href => "/projects/#{@project.name.slug}/commits/#{commit.id_abbrev}"}= commit.id_abbrev
+  .message= commit.short_message
+  .author
+    %a{ :href => "mailto:#{commit.author.email}"}= commit.author.name
+  .time= commit.date

data/lib/app/views/commit.haml

@@ -1,8 +1,38 @@
-%li.commit{:class => commit.properties['status'] && commit.properties['status'].to_i==(0) ? 'success' : 'fail' || 'notest' }
-  %img{ :src => "http://www.gravatar.com/avatar/#{Digest::MD5.hexdigest(commit.author.email)}.jpg?s=42", :widht => 42, :height => 42}
-  .sha1
-    %a{ :href => "/#{@project.name}/commit/#{commit.id_abbrev}"}= commit.id_abbrev
-  .message= commit.short_message
-  .author
-    %a{ :href => "mailto:#{commit.author.email}"}= commit.author.name
-  .time= commit.date
+= haml :_commit, :layout => false, :locals => {:commit => @commit}
+- unless nil
+  %form{:method => 'post'}
+    %input{:type =>'submit', :value => 'Test this commit'}
+- else
+  %form{:method => 'post'}
+    %input{:type =>'submit', :value => 'Tests are runing now', :disabled => 'disabled'}
+
+%p.separator
+  Commit Info
+%p.message
+  = @commit.message
+%p.separator
+  Files
+%p.files
+  %ul
+    -@commit.diffs.each do |diff|
+      - op = diff.deleted_file ? 'deleted' : (diff.new_file ? 'new' : (diff.a_path == diff.b_path ? 'update' : 'moved')) 
+      %li{ :class => op }
+        = "(#{(diff.a_path == diff.b_path) ? 'igual' : 'cambio'})"
+        = diff.a_path || diff.b_path
+- @commit.build.each do |k,v|
+  %p.separator=k.inspect  
+  %p.message=v.inspect
+  
+%p.separator
+  Specs
+  %ul
+    %li
+      %dt Author:
+      %dd= @commit.author.name
+      %dt Commiter:
+      %dd= @commit.committer.name
+      %dt Commit Date:
+      %dd= @commit.date
+      %dt Work Date
+      %dd= @commit.authored_date
+      %dt 

data/lib/app/views/commits.haml

@@ -5,4 +5,4 @@
         - last_commit_date = commit.date.to_i / (60*60*24)
         %li.separator
           = (commit.date.year == Time.now.year) ? commit.date.strftime('%A %b %d') : commit.date.strftime('%A %b %d %Y')        
-      = haml :commit, :layout => false, :locals => {:commit => commit}
+      = haml :_commit, :layout => false, :locals => {:commit => commit}

data/lib/app/views/edit.haml

@@ -0,0 +1,11 @@
+%h1 New Project
+
+%form{:method => "post", :action => "/projects/#{@project.name.slug}"}
+  %input{:type => 'hidden', :name => '_method', :value => 'put'}
+  %fieldset    
+    %label{:for => "build_process"}Build Process
+    %textarea{:name => "project[build_process]", :id => "build_process", :rows => 20, :cols => 80 }= @project.build_process
+    .error= @project.errors["build_process"]
+    
+    %input{:type => "submit", :value => "Update"}
+    

data/lib/app/views/layout.haml

@@ -19,14 +19,17 @@
         %h2 Git Integration System
     #left
       %ul
-        - @ginst.projects.each do |project|
+        - Ginst::Project.projects.each do |project|
           %li
-            %a{:href => "/#{project.name}"}= project.name
-          %ul
-            - project.branches.each do |branch|
-              %li
-                %a{:href => "/#{project.name}/branch/#{branch.name}"}= branch.name
+            %a{:href => "/projects/#{project.name.slug}"}= project.name
+            - if @project == project
+              %ul
+                - project.refs.each do |r|
+                  %li
+                    %a{:href => "/projects/#{project.name.slug}/refs/#{CGI::escape(r.name)}"}= r.name
+        %li
+          %a{:href=> "/projects/new"}New Project
     #mainContent
       =yield
     #footer
-      %p= "Ginst <span class='version'>(#{Ginst::VERSION})</span>     -- Powered by RGitHook <span class='version'>(#{RGitHook::VERSION})</span>"
+      %p== Ginst <span class='version'>(Ginst::VERSION)</span>     -- Powered by RGitHook <span class='version'>(RGitHook::VERSION)</span>

data/lib/app/views/new.haml

@@ -0,0 +1,19 @@
+%h1 New Project
+
+%form{:method => "post", :action => "/projects"}
+  %fieldset
+    %legend Project data
+    %label{:for => "project_name"}Name
+    %input{:type => "text", :name => "project[name]", :id => "project_name", :value => @project.name}
+    .error= @project.errors["name"]
+    %br/
+    %label{:for => "project_dir"}Local directory
+    %input{:type => "text", :name => "project[dir]", :id => "project_dir", :value => @project.dir}
+    .error= @project.errors["dir"]
+    
+    %label{:for => "build_process"}Build Process
+    %textarea{:name => "project[build_process]", :id => "build_process" , :rows => 20, :cols => 80}= @project.build_process
+    .error= @project.errors["build_process"]
+    
+    %input{:type => "submit", :value => "Create"}
+    

data/lib/app/views/project.haml

@@ -1 +1,4 @@
-hello
+%a{:href => "/projects/#{@project.name.slug}/edit"} Edit Project
+%form{:method => "post", :action => "/projects/#{@project.name.slug}"}
+  %input{:type => 'hidden', :name => '_method', :value => 'delete'}    
+    %input{:type => "submit", :value => "Delete"}

data/lib/app/views/ref.haml

@@ -0,0 +1,3 @@
+=haml :commits, :locals => { :commits => @commits}, :layout => false
+
+Here will come the paginator :=) 

data/lib/app/views/style.sass

@@ -35,7 +35,6 @@ body
     padding: 0px
     list-style-type: none
     font-family: Verdana, Geneva, sans-serif
-    text-transform: uppercase
     line-height: 24px
     a
       text-decoration: none

data/lib/app/webserver.rb

@@ -1,113 +1,103 @@
 #!/usr/bin/env ruby
 require 'rubygems'
 require 'sinatra'
-require 'optparse'
-require 'ruby-debug'
-require 'digest/md5'
-require File.join(File.dirname(__FILE__),'authorization')
-
-begin 
-require 'ginst'
-require 'ginst/plugin'
-rescue LoadError
-  require File.join(File.dirname(__FILE__),'..','ginst')
+require File.dirname(__FILE__)+'/authorization'
+
+
+unless defined?(Ginst)
+  begin
+    require File.dirname(__FILE__)+'/../ginst.rb'
+    require 'ruby-debug'
+    puts 'Using development ginst'
+  rescue LoadError
+    require 'ginst'
+  end
 end
 
 
+
 set :views, File.dirname(__FILE__) + '/views'
 set :public, File.dirname(__FILE__) + '/views/assets'
 
-helpers do
-  def format_message(text)
-    text.gsub!("\t",'  ')
-    text.gsub!("\n",'<br/>')
-    text
-  end
-  
-  def redirect_back
-    redirect request.referer
-  end
+get '/' do
+  haml :index
 end
 
-def load_ginst
-  @ginst = Ginst::Ginst.new(ENV["REPO_PATH"] || Dir.pwd)
-  #@ginst.add_project '~/Documents/ginst'
+get '/style.css' do
+  content_type 'text/css', :charset => 'utf-8'
+  # css_files = Dir.glob(File.join(File.dirname(File.expand_path(__FILE__)),'views','assets','*.css'))
+  # css_files.map{|f| File.read f}.join("\n")
+  sass :style
 end
 
-def load_project
-  load_ginst
-  @project = @ginst[params[:project] || @ginst.projects.first ] or raise Sinatra::NotFound
+post '/projects' do
+  @project = Ginst::Project.new(params[:project])
+  if @project.save
+    redirect "/projects/#{@project.name.slug}"
+  else
+    haml :new
+  end
 end
 
-def load_branch
-  load_project
-  @branch  = @project.branch(params[:branch] || 'master')
-  @per_page = (params[:per_page] && params[:per_page].to_i) || 30
-  @page = (params[:page] && params[:page].to_i) || 0
-  @commits = @project.repo.commits(@branch.commit.id,@per_page, @page*@per_page)
+get '/projects/new' do
+  @project = Ginst::Project.new
+  haml :new
 end
 
-def load_commit
-  load_project
-  @commit = @project.repo.commit(params[:commit])
+get '/projects/:id' do
+  @project = Ginst::Project.find_by_slug(params[:id]) or raise Sinatra::NotFound
+  haml :project
 end
 
-
-get '/' do
-  load_ginst
-  redirect @ginst.projects.first.name
-  load_ginst
-  haml :index
+put '/projects/:id' do
+  @project = Ginst::Project.find_by_slug(params[:id]) or raise Sinatra::NotFound
+  @project.build_process = params[:project][:build_process]
+  
+  if @project.save
+    redirect request.env["REQUEST_URI"] || request.env["PATH_INFO"]
+  else
+    redirect "/projects/#{@project.name.slug}/edit"
+  end
 end
 
-get '/:project' do
-  load_project
-  haml :project_index
+delete '/projects/:id' do
+  @project = Ginst::Project.find_by_slug(params[:id]) or raise Sinatra::NotFound
+  @project.destroy
+  
+  redirect request.env["REQUEST_URI"] || request.env["PATH_INFO"]
 end
 
-post '/:project' do
-  load_project
-  @project.install_ginst
-  redirect_back
+get '/projects/:project/edit' do
+  @project = Ginst::Project.find_by_slug(params[:project]) or raise Sinatra::NotFound
+  haml :edit  
 end
 
-get '/:project/branch/:branch' do
-  load_branch
-  haml :branch_index
+get '/projects/:project/refs/:refname' do
+  @project = Ginst::Project.find_by_slug(params[:project]) or raise Sinatra::NotFound
+  @ref = @project.find_ref(CGI::unescape(params[:refname])) or raise Sinatra::NotFound
+  @commits = @ref.commits
+  haml :ref
 end
 
-get '/:project/commit/:commit' do
-  load_commit
-  haml :full_commit
+get '/projects/:project/commits/:commit' do
+  @project = Ginst::Project.find_by_slug(params[:project])  or raise Sinatra::NotFound
+  @commit = @project.find_commit(params[:commit]) or raise Sinatra::NotFound
+  haml :commit
 end
 
-post '/:project/commit/:commit' do
-  load_commit
-  @project.run_hooks_for_commit(@commit)
-  redirect_back
+post '/projects/:project/commits/:commit' do
+  @project = Ginst::Project.find_by_slug(params[:project])  or raise Sinatra::NotFound
+  @commit = @project.find_commit(params[:commit]) or raise Sinatra::NotFound
+  @commit.build!
+  redirect request.env["REQUEST_URI"]
 end
 
+
 not_found do
   haml :not_found, :layout => :clean_layout
 end
+ 
 
-error do
-  'Sorry there was a nasty error - ' + env['sinatra.error'].name
-end
-
-error Exception do
-  'Sorry there was a nasty error - ' + env['sinatra.error'].name
-end
 
-get '/about' do
-  "I'm running on Version " + Sinatra::VERSION
-end
 
-get '/style.css' do
-  content_type 'text/css', :charset => 'utf-8'
-  # css_files = Dir.glob(File.join(File.dirname(File.expand_path(__FILE__)),'views','assets','*.css'))
-  # css_files.map{|f| File.read f}.join("\n")
-  sass :style
-end
-
-  
+  

data/lib/ginst.rb

@@ -1,12 +1,14 @@
 $:.unshift File.dirname(__FILE__)
 
 module Ginst
-  VERSION = '0.1.1'
+  VERSION = '0.2.2'
 end
 
 require 'rubygems'
-require 'rgithook'
+require 'grit'
+require 'ginst/core_extensions'
 
-Ginst.autoload(:Ginst, 'ginst/ginst')
-Ginst.autoload(:Server, 'ginst/server')
-Ginst.autoload(:CommandLine, 'ginst/command_line')
+require 'ginst/ginst'
+Ginst.autoload(:Project, 'ginst/project')
+Ginst.autoload(:WebServer, 'ginst/web_server')
+Ginst.autoload(:Test,'ginst/test')

data/lib/ginst/core_extensions.rb

@@ -0,0 +1,32 @@
+class String
+  def slug
+    str = self.dup
+    accents = { 
+      ['á','à','â','ä','ã'] => 'a',
+      ['Ã','Ä','Â','À','�?'] => 'A',
+      ['é','è','ê','ë'] => 'e',
+      ['Ë','É','È','Ê'] => 'E',
+      ['í','ì','î','ï'] => 'i',
+      ['�?','Î','Ì','�?'] => 'I',
+      ['ó','ò','ô','ö','õ'] => 'o',
+      ['Õ','Ö','Ô','Ò','Ó'] => 'O',
+      ['ú','ù','û','ü'] => 'u',
+      ['Ú','Û','Ù','Ü'] => 'U',
+      ['ç'] => 'c', ['Ç'] => 'C',
+      ['ñ'] => 'n', ['Ñ'] => 'N'
+    }
+    accents.each do |ac,rep|
+      ac.each do |s|
+        str = str.gsub(s, rep)
+      end
+    end
+    str = str.gsub(/[^a-zA-Z0-9 ]/,"")
+
+    str = str.gsub(/[ ]+/," ")
+    str = str.strip
+    str = str.gsub(/ /,"-")
+
+    str = str.downcase
+
+  end
+end

data/lib/ginst/ginst.rb

@@ -1,73 +1,6 @@
-require 'fileutils'
-require 'rgithook'
-require 'ginst/project'
-
-module Ginst
-  class Ginst
-    
-    attr_reader :projects
-    def initialize(path = nil)
-      @projects = [Project.new(path || Dir.pwd)]
-    end
-    
-    def [](project_name)
-      @projects.select{|p| p.name == project_name}.first
-    end
-    
-    def add_project(path_or_project)
-      case path_or_project
-      when String
-        @projects << Project.new(path_or_project)
-      when Project
-        @projects << path_or_project
-      end
-    end
-    # Install Ginst in the given path
-    # Options can be:
-    # * :verbose: true/false
-    def self.install(path,options={})
-      self.new(path).install(options)
-    end
-    
-    def install(options = {})
-      opts={:verbose => true, :interactive => true}
-      opts.merge(options)
-
-      puts 'Installing rgithook' if opts[:verbose]
-      @rgithook = RGitHook::RGitHook.new(@path)
-      @rgithook.install(opts[:interactive])
-      
-      #check for a valid repo
-      @path = Grit::Repo.new(@path).path
-      @ginst_dir = File.join(@path,'ginst')
-
-      puts 'Installing ginst' if opts[:verbose]
-      install_ginst(opts)
-
-      puts 'Installing hooks' if opts[:verbose]
-      install_hook(opts)
-    end
-      
-    def self.install_master(path,options)
-      self.new(path).install_mater(options)
-    end
-    
-  private
-  
-    def install_ginst(opts)
-      puts "Installing Ginst in #{@path}" if opts[:verbose]
-      FileUtils.mkdir(@ginst_dir) unless File.directory? @ginst_dir
-      FileUtils.cp_r(template_path,@ginst_dir, {:preserve => true, :verbose => opts[:verbose]})
-    end
-    
-    def install_hook(opts)
-      puts 
-      @rgithook.conf_file
-    end
-
-    
-    def template_path
-      File.join(File.dirname(__FILE__),'..','app','.')
-    end
+module Ginst::Ginst
+  @working_dir = Dir.pwd
+  class << self
+    attr_accessor :working_dir
   end
-end
+end