mason-server 0.0.3 → 0.0.4

data/Gemfile.lock

@@ -8,21 +8,23 @@ GIT
 PATH
   remote: /data/homedirs/ey/sr/buildozor/client
   specs:
-    mason-client (0)
+    mason-client (0.0.1)
       json
       rack
 
 PATH
   remote: .
   specs:
-    mason-server (0.0.1)
+    mason-server (0.0.3)
       dm-aggregates (~> 1.0.2)
       dm-core (~> 1.0.2)
       dm-migrations (~> 1.0.2)
       dm-postgres-adapter (~> 1.0.2)
       dm-timestamps (~> 1.0.2)
+      dm-validations (~> 1.0.2)
       json (~> 1.4.6)
       open4 (~> 1.0)
+      resque (~> 1.10.0)
       sinatra (~> 1.0)
 
 GEM
@@ -47,6 +49,8 @@ GEM
       do_postgres (~> 0.10.2)
     dm-timestamps (1.0.2)
       dm-core (~> 1.0.2)
+    dm-validations (1.0.2)
+      dm-core (~> 1.0.2)
     do_postgres (0.10.2)
       data_objects (= 0.10.2)
     extlib (0.9.15)
@@ -56,8 +60,18 @@ GEM
     rack-test (0.5.4)
       rack (>= 1.0)
     rake (0.8.7)
+    redis (2.0.9)
+    redis-namespace (0.8.0)
+      redis (< 3.0.0)
+    resque (1.10.0)
+      json (~> 1.4.6)
+      redis-namespace (~> 0.8.0)
+      sinatra (>= 0.9.2)
+      vegas (~> 0.1.2)
     sinatra (1.0)
       rack (>= 1.0)
+    vegas (0.1.7)
+      rack (>= 1.0.0)
 
 PLATFORMS
   ruby
@@ -70,10 +84,12 @@ DEPENDENCIES
   dm-migrations (~> 1.0.2)
   dm-postgres-adapter (~> 1.0.2)
   dm-timestamps (~> 1.0.2)
+  dm-validations (~> 1.0.2)
   json (~> 1.4.6)
   mason-client!
   mason-server!
   open4 (~> 1.0)
   rack-test
   rake
+  resque (~> 1.10.0)
   sinatra (~> 1.0)

data/lib/mason_server.rb

@@ -2,15 +2,18 @@ require "pathname"
 require "uri"
 
 require "dm-core"
+require "dm-validations"
 require "dm-aggregates"
 require "dm-timestamps"
 require "dm-migrations"
 require "json"
 require "sinatra"
 require "open4"
+require "resque"
 
-require "mason_server/build"
 require "mason_server/app"
+require "mason_server/build"
+require "mason_server/build_job"
 require "mason_server/command_runner"
 
 module MasonServer
@@ -25,6 +28,8 @@ module MasonServer
   def self.setup(url, directory)
     @url       = URI(url)
     @directory = Pathname(directory)
+
+    DataMapper::Model.raise_on_save_failure = true
   end
 
   def self.app

data/lib/mason_server/build.rb

@@ -3,10 +3,10 @@ module MasonServer
     include DataMapper::Resource
 
     property :id,           Serial
-    property :repo,         String,  :required => true
-    property :ref,          String,  :required => true
-    property :command,      String,  :required => true
-    property :callback,     String,  :required => true
+    property :repo,         String,  :required => true, :length => 255
+    property :ref,          String,  :required => true, :length => 255
+    property :command,      String,  :required => true, :length => 255
+    property :callback,     String,  :required => true, :length => 255
     property :status,       Integer
     property :output,       Text
     property :started_at,   DateTime
@@ -15,17 +15,13 @@ module MasonServer
     timestamps :at
 
     def self.run(request)
