cap-util 1.1.0 → 1.2.0

data/.gitignore

@@ -1,11 +1,10 @@
 *.gem
 *.log
 *.rbc
+.rbx/
 .bundle
 .config
 .yardoc
-.rvmrc
-.rbenv-version
 Gemfile.lock
 InstalledFiles
 _yardoc

data/Gemfile

@@ -1,6 +1,6 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
 
 gemspec
 
-gem 'bundler', '~>1.1'
-gem 'rake',    '~>0.9.2'
+gem 'rake'
+gem 'pry'

data/{LICENSE → LICENSE.txt}

@@ -1,4 +1,4 @@
-Copyright (c) 2012 <TODO: copyright holders>
+Copyright (c) 2012-Present Kelly Redding and Collin Redding
 
 MIT License
 

data/README.md

@@ -2,23 +2,9 @@
 
 A set of utilities for writing cap tasks.  Use these to help extract business logic from your tasks and test them.
 
-## Installation
-
-Add this line to your application's Gemfile:
-
-    gem 'cap-util'
-
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
-
-    $ gem install cap-util
-
 ## The Mixin
 
-The main `CapUtil` mixin can be used to make any class a cap utility.  All the cap util requires is that your class define a `cap` method that returns an instance of a cap invocations.
+The main `CapUtil` mixin can be used to make any class a cap utility.  All the cap util requires is that your class define a `cap` method that returns an instance of a cap invocations.  The mixin provides a default `attr_accessor :cap` for you; set an `@cap` instance variable to use it or override it with a custom `def cap` method.
 
 ```ruby
 # in some_great_util.rb
@@ -166,6 +152,20 @@ class MyServerRolesYaml < CapUtil::ServerRolesYaml
 end
 ```
 
+## Installation
+
+Add this line to your application's Gemfile:
+
+    gem 'cap-util'
+
+And then execute:
+
+    $ bundle
+
+Or install it yourself as:
+
+    $ gem install cap-util
+
 ## Contributing
 
 1. Fork it

data/Rakefile

@@ -1,8 +1 @@
-#!/usr/bin/env rake
-
-require 'assert/rake_tasks'
-Assert::RakeTasks.install
-
 require 'bundler/gem_tasks'
-
-task :default => :build

data/cap-util.gemspec

@@ -1,23 +1,25 @@
 # -*- encoding: utf-8 -*-
-require File.expand_path('../lib/cap-util/version', __FILE__)
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require "cap-util/version"
 
 Gem::Specification.new do |gem|
   gem.name        = "cap-util"
   gem.version     = CapUtil::VERSION
-  gem.description = %q{A set of utilities for writing cap tasks.}
-  gem.summary     = %q{A set of utilities for writing cap tasks.}
-
   gem.authors     = ["Kelly Redding", "Collin Redding"]
   gem.email       = ["kelly@kellyredding.com", "collin.redding@me.com"]
+  gem.description = %q{A set of utilities for writing cap tasks.}
+  gem.summary     = %q{A set of utilities for writing cap tasks.}
   gem.homepage    = "http://github.com/redding/cap-util"
 
-  gem.files         = `git ls-files`.split("\n")
-  gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  gem.files         = `git ls-files`.split($/)
+  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_development_dependency("assert", ["~>1.0"])
+  gem.add_development_dependency("assert", ["~> 2.0"])
+
+  gem.add_dependency("scmd", ["~> 2.0"])
   gem.add_dependency("capistrano")
-  gem.add_dependency("scmd", ["~>2.0"])
 
 end

data/lib/cap-util.rb

@@ -1,8 +1,8 @@
+require 'cap-util/version'
 require 'cap-util/say'
-require 'cap-util/run'
 require 'cap-util/halt'
+require 'cap-util/run'
 require 'cap-util/time'
-
 require 'cap-util/unset_var'
 
 module CapUtil

data/lib/cap-util/server_roles.rb

@@ -61,8 +61,8 @@ module CapUtil
 
       attr_reader :hostname, :options
 
