@@ -27,4 +27,5 @@ user/templates/*

 !user/templates/.gitignore

 db/*

 !db/.gitignore

-extlib

+extlib/*

+rep/*

@@ -10,6 +10,7 @@ use Validator::Custom;

 use Encode qw/encode decode/;

 use Mojo::JSON;

 use Gitprep::API;

+use Carp 'croak';

 has 'git';

 has 'dbi';

@@ -19,19 +20,12 @@ sub startup {

   my $self = shift;

   # Config

-  my $conf_file = $ENV{GITPREP_CONFIG_FILE}

-    || $self->home->rel_file('gitprep.conf');

-  $self->plugin('JSONConfigLoose', {file => $conf_file}) if -f $conf_file;

+  #my $conf_file = $ENV{GITPREP_CONFIG_FILE}

+  #  || $self->home->rel_file('gitprep.conf');

+  #$self->plugin('JSONConfigLoose', {file => $conf_file}) if -f $conf_file;

   my $conf = $self->config;

-  $conf->{search_dirs} ||= ['/git/pub', '/home'];

-  $conf->{search_max_depth} ||= 10;

-  $conf->{logo_link} ||= "https://github.com/yuki-kimoto/gitprep";

-  $conf->{hypnotoad} ||= {listen => ["http://*:10010"]};

-  $conf->{prevent_xss} ||= 0;

-  $conf->{encoding} ||= 'UTF-8';

-  $conf->{text_exts} ||= ['txt'];

-  $conf->{root} ||= '/gitprep';

-  $conf->{ssh_port} ||= '';

+  $conf->{root} = $self->home->rel_file('rep');

+  $conf->{hypnotoad} ||= {listen => ["http://*:10020"]};

   # Added public directory

   push @{$self->static->paths}, $conf->{root};

@@ -42,10 +36,12 @@ sub startup {

   die qq/Can't detect git command. set "git_bin" in gitprep.conf/

     unless $git_bin;

   $git->bin($git_bin);

-  $git->search_dirs($conf->{search_dirs});

-  $git->search_max_depth($conf->{search_max_depth});

-  $git->encoding($conf->{encoding});

-  $git->text_exts($conf->{text_exts});

+  my $rep_home = $self->home->rel_file('rep');

+  $git->rep_home($rep_home);

+  unless (-d $rep_home) {

+    mkdir $rep_home

+      or croak "Can't create directory $rep_home: $!";

+  }

   $self->git($git);

   # Reverse proxy support

@@ -126,9 +122,6 @@ sub startup {

     $r->get('/compare/(#rev1)...(#rev2)')->to('#compare');

   }

-  # File cache

-  $git->search_projects;

-  

   # DBI

   my $db_file = $self->home->rel_file('db/gitprep.db');

   my $dbi = DBIx::Custom->connect(

@@ -5,6 +5,12 @@ use Carp 'croak';

 use File::Find 'find';

 use File::Basename qw/basename dirname/;

 use Fcntl ':mode';

+use File::Path 'mkpath';

+

+# Attributes

+has 'bin';

+has 'rep_home';

+has 'encoding' => 'UTF-8';

 # Encode

 use Encode qw/encode decode/;

@@ -27,13 +33,6 @@ sub dec {

   return $@ ? $str : $new_str;

 }

-# Attributes

-has 'bin';

-has 'search_dirs';

-has 'search_max_depth';

-has 'encoding';

-has 'text_exts';

-

 sub authors {

   my ($self, $rep, $ref, $file) = @_;

@@ -178,6 +177,47 @@ sub cmd {

   return ($self->bin, "--git-dir=$project");

 }

+sub create_repository {

+  my ($self, $user, $project, $opts) = @_;

+  

+  # Repository

+  my $rep_home = $self->rep_home;

+  my $rep = "$rep_home/$user/$project.git";

+  mkpath $rep;

+    

+  # Git init

+  my @git_init_cmd = ($self->cmd($rep), 'init', '--bare');

+  warn "@git_init_cmd";

+  system(@git_init_cmd) == 0

+    or croak "Can't execute git init";

+  

+  # Description

+  if (my $description = $opts->{description}) {

+    my $file = "$rep/description";

+    open my $fh, '>', $file

+      or croak "Can't open $file: $!";

+    print $fh $description

+      or croak "Can't write $file: $!";

+    close $fh;

+  }

+}

+

+sub branch_exists {

+  my ($self, $user, $project) = @_;

+  

+  my $home = $self->rep_home;

+  my $rep = "$home/$user/$project.git";

+

+  my @cmd = ($self->cmd($rep), 'branch');

+  open my $fh, "-|", @cmd

+    or croak 'git branch failed';

+  

+  local $/;

+  my $branches = <$fh>;

+  

+  return $branches eq '' ? 0 : 1;

+}

+

 sub branch_commits {

   my ($self, $rep, $rev1, $rev2) = @_;

@@ -601,9 +641,10 @@ sub fill_projects {

 }

 sub projects {

-  my ($self, $dir, %opt) = @_;

+  my ($self, $user, $opts) = @_;

-  my $filter = $opt{filter};

+  my $home = $self->rep_home;

+  my $dir = "$home/$user";

   # Repositories

   opendir my $dh, $self->enc($dir)

@@ -611,8 +652,6 @@ sub projects {

   my @reps;

   while (my $rep = readdir $dh) {

     next unless $rep =~ /\.git$/;

-    next unless $self->check_head_link("$dir/$rep");

-    next if defined $filter && $rep !~ /\Q$filter\E/;

     my $rep_name = $rep;

     $rep_name =~ s/\.git$//;

     push @reps, { name => $rep_name, path => $rep };

@@ -620,14 +659,14 @@ sub projects {

   # Fill repositroies information

   for my $rep (@reps) {

-    my (@activity) = $self->last_activity("$dir/$rep->{path}");

-    next unless @activity;

-    ($rep->{age}, $rep->{age_string}) = @activity;

-    if (!defined $rep->{descr}) {

-      my $descr = $self->project_description("$dir/$rep->{path}") || '';

-      $rep->{descr_long} = $descr;

-      $rep->{descr} = $self->_chop_str($descr, 25, 5);

+    my @activity = $self->last_activity("$dir/$rep->{path}");

+    

+    if (@activity) {

+      ($rep->{age}, $rep->{age_string}) = @activity;

     }

+

+    my $description = $self->project_description("$dir/$rep->{path}") || '';

+    $rep->{description} = $self->_chop_str($description, 25, 5);

   }

   return \@reps;

@@ -1074,65 +1113,6 @@ sub search_bin {

   return;

 }

-sub search_projects {

-  my ($self, %opt) = @_;

-  my $dirs = $self->search_dirs;

-  my $max_depth = $self->search_max_depth;

-  

-  # Search

-  my @projects;

-  for my $dir (@$dirs) {

-    next unless -d $dir;

-  

-    $dir =~ s/\/$//;

-    my $prefix_length = length($dir);

-    my $prefix_depth = 0;

-    for my $c (split //, $dir) {

-      $prefix_depth++ if $c eq '/';

-    }

-    

-    no warnings 'File::Find';

-    File::Find::find({

-      follow_fast => 1,

-      follow_skip => 2,

-      dangling_symlinks => 0,

-      wanted => sub {

-        my $path = $File::Find::name;

-        my $base_path = $_;

-        

-        return if (m!^[/.]$!);

-        return unless -d $base_path;

-        

-        if ($base_path eq '.git') {

-          $File::Find::prune = 1;

-          return;

-        };

-        

-        my $depth = 0;

-        for my $c (split //, $dir) {

-          $depth++ if $c eq '/';

-        }

-        

-        if ($depth - $prefix_depth > $max_depth) {

-          $File::Find::prune = 1;

-          return;

-        }

-        

-        if (-d $path) {

-          if ($self->check_head_link($path)) {

-            my $home = dirname $path;

-            my $name = basename $path;

-            push @projects, {home => $home, name => $name};

-            $File::Find::prune = 1;

-          }

-        }

-      },

-    }, $dir);

-  }

-  

-  return \@projects;

-}

-

 sub snapshot_name {

   my ($self, $project, $cid) = @_;

@@ -8,21 +8,18 @@

     # Validation

     my $params = $api->params;

-    my $repository_name_check = sub {

+    my $project_check = sub {

       my $value = shift;

       return ($value || '') =~ /^[a-zA-Z0-9_\-]+$/

     };

     my $rule = [

-      repository_name => [

+      project => [

         ['not_blank' => 'Repository name is empty'],

-        [$repository_name_check => 'Invalid repository name']

+        [$project_check => 'Invalid repository name']

       ],

       description => [

         'any'

-      ],

-      readme_contain => {require => 0} => [

-        'any'

       ]

     ];

     my $validator = app->validator;

@@ -31,13 +28,19 @@

     if ($vresult->is_ok) {

       my $user = session('user_id');

       my $data = $vresult->data;

-      my $rep = $data->{repository_name};

-      $self->redirect_to("/$user/$rep");

+      my $project = $data->{project};

+      my $description = $data->{description};

+      

+      app->git->create_repository(

+        $user,

+        $project,

+        {description => $description}

+      );

+      

+      $self->redirect_to("/$user/$project");

       return 1;

     }

-    else {

-      $errors = $vresult->messages;

-    }

+    else { $errors = $vresult->messages }

   }

 %>

@@ -56,17 +59,11 @@

     % }

     <form action="<%= url_for->query(op => 'create') %>" method="post">

       <div><b>Repository name</b></div>

-      <div><%= input_tag 'repository_name', type => 'text', style => 'width:300px' %></div>

+      <div><%= input_tag 'project', type => 'text', style => 'width:300px' %></div>

       <div><b>Description</b> (optional)</div>

       <div><%= input_tag 'description', type => 'text', style => 'width:600px' %></div>

-      <label class="checkbox">

-        <%= check_box 'readme_contain' => 1 %> <b>Initialize this repository with a README</b>

-      </label>

-      <div style="margin-bottom:10px">

-        This will allow you to git clone the repository immediately.

-      </div>

       <input type="submit" class="btn" value="Create repository">

     </form>

   </div>

@@ -1,7 +1,5 @@

 <%

-  use Gitprep::API;

-  my $api = Gitprep::API->new($self);

-  

+  my $api = gitprep_api;

   my $users = $api->users;

 %>

@@ -1,5 +1,7 @@

 <%

   use Gitprep::API;

+  

+  my $state;

   # API

   my $api = Gitprep::API->new($self);

@@ -21,84 +23,120 @@

   # Git

   my $git = app->git;

-

-  # Id and directory

-  my ($id, $dir) = $git->parse_object($rep, $object);

-  

-  # Tree id

-  my $tid;

-  my $commit = $git->parse_commit($rep, $id);

-  if (defined $dir && $dir ne '') {

-    $tid = $git->id_by_path($rep, $id, $dir, 'tree');

-  }

-  else { $tid = $commit->{tree} }

-  $self->render_not_found unless defined $tid;

-

-  # Commit log

-  my $latest_commit_log = $git->latest_commit_log($rep, $rev);

-  

-  # Tree

-  my $trees = $git->trees($rep, $tid, $rev);

-  # Repository description

-  my $desc = $git->project_description($rep);

+  # Check exsitence

+  my $desc;

+  my $commits_number;

+  my $readme;

-  # Commits number

-  my $commits_number = $git->commits_number($rep, $rev);

-  

-  # README

-  my $readme = $git->blob_plain($rep, $rev, 'README');

-  

-  # Variable for included template

-  stash(

-    commit => $commit,

-    latest_commit_log => $latest_commit_log,

-    trees => $trees,

-    dir => $dir,

-    rev => $rev,

-    title => "$user/$project"

-  );

+  if ($git->branch_exists($user, $project)) {

+    # Id and directory

+    my ($id, $dir) = $git->parse_object($rep, $object);

+    

+    # Tree id

+    my $tid;

+    my $commit = $git->parse_commit($rep, $id);

+    if (defined $dir && $dir ne '') {

+      $tid = $git->id_by_path($rep, $id, $dir, 'tree');

+    }

+    else { $tid = $commit->{tree} }

+    $self->render_not_found unless defined $tid;

+

+    # Commit log

+    my $latest_commit_log = $git->latest_commit_log($rep, $rev);

+    

+    # Tree

+    my $trees = $git->trees($rep, $tid, $rev);

+    

+    # Repository description

+    my $desc = $git->project_description($rep);

+    

+    # Commits number

+    my $commits_number = $git->commits_number($rep, $rev);

+    

+    # README

+    my $readme = $git->blob_plain($rep, $rev, 'README');

+    

+    # Variable for included template

+    stash(

+      commit => $commit,

+      latest_commit_log => $latest_commit_log,

+      trees => $trees,

+      dir => $dir,

+      rev => $rev,

+      title => "$user/$project"

+    );

+    

+    $state = 'display';

+  }

+  else { $state = 'init' }

 %>

 % layout 'common';

-  %= stylesheet begin

-  % end

-

   %= include '/include/header';

   <div class="container">

     %= include '/include/project_header';

-    <h4 style="margin-top:0px">

-      <%= $desc %>

-    </h4>

+    % if ($state eq 'display') {

+      <h4 style="margin-top:0px">

+        <%= $desc %>

+      </h4>

-    <div class="breadcrumb" style="background-color:white;border:1px solid #ccc;padding:0 5px;">

-      <a class="btn" href="<%= url_for("/$user/$project/archive/master.zip") %>"><i class="icon-arrow-down"></i>ZIP</a>

-      <a class="btn corner-right-none" href="#" >HTTP</a><a class="btn corner-left-none corner-right-none" href="#">SSH</a><input type="text" style="border-top-left-radius:0;border-bottom-left-radius:0;margin-left:0;margin-top:10px;">

-      <span>Read-only access</span>

-    </div>

-    

-    %= include '/include/code_menu', display => 'files';

-    

-    <div class="row">

-      <div class="span6">

-        <a href="<%= url_for %>"><%= $project %></a>

+      <div class="breadcrumb" style="background-color:white;border:1px solid #ccc;padding:0 5px;">

+        <a class="btn" href="<%= url_for("/$user/$project/archive/master.zip") %>"><i class="icon-arrow-down"></i>ZIP</a>

+        <a class="btn corner-right-none" href="#" >HTTP</a><a class="btn corner-left-none corner-right-none" href="#">SSH</a><input type="text" style="border-top-left-radius:0;border-bottom-left-radius:0;margin-left:0;margin-top:10px;">

+        <span>Read-only access</span>

       </div>

-      <div class="span6 text-right">

-        <a href="<%= url_for("/$user/$project/commits/master") %>">

-          <%= $commits_number %> commits

-        </a>

+      

+      %= include '/include/code_menu', display => 'files';

+      

+      <div class="row">

+        <div class="span6">

+          <a href="<%= url_for %>"><%= $project %></a>

+        </div>

+        <div class="span6 text-right">

+          <a href="<%= url_for("/$user/$project/commits/master") %>">

+            <%= $commits_number %> commits

+          </a>

+        </div>

       </div>

-    </div>

-    

-    %= include '/include/tree';

+      

+      %= include '/include/tree';

+      

+      <div>

+        <h3>README</h3>

+        <pre><%= $readme %></pre>

+      </div>

+    % } elsif ($state eq 'init') {

-    <div>

-      <h3>README</h3>

-      <pre><%= $readme %></pre>

-    </div>

+      <div class="text-center" style="margin-bottom:10px">

+        <b>Create a new repository on the command line</b>

+      </div>

+      

+      % my $url = url_for->to_abs;

+      % my $ssh_port = config->{ssh_port};

+      % my $rep_home = app->git->rep_home;

+      % my $ssh_url = 'ssh://kimoto@' . $url->host

+      %   . ($ssh_port ? ":$ssh_port" : '') . "$rep_home/$user/$project.git";

+      

+      <pre style="margin-bottom:30px">

+touch README

+git init

+git add README

+git commit -m "first commit"

+git remote add origin <%= $ssh_url %>

+git push -u origin master</pre>

+      

+      <div class="text-center" style="margin-bottom:10px">

+        <b>Push an existing repository from the command line</b>

+      </div>

+      

+      <pre style="margin-bottom:30px">

+git remote add origin <%= $ssh_url %>

+git push -u origin master</pre>

+    % }

   </div>

   %= include '/include/footer';

@@ -1,9 +1,8 @@

 <%

-  my $root = config->{root};

   my $user = param('user');

   # Projects

-  my $reps = app->git->projects("/$root/$user");

+  my $reps = app->git->projects($user);

 %>

 % layout 'common';

@@ -29,9 +28,10 @@

                 </a>

               </td>

               <td>

-                <%= $rep->{descr} %>

+                <%= $rep->{description} %>

               </td>

-              <td class="muted">last updated <%= $rep->{age_string} %></td>

+              % my $age = $rep->{age_string};

+              <td class="muted"><%= $age ? "last updated $age" : 'new repository' %></td>

             </div>

           </tr>

         % }