Merge pull request #1 from amaabca/errbit_update

Errbit update

Merge pull request #1 from amaabca/errbit_update
Errbit update
darkodosenovic
2 parents 2861fd96 9d90543a
Showing 24 changed files with 169 additions and 94 deletions Show diff stats
.travis.yml
Gemfile
Gemfile.lock
README.md
app/controllers/errs_controller.rb
app/models/issue_trackers/github_issues_tracker.rb
app/models/issue_trackers/pivotal_labs_tracker.rb
app/models/notice.rb
app/models/problem.rb
app/views/apps/show.html.haml
app/views/errs/_issue_tracker_links.html.haml
app/views/errs/_table.html.haml
app/views/errs/show.html.haml
app/views/notices/_user_attributes.html.haml
app/views/shared/_link_github_account.html.haml
app/views/users/_fields.html.haml
app/views/users/show.html.haml
db/migrate/20120603112130_change_github_url_to_github_repo.rb
spec/models/issue_trackers/pivotal_labs_tracker_spec.rb
spec/views/apps/index.html.haml_spec.rb
+language: ruby
 rvm:
   - 1.9.3
   - 1.9.2
   - 1.8.7
  
-
 # To stop Travis from running tests for a new commit,
 # add the following to your commit message: [ci skip]
 # You should add this when you edit documentation or comments, etc.
-
 source 'http://rubygems.org'
  
-gem 'rails', '3.2.5'
+gem 'rails', '3.2.6'
  
 gem 'nokogiri'
 gem 'mongoid', '~> 2.4.10'
@@ -2,16 +2,16 @@ GEM
   remote: http://rubygems.org/
   specs:
     SystemTimer (1.2.3)
-    actionmailer (3.2.5)
-      actionpack (= 3.2.5)
+    actionmailer (3.2.6)
+      actionpack (= 3.2.6)
       mail (~> 2.4.4)
     actionmailer_inline_css (1.3.1)
       actionmailer (>= 3.0.0)
       nokogiri (>= 1.4.4)
       premailer (>= 1.7.1)
-    actionpack (3.2.5)
-      activemodel (= 3.2.5)
-      activesupport (= 3.2.5)
+    actionpack (3.2.6)
+      activemodel (= 3.2.6)
+      activesupport (= 3.2.6)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.1)
@@ -19,18 +19,18 @@ GEM
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.1.3)
-    activemodel (3.2.5)
-      activesupport (= 3.2.5)
+    activemodel (3.2.6)
+      activesupport (= 3.2.6)
       builder (~> 3.0.0)
-    activerecord (3.2.5)
-      activemodel (= 3.2.5)
-      activesupport (= 3.2.5)
+    activerecord (3.2.6)
+      activemodel (= 3.2.6)
+      activesupport (= 3.2.6)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.5)
-      activemodel (= 3.2.5)
-      activesupport (= 3.2.5)
-    activesupport (3.2.5)
+    activeresource (3.2.6)
+      activemodel (= 3.2.6)
+      activesupport (= 3.2.6)
+    activesupport (3.2.6)
       i18n (~> 0.6)
       multi_json (~> 1.0)
     addressable (2.2.8)
@@ -88,7 +88,7 @@ GEM
     inherited_resources (1.3.1)
       has_scope (~> 0.5.0)
       responders (~> 0.6)
-    journey (1.0.3)
+    journey (1.0.4)
     json (1.7.3)
     kaminari (0.13.0)
       actionpack (>= 3.0.0)
@@ -106,7 +106,7 @@ GEM
       activesupport (>= 3.0.0)
     linecache (0.46)
       rbx-require-relative (> 0.0.4)
-    linecache19 (0.5.12)
+    linecache19 (0.5.13)
       ruby_core_source (>= 0.1.4)
     mail (2.4.4)
       i18n (>= 0.4.0)
@@ -170,19 +170,19 @@ GEM
     rack-ssl-enforcer (0.2.4)
     rack-test (0.6.1)
       rack (>= 1.0)
-    rails (3.2.5)
-      actionmailer (= 3.2.5)
-      actionpack (= 3.2.5)
-      activerecord (= 3.2.5)
-      activeresource (= 3.2.5)
-      activesupport (= 3.2.5)
+    rails (3.2.6)
+      actionmailer (= 3.2.6)
+      actionpack (= 3.2.6)
+      activerecord (= 3.2.6)
+      activeresource (= 3.2.6)
+      activesupport (= 3.2.6)
       bundler (~> 1.0)
