rails_info 0.1.0 → 0.1.1

data/app/models/version_control/filter.rb

@@ -0,0 +1,271 @@
+class VersionControl::Filter
+  attr_accessor :workspace, :repository, :project_slug, :branch, :path, :author, :from, :to, :id, :message, :story, :tasks, :filter_merges, :logger
+  attr_reader :errors, :commits_count, :last_revision, :first_revision, :previous_revision, :previous_revision_by_file
+  
+  def initialize(attributes = {})
+    @commits_count, @previous_revision_by_file = 0, {}
+    
+    initialize_attributes(attributes)
+    
+    self
+  end
+  
+  def self.create(attributes = {})
+    resource = new(attributes)
+    
+    resource.files_by_category if resource.valid?
+    
+    resource
+  end
+  
+  def repository_path; self.workspace.to_s + '/' + self.repository.to_s; end
+  
+  def valid?
+    @valid = _valid? ? true : false
+  end
+  
+  def files_by_category
+    return {} unless valid?
+    
+    return @files_by_category if @files_by_category
+    
+    @files_by_category = { 
+      library: { paths: [/^lib\//, /^app\/mailers\//] }, 
+      model: { paths: [/^app\/models\//, /^db\//] }, 
+      controller: { paths: [/^app\/controllers\//] }, 
+      javascript: { paths: [/^app\/assets\/javascripts\//] },
+      view: { 
+        paths: [
+          /^app\/assets\/stylesheets\//, /^app\/views\//, /^app\/helpers\//, /^app\/presenters\//,
+          /^public\//
+        ] 
+      },
+      tests: { paths: [/^spec\//, /^features\//] },
+      configuration: { paths: [/^config\//] },
+      misc: { paths: [] }
+    }
+  
+    catch(:done) do
+      commits do |page|
+        page.each do |commit| 
+          add_commit_to_files(commit) if commit_attributes_match_criteria?(commit)
+        end
+      end 
+    end
+    
+    @files_by_category.each {|category, setting| @files_by_category.delete(category) unless setting[:files].try(:any?) }
+    
+    #get_previous_revision_for_files
+    
+    @files_by_category
+  rescue Grit::NoSuchPathError
+    @errors ||= {}
+    @errors['base'] = 'Repository not found.'
+  end
+  
+  def files_count; @previous_revision_by_file.keys.length; end
+  
+  def users
+    return @users if @users
+    
+    @users = []
+    
+    if files_by_category.is_a? Hash
+      files_by_category.each do |category, setting|
+        next if setting[:files].blank?
+        
+        @users += setting[:files].values.flatten.map{|commit| commit[:author]}.uniq
+      end
+      
+      @users.uniq!
+    end
+    
+    @users.none? ? repository_users : @users
+  end
+  
+  private
+  
+  def initialize_attributes(attributes)
+    default_attributes = { 'branch' => 'master', 'filter_merges' => true }
+    
+    workspace = Rails.root.to_s.split('/')
+    default_attributes['repository'] = workspace.pop
+    
+    default_attributes['workspace'] = workspace.join('/')
+    
+    attributes = default_attributes.merge(attributes)
+    
+    attributes['project_slug'] = attributes['repository'].split('mtvnn-').last if attributes['repository'].match('mtvnn-')
+    attributes['filter_merges'] = false if attributes['filter_merges'].to_s == '0'
+    attributes['to'] = 1.day.since.strftime('%Y-%m-%d') if attributes['from'].present? && attributes['to'].blank?
+    
+    attributes.each {|attribute, value| self.send("#{attribute}=", value) }
+  end
+  
+  def _valid?
+    @errors ||= {}
+    
+    ['workspace', 'repository', 'project_slug', 'branch'].each do |field|
+      @errors[field] = "can't be blank." if self.send(field).blank?
+    end  
+    
+    if path.blank? && author.blank? && id.blank? && message.blank? && story.blank? && tasks.blank? && from.blank? && to.blank?
+      @errors['base'] = 'set at least one of these: path, author, id, message, story, tasks, from, to'
+    end
+    
+    if from.present? && to.present?
+      if Time.parse(from) > Time.parse(to) then @errors['from'] = "can't be greater than 'to'"
+      #elsif Time.parse(to) - Time.parse(from) > 3.months
+      #  @errors['base'] = "Difference between from and to can't be greater than 3 months."
+      end
+    end
+    
+    @errors.empty?
+  end
+  
+  def repository_users
+    @repository_users ||= [
+      "Mathias Gawlista", "Boris Ruf", "Holger Drescher", "Florian Klotz", "pseidemann", "boris", "Manuel Meurer", 
+      "Ivo Strugar", "elistemann", "Caspar Clemens Mierau", "Florian G\xC3\xB6rsdorf", "Sascha Teske", 
+      "Kasar Masood", "Ren\xC3\xA9 F\xC3\xBCrstenberg", "Enrico Listemann", "Ubuntu", "rubyphunk", 
+      "Enrico", "Stefan Haubold", "Michael C. Alber"
+    ].sort
+
+    return @repository_users if @repository_users
+    
+    @repository_users = []
+    
+    commits do |page|
+      page.each {|commit| @repository_users << commit.author.name }
+      
+      @repository_users.uniq!
+    end 
+    
+    @repository_users
+  end
+  
+  def repository_instance
+    @repository_instance ||= Grit::Repo.new(self.repository_path)
+  end
+  
+  def commits
+    offset = 0
+    
+    if id.present?
+      yield repository_instance.commits(id).select{|commit| commit.id == id }
+    else
+      while (page = try_two_times("Get commits from #{offset} to #{(offset + 100)}") { repository_instance.commits(self.branch, 100, offset) }).length > 0
+        
+        yield page
+        
+        offset += 100
+      end
+      
+      # => offset > 8400
+    end
+  end
+  
+  def commit_attributes_match_criteria?(commit)
+    if filter_merges && commit.message.match(/^Merge branch /)
+      return false
+    elsif commit.message.match(message) && (author.blank? || commit.author.name == author) && between_timespan?(commit.committed_date)
+      return true
+    else
+      @previous_revision ||= commit.id
+        
+      throw :done if from.present? && Time.parse(from) > commit.committed_date
+  
+      false
+    end
+  end
+  
+  def add_commit_to_files(commit)
+    @previous_revision = nil
+    
+    return if filter_merges && commit.message.match(/^Merge branch /)
+    
+    if commit.message.match(message) && (author.blank? || commit.author.name == author) && between_timespan?(commit.committed_date)
+      @previous_revision = nil
+    else
+      @previous_revision ||= commit.id
+      
+      throw :done if from.present? && Time.parse(from) > commit.committed_date
+
+      return
+    end
+    
+    files = try_two_times("Commit(id: #{commit.id})#stats") { commit.stats }.files.map(&:first).select do |file_path|
+      path.blank? || file_path.match(path)
+    end
+    
+    return if files.none?
+    
+    @first_revision = commit.id
+    @last_revision ||= commit.id
+    @commits_count += 1
+    
+    files.each {|file_path| add_commit_to_file(file_path, commit) }
+  end
+  
+  def between_timespan?(timestamp)
+    return true if from.blank? && to.blank?
+    
+    from_valid = from.present? && Time.parse(from) <= timestamp
+    to_valid = to.present? && Time.parse(to) >= timestamp
+    
+    valid = if from.present? && to.present? && from_valid && to_valid
+      true
+    elsif (from.blank? || to.blank?) && ((from.present? && from_valid) || (to.present? && to_valid))
+      true
+    else 
+      false
+    end
+    
+    valid
+  end
+  
+  def add_commit_to_file(file_path, commit)
+    category = :misc
+            
+    if file_path.match(/\//)
+      @files_by_category.each do |current_category, setting|
+        if setting[:paths].select{|part| file_path.match(part) }.any?  
+          category = current_category; break
+        end
+      end
+    else
+      category = :configuration
+    end
+    
+    if commit.parents.any?
+      @previous_revision_by_file[file_path] = commit.parents.first.id  
+    else
+      # e.g. first commit has no parents
+      @previous_revision_by_file[file_path] = nil
+    end
+    
+    @files_by_category[category][:files] ||= {}
+    @files_by_category[category][:files][file_path] ||= []
+    @files_by_category[category][:files][file_path] << { 
+      id: commit.id, committed_at: commit.committed_date.strftime('%d.%m.%Y %H:%M:%S'),
+      message: commit.message, author: commit.author.name
+    }
+  end
+  
+  # alternative for Integer#tries to log try number and sleep between 
+  def try_two_times(message = '')
+    tries ||= 1
+    
+    logger.info "#{Time.now.strftime('%H:%M:%S')} #{message} (try ##{tries})"
+    
+    yield
+  rescue Grit::Git::GitTimeout => e
+    if (tries += 1) == 2
+      sleep 2
+      
+      retry
+    else
+      raise e
+    end
+  end
+end

data/app/presenters/rails_info/logs/server/action_presenter.rb

@@ -47,7 +47,7 @@ class RailsInfo::Logs::Server::ActionPresenter < ::RailsInfo::Presenter
   def tab(tab_key)
     @content = @tabs_data[tab_key]
     
-    content_tag :div, class: 'tabs', id: "tabs-#{@index}-#{@tab_index}" do
+    content_tag :div, id: "tabs-#{@index}-#{@tab_index}" do
       html = if tab_key == 'Request'
         raw render partial: 'rails_info/logs/server/request', locals: { content: @content }
       else

data/app/views/layouts/rails_info/exception.html.erb

@@ -1 +1 @@
-<%= render 'rails_info/shared/layout' %>
+<%= render 'rails_info/shared/layout', layout: 'rails_info/exception' %>

data/app/views/rails_info/logs/server/big.html.erb

@@ -0,0 +1,3 @@
+<% @requests.each do |current_request| %>
+  <%= current_request%><br/>
+<% end %>

data/app/views/rails_info/shared/_layout.html.erb

@@ -1,15 +1,22 @@
+<% layout ||= rails_info_stylesheet %>
 <!DOCTYPE html>
 <html>
 <head>
   <title>Rails Info</title>
   <meta charset='utf-8'>
   <meta content='text/html; charset=utf-8' http-equiv='Content-Type'>
-  <%= stylesheet_link_tag rails_info_stylesheet, media: 'all' %>
+  <%= stylesheet_link_tag layout, media: 'all' %>
+  <%= yield :styles %>
   <%= javascript_include_tag 'rails_info/application' %>
+  <%= yield :scripts %>
   <%= csrf_meta_tags %>
 </head>
 <body>
   <%= render 'rails_info/shared/navigation' %>
+  <section id="dialog">
+    <%= image_tag 'rails_info/spinner.gif', class: 'hide', id: 'dialog_body_spinner' %>
+    <div id="dialog_body"/>
+  </section>
   <div class='container-fluid'>
     <div class="row-fluid">
       <div class="span12">  

data/app/views/rails_info/version_control/filters/_categories.html.erb

@@ -0,0 +1,30 @@
+
+<div class="bootstrap_accordion">
+  <% display = 'block' %>
+  <% @filter.files_by_category.each do |category, setting| %>
+    <% paths = setting[:files].keys.sort %>
+    <div>
+      <h3><a href="#"><%= category.to_s.humanize %> (<%= setting[:files].keys.length %> Files)</a></h3>
+      <div class="tabs">
+        <p>Diff from last revision to previous revision (TODO)</p>
+        <ul>
+          <% paths.each do |path| %>
+            <% commits = setting[:files][path] %>
+            <li>
+              <% matching_part = setting[:paths].select{|part| path.match(part) }.first %>
+              <a href="#<%= version_control_path_id(path) %>">
+                <%= matching_part ? path.gsub(matching_part, '') : path %>
+              </a>
+            </li>
+          <% end %>
+        </ul>
+        <% paths.each do |path| %>
+          <div id="<%=version_control_path_id(path)%>">
+            <%= render 'file_commits', commits: setting[:files][path], path: path %>
+          </div>
+        <% end %>
+      </div>
+    </div>
+    <% display = 'none' %>
+  <% end %>
+</div>

data/app/views/rails_info/version_control/filters/_file_commits.html.erb

@@ -0,0 +1,68 @@
+<% previous_file_rev = @filter.previous_revision_by_file[path] %>
+<p>
+  <strong>Full Path:</strong> <%= path %>
+</p>
+<%= form_tag '#', method: 'post', class: 'file_commits' do %>
+  <%= hidden_field_tag :repository_path, @filter.repository_path %>
+  <%= hidden_field_tag :project_slug, @filter.project_slug %>
+  <%= hidden_field_tag :path, path %>
+  <table class='table table-striped table-condensed'>
+    <thead>
+      <tr>
+        <th colspan="2" style="width: 50px; text-align:center">
+          <%= version_control_diff_link path, commits.first[:id].try(:to_s) %>
+        </th>
+        <th>Date</th>
+        <th>Author</th>
+        <th>Message</th>
+      </tr>
+    </thead>
+    <tbody>
+      <% param = params[version_control_path_id(path)] || {} %>
+      <% commits.each_with_index do |commit, commits_index| %>
+        <tr>
+          <td style="width:25px; text-align:center">
+            <% first_commit = previous_file_rev.blank? && commit[:id].try(:to_s) == commits.last[:id].try(:to_s) %>
+            <% unless first_commit %>
+              <% checked = param['rev'] == commit[:id].try(:to_s) ? true : false %>
+              <% checked = true if commits_index == 0 && !param.has_key?('rev') %>
+              <%= radio_button_tag :rev, commit[:id].try(:to_s), checked, id: '' %>
+            <% end %>
+          </td>
+          <td style="width:25px; text-align:center">  
+            <% unless commits_index == 0 %>
+              <% checked = param['rev_to'] == commit[:id].try(:to_s) ? true : false %>
+              <% checked = true if commits_index == (commits.length - 1) && !param.has_key?('rev_to') %>
+              <%= radio_button_tag :rev_to, commit[:id].try(:to_s), checked, id: '' %>
+            <% end %>
+          </td>
+          <td><%= version_control_file_revision_link commit[:committed_at], commit[:id], path, method: 'annotate' %></td>
+          <td><%= commit[:author]%></td>
+          <td>
+            <%= raw commit[:message].gsub(/#([0-9]+)/, '<a href="https://projects.mtvnn.com/issues/\1">#\1</a>') %>
+          </td>
+        </tr>
+      <% end %>
+    </tbody>
+    <tfoot>
+      <% if previous_file_rev.present? %>
+        <tr>
+          <td>
+          </td>
+          <td style="width:25px; text-align:center">  
+            <% checked = param['rev_to'] == previous_file_rev ? true : false %>
+            <% checked = true unless param.has_key?('rev_to') %>
+            <%= radio_button_tag :rev_to, previous_file_rev, checked, id: '' %>
+          </td>
+          <th colspan="3"/>
+        </tr>
+      <% end %>
+      <tr>
+        <th colspan="2" style="text-align:center">
+          <%= version_control_diff_link path, commits.first[:id].try(:to_s) %>
+        </th>
+        <th colspan="3"/>
+      </tr>
+    </tfoot>
+  </table>
+<% end %>