octopusci 0.0.5 → 0.0.6

data/bin/octopusci-tentacles

@@ -5,4 +5,12 @@ $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
 require 'rubygems'
 require 'octopusci'
 
+# The StageLocker.load() method is called here not only to set things into
+# valid initial state. But, also in the case that octopusci-tentacles was
+# killed it nukes the potentially screwed up state the redis data is in and
+# initializes it the proper state based on the config.
+if Octopusci::CONFIG.has_key?('stages')
+  Octopusci::StageLocker.load(Octopusci::CONFIG['stages'])
+end
+
 Octopusci::WorkerLauncher.launch

data/lib/octopusci/job.rb

@@ -6,7 +6,10 @@ module Octopusci
 
     def self.perform(project_name, branch_name, job_id, job_conf)
       ActiveRecord::Base.verify_active_connections!
-      
+
+      # Note: There is no logic for handling stage coming back as nil because
+      # it should never happen because there are the same number of resque
+      # workers as there are stages at all times.
       if Octopusci::CONFIG.has_key?('stages')
         # Get the next available stage from redis which locks it by removing it
         # from the list of available

data/lib/octopusci/server.rb

@@ -11,14 +11,6 @@ module Octopusci
     set :public, "#{dir}/server/public"
     set :static, true
     
-    def initialize
-      if Octopusci::CONFIG.has_key?('stages')
-        Octopusci::StageLocker.load(Octopusci::CONFIG['stages'])
-      end
-      
-      super
-    end
-    
     before do
       ActiveRecord::Base.verify_active_connections!
     end

data/lib/octopusci/version.rb

@@ -1,3 +1,3 @@
 module Octopusci
-  Version = VERSION = '0.0.5'
+  Version = VERSION = '0.0.6'
 end

metadata

@@ -1,19 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: octopusci
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
 - Andrew De Ponte
+- Aldo Sarmiento
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-22 00:00:00.000000000Z
+date: 2011-09-23 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70272754582020 !ruby/object:Gem::Requirement
+  requirement: &70236289300900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70272754582020
+  version_requirements: *70236289300900
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70272754577000 !ruby/object:Gem::Requirement
+  requirement: &70236289297760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70272754577000
+  version_requirements: *70236289297760
 - !ruby/object:Gem::Dependency
   name: resque
-  requirement: &70272754575120 !ruby/object:Gem::Requirement
+  requirement: &70236289295540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70272754575120
+  version_requirements: *70236289295540
 - !ruby/object:Gem::Dependency
   name: actionmailer
-  requirement: &70272754574100 !ruby/object:Gem::Requirement
+  requirement: &70236289294600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +55,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70272754574100
+  version_requirements: *70236289294600
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70272754573060 !ruby/object:Gem::Requirement
+  requirement: &70236289293520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +66,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70272754573060
+  version_requirements: *70236289293520
 - !ruby/object:Gem::Dependency
   name: mysql
-  requirement: &70272754571980 !ruby/object:Gem::Requirement
+  requirement: &70236289292240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +77,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70272754571980
+  version_requirements: *70236289292240
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70272754570660 !ruby/object:Gem::Requirement
+  requirement: &70236289291100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +88,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70272754570660
+  version_requirements: *70236289291100
 - !ruby/object:Gem::Dependency
   name: time-ago-in-words
-  requirement: &70272754568760 !ruby/object:Gem::Requirement
+  requirement: &70236289277620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +99,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70272754568760
+  version_requirements: *70236289277620
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70272754556080 !ruby/object:Gem::Requirement
+  requirement: &70236289276660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +110,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70272754556080
+  version_requirements: *70236289276660
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70272754554900 !ruby/object:Gem::Requirement
+  requirement: &70236289275320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +121,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70272754554900
+  version_requirements: *70236289275320
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70272754552500 !ruby/object:Gem::Requirement
+  requirement: &70236289272920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +132,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70272754552500
+  version_requirements: *70236289272920
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70272754550100 !ruby/object:Gem::Requirement
+  requirement: &70236289271120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +143,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70272754550100
+  version_requirements: *70236289271120
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
-  requirement: &70272754548420 !ruby/object:Gem::Requirement
+  requirement: &70236289269000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +154,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70272754548420
+  version_requirements: *70236289269000
 - !ruby/object:Gem::Dependency
   name: growl
-  requirement: &70272754546800 !ruby/object:Gem::Requirement
+  requirement: &70236289267280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,10 +165,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70272754546800
+  version_requirements: *70236289267280
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70272754545420 !ruby/object:Gem::Requirement
+  requirement: &70236289266180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -175,10 +176,11 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70272754545420
+  version_requirements: *70236289266180
 description: A multi-branch Continous Integration server that integrates with GitHub
 email:
 - cyphactor@gmail.com
+- sarmiena@gmail.com
 executables:
 - octopusci-tentacles
 - octopusci-skel