-      def initialize(name, options_list=[])
-        @hostname = "#{name}.reelfx.com"
+      def initialize(hostname, options_list=nil)
+        @hostname = hostname
         @options = {}
 
         # so, weird cap bug.  options have to match type when using them in
@@ -72,7 +72,7 @@ module CapUtil
         # so, I'm just defining each option, both in string (how it comes from
         # the configs) and symbol form.
 
-        options_list.each do |option|
+        (options_list || []).each do |option|
           @options[option.to_s]   = true
           @options[option.to_sym] = true
         end

data/lib/cap-util/timer.rb

@@ -1,4 +1,4 @@
-require 'cap-util'
+require 'cap-util/say'
 
 module CapUtil
   class Timer

data/lib/cap-util/unset_var.rb

@@ -1,3 +1,5 @@
+require 'cap-util/halt'
+
 module CapUtil
   module UnsetVar
 

data/lib/cap-util/version.rb

@@ -1,3 +1,3 @@
 module CapUtil
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

data/test/helper.rb

@@ -1,22 +1,13 @@
-# this file is automatically required in when you require 'assert' in your tests
-# put test helpers here
-ENV['CAPUTIL_SILENCE_SAY'] = 'yes'
+# this file is automatically required when you run `assert`
+# put any test helpers here
 
-# add root dir to the load path
+# add the root dir to the load path
 $LOAD_PATH.unshift(File.expand_path("../..", __FILE__))
 
-require 'cap-util'
-require 'cap-util/fake_cap'
-
-module TestHelpers
-
-  class AnCapUtil
-    include CapUtil
+# require pry for debugging (`binding.pry`)
+require 'pry'
 
-    def initialize(cap)
-      @cap = cap
-    end
-
-  end
+ENV['CAPUTIL_SILENCE_SAY'] = 'yes'
 
-end
+require 'cap-util'
+require 'cap-util/fake_cap'

data/test/support/an_cap_util.rb

@@ -0,0 +1,14 @@
+require 'cap-util'
+
+module TestHelpers
+
+  class AnCapUtil
+    include CapUtil
+
+    def initialize(cap)
+      @cap = cap
+    end
+
+  end
+
+end

data/test/{cap_util_tests.rb → system/cap_util_tests.rb}

@@ -1,6 +1,7 @@
 require 'assert'
+require 'test/support/an_cap_util'
 
-module CapUtil
+module CapUtilSysTests
 
   class CapUtilTests < Assert::Context
     desc "the CapUtil module"
@@ -26,7 +27,7 @@ module CapUtil
   class CapUtilMixinTests < Assert::Context
     desc "the CapUtil mixin"
     setup do
-      @cap_util = TestHelpers::AnCapUtil.new(FakeCap.new)
+      @cap_util = TestHelpers::AnCapUtil.new(CapUtil::FakeCap.new)
     end
     subject { @cap_util }
 

data/test/{fake_cap_tests.rb → unit/fake_cap_tests.rb}

@@ -1,13 +1,12 @@
 require 'assert'
-
 require 'cap-util/fake_cap'
 
-module CapUtil
+class CapUtil::FakeCap
 
-  class FakeCapTests < Assert::Context
+  class BaseTests < Assert::Context
     desc "the fake cap helper"
     setup do
-      @fc = FakeCap.new
+      @fc = CapUtil::FakeCap.new
     end
     subject { @fc }
 

data/test/{git_branch_tests.rb → unit/git_branch_tests.rb}

@@ -1,12 +1,11 @@
 require 'assert'
-
 require 'cap-util/git_branch'
 
-module CapUtil
+class CapUtil::GitBranch
 
-  class GitBranchTests < Assert::Context
+  class BaseTests < Assert::Context
     desc "the GitBranch util"
-    subject { GitBranch }
+    subject { CapUtil::GitBranch }
 
     should have_imeth :current
 

data/test/{local_cmd_runner_tests.rb → unit/local_cmd_runner_tests.rb}

@@ -1,13 +1,12 @@
 require 'assert'
-
 require 'cap-util/run'
 