-      railties (= 3.2.5)
+      railties (= 3.2.6)
     rails_autolink (1.0.9)
       rails (~> 3.1)
-    railties (3.2.5)
-      actionpack (= 3.2.5)
-      activesupport (= 3.2.5)
+    railties (3.2.6)
+      actionpack (= 3.2.6)
+      activesupport (= 3.2.6)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
@@ -299,7 +299,7 @@ DEPENDENCIES
   pivotal-tracker
   rack-ssl
   rack-ssl-enforcer
-  rails (= 3.2.5)
+  rails (= 3.2.6)
   rails_autolink (~> 1.0.9)
   ri_cal
   rspec (~> 2.6)
@@ -163,13 +163,30 @@ heroku run rake db:seed
  
   * If you are using a free database on Heroku, you may want to periodically clear resolved errors to free up space.
  
-```bash
-# Install the heroku cron addon, to clear resolved errors daily:
-heroku addons:add cron:daily
-
-# Or, clear resolved errors manually:
-heroku rake errbit:db:clear_resolved
-```
+    * With the heroku-scheduler add-on (replacement for cron):
+
+    ```bash
+    # Install the heroku scheduler add-on
+    heroku addons:add scheduler:standard
+    
+    # Go open the dashboard to schedule the job.  You should use
+    # 'rake errbit:db:clear_resolved' as the task command, and schedule it
+    # at whatever frequency you like (once/day should work great).
+    heroku addons:open scheduler
+    ```
+
+    * With the cron add-on:
+
+    ```bash
+    # Install the heroku cron addon, to clear resolved errors daily:
+    heroku addons:add cron:daily
+    ```
+
+    * Or clear resolved errors manually:
+
+    ```bash
+    heroku rake errbit:db:clear_resolved
+    ```
  
   * You may want to enable the deployment hook for heroku :
  
@@ -46,7 +46,7 @@ class ErrsController &lt; ApplicationController
       else
         @tracker = GithubIssuesTracker.new(
           :app         => @app,
-          :login       => current_user.github_login,
+          :username    => current_user.github_login,
           :oauth_token => current_user.github_oauth_token
         )
       end
@@ -21,7 +21,7 @@ class IssueTrackers::GithubIssuesTracker &lt; IssueTracker
  
   def check_params
     if Fields.detect {|f| self[f[0]].blank? }
-      errors.add :base, 'You must specify your GitHub repository, username and password'
+      errors.add :base, 'You must specify your GitHub username and password'
     end
   end
  
@@ -17,11 +17,18 @@ class IssueTrackers::PivotalLabsTracker &lt; IssueTracker
     PivotalTracker::Client.token = api_token
     PivotalTracker::Client.use_ssl = true
     project = PivotalTracker::Project.find project_id.to_i
-    story = project.stories.create :name => issue_title(problem), :story_type => 'bug', :description => body_template.result(binding)
-    problem.update_attributes(
-      :issue_link => "https://www.pivotaltracker.com/story/show/#{story.id}",
-      :issue_type => Label
-    )
+    story = project.stories.create :name => issue_title(problem),
+      :story_type => 'bug', :description => body_template.result(binding),
+      :requested_by => reported_by.name
+
+    if story.errors.present?
+      raise IssueTrackers::IssueTrackerError, story.errors.first
+    else
+      problem.update_attributes(
+        :issue_link => "https://www.pivotaltracker.com/story/show/#{story.id}",
+        :issue_type => Label
+      )
+    end
   end
  
   def body_template
@@ -94,6 +94,14 @@ class Notice
     backtrace.select { |l| l && l['file'] && l['file'].include?("[PROJECT_ROOT]") }
   end
  
+  def backtrace
+    # If gems are vendored into project, treat vendored gem dir as [GEM_ROOT]
+    (read_attribute(:backtrace) || []).map do |line|
+      # Changes "[PROJECT_ROOT]/rubygems/ruby/1.9.1/gems" to "[GEM_ROOT]/gems"
+      line.merge 'file' => line['file'].to_s.gsub(/\[PROJECT_ROOT\]\/.*\/ruby\/[0-9.]+\/gems/, '[GEM_ROOT]/gems')
+    end
+  end
+
   protected
  
   def increase_counter_cache
@@ -121,7 +129,7 @@ class Notice
       send("#{h}=",sanitize_hash(send(h)))
     end
     # Set unknown backtrace files
-    backtrace.each{|line| line['file'] = "[unknown source]" if line['file'].blank? }
+    read_attribute(:backtrace).each{|line| line['file'] = "[unknown source]" if line['file'].blank? }
   end
  
   def sanitize_hash(h)
