dotcloud 0.0.1 → 0.0.2

data/Gemfile

@@ -1,3 +1,3 @@
-gem 'activesupport', '~> 3.0.8'
-gem 'jeweler', '~> 1.6.2'
+gem 'activesupport', '~> 3.0.0'
+gem 'jeweler', '~> 1.6.0'
 gem 'i18n', '~> 0.6.0'

data/Rakefile

@@ -1,3 +1,6 @@
+require 'rake'
+require 'rake/testtask'
+
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |s|
@@ -16,3 +19,12 @@ begin
 rescue LoadError
   puts "Jeweler, or one of its dependencies, is not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
 end
+
+task :default => [:test]
+
+desc "Run tests"
+Rake::TestTask.new("test") do |t|
+  t.pattern = 'test/*_test.rb'
+  t.verbose = true
+  t.warning = true
+end

data/TODO

@@ -1 +1,2 @@
-- Add tests
+- Logging
+- More testing

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/lib/dotcloud/dsl.rb

@@ -7,6 +7,10 @@ module DotCloud
     def service(name, &block)
       @services[name.to_s] = block
     end
+
+    def [](name)
+      @services[name]
+    end
   end
 
   class DSL
@@ -20,19 +24,40 @@ module DotCloud
     def namespace(name, &block)
       @current_namespace = Namespace.new
       @namespaces[name.to_s] = @current_namespace
+      yield
+      @current_namespace = nil
     end
+    alias_method :application, :namespace
 
     def service(name, &block)
+      raise ArgumentError, "No current namespace set" unless @current_namespace
       @current_namespace.service(name, &block)
     end
+
+    def run
+      namespace_str = Host.instance.namespace
+      namespace = @namespaces[namespace_str]
+      unless namespace
+        puts "No namespace '#{namespace_str}' found"
+        return
+      end
+
+      service_str = Host.instance.service
+      service = namespace[service_str]
+      unless service
+        puts "No service '#{service_str}' found in namespace '#{namespace_str}'"
+        return
+      end
+
+      service.call
+    end
   end
 end
 
+
 def namespace(name, &block)
-  DSL.instance.namespace(name, &block)
+  DotCloud::DSL.instance.namespace(name, &block)
 end
-alias_method :application, :namespace
-
 def service(name, &block)
-  DSL.instance.service(name, &block)
+  DotCloud::DSL.instance.service(name, &block)
 end

data/lib/dotcloud/host.rb

@@ -1,50 +1,60 @@
 module DotCloud
   class Host
-    class << self
-      def host
-        do_match
-        @@host
-      end
-      alias_method :str, :host
+    include Singleton
 
-      def namespace
-        do_match
-        @@namespace
-      end
-      alias_method :application, :namespace
-      alias_method :app, :namespace
+    def initialize
+      reset
+    end
 
-      def service
-        do_match
-        @@service
-      end
+    def reset
+      @host = nil
+      @namespace = nil
+      @service = nil
+      @id = nil
+    end
 
-      def id
-        do_match
-        @@id
-      end
+    def host
+      do_match unless @host
+      @host
+    end
+    alias_method :str, :host
 
-      def type
-        raise ArgumentError, "TODO: parse dotcloud.yml to get service mappings"
-      end
+    def namespace
+      do_match unless @namespace
+      @namespace
+    end
+    alias_method :application, :namespace
+    alias_method :app, :namespace
 
-      def matched?
-        class_variable_defined?(:@@namespace)
-      end
+    def service
+      do_match unless @service
+      @service
+    end
 
-      private
-      REGEX = /([a-zA-Z]+)-default-(.*)-([0-9]+)/
-      def do_match
-        return if matched?
+    def id
+      do_match unless @id
+      @id
+    end
 
-        @@host = Socket.gethostname
-        match = REGEX.match(@@host)
-        raise ArgumentError, "#{@@host} did not match regex" unless match
+    def type
+      raise ArgumentError, "TODO: parse dotcloud.yml to get service mappings"
+    end
 
-        @@namespace = match[1]
-        @@service = match[2]
-        @@id = match[3].to_i
+    private
+    REGEX = /([a-zA-Z]+)-default-(.*)-([0-9]+)/
+    def do_match
+      @host = Socket.gethostname
+      match = REGEX.match(@host)
+      unless match
+        puts "#{@host} did not match regex"
+        return false
       end
+
+      @namespace = match[1]
+      @service = match[2]
+      @id = match[3].to_i
+
+      true
     end
   end
 end

data/lib/dotcloud.rb

@@ -3,9 +3,18 @@ require 'fileutils'
 require 'socket'
 
 # 3rd party includes
+require 'rubygems'
 require 'active_support'
 
 # our files
 $LOAD_PATH.unshift File.dirname(__FILE__)
 require 'dotcloud/host'
 require 'dotcloud/dsl'
+
+module DotCloud
+  class << self
+    def run
+      DSL.instance.run
+    end
+  end
+end

data/test/dsl_test.rb

@@ -0,0 +1,53 @@
+require 'test/test_helper'
+
+class DslTest < Test::Unit::TestCase
+  def test_invalid_no_namespace
+    assert_raise(ArgumentError) do
+      service :foo do
+      end
+    end
+  end
+
+  def test_few
+    @namespace = nil
+    @service = nil
+
+    namespace :na do
+      service :sa do
+        @namespace = 'na'
+        @service = 'sa'
+      end
+      service :sb do
+        @namespace = 'na'
+        @service = 'sb'
+      end
+    end
+    namespace :nb do
+      service :sx do
+        @namespace = 'nb'
+        @service = 'sx'
+      end
+      service :sy do
+        @namespace = 'nb'
+        @service = 'sy'
+      end
+    end
+
+    DotCloud.run
+    assert_nil @namespace
+    assert_nil @service
+
+    DotCloud::Host.instance.reset
+    DotCloud::Host.instance.send :instance_variable_set, :@namespace, 'na'
+    DotCloud.run
+    assert_nil @namespace
+    assert_nil @service
+
+    DotCloud::Host.instance.reset
+    DotCloud::Host.instance.send :instance_variable_set, :@namespace, 'na'
+    DotCloud::Host.instance.send :instance_variable_set, :@service, 'sb'
+    DotCloud.run
+    assert_equal 'na', @namespace
+    assert_equal 'sb', @service
+  end
+end

data/test/test_helper.rb

@@ -0,0 +1,3 @@
+require 'test/unit'
+
+require File.expand_path('../../lib/dotcloud', __FILE__)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dotcloud
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Nitay Joffe
@@ -25,12 +25,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 7
         segments: 
         - 3
         - 0
-        - 8
-        version: 3.0.8
+        - 0
+        version: 3.0.0
   name: activesupport
   version_requirements: *id001
   prerelease: false
@@ -41,12 +41,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 11
+        hash: 15
         segments: 
         - 1
         - 6
-        - 2
-        version: 1.6.2
+        - 0
+        version: 1.6.0
   name: jeweler
   version_requirements: *id002
   prerelease: false
@@ -85,6 +85,8 @@ files:
 - lib/dotcloud.rb
 - lib/dotcloud/dsl.rb
 - lib/dotcloud/host.rb
+- test/dsl_test.rb
+- test/test_helper.rb
 has_rdoc: true
 homepage: http://github.com/nitay/dotcloud
 licenses: []