-module CapUtil
+class CapUtil::LocalCmdRunner
 
-  class LocalCmdRunnerTests < Assert::Context
+  class BaseTests < Assert::Context
     desc "the local cmd runner helper class"
     setup do
-      @cmd_runner = LocalCmdRunner.new("echo hi")
+      @cmd_runner = CapUtil::LocalCmdRunner.new("echo hi")
     end
     subject { @cmd_runner }
 

data/test/{rake_task_tests.rb → unit/rake_task_tests.rb}

@@ -1,17 +1,16 @@
 require 'assert'
-
 require 'cap-util/rake_task'
 
-module CapUtil
+class CapUtil::RakeTask
 
-  class RakeTaskTests < Assert::Context
+  class BaseTests < Assert::Context
     desc "the rake task util"
     setup do
-      @fake_cap = FakeCap.new
+      @fake_cap = CapUtil::FakeCap.new
       @fake_cap.fetch_rake = "bundle exec rake"
       @fake_cap.current_path = "/a/current/path"
       @fake_cap.release_path = "/dat/release/path"
-      @rake_task_util = RakeTask.new(@fake_cap, 'a:task:to:run')
+      @rake_task_util = CapUtil::RakeTask.new(@fake_cap, 'a:task:to:run')
     end
     subject { @rake_task_util }
 
@@ -27,7 +26,7 @@ module CapUtil
     end
 
     should "run the task with a custom rake if given" do
-      task = RakeTask.new(@fake_cap, '', :rake => '/path/to/rake')
+      task = CapUtil::RakeTask.new(@fake_cap, '', :rake => '/path/to/rake')
       assert_match '/path/to/rake', task.cmd
     end
 
@@ -36,12 +35,12 @@ module CapUtil
     end
 
     should "use a custom cap path if given" do
-      task = RakeTask.new(@fake_cap, '', :root => :release_path)
+      task = CapUtil::RakeTask.new(@fake_cap, '', :root => :release_path)
       assert_match "cd #{@fake_cap.release_path} &&", task.cmd
     end
 
     should "use a custom env var string if given" do
-      task = RakeTask.new(@fake_cap, '', :env => "FOO=bar")
+      task = CapUtil::RakeTask.new(@fake_cap, '', :env => "FOO=bar")
       assert_match "FOO=bar bundle", task.cmd
     end
 

data/test/unit/server_roles_tests.rb

@@ -0,0 +1,115 @@
+require 'assert'
+require 'cap-util/server_roles'
+
+class CapUtil::ServerRoles
+
+  class BaseTests < Assert::Context
+    desc "the ServerRoles handler"
+    setup do
+      roles_yaml = <<YAML
+---
+hosts:
+  host1: [primary]
+  host2: []
+YAML
+      @fake_cap = CapUtil::FakeCap.new
+      @server_roles = CapUtil::ServerRoles.new(@fake_cap, roles_yaml)
+    end
+    subject { @server_roles }
+
+    should have_reader :roles
+    should have_imeth :apply
+
+    should "build cap roles from yaml using the apply meth" do
+      subject.apply
+      roles = @fake_cap.roles.sort{|a,b| a[1] <=> b[1]}
+
+      assert_equal 2, @fake_cap.roles.size
+      assert_equal ['hosts', 'host2', {}], roles.last
+    end
+
+  end
+
+  class RoleSetTests < Assert::Context
+    desc "the server roles RoleSet"
+    setup do
+      @roles_hash = {
+        'hosts' => {
+          'host1' => ['primary'],
+          'host2' => []
+        }
+      }
+      @role_set = CapUtil::ServerRoles::RoleSet.new @roles_hash
+    end
+    subject { @role_set }
+
+    should have_reader :role_defs
+    should have_imeth :each
+
+    should "yield the name, hostname, and opts for each host/server when iterating the roles" do
+      exp = [
+        ['hosts', 'host1', {:primary => true, 'primary' => true}],
+        ['hosts', 'host2', {}]
+      ]
+      actual = []
+      subject.each do |name, host, opts|
+        actual << [name, host, opts]
+      end
+
+      assert_equal exp, actual.sort{|a, b| a[1] <=> b[1]}
+    end
+  end
+
+  class RoleDefTests < RoleSetTests
+    desc "the server roles RoleDef"
+    setup do
+      @role_servers_hash = {
+        'host1' => ['primary'],
+        'host2' => []
+      }
+      @role = CapUtil::ServerRoles::RoleDef.new('hosts', @role_servers_hash)
+    end
+    subject { @role }
+
+    should have_reader :name, :servers
+    should have_imeth :apply
+
+    should "build a set of servers from a definition hash" do
+      servs = subject.servers.sort{|a, b| a.hostname <=> b.hostname }
+
+      assert_kind_of ::Array, servs
+      assert_equal 2, servs.size
+      assert_kind_of ServerDef, servs.first
+      assert_equal 'host2', servs.last.hostname
+      assert_equal true, servs.first.options['primary']
+    end
+
+  end
+
+  class ServerDefTests < Assert::Context
+    desc "the server roles ServerDef"
+    setup do
+      @server = CapUtil::ServerRoles::ServerDef.new('host1')
+    end
+    subject { @server }
+
+    should have_readers :hostname, :options
+
+    should "build its hostname from the server name" do
+      assert_equal "host1", subject.hostname
+    end
+
+    should "have no options by defoult" do
+      assert_empty subject.options
+    end
+
+    should "build its options with both string and symbol keys" do
+      server = CapUtil::ServerRoles::ServerDef.new('opts1', 'primary')
+
+      assert_equal true, server.options[:primary]
+      assert_equal true, server.options['primary']
+    end
+
+  end
+
+end

