dotcloud 0.0.2 → 0.0.3

data/Gemfile

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

data/Gemfile.lock

@@ -2,7 +2,7 @@ GEM
   specs:
     activesupport (3.0.8)
     git (1.2.5)
-    i18n (0.6.0)
+    i18n (0.5.0)
     jeweler (1.6.2)
       bundler (~> 1.0)
       git (>= 1.2.5)
@@ -13,6 +13,6 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  activesupport (~> 3.0.8)
-  i18n (~> 0.6.0)
-  jeweler (~> 1.6.2)
+  activesupport (~> 3.0.0)
+  i18n (~> 0.5.0)
+  jeweler (~> 1.6.0)

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/lib/dotcloud/host.rb

@@ -41,9 +41,13 @@ module DotCloud
     end
 
     private
+    def get_host
+      Socket.gethostname
+    end
+
     REGEX = /([a-zA-Z]+)-default-(.*)-([0-9]+)/
     def do_match
-      @host = Socket.gethostname
+      @host = get_host
       match = REGEX.match(@host)
       unless match
         puts "#{@host} did not match regex"

data/test/dsl_test.rb

@@ -40,6 +40,7 @@ class DslTest < Test::Unit::TestCase
     DotCloud::Host.instance.reset
     DotCloud::Host.instance.send :instance_variable_set, :@namespace, 'na'
     DotCloud.run
+    DotCloud::Host.instance.reset
     assert_nil @namespace
     assert_nil @service
 
@@ -47,6 +48,7 @@ class DslTest < Test::Unit::TestCase
     DotCloud::Host.instance.send :instance_variable_set, :@namespace, 'na'
     DotCloud::Host.instance.send :instance_variable_set, :@service, 'sb'
     DotCloud.run
+    DotCloud::Host.instance.reset
     assert_equal 'na', @namespace
     assert_equal 'sb', @service
   end

data/test/host_test.rb

@@ -0,0 +1,35 @@
+require 'test/test_helper'
+
+# TODO: replace with mocks or some other better method
+$host = nil
+module DotCloud
+  class Host
+    def get_host
+      $host
+    end
+  end
+end
+
+class HostTest < Test::Unit::TestCase
+  def setup
+    $host = nil
+    hi.reset
+  end
+
+  def hi
+    DotCloud::Host.instance
+  end
+
+  def test_invalid
+    assert_nil hi.namespace
+    assert_nil hi.service
+    assert_nil hi.id
+  end
+
+  def test_parse
+    $host = 'fundecho-default-www-0'
+    assert_equal 'fundecho', hi.namespace
+    assert_equal 'www', hi.service
+    assert_equal 0, hi.id
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dotcloud
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Nitay Joffe
@@ -57,12 +57,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 11
         segments: 
         - 0
-        - 6
+        - 5
         - 0
-        version: 0.6.0
+        version: 0.5.0
   name: i18n
   version_requirements: *id003
   prerelease: false
@@ -86,6 +86,7 @@ files:
 - lib/dotcloud/dsl.rb
 - lib/dotcloud/host.rb
 - test/dsl_test.rb
+- test/host_test.rb
 - test/test_helper.rb
 has_rdoc: true
 homepage: http://github.com/nitay/dotcloud