mason-server 0.0.2 → 0.0.3

data/lib/mason_server.rb

@@ -1,4 +1,5 @@
 require "pathname"
+require "uri"
 
 require "dm-core"
 require "dm-aggregates"
@@ -11,15 +12,19 @@ require "open4"
 require "mason_server/build"
 require "mason_server/app"
 require "mason_server/command_runner"
-require "mason_server/deployment"
 
 module MasonServer
   class Error < StandardError; end
 
   Request = Struct.new(:repo, :ref, :command, :callback)
 
-  def self.setup(environment, url, db_config, directory)
-    @deployment = Deployment.new(environment, url, db_config, directory)
+  class << self
+    attr_reader :url, :directory
+  end
+
+  def self.setup(url, directory)
+    @url       = URI(url)
+    @directory = Pathname(directory)
   end
 
   def self.app
@@ -28,28 +33,4 @@ module MasonServer
 
   def self.enable_mock!
   end
-
-  def self.url
-    @deployment.url
-  end
-
-  def self.setup_db
-    @deployment.setup_db
-  end
-
-  def self.reset_db
-    @deployment.reset_db
-  end
-
-  def self.directory
-    @deployment.directory
-  end
-
-  def self.deployment
-    unless @deployment
-      raise Error, "call setup first"
-    end
-
-    @deployment
-  end
 end

data/lib/mason_server/build.rb

@@ -32,7 +32,7 @@ module MasonServer
     end
 
     def url
-      "#{MasonServer.url}/#{id}"
+      MasonServer.url + id.to_s
     end
 
     def run

data/lib/mason_server/command_runner.rb

@@ -5,7 +5,7 @@ module MasonServer
     end
 
     def initialize(directory, command, handler)
-      @directory = Pathname(directory)
+      @directory = directory
       @command   = command
       @handler   = handler
     end

data/mason-server.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name  = "mason-server"
-  s.version = "0.0.2"
+  s.version = "0.0.3"
   s.summary = "builds things"
 
   s.add_dependency "dm-core",             "~>1.0.2"

data/test/command_runner_test.rb

@@ -1,10 +1,14 @@
 require "helper"
 
 class CommandRunnerTest < Test::Unit::TestCase
+  setup do
+    @dir = Pathname("tmp").expand_path
+  end
+
   test "output" do
     output = ""
 
-    MasonServer::CommandRunner.run("tmp", "echo suck") do |chunk|
+    MasonServer::CommandRunner.run(@dir, "echo suck") do |chunk|
       output << chunk
     end
 
@@ -12,12 +16,12 @@ class CommandRunnerTest < Test::Unit::TestCase
   end
 
   test "success" do
-    result = MasonServer::CommandRunner.run("tmp", "true")
+    result = MasonServer::CommandRunner.run(@dir, "true")
     assert_equal 0, result
   end
 
   test "fail" do
-    result = MasonServer::CommandRunner.run("tmp", "false")
+    result = MasonServer::CommandRunner.run(@dir, "false")
     assert_equal 1, result
   end
 end

data/test/helper.rb

@@ -7,3 +7,34 @@ require "helper/mock_receiver"
 
 require "mason_client"
 require "mason_server"
+
+module Mason
+  module TestHelper
+    def db_setup
+      DataMapper.setup(:default, ("postgres://%s:%s@%s/%s" % db_config))
+    end
+
+    def db_reset
+      DataMapper.auto_migrate!
+    end
+
+    def app
+      @app ||= Rack::Builder.new {
+        map "/callback" do
+          run MasonClient.app
+        end
+
+        map "/" do
+          run MasonServer.app
+        end
+      }
+    end
+
+    def db_config
+      @db_config ||=
+        YAML.load_file("config/database.yml").
+        fetch("test").
+        values_at("username", "password", "host", "database")
+    end
+  end
+end

data/test/mason_server_test.rb

@@ -1,27 +1,14 @@
 require "helper"
 
 class MasonServerTest < Test::Unit::TestCase
-  include Rack::Test::Methods
-
-  def app
-    @app ||= Rack::Builder.new {
-      map "/callback" do
-        run MasonClient.app
-      end
-
-      map "/" do
-        run MasonServer.app
-      end
-    }
-  end
+  include Mason::TestHelper
 
   setup do
-    @receiver = MockReceiver.new
+    MasonServer.setup("http://mason.example.com", "tmp")
+    db_setup
+    db_reset
 
-    MasonServer.setup("test", "http://mason.example.com", "config/database.yml", "tmp")
-    MasonServer.setup_db
-    MasonServer.reset_db
-    MasonServer.enable_mock!
+    @receiver = MockReceiver.new
 
     MasonClient.setup("http://mason.example.com/") do |result|
       @receiver.handle(result)

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: []
 
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-18 00:00:00 +02:00
+date: 2010-09-19 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -146,7 +146,6 @@ files:
 - lib/mason_server/app.rb
 - lib/mason_server/build.rb
 - lib/mason_server/command_runner.rb
-- lib/mason_server/deployment.rb
 - mason-server.gemspec
 - test/command_runner_test.rb
 - test/helper.rb

data/lib/mason_server/deployment.rb

@@ -1,26 +0,0 @@
-module MasonServer
-  class Deployment
-    def initialize(environment, url, db_config_file, directory)
-      @environment    = environment
-      @url            = url
-      @db_config_file = db_config_file
-      @directory      = directory
-    end
-
-    attr_reader :url, :directory
-
-    def setup_db
-      DataMapper.setup(:default, ("postgres://%s:%s@%s/%s" % db_config))
-    end
-
-    def reset_db
-      DataMapper.auto_migrate!
-    end
-
-    def db_config
-      @db_config ||= YAML.load_file(@db_config_file).
-        fetch(@environment).
-        values_at("username", "password", "host", "database")
-    end
-  end
-end