@@ -119,7 +119,7 @@ class Problem
       end
       collection.update({'_id' => self.id},
                         {'$set' => {'app_name' => self.app_name,
-                          'last_deploy_at' => self.last_deploy_at}})
+                          'last_deploy_at' => self.last_deploy_at.try(:utc)}})
     end
   end
  
@@ -11,7 +11,7 @@
 - content_for :action_bar do
   - if current_user.admin?
     = link_to 'edit', edit_app_path(@app), :class => 'button'
-    = link_to 'destroy', app_path(@app), :method => :delete, :confirm => 'Seriously?', :class => 'button'
+    = link_to 'destroy', app_path(@app), :method => :delete, :data => { :confirm => 'Seriously?' }, :class => 'button'
     - if @all_errs
       = link_to 'unresolved errs', app_path(@app), :class => 'button'
     - else
 - if @app.issue_tracker_configured? || current_user.github_account?
   - if @problem.issue_link.present?
     %span= link_to 'go to issue', @problem.issue_link, :class => "#{@problem.issue_type}_goto goto-issue"
-    = link_to 'unlink issue', unlink_issue_app_err_path(@app, @problem), :method => :delete, :confirm => "Unlink err issues?", :class => "unlink-issue"
+    = link_to 'unlink issue', unlink_issue_app_err_path(@app, @problem), :method => :delete, :data => { :confirm => "Unlink err issues?" }, :class => "unlink-issue"
   - elsif @problem.issue_link == "pending"
     %span.disabled= link_to 'creating...', '#', :class => "#{@problem.issue_type}_inactive create-issue"
     = link_to 'retry', create_issue_app_err_path(@app, @problem), :method => :post
   - else
-    - if current_user.can_create_github_issues? && @app.github_repo?
-      %span= link_to 'create issue', create_issue_app_err_path(@app, @problem, :tracker => 'user_github'), :method => :post, :class => "github_create create-issue"
+    - if @app.github_repo?
+      - if current_user.can_create_github_issues?
+        %span= link_to 'create issue', create_issue_app_err_path(@app, @problem, :tracker => 'user_github'), :method => :post, :class => "github_create create-issue"
+      - elsif @app.issue_tracker_configured? && @app.issue_tracker.is_a?(GithubIssuesTracker)
+        %span= link_to 'create issue', create_issue_app_err_path(@app, @problem), :method => :post, :class => "github_create create-issue"
     - if @app.issue_tracker_configured? && !@app.issue_tracker.is_a?(GithubIssuesTracker)
       %span= link_to 'create issue', create_issue_app_err_path(@app, @problem), :method => :post, :class => "#{@app.issue_tracker.label}_create create-issue"
@@ -40,7 +40,7 @@
             %td.issue_link
               - if problem.app.issue_tracker_configured? && problem.issue_link.present? && problem.issue_link != 'pending'
                 = link_to image_tag("#{problem.issue_type}_goto.png"), problem.issue_link, :target => "_blank"
-          %td.resolve= link_to image_tag("thumbs-up.png"), resolve_app_err_path(problem.app, problem), :title => "Resolve", :method => :put, :confirm => err_confirm, :class => 'resolve' if problem.unresolved?
+          %td.resolve= link_to image_tag("thumbs-up.png"), resolve_app_err_path(problem.app, problem), :title => "Resolve", :method => :put, :data => { :confirm => err_confirm }, :class => 'resolve' if problem.unresolved?
       - if errs.none?
         %tr
           %td{:colspan => (any_issue_links ? 8 : 7)}
@@ -13,7 +13,7 @@
   = last_notice_at(@problem).to_s(:precise)
 - content_for :action_bar do
   - if @problem.unresolved?
-    %span= link_to 'resolve', resolve_app_err_path(@app, @problem), :method => :put, :confirm => err_confirm, :class => 'resolve'
+    %span= link_to 'resolve', resolve_app_err_path(@app, @problem), :method => :put, :data => { :confirm => err_confirm }, :class => 'resolve'
   - if current_user.authentication_token
     %span= link_to 'iCal', app_err_path(:app_id => @app.id, :id => @problem.id, :format => "ics", :auth_token => current_user.authentication_token), :class => "calendar_link"
   %span>= link_to 'up', (request.env['HTTP_REFERER'] ? :back : app_errs_path(@app)), :class => 'up'
@@ -28,7 +28,7 @@
         %table.comment
           %tr
             %th
