octopusci 0.3.11 → 0.3.12

data/README.markdown

@@ -1,14 +1,14 @@
-Octopusci
+OctopusCI
 =========
 
-Octopusci is fresh new take on a continuous integration server centralized
+OctopusCI is fresh new take on a continuous integration server centralized
 around the concept of getting the same great CI benefits when using a
 multi-branch workflow.
 
 How's it Different?
 -------------------
 
-The impetus that brought Octopusci into being was simply the lack of CI servers
+The impetus that brought OctopusCI into being was simply the lack of CI servers
 that cleanly supported a software development workflow based on multiple
 branches. Secondarily, it was the excessive amount of effort necessary to get a
 basic CI server up and running.
@@ -16,7 +16,7 @@ basic CI server up and running.
 Octopsuci fills this gap by providing intelligent multi-branch queueing
 and multi-server job distribution. Beyond that it provides a
 solid continous integration server that is trivial to get setup and running. A number
-of the concepts used in Octopusci are pulled from
+of the concepts used in OctopusCI are pulled from
 [Continuous Delivery](http://continuousdelivery.com/),
 [Continuous Integration](http://martinfowler.com/articles/continuousIntegration.html)
 as well as Scott Chacon's post on the 
@@ -26,14 +26,14 @@ The following is a listing of a number of some of its more significant features.
 
 ### Dynamic Multi-Branch Triggering
 
-Octopusci detects branch creation/modification and dynamically generates a build for
+OctopusCI detects branch creation/modification and dynamically generates a build for
 that branch based on the project the pushed branch belongs to. Most existing CI servers
 that I have used force you to manually define jobs for each branch you would like it to
 manage.
 
 ### Multi-Server Job Distribution
 
-Octopusci allows you to configure it to run "remote jobs" on numerous servers and it
+OctopusCI allows you to configure it to run "remote jobs" on numerous servers and it
 keeps track of which servers are currently busy as well as handing new jobs to the
 correct servers as they become available. This is extremely valuable if you are
 interested in running automated acceptance tests that take a long time to run such
@@ -41,17 +41,17 @@ as Selenium/Cucumber & Capybara Tests.
 
 ### Intelligent Multi-Branch Queueing
 
-Octopusci intelligently manages its job queue by by simply updating any pending jobs with
+OctopusCI intelligently manages its job queue by by simply updating any pending jobs with
 the newly pushed branch data. This means that at any given point in time there is only
-ever one pending job for each branch. When, a code push comes into Octopusci it
+ever one pending job for each branch. When, a code push comes into OctopusCI it
 first looks to see if there is already a pending job for the branch that was pushed. If
 there is, it simply updates the jobs associated branch data. If there is not already a
 pending job then it queues a new job for that branch.
 
 ### GitHub Integration ###
 
-Octopusci was designed specifically to integrate cleanly with GitHub's push notifications
-system. At some point in the future Octopusci may support more than just GitHub but for
+OctopusCI was designed specifically to integrate cleanly with GitHub's push notifications
+system. At some point in the future OctopusCI may support more than just GitHub but for
 the time being GitHub is our primary focus.
 
 Install Guide
@@ -59,9 +59,9 @@ Install Guide
 
 ### Install Dependencies ###
 
-Octopusci has one major dependency at the moment, [Redis](http://redis.io/).
+OctopusCI has one major dependency at the moment, [Redis](http://redis.io/).
 [Redis](http://redis.io/) needs to be installed and configured to startup appropriately
-on the box you plan to run Octopusci on.
+on the box you plan to run OctopusCI on.
 
 On Debian/Ubuntu machines this is to my knowledge as easy as `apt-get install redis-server`.
 
@@ -88,7 +88,7 @@ TODO: Fill this out with details on the config, required fields, optional fields
 ### Jobs ###
 
 Add any jobs you would like to the `/etc/octopusci/jobs` directory as .rb files
-and Octopusci will load them appropriately when started.
+and OctopusCI will load them appropriately when started.
 
 ### Web Interface ###
 
@@ -114,13 +114,13 @@ Apache virtual host example
       </Directory>
     </VirtualHost>
 
-The above will give us the web Octopusci web interface.
+The above will give us the web OctopusCI web interface.
 
 If you are developing you can simply start this up by running
 `rackup -p whatever_port` while inside the octopusci directory where the
 `config.ru` file exists.
 
-I recommend you setup the second half of Octopusci (`octopusci-tentacles`) with
+I recommend you setup the second half of OctopusCI (`octopusci-tentacles`) with
 God or some other monitoring system. However, for development you can simply
 run `octopusci-tentacles` directoly as follows:
 
@@ -129,9 +129,15 @@ run `octopusci-tentacles` directoly as follows:
 Screenshots
 -----------
 
-![Octopusci - Dashboard](https://img.skitch.com/20111005-tfxgw59mec5msnfu3pd6is3btf.jpg)
+![OctopusCI - Dashboard](https://img.skitch.com/20111005-tfxgw59mec5msnfu3pd6is3btf.jpg)
+
+IRC
+---
+
+We currently have a persistent IRC channel named `#octopusci` setup on `irc.freenode.net`.
+I try to be in this room all the time to help people out, answer questions, and help contributors out.
 
 Development
 -----------
 
-If you are interested in developing Octopusci then please checkout the [Developer Setup](http://github.com/cyphactor/octopusci/wiki/Developer-Setup) wiki page.
+If you are interested in developing OctopusCI then please checkout the [Developer Setup](http://github.com/cyphactor/octopusci/wiki/Developer-Setup) wiki page.

data/lib/octopusci/server/views/job_summary.erb

@@ -1,12 +1,9 @@
 <div class="job_header">
-  <div class="job_title" style="width: 100%;">
+  <div class="job_title">
     <span class="status <%= j['status'] %>"></span>
     <div style="float: left;">
       <a href="<%= j['payload']['repository']['url'] %>"><%= j['repo_name'] %></a> / <a href="/<%= j['repo_name'] %>/<%= j['branch_name'] %>/jobs"><%= j['branch_name'] %></a>
     </div>
-    <div style="float: right;">
-      <a href="">retry</a>
-    </div>
     <div style="clear: both;"></div>
   </div>
   <div class="created_on">
@@ -18,7 +15,7 @@
   <table>
     <tr>
       <td style="text-align: right;">Job:</td>
-      <td style="width: 200px;"><a href="/jobs/<%= j['id'] %>"><%= j['id'] %></a></td>
+      <td style="width: 200px;"><a href="/jobs/<%= j['id'] %>"><%= j['id'] %></a> ( <a href="/rebuild/<%= j['id'] %>">re-enqueue</a> )</td>
       <td style="text-align: right;">Before Commit:</td>
       <td>
         <% if !j['payload']['created'] %>

data/lib/octopusci/server.rb

@@ -70,6 +70,26 @@ module Octopusci
       @job = Octopusci::JobStore.get(params[:job_id])
       erb :job_summary, :layout => false, :locals => { :j => @job }
     end
+
+    get '/rebuild/:job_id' do
+      protected!
+
+      job = Octopusci::JobStore.get(params[:job_id])
+
+      # Make sure that the request is for a project Octopusci knows about
+      proj_info = Octopusci::Helpers.get_project_info(job['repo_name'], job['repo_owner_name'])
+      if proj_info.nil?
+        return 404
+      end
+
+      gh_pl_key = Octopusci::Queue.github_payload_key(job['repo_name'], job['branch_name'])
+      resque_encoded_payload = Octopusci::Queue.redis.get(gh_pl_key)
+      gh_pl = Resque.decode(resque_encoded_payload)
+
+      Octopusci::Queue.enqueue(proj_info['job_klass'], job['repo_name'], job['branch_name'], gh_pl, proj_info)
+
+      redirect '/'
+    end
     
     post '/github-build' do
       if params['payload'].nil?
@@ -95,4 +115,4 @@ module Octopusci
     end
 
   end
-end
+end

data/lib/octopusci/version.rb

@@ -1,3 +1,3 @@
 module Octopusci
-  Version = VERSION = '0.3.11'
+  Version = VERSION = '0.3.12'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: octopusci
 version: !ruby/object:Gem::Version
-  version: 0.3.11
+  version: 0.3.12
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-23 00:00:00.000000000 Z
+date: 2012-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70193733684480 !ruby/object:Gem::Requirement
+  requirement: &70107108014280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70193733684480
+  version_requirements: *70107108014280
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70193733684020 !ruby/object:Gem::Requirement
+  requirement: &70107108013340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70193733684020
+  version_requirements: *70107108013340
 - !ruby/object:Gem::Dependency
   name: resque
-  requirement: &70193733683400 !ruby/object:Gem::Requirement
+  requirement: &70107108040540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70193733683400
+  version_requirements: *70107108040540
 - !ruby/object:Gem::Dependency
   name: actionmailer
-  requirement: &70193733682980 !ruby/object:Gem::Requirement
+  requirement: &70107108039840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70193733682980
+  version_requirements: *70107108039840
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70193733682460 !ruby/object:Gem::Requirement
+  requirement: &70107108039080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70193733682460
+  version_requirements: *70107108039080
 - !ruby/object:Gem::Dependency
   name: time-ago-in-words
-  requirement: &70193733682020 !ruby/object:Gem::Requirement
+  requirement: &70107108038360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70193733682020
+  version_requirements: *70107108038360
 - !ruby/object:Gem::Dependency
   name: ansi2html
-  requirement: &70193733681600 !ruby/object:Gem::Requirement
+  requirement: &70107108036920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70193733681600
+  version_requirements: *70107108036920
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &70193733681100 !ruby/object:Gem::Requirement
+  requirement: &70107108036240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70193733681100
+  version_requirements: *70107108036240
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70193733680640 !ruby/object:Gem::Requirement
+  requirement: &70107108035260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70193733680640
+  version_requirements: *70107108035260
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70193733680180 !ruby/object:Gem::Requirement
+  requirement: &70107108034420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +121,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70193733680180
+  version_requirements: *70107108034420
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70193733679720 !ruby/object:Gem::Requirement
+  requirement: &70107108033800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,10 +132,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70193733679720
+  version_requirements: *70107108033800
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70193733679240 !ruby/object:Gem::Requirement
+  requirement: &70107108032800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,10 +143,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70193733679240
+  version_requirements: *70107108032800
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70193733678720 !ruby/object:Gem::Requirement
+  requirement: &70107108057400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -154,10 +154,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70193733678720
+  version_requirements: *70107108057400
 - !ruby/object:Gem::Dependency
   name: ruby_gntp
-  requirement: &70193733678120 !ruby/object:Gem::Requirement
+  requirement: &70107108056540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -165,7 +165,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70193733678120
+  version_requirements: *70107108056540
 description: A multi-branch Continuous Integration server that integrates with GitHub
 email:
 - cyphactor@gmail.com