data/test/{server_roles_yaml_tests.rb → unit/server_roles_yaml_tests.rb}

@@ -1,13 +1,12 @@
 require 'assert'
-
 require 'cap-util/server_roles_yaml'
 
-module CapUtil
+class CapUtil::ServerRolesYaml
 
-  class ServerRolesYamlTests < Assert::Context
+  class BaseTests < Assert::Context
     desc "the ServerRolesYaml util"
     setup do
-      @roles_yaml = ServerRolesYaml.new(FakeCap.new )
+      @roles_yaml = CapUtil::ServerRolesYaml.new(CapUtil::FakeCap.new )
     end
     subject { @roles_yaml }
 
@@ -20,7 +19,7 @@ module CapUtil
     end
 
     should "use a custom desc and source if given" do
-      yml = ServerRolesYaml.new(FakeCap.new, {
+      yml = CapUtil::ServerRolesYaml.new(CapUtil::FakeCap.new, {
         :desc => 'staging',
         :source => 'the place'
       })

data/test/{shared_path_tests.rb → unit/shared_path_tests.rb}

@@ -1,18 +1,17 @@
 require 'assert'
 require 'fileutils'
 require 'pathname'
-
 require 'cap-util/shared_path'
 
-module CapUtil
+class CapUtil::SharedPath
 
-  class SharedPathTests < Assert::Context
+  class BaseTests < Assert::Context
     desc "the SharedPath util"
     setup do
-      @fake_cap = FakeCap.new
+      @fake_cap = CapUtil::FakeCap.new
       @fake_cap.shared_path = Pathname.new File.expand_path("tmp/shared")
 
-      @shared_path = SharedPath.new(@fake_cap)
+      @shared_path = CapUtil::SharedPath.new(@fake_cap)
     end
     subject { @shared_path }
 

data/test/{timer_tests.rb → unit/timer_tests.rb}

@@ -1,13 +1,12 @@
 require 'assert'
-
 require 'cap-util/timer'
 
-module CapUtil
+class CapUtil::Timer
 
-  class TimerTests < Assert::Context
+  class BaseTests < Assert::Context
     desc "the Timer helper class"
     setup do
-      @timer_util = Timer.new('a timer', :quiet)
+      @timer_util = CapUtil::Timer.new('a timer', :quiet)
     end
     subject { @timer_util }
 
@@ -41,7 +40,7 @@ module CapUtil
 
       assert_equal exp_end_time, subject.end_time
       assert_equal (exp_end_time - exp_start_time), subject.elapsed_time
-      assert_equal "0:01", Timer.pretty_time(subject.elapsed_time.to_i)
+      assert_equal "0:01", CapUtil::Timer.pretty_time(subject.elapsed_time.to_i)
     end
 
   end

data/test/{unset_var_tests.rb → unit/unset_var_tests.rb}

@@ -1,14 +1,13 @@
 require 'assert'
-
 require 'cap-util/unset_var'
 
-module CapUtil
+module CapUtil::UnsetVar
 
-  class UnsetVarTests < Assert::Context
+  class BaseTests < Assert::Context
     desc "the unset var helper"
     setup do
       @var_name = 'test'
-      @unset = UnsetVar.new(@var_name)
+      @unset = CapUtil::UnsetVar.new(@var_name)
     end
     subject { @unset }
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cap-util
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 31
   prerelease: 
   segments: 
   - 1
-  - 1
+  - 2
   - 0
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors: 
 - Kelly Redding
@@ -16,52 +16,52 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-02-04 00:00:00 Z
+date: 2013-03-25 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  name: assert
   prerelease: false
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 3
         segments: 
-        - 1
+        - 2
         - 0
-        version: "1.0"
-  requirement: *id001
-  name: assert
+        version: "2.0"
   type: :development
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
+  name: scmd
   prerelease: false
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         hash: 3
         segments: 
+        - 2
         - 0
-        version: "0"
-  requirement: *id002
-  name: capistrano
+        version: "2.0"
   type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
+  name: capistrano
   prerelease: false
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         hash: 3
         segments: 
-        - 2
         - 0
-        version: "2.0"
-  requirement: *id003
-  name: scmd
+        version: "0"
   type: :runtime
+  version_requirements: *id003
 description: A set of utilities for writing cap tasks.
 email: 
 - kelly@kellyredding.com
@@ -75,7 +75,7 @@ extra_rdoc_files: []
 files: 
 - .gitignore
 - Gemfile
-- LICENSE
+- LICENSE.txt
 - README.md
 - Rakefile
 - cap-util.gemspec
@@ -93,18 +93,18 @@ files:
 - lib/cap-util/timer.rb
 - lib/cap-util/unset_var.rb
 - lib/cap-util/version.rb
-- test/cap_util_tests.rb
-- test/fake_cap_tests.rb
-- test/git_branch_tests.rb
 - test/helper.rb
-- test/irb.rb
-- test/local_cmd_runner_tests.rb
-- test/rake_task_tests.rb
-- test/server_roles_tests.rb
-- test/server_roles_yaml_tests.rb
-- test/shared_path_tests.rb
-- test/timer_tests.rb
-- test/unset_var_tests.rb
+- test/support/an_cap_util.rb
+- test/system/cap_util_tests.rb
+- test/unit/fake_cap_tests.rb
+- test/unit/git_branch_tests.rb
+- test/unit/local_cmd_runner_tests.rb
+- test/unit/rake_task_tests.rb
+- test/unit/server_roles_tests.rb
+- test/unit/server_roles_yaml_tests.rb
+- test/unit/shared_path_tests.rb
+- test/unit/timer_tests.rb
+- test/unit/unset_var_tests.rb
 homepage: http://github.com/redding/cap-util
 licenses: []
 
@@ -134,20 +134,20 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A set of utilities for writing cap tasks.
 test_files: 
-- test/cap_util_tests.rb
-- test/fake_cap_tests.rb
-- test/git_branch_tests.rb
 - test/helper.rb
-- test/irb.rb
-- test/local_cmd_runner_tests.rb
-- test/rake_task_tests.rb
-- test/server_roles_tests.rb
-- test/server_roles_yaml_tests.rb
-- test/shared_path_tests.rb
-- test/timer_tests.rb
-- test/unset_var_tests.rb
+- test/support/an_cap_util.rb
+- test/system/cap_util_tests.rb
+- test/unit/fake_cap_tests.rb
+- test/unit/git_branch_tests.rb
+- test/unit/local_cmd_runner_tests.rb
+- test/unit/rake_task_tests.rb
+- test/unit/server_roles_tests.rb
+- test/unit/server_roles_yaml_tests.rb
+- test/unit/shared_path_tests.rb
+- test/unit/timer_tests.rb
+- test/unit/unset_var_tests.rb

data/test/irb.rb

@@ -1,9 +0,0 @@
-require 'assert/setup'
-
-# this file is required in when the 'irb' rake test is run.
-# b/c 'assert/setup' is required above, the test helper will be
-# required in as well.
-
-# put any IRB setup code here
-
-require 'cap-util'

data/test/server_roles_tests.rb

@@ -1,120 +0,0 @@
-require 'assert'
-
-require 'cap-util/server_roles'
-
-module CapUtil
-
-  class ServerRolesTests < Assert::Context
-    desc "the ServerRoles handler"
-    setup do
-      roles_yaml = <<YAML
----
-hosts:
-  host1: [primary]
-  host2: []
-YAML
-      @fake_cap = FakeCap.new
-      @server_roles = ServerRoles.new(@fake_cap, roles_yaml)
-    end
-    subject { @server_roles }
-
-    should have_reader :roles
-    should have_imeth :apply
-
-    should "build cap roles from yaml using the apply meth" do
-      subject.apply
-      roles = @fake_cap.roles.sort{|a,b| a[1] <=> b[1]}
-
-      assert_equal 2, @fake_cap.roles.size
-      assert_equal ['hosts', 'host2.reelfx.com', {}], roles.last
-    end
-
-  end
-
-  class ServerRoles
-
-    class RoleSetTests < Assert::Context
-      desc "the server roles RoleSet"
-      setup do
-        @roles_hash = {
-          'hosts' => {
-            'host1' => ['primary'],
-            'host2' => []
-          }
-        }
-        @role_set = RoleSet.new @roles_hash
-      end
-      subject { @role_set }
-
-      should have_reader :role_defs
-      should have_imeth :each
-
-      should "yield the name, hostname, and opts for each host/server when iterating the roles" do
-        exp = [
-          ['hosts', 'host1.reelfx.com', {:primary => true, 'primary' => true}],
-          ['hosts', 'host2.reelfx.com', {}]
-        ]
-        actual = []
-        subject.each do |name, host, opts|
-          actual << [name, host, opts]
-        end
-
-        assert_equal exp, actual.sort{|a, b| a[1] <=> b[1]}
-      end
-    end
-
-    class RoleDefTests < RoleSetTests
-      desc "the server roles RoleDef"
-      setup do
-        @role_servers_hash = {
-          'host1' => ['primary'],
-          'host2' => []
-        }
-        @role = RoleDef.new('hosts', @role_servers_hash)
-      end
-      subject { @role }
-
-      should have_reader :name, :servers
-      should have_imeth :apply
-
-      should "build a set of servers from a definition hash" do
-        servs = subject.servers.sort{|a, b| a.hostname <=> b.hostname }
-
-        assert_kind_of ::Array, servs
-        assert_equal 2, servs.size
-        assert_kind_of ServerDef, servs.first
-        assert_equal 'host2.reelfx.com', servs.last.hostname
-        assert_equal true, servs.first.options['primary']
-      end
-
-    end
-
-    class ServerDefTests < Assert::Context
-      desc "the server roles ServerDef"
-      setup do
-        @server = ServerDef.new('host1')
-      end
-      subject { @server }
-
-      should have_readers :hostname, :options
-
-      should "build its hostname from the server name" do
-        assert_equal "host1.reelfx.com", subject.hostname
-      end
-
-      should "have no options by defoult" do
-        assert_empty subject.options
-      end
-
-      should "build its options with both string and symbol keys" do
-        server = ServerDef.new('opts1', 'primary')
-
-        assert_equal true, server.options[:primary]
-        assert_equal true, server.options['primary']
-      end
-
-    end
-
-  end
-
-end