Merge branch 'smart_http' into staging
Conflicts: app/models/relation.rb app/models/user.rb
This commit is contained in:
Pavel Chipiga
commit
d49880f24e
3
Gemfile
3
Gemfile
|
|
@ -22,8 +22,9 @@ gem "will_paginate", "~> 3.0.2"
|
|||
gem 'meta-tags', '~> 1.2.4', :require => 'meta_tags'
|
||||
gem "russian"
|
||||
|
||||
# gem 'ghoul_grack', '~> 0.0.1'
|
||||
gem 'grack', :git => 'git://github.com/rdblue/grack.git', :require => 'git_http'
|
||||
gem "grit"
|
||||
gem 'gitolito', :git => 'git@github.com:warpc/gitolito.git'
|
||||
gem 'whenever', :require => false
|
||||
gem 'delayed_job'
|
||||
gem 'whenever', :require => false
|
||||
|
|
|
|||
|
|
@ -13,11 +13,10 @@ GIT
|
|||
rails-xmlrpc (0.3.1)
|
||||
|
||||
GIT
|
||||
remote: git@github.com:warpc/gitolito.git
|
||||
revision: 120992e79d079800f6efb07f100ab80437b20b43
|
||||
remote: git://github.com/rdblue/grack.git
|
||||
revision: 020be3fef3fb308b9d214252522aa5945bf6584a
|
||||
specs:
|
||||
gitolito (0.0.1)
|
||||
grit
|
||||
grack (0.2.0)
|
||||
|
||||
GEM
|
||||
remote: http://rubygems.org/
|
||||
|
|
@ -282,7 +281,7 @@ DEPENDENCIES
|
|||
delayed_job
|
||||
devise (~> 1.4.8)
|
||||
factory_girl_rails (~> 1.3.0)
|
||||
gitolito!
|
||||
grack!
|
||||
grit
|
||||
haml-rails (~> 0.3.4)
|
||||
hirb
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ class AutoBuildListsController < ApplicationController
|
|||
#before_filter :check_global_access
|
||||
|
||||
def index
|
||||
projects = Project.where(:owner_id => current_user.id, :owner_type => 'User')
|
||||
projects = Project.where(:owner_id => current_user.id, :owner_type => 'User').order('name ASC')
|
||||
@projects_not_automated = projects.automateable.paginate(:page => params[:not_automated_page])
|
||||
@projects_not_automated = @projects_not_automated.where(:name => params[:name]) unless params[:name].blank?
|
||||
|
||||
|
|
|
|||
|
|
@ -64,7 +64,8 @@ class ProjectsController < ApplicationController
|
|||
redirect_to @project.owner
|
||||
end
|
||||
|
||||
def auto_build
|
||||
# TODO remove this?
|
||||
def auto_build
|
||||
uname, unixname = params[:git_repo].split('/')
|
||||
owner = User.find_by_uname(uname) || Group.find_by_uname(uname)
|
||||
project = Project.where(:owner_id => owner.id, :owner_type => owner.class).find_by_unixname!(unixname)
|
||||
|
|
|
|||
|
|
@ -1,10 +1,9 @@
|
|||
module ProjectsHelper
|
||||
def git_repo_url(name)
|
||||
port = APP_CONFIG['ssh_port'] || 22
|
||||
if port == 22
|
||||
"git@#{request.host}:#{name}.git"
|
||||
def git_repo_url(name, read_only = true)
|
||||
if current_user and !read_only
|
||||
"http://#{current_user.uname}@#{request.host_with_port}/#{name}.git"
|
||||
else
|
||||
"ssh://git@#{request.host}:#{port}/#{name}.git"
|
||||
"http://#{request.host_with_port}/#{name}.git"
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -16,9 +16,8 @@ class Group < ActiveRecord::Base
|
|||
has_many :platforms, :through => :targets, :source => :target, :source_type => 'Platform', :autosave => true
|
||||
has_many :repositories, :through => :targets, :source => :target, :source_type => 'Repository', :autosave => true
|
||||
|
||||
validates :name, :uname, :owner_id, :presence => true
|
||||
validates :name, :uname, :uniqueness => true
|
||||
validates :uname, :format => { :with => /^[a-zA-Z0-9_]+$/ }, :allow_nil => false, :allow_blank => false
|
||||
validates :name, :owner, :presence => true
|
||||
validates :uname, :presence => true, :uniqueness => {:case_sensitive => false}, :format => { :with => /^[a-z0-9_]+$/ }, :allow_nil => false, :allow_blank => false
|
||||
validate { errors.add(:uname, :taken) if User.where('uname LIKE ?', uname).present? }
|
||||
|
||||
attr_readonly :uname
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ class Platform < ActiveRecord::Base
|
|||
has_many :groups, :through => :objects, :source => :object, :source_type => 'Group'
|
||||
|
||||
validates :name, :presence => true, :uniqueness => true
|
||||
validates :unixname, :uniqueness => true, :presence => true, :format => { :with => /^[a-zA-Z0-9_]+$/ }, :allow_nil => false, :allow_blank => false
|
||||
validates :unixname, :uniqueness => true, :presence => true, :format => { :with => /^[a-z0-9_]+$/ }, :allow_nil => false, :allow_blank => false
|
||||
validates :distrib_type, :presence => true, :allow_nil => :false, :allow_blank => false, :inclusion => {:in => APP_CONFIG['distr_types']}
|
||||
|
||||
after_create :make_owner_rel
|
||||
|
|
|
|||
|
|
@ -15,18 +15,16 @@ class Project < ActiveRecord::Base
|
|||
has_many :relations, :as => :target, :dependent => :destroy
|
||||
has_many :collaborators, :through => :relations, :source => :object, :source_type => 'User'
|
||||
has_many :groups, :through => :relations, :source => :object, :source_type => 'Group'
|
||||
has_many :auto_build_lists, :dependent => :destroy
|
||||
|
||||
validates :name, :uniqueness => {:scope => [:owner_id, :owner_type]}, :presence => true, :allow_nil => false, :allow_blank => false
|
||||
validates :unixname, :uniqueness => {:scope => [:owner_id, :owner_type]}, :presence => true, :format => { :with => /^[a-zA-Z0-9_\-\+\.]+$/ }, :allow_nil => false, :allow_blank => false
|
||||
validates :unixname, :uniqueness => {:scope => [:owner_id, :owner_type]}, :presence => true, :format => { :with => /^[a-z0-9_\-\+\.]+$/ }, :allow_nil => false, :allow_blank => false
|
||||
validates :owner, :presence => true
|
||||
validate {errors.add(:base, I18n.t('flash.project.save_warning_ssh_key')) if owner.ssh_key.blank?}
|
||||
# validate {errors.add(:base, I18n.t('flash.project.save_warning_ssh_key')) if owner.ssh_key.blank?}
|
||||
|
||||
#attr_accessible :category_id, :name, :unixname, :description, :visibility
|
||||
attr_readonly :unixname
|
||||
|
||||
scope :recent, order("name ASC")
|
||||
# scope :by_name, lambda { |name| {:conditions => ['name like ?', '%' + name + '%']} }
|
||||
scope :by_name, lambda { |name| where('name like ?', '%' + name + '%') }
|
||||
scope :by_visibilities, lambda {|v| {:conditions => ['visibility in (?)', v.join(',')]}}
|
||||
scope :addable_to_repository, lambda { |repository_id| where("projects.id NOT IN (SELECT project_to_repositories.project_id FROM project_to_repositories WHERE (project_to_repositories.repository_id = #{ repository_id }))") }
|
||||
|
|
@ -38,7 +36,6 @@ class Project < ActiveRecord::Base
|
|||
|
||||
after_create :attach_to_personal_repository
|
||||
after_create :create_git_repo
|
||||
before_update :update_git_repo
|
||||
after_destroy :destroy_git_repo
|
||||
after_rollback lambda { destroy_git_repo rescue true if new_record? }
|
||||
|
||||
|
|
@ -69,7 +66,7 @@ class Project < ActiveRecord::Base
|
|||
end
|
||||
|
||||
def members
|
||||
collaborators + groups
|
||||
collaborators + groups.map(&:members).flatten
|
||||
end
|
||||
|
||||
# include Project::HasRepository
|
||||
|
|
@ -83,12 +80,8 @@ class Project < ActiveRecord::Base
|
|||
@git_repo_path ||= path
|
||||
end
|
||||
def git_repo_name
|
||||
[owner.uname, unixname].join('/')
|
||||
File.join owner.uname, unixname
|
||||
end
|
||||
def git_repo_name_was
|
||||
[owner.uname, unixname_was].join('/')
|
||||
end
|
||||
def git_repo_name_changed?; git_repo_name != git_repo_name_was; end
|
||||
|
||||
def public?
|
||||
visibility == 'open'
|
||||
|
|
@ -143,29 +136,11 @@ class Project < ActiveRecord::Base
|
|||
end
|
||||
|
||||
def create_git_repo
|
||||
with_ga do |ga|
|
||||
repo = ga.add_repo git_repo_name
|
||||
repo.add_key owner.ssh_key, 'RW'
|
||||
repo.has_anonymous_access!('R') if public?
|
||||
ga.save_and_release
|
||||
end
|
||||
end
|
||||
|
||||
def update_git_repo
|
||||
with_ga do |ga|
|
||||
if repo = ga.find_repo(git_repo_name_was)
|
||||
repo.rename(git_repo_name) if git_repo_name_changed?
|
||||
public? ? repo.has_anonymous_access!('R') : repo.has_not_anonymous_access!
|
||||
ga.save_and_release
|
||||
end
|
||||
end if git_repo_name_changed? or visibility_changed?
|
||||
Grit::Repo.init_bare git_repo_path
|
||||
end
|
||||
|
||||
def destroy_git_repo
|
||||
with_ga do |ga|
|
||||
ga.rm_repo git_repo_name
|
||||
ga.save_and_release
|
||||
end
|
||||
FileUtils.rm_rf git_repo_path
|
||||
end
|
||||
|
||||
def add_owner_rel
|
||||
|
|
|
|||
|
|
@ -4,36 +4,12 @@ class Relation < ActiveRecord::Base
|
|||
|
||||
#has_many :role_lines
|
||||
#has_many :roles, :autosave => true, :through => :role_lines
|
||||
|
||||
|
||||
ROLES = %w[read write admin]
|
||||
|
||||
validates :role, :inclusion => {:in => ROLES}
|
||||
|
||||
#bitmask :roles, :as => [:read, :update]
|
||||
|
||||
after_create {
|
||||
with_ga do |ga|
|
||||
if repo = ga.find_repo(target.git_repo_name) and key = object.ssh_key and key.present?
|
||||
repo.add_key(key, 'RW', :force => true)
|
||||
ga.save_and_release
|
||||
end
|
||||
end if target_type == 'Project' and object_type == 'User'
|
||||
}
|
||||
after_destroy {
|
||||
with_ga do |ga|
|
||||
if repo = ga.find_repo(target.git_repo_name) and key = object.ssh_key and key.present?
|
||||
repo.rm_key(key)
|
||||
ga.save_and_release
|
||||
end
|
||||
end if target_type == 'Project' and object_type == 'User'
|
||||
}
|
||||
|
||||
#after_create {
|
||||
# if self.role.blank?
|
||||
# update_attribute(:role, 'read')
|
||||
# end
|
||||
#}
|
||||
|
||||
scope :by_object, lambda {|obj| {:conditions => ['object_id = ? AND object_type = ?', obj.id, obj.class.to_s]}}
|
||||
scope :by_target, lambda {|tar| {:conditions => ['target_id = ? AND target_type = ?', tar.id, tar.class.to_s]}}
|
||||
end
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ class Repository < ActiveRecord::Base
|
|||
has_many :groups, :through => :objects, :source => :object, :source_type => 'Group'
|
||||
|
||||
validates :name, :uniqueness => {:scope => :platform_id}, :presence => true
|
||||
validates :unixname, :uniqueness => {:scope => :platform_id}, :presence => true, :format => { :with => /^[a-zA-Z0-9\-.]+$/ }
|
||||
validates :unixname, :uniqueness => {:scope => :platform_id}, :presence => true, :format => { :with => /^[a-z0-9\-.]+$/ }
|
||||
# validates :platform_id, :presence => true # if you uncomment this platform clone will not work
|
||||
|
||||
scope :recent, order("name ASC")
|
||||
|
|
|
|||
|
|
@ -26,13 +26,9 @@ class User < ActiveRecord::Base
|
|||
|
||||
include PersonalRepository
|
||||
|
||||
validates :uname, :presence => true, :uniqueness => {:case_sensitive => false}, :format => { :with => /^[a-zA-Z0-9_]+$/ }, :allow_nil => false, :allow_blank => false
|
||||
validates :ssh_key, :uniqueness => true, :allow_blank => true
|
||||
validates :uname, :presence => true, :uniqueness => {:case_sensitive => false}, :format => { :with => /^[a-z0-9_]+$/ }, :allow_nil => false, :allow_blank => false
|
||||
validate { errors.add(:uname, :taken) if Group.where('uname LIKE ?', uname).present? }
|
||||
#TODO: Replace this simple cross-table uniq validation by more progressive analog
|
||||
validate lambda {
|
||||
errors.add(:uname, I18n.t('flash.user.group_uname_exists')) if Group.exists? :uname => uname
|
||||
}
|
||||
validates :ssh_key, :uniqueness => true, :allow_blank => true
|
||||
validates :role, :inclusion => {:in => ROLES}
|
||||
|
||||
attr_accessible :email, :password, :password_confirmation, :remember_me, :login, :name, :ssh_key, :uname
|
||||
|
|
@ -40,17 +36,6 @@ class User < ActiveRecord::Base
|
|||
attr_accessor :login
|
||||
|
||||
before_create :add_default_role
|
||||
|
||||
before_update {
|
||||
if ssh_key_was.blank? and ssh_key.present?
|
||||
create_ssh_key ssh_key
|
||||
elsif ssh_key_was.present? and ssh_key.blank?
|
||||
destroy_ssh_key ssh_key_was
|
||||
elsif ssh_key_changed? and ssh_key.present? and ssh_key_was.present?
|
||||
update_ssh_key ssh_key_was, ssh_key
|
||||
end
|
||||
}
|
||||
before_destroy { destroy_ssh_key(ssh_key) if ssh_key.present? }
|
||||
# after_create() { UserMailer.new_user_notification(self).deliver }
|
||||
|
||||
def admin?
|
||||
|
|
@ -94,33 +79,4 @@ class User < ActiveRecord::Base
|
|||
clean_up_passwords
|
||||
result
|
||||
end
|
||||
|
||||
protected
|
||||
|
||||
def create_ssh_key(key)
|
||||
with_ga do |ga|
|
||||
ga.store_key! key
|
||||
projects.each do |project|
|
||||
repo = ga.find_repo(project.git_repo_name)
|
||||
repo.add_key(key, 'RW') if repo
|
||||
end
|
||||
ga.save_and_release
|
||||
end
|
||||
end
|
||||
|
||||
def update_ssh_key(old_key, new_key)
|
||||
with_ga do |ga|
|
||||
ga.repos.replace_key old_key, new_key #, options = {}
|
||||
ga.replace_key! old_key, new_key
|
||||
ga.save_and_release
|
||||
end
|
||||
end
|
||||
|
||||
def destroy_ssh_key(key)
|
||||
with_ga do |ga|
|
||||
ga.repos.rm_key key
|
||||
ga.rm_key! key
|
||||
ga.save_and_release
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -10,4 +10,4 @@
|
|||
%td= link_to project.name, project_path(project)
|
||||
%td= link_to t("layout.auto_build_lists.cancel_btn"), auto_build_list_path(project.auto_build_lists_id), :method => :delete, :confirm => t("layout.confirm")
|
||||
|
||||
= will_paginate @projects_not_automated, :param_name => 'already_automated_page'
|
||||
= will_paginate @projects_already_automated, :param_name => 'already_automated_page'
|
||||
|
|
@ -1 +1,10 @@
|
|||
APP_CONFIG = YAML.load_file("#{Rails.root}/config/application.yml")[Rails.env]
|
||||
|
||||
# Setup Smart HTTP GRack
|
||||
require 'grack'
|
||||
config = {:project_root => File.join(APP_CONFIG['root_path'], 'git_projects'), :git_path => '/opt/local/bin/git', :upload_pack => true, :receive_pack => true}
|
||||
# Rosa::Application.config.middleware.insert_before ::ActionDispatch::Static, ::Grack::Handler, config
|
||||
Rosa::Application.config.middleware.insert_after ::Rails::Rack::Logger, ::Grack::Handler, config
|
||||
Rosa::Application.config.middleware.insert_before ::Grack::Handler, ::Grack::Auth
|
||||
|
||||
# Grit::Git.git_timeout = 60
|
||||
|
|
|
|||
|
|
@ -338,7 +338,6 @@ ru:
|
|||
saved: Пользователь успешно сохранен
|
||||
save_error: Не удалось сохранить данные о пользователе
|
||||
destroyed: Учетная запись успешно удалена
|
||||
group_uname_exists: Группа с таким именем уже зарегестрирована
|
||||
|
||||
group:
|
||||
saved: Группа успешно сохранена
|
||||
|
|
|
|||
|
|
@ -1,13 +0,0 @@
|
|||
require 'gitolito'
|
||||
|
||||
Grit::Git.git_timeout = 60
|
||||
# Grit::Git.git_max_size = 20.megabytes
|
||||
|
||||
class Object
|
||||
def with_ga(&block)
|
||||
::Gitolito::GitoliteAdmin.thread_safe(File.join(APP_CONFIG['root_path'], 'gitolite-admin'), {:wait_lock => true, :seconds => 60}) do |ga|
|
||||
block.call(ga)
|
||||
end
|
||||
# ga = Gitolito::GitoliteAdmin.new File.join(APP_CONFIG['root_path'], 'gitolite-admin'); block.call(ga)
|
||||
end
|
||||
end
|
||||
|
|
@ -0,0 +1,7 @@
|
|||
module Grack
|
||||
extend ActiveSupport::Autoload
|
||||
|
||||
autoload :Base
|
||||
autoload :Auth
|
||||
autoload :Handler
|
||||
end
|
||||
|
|
@ -0,0 +1,22 @@
|
|||
module Grack
|
||||
class Auth < Base
|
||||
def initialize(app)
|
||||
@app = app
|
||||
end
|
||||
|
||||
# TODO tests!!!
|
||||
def call(env)
|
||||
super
|
||||
if git?
|
||||
return [404, {"Content-Type" => "text/plain"}, ["Not Found"]] if project.blank?
|
||||
|
||||
return ::Rack::Auth::Basic.new(@app) do |u, p|
|
||||
user = User.find_for_database_authentication(:login => u) and user.valid_password?(p) and
|
||||
project.members.include?(user) # TODO ACL
|
||||
# ability = ::Ability.new(user) and ability.can?(action, project)
|
||||
end.call(env) unless project.public? and read? # need auth
|
||||
end
|
||||
@app.call(env) # next app in stack
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
@ -0,0 +1,36 @@
|
|||
module Grack
|
||||
class Base # abstract
|
||||
def call(env)
|
||||
@env = env
|
||||
@project = nil
|
||||
end
|
||||
|
||||
def git?
|
||||
@env['HTTP_USER_AGENT'] =~ /^git\//
|
||||
end
|
||||
|
||||
def read?
|
||||
@env['REQUEST_URI'] =~ /git-upload-pack$/
|
||||
end
|
||||
|
||||
def write?
|
||||
@env['REQUEST_URI'] =~ /git-receive-pack$/
|
||||
end
|
||||
|
||||
def action
|
||||
write? ? 'update' : 'read'
|
||||
end
|
||||
|
||||
def project
|
||||
@project ||= begin
|
||||
uname, unixname = @env['PATH_INFO'].split('/')[1,2]
|
||||
unixname.gsub! /\.git$/, ''
|
||||
owner = User.find_by_uname(uname) || Group.find_by_uname(uname)
|
||||
Project.where(:owner_id => owner.id, :owner_type => owner.class).find_by_unixname(unixname)
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
# ({"HTTP_ACCEPT"=>"*/*", "HTTP_HOST"=>"localhost:3000", "SERVER_NAME"=>"localhost", "rack.url_scheme"=>"http", "PASSENGER_CONNECT_PASSWORD"=>"xbRC6murG5bIDTsaed8ksaZhjf8yFsadlX4QL0qWNbS", "HTTP_USER_AGENT"=>"git/1.7.7.2", "PASSENGER_SPAWN_METHOD"=>"smart-lv2", "PASSENGER_FRIENDLY_ERROR_PAGES"=>"true", "CONTENT_LENGTH"=>"0", "rack.errors"=>#<IO:0x108494a90>, "SERVER_PROTOCOL"=>"HTTP/1.1", "action_dispatch.secret_token"=>"df2fb72d477491cf15ef0f93449bcb59c3412c255c2386e07772935565c1b6ad23539ed804b8f12e3221e47abb78f5b679693c391acb33477be0e633e7a2e2a4", "rack.run_once"=>false, "rack.version"=>[1, 0], "REMOTE_ADDR"=>"127.0.0.1", "SERVER_SOFTWARE"=>"nginx/1.0.6", "PASSENGER_MIN_INSTANCES"=>"1", "PATH_INFO"=>"/codefoundry.git/info/refs", "SERVER_ADDR"=>"127.0.0.1", "SCRIPT_NAME"=>"", "action_dispatch.parameter_filter"=>[:password], "action_dispatch.show_exceptions"=>true, "rack.multithread"=>false, "PASSENGER_USER"=>"", "PASSENGER_ENVIRONMENT"=>"development", "PASSENGER_SHOW_VERSION_IN_HEADER"=>"true", "rack.multiprocess"=>true, "REMOTE_PORT"=>"49387", "REQUEST_URI"=>"/codefoundry.git/info/refs", "SERVER_PORT"=>"3000", "SCGI"=>"1", "PASSENGER_APP_TYPE"=>"rack", "PASSENGER_USE_GLOBAL_QUEUE"=>"true", "REQUEST_METHOD"=>"GET", "PASSENGER_GROUP"=>"", "PASSENGER_DEBUGGER"=>"false", "DOCUMENT_ROOT"=>"/Users/pasha/Sites/rosa-build/public", "_"=>"_", "PASSENGER_FRAMEWORK_SPAWNER_IDLE_TIME"=>"-1", "UNION_STATION_SUPPORT"=>"false", "rack.input"=>#<PhusionPassenger::Utils::RewindableInput:0x10bb55a20 @rewindable_io=nil, @io=#<PhusionPassenger::Utils::UnseekableSocket:0x10bb56c90 @socket=#<UNIXSocket:0x10bb56b28>>, @unlinked=false>, "HTTP_PRAGMA"=>"no-cache", "QUERY_STRING"=>"", "PASSENGER_APP_SPAWNER_IDLE_TIME"=>"-1"}) (process 41940, thread #<Thread:0x1084a1268>)
|
||||
# {"rack.session"=>{}, "HTTP_ACCEPT"=>"*/*", "HTTP_HOST"=>"localhost:3000", "SERVER_NAME"=>"localhost", "action_dispatch.remote_ip"=>#<ActionDispatch::RemoteIp::RemoteIpGetter:0x10b621338 @check_ip_spoofing=true, @env={...}, @trusted_proxies=/(^127\.0\.0\.1$|^(10|172\.(1[6-9]|2[0-9]|30|31)|192\.168)\.)/i>, "rack.url_scheme"=>"http", "PASSENGER_CONNECT_PASSWORD"=>"dljpLA91qGH4v2gwaccoAxFysOmSkEFbRtPyPOe9953", "HTTP_USER_AGENT"=>"git/1.7.7.2", "PASSENGER_SPAWN_METHOD"=>"smart-lv2", "PASSENGER_FRIENDLY_ERROR_PAGES"=>"true", "CONTENT_LENGTH"=>"0", "action_dispatch.request.unsigned_session_cookie"=>{}, "rack.errors"=>#<IO:0x10724baa0>, "SERVER_PROTOCOL"=>"HTTP/1.1", "action_dispatch.secret_token"=>"df2fb72d477491cf15ef0f93449bcb59c3412c255c2386e07772935565c1b6ad23539ed804b8f12e3221e47abb78f5b679693c391acb33477be0e633e7a2e2a4", "rack.run_once"=>false, "rack.version"=>[1, 0], "REMOTE_ADDR"=>"127.0.0.1", "SERVER_SOFTWARE"=>"nginx/1.0.6", "PASSENGER_MIN_INSTANCES"=>"1", "PATH_INFO"=>"/pasha/mc.git/info/refs", "SERVER_ADDR"=>"127.0.0.1", "SCRIPT_NAME"=>"", "action_dispatch.parameter_filter"=>[:password], "action_dispatch.show_exceptions"=>true, "rack.multithread"=>false, "PASSENGER_USER"=>"", "PASSENGER_ENVIRONMENT"=>"development", "PASSENGER_SHOW_VERSION_IN_HEADER"=>"true", "action_dispatch.cookies"=>{}, "rack.multiprocess"=>true, "REMOTE_PORT"=>"49643", "REQUEST_URI"=>"/pasha/mc.git/info/refs", "SERVER_PORT"=>"3000", "SCGI"=>"1", "PASSENGER_APP_TYPE"=>"rack", "PASSENGER_USE_GLOBAL_QUEUE"=>"true", "rack.session.options"=>{:httponly=>true, :expire_after=>nil, :domain=>nil, :path=>"/", :secure=>false, :id=>nil}, "REQUEST_METHOD"=>"GET", "PASSENGER_GROUP"=>"", "PASSENGER_DEBUGGER"=>"false", "DOCUMENT_ROOT"=>"/Users/pasha/Sites/rosa-build/public", "warden"=>Warden::Proxy:2242130160 @config={:failure_app=>Devise::FailureApp, :default_scope=>:user, :intercept_401=>false, :scope_defaults=>{}, :default_strategies=>{:user=>[:rememberable, :database_authenticatable]}}, "_"=>"_", "PASSENGER_FRAMEWORK_SPAWNER_IDLE_TIME"=>"-1", "UNION_STATION_SUPPORT"=>"false", "rack.input"=>#<PhusionPassenger::Utils::RewindableInput:0x10b6225f8 @rewindable_io=nil, @io=#<PhusionPassenger::Utils::UnseekableSocket:0x10a8f5a10 @socket=#<UNIXSocket:0x10b623700>>, @unlinked=false>, "HTTP_PRAGMA"=>"no-cache", "QUERY_STRING"=>"", "PASSENGER_APP_SPAWNER_IDLE_TIME"=>"-1"}
|
||||
|
|
@ -0,0 +1,19 @@
|
|||
module Grack
|
||||
class Handler < Base
|
||||
def initialize(app, config)
|
||||
@app = app
|
||||
@config = config
|
||||
end
|
||||
|
||||
def call(env)
|
||||
super
|
||||
if git?
|
||||
# TODO event_log? called twice!
|
||||
project.auto_build if write? # hook
|
||||
::GitHttp::App.new(@config).call(env)
|
||||
else
|
||||
@app.call(env)
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
@ -1,15 +1,15 @@
|
|||
namespace :import do
|
||||
desc "Load projects"
|
||||
task :projects => :environment do
|
||||
# open('http://dl.dropbox.com/u/984976/sorted4.txt').readlines.each do |name| # TODO clean names
|
||||
open('http://dl.dropbox.com/u/984976/PackageList.txt').readlines.each do |name|
|
||||
name.chomp!
|
||||
name.chomp!; name.downcase!
|
||||
print "Import #{name}..."
|
||||
owner = User.find(2) # vsharshov@gmail.com
|
||||
owner = User.find(1) # I am
|
||||
# owner = Group.find(1) # Core Team
|
||||
# puts Project.create(:name => name, :unixname => name) {|p| p.owner = owner} ? "Ok!" : "Fail"
|
||||
p = Project.find_or_create_by_name_and_unixname(name, name) {|p| p.owner = owner}
|
||||
puts p.persisted? ? "Ok!" : "Fail!"
|
||||
# sleep 1
|
||||
end
|
||||
puts 'DONE'
|
||||
end
|
||||
|
|
|
|||
Loading…
Reference in New Issue