-              %span= link_to '&#10008;'.html_safe, app_err_comment_path(@app, @problem, comment), :method => :delete, :confirm => "Are sure you don't need this comment?", :class => "destroy-comment"
+              %span= link_to '&#10008;'.html_safe, app_err_comment_path(@app, @problem, comment), :method => :delete, :data => { :confirm => "Are sure you don't need this comment?" }, :class => "destroy-comment"
               = time_ago_in_words(comment.created_at, true) << " ago by "
               = link_to comment.user.email, user_path(comment.user)
           %tr
@@ -6,4 +6,4 @@
     - user.each do |user_key, user_value|
       %tr
         %th= user_key
-        %td= auto_link(user_value).html_safe
+        %td= auto_link(user_value.to_s).html_safe
 - if Errbit::Config.github_authentication && user == current_user
   - if user.github_account?
-    %span.unlink_github= link_to "Unlink GitHub account", unlink_github_user_path(user), :method => :delete, :confirm => "Are you sure?"
+    %span.unlink_github= link_to "Unlink GitHub account", unlink_github_user_path(user), :method => :delete, :data => { :confirm => "Are you sure?" }
   - else
     %span.github= link_to "Link GitHub account", user_omniauth_authorize_path(:github)
@@ -18,7 +18,7 @@
   = f.text_field :github_login
  
 .required
-  = f.label 'Entries per page'
+  = f.label :per_page, 'Entries per page'
   = f.select :per_page, [10, 20, 30, 50, 75, 100]
  
 .required
@@ -3,7 +3,7 @@
   = render 'shared/link_github_account', :user => @user
   %span= link_to('Add a New User', new_user_path, :class => 'add')
   = link_to 'edit', edit_user_path(@user), :class => 'button'
-  = link_to 'destroy', user_path(@user), :method => :delete, :confirm => 'Seriously?', :class => 'button'
+  = link_to 'destroy', user_path(@user), :method => :delete, :data => { :confirm => 'Seriously?' }, :class => 'button'
  
  
 %table.single_user
@@ -3,7 +3,7 @@ class ChangeGithubUrlToGithubRepo &lt; Mongoid::Migration
     App.collection.update({}, {'$rename' => {'github_url' => 'github_repo'}}, multi: true, safe: true)
     App.all.each do |app|
       app.send :normalize_github_repo
-      app.save!
+      app.save
     end
   end
  
 require 'spec_helper'
  
 describe IssueTrackers::PivotalLabsTracker do
-  it "should create an issue on Pivotal Tracker with problem params, and set issue link for problem" do
-    notice = Fabricate :notice
-    tracker = Fabricate :pivotal_labs_tracker, :app => notice.app, :project_id => 10
-    problem = notice.problem
  
-    story_id = 5
-    @issue_link = "https://www.pivotaltracker.com/story/show/#{story_id}"
+  let(:user) { Fabricate(:user) }
+  let(:notice) { Fabricate(:notice) }
+  let(:tracker) { Fabricate :pivotal_labs_tracker, :app => notice.app, :project_id => 10 }
+  let(:problem) { notice.problem }
+  let(:story_id) { 5 }
+  let(:issue_link) { "https://www.pivotaltracker.com/story/show/#{story_id}" }
+
+  it "creates an issue on Pivotal Tracker with problem params, and set issue link for problem" do
     project_body = "<project><id>#{tracker.project_id}</id><name>TestProject</name></project>"
     stub_request(:get, "https://www.pivotaltracker.com/services/v3/projects/#{tracker.project_id}").
-                 to_return(:status => 200, :headers => {'Location' => @issue_link}, :body => project_body )
+                 to_return(:status => 200, :headers => {'Location' => issue_link}, :body => project_body )
     story_body = "<story><name>Test Story</name><id>#{story_id}</id></story>"
     stub_request(:post, "https://www.pivotaltracker.com/services/v3/projects/#{tracker.project_id}/stories").
-                 to_return(:status => 201, :headers => {'Location' => @issue_link}, :body => story_body )
+                 to_return(:status => 201, :headers => {'Location' => issue_link}, :body => story_body )
  
-    problem.app.issue_tracker.create_issue(problem)
+    problem.app.issue_tracker.create_issue(problem, user)
     problem.reload
  
     requested = have_requested(:post, "https://www.pivotaltracker.com/services/v3/projects/#{tracker.project_id}/stories")