-      build = new(
+      build = create(
         :repo     => request.repo,
         :ref      => request.ref,
         :command  => request.command,
         :callback => request.callback
       )
 
-      unless build.save
-        raise Error, "failed to create build for #{request.inspect}"
-      end
-
       # TODO need aync
       build.run
       build.url
@@ -36,6 +32,10 @@ module MasonServer
     end
 
     def run
+      BuildJob.enqueue(id)
+    end
+
+    def run!
       start
       setup_checkout
       run_command
@@ -44,9 +44,7 @@ module MasonServer
     end
 
     def start
-      unless update(:started_at => Time.now)
-        raise Error, "failed to start build"
-      end
+      update(:started_at => Time.now)
     end
 
     def setup_checkout
@@ -57,9 +55,7 @@ module MasonServer
         output_handler(chunk)
       end
 
-      unless update(:status => status)
-        raise Error, "could not set status"
-      end
+      update(:status => status)
     end
 
     def output_handler(chunk)
@@ -71,13 +67,11 @@ module MasonServer
     end
 
     def complete
-      unless update(:completed_at => Time.now)
-        raise Error, "failed to complete build"
-      end
+      update(:completed_at => Time.now)
     end
 
     def notify
-      Net::HTTP.post_form(URI(callback.to_s), "payload" => payload.to_json)
+      Net::HTTP.post_form(URI(callback), "payload" => payload.to_json)
     end
 
     def payload

data/lib/mason_server/build_job.rb

@@ -0,0 +1,15 @@
+module MasonServer
+  class BuildJob
+    def self.queue
+      "mason"
+    end
+
+    def self.enqueue(build)
+      Resque.enqueue(self, build.id)
+    end
+
+    def self.perform(id)
+      Build.get!(id).run!
+    end
+  end
+end

data/mason-server.gemspec

@@ -1,17 +1,19 @@
 Gem::Specification.new do |s|
   s.name  = "mason-server"
-  s.version = "0.0.3"
+  s.version = "0.0.4"
   s.summary = "builds things"
 
   s.add_dependency "dm-core",             "~>1.0.2"
+  s.add_dependency "dm-validations",      "~>1.0.2"
   s.add_dependency "dm-aggregates",       "~>1.0.2"
-  s.add_dependency "dm-migrations",       "~>1.0.2"
   s.add_dependency "dm-timestamps",       "~>1.0.2"
+  s.add_dependency "dm-migrations",       "~>1.0.2"
   s.add_dependency "dm-postgres-adapter", "~>1.0.2"
 
   s.add_dependency "open4",   "~>1.0"
   s.add_dependency "sinatra", "~>1.0"
   s.add_dependency "json",    "~>1.4.6"
+  s.add_dependency "resque",  "~>1.10.0"
 
   s.files        = `git ls-files`.split("\n")
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: []
 
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-19 00:00:00 +02:00
+date: 2010-09-20 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,7 +32,7 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: dm-aggregates
+  name: dm-validations
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
@@ -46,7 +46,7 @@ dependencies:
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: dm-migrations
+  name: dm-aggregates
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
@@ -74,7 +74,7 @@ dependencies:
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: dm-postgres-adapter
+  name: dm-migrations
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     requirements: 
@@ -88,7 +88,7 @@ dependencies:
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: open4
+  name: dm-postgres-adapter
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     requirements: 
@@ -97,11 +97,12 @@ dependencies:
         segments: 
         - 1
         - 0
-        version: "1.0"
+        - 2
+        version: 1.0.2
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: sinatra
+  name: open4
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     requirements: 
@@ -114,9 +115,22 @@ dependencies:
   type: :runtime
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: json
+  name: sinatra
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 0
+        version: "1.0"
+  type: :runtime
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: json
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
@@ -126,7 +140,21 @@ dependencies:
         - 6
         version: 1.4.6
   type: :runtime
-  version_requirements: *id008
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
+  name: resque
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 10
+        - 0
+        version: 1.10.0
+  type: :runtime
+  version_requirements: *id010
 description: 
 email: 
 executables: []
@@ -145,6 +173,7 @@ files:
 - lib/mason_server.rb
 - lib/mason_server/app.rb
 - lib/mason_server/build.rb
+- lib/mason_server/build_job.rb
 - lib/mason_server/command_runner.rb
 - mason-server.gemspec
 - test/command_runner_test.rb