@@ -24,7 +26,20 @@ describe IssueTrackers::PivotalLabsTracker do
     WebMock.should requested.with(:body => /<name>\[#{ problem.environment }\]\[#{problem.where}\] #{problem.message.to_s.truncate(100)}<\/name>/)
     WebMock.should requested.with(:body => /<description>.+<\/description>/m)
  
-    problem.issue_link.should == @issue_link
+    problem.issue_link.should == issue_link
+  end
+
+  it "raises IssueTrackers::IssueTrackerError exception when invalid params and does not set issue link for problem" do
+    project_body = "<project><id>#{tracker.project_id}</id><name>TestProject</name></project>"
+    stub_request(:get, "https://www.pivotaltracker.com/services/v3/projects/#{tracker.project_id}").
+                 to_return(:status => 200, :body => project_body )
+    story_body = "<errors><error>Requested by can't be blank</error><error>Requested by can't be blank</error></errors>"
+    stub_request(:post, "https://www.pivotaltracker.com/services/v3/projects/#{tracker.project_id}/stories").
+                 to_return(:status => 422, :body => story_body )
+
+    lambda { problem.app.issue_tracker.create_issue(problem, user)
+        }.should raise_exception(IssueTrackers::IssueTrackerError, "Requested by can't be blank")
+    problem.issue_link.should be_nil
   end
 end
  
@@ -2,11 +2,11 @@ require &#39;spec_helper&#39;
  
 describe "apps/index.html.haml" do
   before do
-    app = Fabricate(:app, :deploys => [Fabricate(:deploy, :revision => "123456789abcdef")])
+    app = stub_model(App, :deploys => [stub_model(Deploy, :created_at => Time.now, :revision => "123456789abcdef")])
     assign :apps, [app]
     assign :problem_counts, {app.id => 0}
     assign :unresolved_counts, {app.id => 0}
-    controller.stub(:current_user) { Fabricate(:user) }
+    controller.stub(:current_user) { stub_model(User) }
   end
  
   describe "deploy column" do
@@ -13,6 +13,12 @@ describe &quot;errs/show.html.haml&quot; do
     controller.stub(:current_user) { Fabricate(:user) }
   end
  
+  def with_issue_tracker(tracker, problem)
+    problem.app.issue_tracker = tracker.new :api_token => "token token token", :project_id => "1234"
+    assign :problem, problem
+    assign :app, problem.app
+  end
+
   describe "content_for :action_bar" do
     def action_bar
       view.content_for(:action_bar)
@@ -35,7 +41,7 @@ describe &quot;errs/show.html.haml&quot; do
       Errbit::Config.stub(:confirm_resolve_err).and_return(false)
       render
  
-      action_bar.should_not have_selector('a.resolve[data-confirm]')
+      action_bar.should have_selector('a.resolve[data-confirm="null"]')
     end
  
     it "should link 'up' to HTTP_REFERER if is set" do
@@ -68,6 +74,16 @@ describe &quot;errs/show.html.haml&quot; do
  
         action_bar.should have_selector("span a.github_create.create-issue", :text => 'create issue')
       end
+
+      it 'should allow creating issue for github if application has a github tracker' do
+        problem = Fabricate(:problem_with_comments, :app => Fabricate(:app, :github_repo => "test_user/test_repo"))
+        with_issue_tracker(GithubIssuesTracker, problem)
+        assign :problem, problem
+        assign :app, problem.app
+        render
+
+        action_bar.should have_selector("span a.github_create.create-issue", :text => 'create issue')
+      end
     end
   end
  
@@ -87,15 +103,9 @@ describe &quot;errs/show.html.haml&quot; do
     end
  
     context "with issue tracker" do
-      def with_issue_tracker(problem)
-        problem.app.issue_tracker = PivotalLabsTracker.new :api_token => "token token token", :project_id => "1234"
-        assign :problem, problem
-        assign :app, problem.app
-      end
-
       it 'should not display the comments section' do
         problem = Fabricate(:problem)
-        with_issue_tracker(problem)
+        with_issue_tracker(PivotalLabsTracker, problem)
         render
         view.view_flow.get(:comments).should be_blank
       end
@@ -103,7 +113,7 @@ describe &quot;errs/show.html.haml&quot; do
       it 'should display existing comments' do
         problem = Fabricate(:problem_with_comments)
         problem.reload
-        with_issue_tracker(problem)
+        with_issue_tracker(PivotalLabsTracker, problem)
         render
  
         view.content_for(:comments).should include('Test comment')
@@ -2,17 +2,15 @@ require &#39;spec_helper&#39;
  
 describe "notices/_backtrace.html.haml" do
   describe 'missing file in backtrace' do
-    before do
-      @notice = Fabricate(:notice, :backtrace => [{
-        'number'  => rand(999),
-        'file'    => nil,
-        'method'  => ActiveSupport.methods.shuffle.first
-      }])
-      assign :app, @notice.err.app
+    let(:notice) do
+      backtrace = { 'number' => rand(999), 'file' => nil, 'method' => ActiveSupport.methods.shuffle.first }
+      Fabricate(:notice, :backtrace => [backtrace])
     end
  
     it "should replace nil file with [unknown source]" do
-      render "notices/backtrace", :lines => @notice.backtrace
+      assign :app, notice.err.app
+
+      render "notices/backtrace", :lines => notice.backtrace
       rendered.should match(/\[unknown source\]/)
     end
   end
@@ -0,0 +1,18 @@
+require 'spec_helper'
+
+describe "notices/_user_attributes.html.haml" do
+  describe 'autolink' do
+    let(:notice) do
+      user_attributes = { 'foo' => {'bar' => 'http://example.com'} }
+      Fabricate(:notice, :user_attributes => user_attributes)
+    end
+
+    it "renders table with user attributes" do
+      assign :app, notice.err.app
+
+      render "notices/user_attributes", :user => notice.user_attributes
+      rendered.should have_link('http://example.com')
+    end
+  end
+end
+
@@ -2,12 +2,12 @@ require &#39;spec_helper&#39;
  
 describe 'users/show.html.haml' do
   let(:user) do
-    user = stub_model(User, :created_at => Time.now)
+    stub_model(User, :created_at => Time.now)
   end
  
   before do
     Errbit::Config.stub(:github_authentication) { true }
-    controller.stub(:current_user) { Fabricate(:user) }
+    controller.stub(:current_user) { stub_model(User) }
   end
  
   context 'with GitHub authentication' do
@@ -39,9 +39,8 @@ describe &#39;users/show.html.haml&#39; do
  
     context 'viewing own user page' do
       before do
-        @user = Fabricate(:user)
-        controller.stub!(:current_user).and_return(@user)
-        assign :user, @user
+        controller.stub(:current_user) { user }
+        assign :user, user
       end
  
       it 'shows link github button when no login or token' do
@@ -50,8 +49,9 @@ describe &#39;users/show.html.haml&#39; do
       end
  
       it 'shows unlink github button when login and token' do
-        @user.github_login = 'test_user'
-        @user.github_oauth_token = 'abcdef'
+        user.github_login = 'test_user'
+        user.github_oauth_token = 'abcdef'
+
         render
         view.content_for(:action_bar).should include('Unlink GitHub account')
       end
	1	+language: ruby
1	2	rvm:
2	3	- 1.9.3
3	4	- 1.9.2
4	5	- 1.8.7
5	6
6		-
7	7	# To stop Travis from running tests for a new commit,
8	8	# add the following to your commit message: [ci skip]
9	9	# You should add this when you edit documentation or comments, etc.
10		-
...	...
1	1	source 'http://rubygems.org'
2	2
3		-gem 'rails', '3.2.5'
	3	+gem 'rails', '3.2.6'
4	4
5	5	gem 'nokogiri'
6	6	gem 'mongoid', '~> 2.4.10'
...	...
...	...	@@ -2,16 +2,16 @@ GEM
2	2	remote: http://rubygems.org/
3	3	specs:
4	4	SystemTimer (1.2.3)
5		- actionmailer (3.2.5)
6		- actionpack (= 3.2.5)
	5	+ actionmailer (3.2.6)
	6	+ actionpack (= 3.2.6)
7	7	mail (~> 2.4.4)
8	8	actionmailer_inline_css (1.3.1)
9	9	actionmailer (>= 3.0.0)
10	10	nokogiri (>= 1.4.4)
11	11	premailer (>= 1.7.1)
12		- actionpack (3.2.5)
13		- activemodel (= 3.2.5)
14		- activesupport (= 3.2.5)
	12	+ actionpack (3.2.6)
	13	+ activemodel (= 3.2.6)
	14	+ activesupport (= 3.2.6)
15	15	builder (~> 3.0.0)
16	16	erubis (~> 2.7.0)
17	17	journey (~> 1.0.1)
...	...	@@ -19,18 +19,18 @@ GEM
19	19	rack-cache (~> 1.2)
20	20	rack-test (~> 0.6.1)
21	21	sprockets (~> 2.1.3)
22		- activemodel (3.2.5)
23		- activesupport (= 3.2.5)
	22	+ activemodel (3.2.6)
	23	+ activesupport (= 3.2.6)
24	24	builder (~> 3.0.0)
25		- activerecord (3.2.5)
26		- activemodel (= 3.2.5)
27		- activesupport (= 3.2.5)
	25	+ activerecord (3.2.6)
	26	+ activemodel (= 3.2.6)
	27	+ activesupport (= 3.2.6)
28	28	arel (~> 3.0.2)
29	29	tzinfo (~> 0.3.29)
30		- activeresource (3.2.5)
31		- activemodel (= 3.2.5)
32		- activesupport (= 3.2.5)
33		- activesupport (3.2.5)
	30	+ activeresource (3.2.6)
	31	+ activemodel (= 3.2.6)
	32	+ activesupport (= 3.2.6)
	33	+ activesupport (3.2.6)
34	34	i18n (~> 0.6)
35	35	multi_json (~> 1.0)
36	36	addressable (2.2.8)
...	...	@@ -88,7 +88,7 @@ GEM
88	88	inherited_resources (1.3.1)
89	89	has_scope (~> 0.5.0)
90	90	responders (~> 0.6)
91		- journey (1.0.3)
	91	+ journey (1.0.4)
92	92	json (1.7.3)
93	93	kaminari (0.13.0)
94	94	actionpack (>= 3.0.0)
...	...	@@ -106,7 +106,7 @@ GEM
106	106	activesupport (>= 3.0.0)
107	107	linecache (0.46)
108	108	rbx-require-relative (> 0.0.4)
109		- linecache19 (0.5.12)
	109	+ linecache19 (0.5.13)
110	110	ruby_core_source (>= 0.1.4)
111	111	mail (2.4.4)
112	112	i18n (>= 0.4.0)
...	...	@@ -170,19 +170,19 @@ GEM
170	170	rack-ssl-enforcer (0.2.4)
171	171	rack-test (0.6.1)
172	172	rack (>= 1.0)
173		- rails (3.2.5)
174		- actionmailer (= 3.2.5)
175		- actionpack (= 3.2.5)
176		- activerecord (= 3.2.5)
177		- activeresource (= 3.2.5)
178		- activesupport (= 3.2.5)
	173	+ rails (3.2.6)
	174	+ actionmailer (= 3.2.6)
	175	+ actionpack (= 3.2.6)
	176	+ activerecord (= 3.2.6)
	177	+ activeresource (= 3.2.6)
	178	+ activesupport (= 3.2.6)
179	179	bundler (~> 1.0)
180		- railties (= 3.2.5)
	180	+ railties (= 3.2.6)
181	181	rails_autolink (1.0.9)
182	182	rails (~> 3.1)
183		- railties (3.2.5)
184		- actionpack (= 3.2.5)
185		- activesupport (= 3.2.5)
	183	+ railties (3.2.6)
	184	+ actionpack (= 3.2.6)
	185	+ activesupport (= 3.2.6)
186	186	rack-ssl (~> 1.3.2)
187	187	rake (>= 0.8.7)
188	188	rdoc (~> 3.4)
...	...	@@ -299,7 +299,7 @@ DEPENDENCIES
299	299	pivotal-tracker
300	300	rack-ssl
301	301	rack-ssl-enforcer
302		- rails (= 3.2.5)
	302	+ rails (= 3.2.6)
303	303	rails_autolink (~> 1.0.9)
304	304	ri_cal
305	305	rspec (~> 2.6)
...	...
...	...	@@ -163,13 +163,30 @@ heroku run rake db:seed
163	163
164	164	* If you are using a free database on Heroku, you may want to periodically clear resolved errors to free up space.
165	165
166		-```bash
167		-# Install the heroku cron addon, to clear resolved errors daily:
168		-heroku addons:add cron:daily
169		-
170		-# Or, clear resolved errors manually:
171		-heroku rake errbit:db:clear_resolved
172		-```
	166	+ * With the heroku-scheduler add-on (replacement for cron):
	167	+
	168	+ ```bash
	169	+ # Install the heroku scheduler add-on
	170	+ heroku addons:add scheduler:standard
	171	+
	172	+ # Go open the dashboard to schedule the job. You should use
	173	+ # 'rake errbit:db:clear_resolved' as the task command, and schedule it
	174	+ # at whatever frequency you like (once/day should work great).
	175	+ heroku addons:open scheduler
	176	+ ```
	177	+
	178	+ * With the cron add-on:
	179	+
	180	+ ```bash
	181	+ # Install the heroku cron addon, to clear resolved errors daily:
	182	+ heroku addons:add cron:daily
	183	+ ```
	184	+
	185	+ * Or clear resolved errors manually:
	186	+
	187	+ ```bash
	188	+ heroku rake errbit:db:clear_resolved
	189	+ ```
173	190
174	191	* You may want to enable the deployment hook for heroku :
175	192
...	...
...	...	@@ -46,7 +46,7 @@ class ErrsController < ApplicationController
46	46	else
47	47	@tracker = GithubIssuesTracker.new(
48	48	:app => @app,
49		- :login => current_user.github_login,
	49	+ :username => current_user.github_login,
50	50	:oauth_token => current_user.github_oauth_token
51	51	)
52	52	end
...	...
...	...	@@ -21,7 +21,7 @@ class IssueTrackers::GithubIssuesTracker < IssueTracker
21	21
22	22	def check_params
23	23	if Fields.detect {\|f\| self[f[0]].blank? }
24		- errors.add :base, 'You must specify your GitHub repository, username and password'
	24	+ errors.add :base, 'You must specify your GitHub username and password'
25	25	end
26	26	end
27	27
...	...
...	...	@@ -17,11 +17,18 @@ class IssueTrackers::PivotalLabsTracker < IssueTracker
17	17	PivotalTracker::Client.token = api_token
18	18	PivotalTracker::Client.use_ssl = true
19	19	project = PivotalTracker::Project.find project_id.to_i
20		- story = project.stories.create :name => issue_title(problem), :story_type => 'bug', :description => body_template.result(binding)
21		- problem.update_attributes(
22		- :issue_link => "https://www.pivotaltracker.com/story/show/#{story.id}",
23		- :issue_type => Label
24		- )
	20	+ story = project.stories.create :name => issue_title(problem),
	21	+ :story_type => 'bug', :description => body_template.result(binding),
	22	+ :requested_by => reported_by.name
	23	+
	24	+ if story.errors.present?
	25	+ raise IssueTrackers::IssueTrackerError, story.errors.first
	26	+ else
	27	+ problem.update_attributes(
	28	+ :issue_link => "https://www.pivotaltracker.com/story/show/#{story.id}",
	29	+ :issue_type => Label
	30	+ )
	31	+ end
25	32	end
26	33
27	34	def body_template
...	...
...	...	@@ -94,6 +94,14 @@ class Notice
94	94	backtrace.select { \|l\| l && l['file'] && l['file'].include?("[PROJECT_ROOT]") }
95	95	end
96	96
	97	+ def backtrace
	98	+ # If gems are vendored into project, treat vendored gem dir as [GEM_ROOT]
	99	+ (read_attribute(:backtrace) \|\| []).map do \|line\|
	100	+ # Changes "[PROJECT_ROOT]/rubygems/ruby/1.9.1/gems" to "[GEM_ROOT]/gems"
	101	+ line.merge 'file' => line['file'].to_s.gsub(/\[PROJECT_ROOT\]\/.*\/ruby\/[0-9.]+\/gems/, '[GEM_ROOT]/gems')
	102	+ end
	103	+ end
	104	+
97	105	protected
98	106
99	107	def increase_counter_cache
...	...	@@ -121,7 +129,7 @@ class Notice
121	129	send("#{h}=",sanitize_hash(send(h)))
122	130	end
123	131	# Set unknown backtrace files
124		- backtrace.each{\|line\| line['file'] = "[unknown source]" if line['file'].blank? }
	132	+ read_attribute(:backtrace).each{\|line\| line['file'] = "[unknown source]" if line['file'].blank? }
125	133	end
126	134
127	135	def sanitize_hash(h)
...	...
...	...	@@ -119,7 +119,7 @@ class Problem
119	119	end
120	120	collection.update({'_id' => self.id},
121	121	{'$set' => {'app_name' => self.app_name,
122		- 'last_deploy_at' => self.last_deploy_at}})
	122	+ 'last_deploy_at' => self.last_deploy_at.try(:utc)}})
123	123	end
124	124	end
125	125
...	...
...	...	@@ -11,7 +11,7 @@
11	11	- content_for :action_bar do
12	12	- if current_user.admin?
13	13	= link_to 'edit', edit_app_path(@app), :class => 'button'
14		- = link_to 'destroy', app_path(@app), :method => :delete, :confirm => 'Seriously?', :class => 'button'
	14	+ = link_to 'destroy', app_path(@app), :method => :delete, :data => { :confirm => 'Seriously?' }, :class => 'button'
15	15	- if @all_errs
16	16	= link_to 'unresolved errs', app_path(@app), :class => 'button'
17	17	- else
...	...