machines 0.5.4 → 0.5.6

data/spec/lib/packages/nginx_spec.rb

@@ -2,7 +2,6 @@ require 'spec_helper'
 
 describe 'packages/nginx' do
   before(:each) do
-    load_package('nginx')
     $conf.from_hash(webserver: {name: 'nginx', version: '1.2.3',
       path: 'nginx_path', conf_path: 'conf', modules: '--with-http_ssl_module'})
     $conf.from_hash(:passenger => {:nginx => '/passenger/path/ext/nginx'})

data/spec/lib/packages/openbox_spec.rb

@@ -1,10 +1,6 @@
 require 'spec_helper'
 
 describe 'packages/openbox' do
-  before(:each) do
-    load_package('openbox')
-  end
-
   it 'adds the following commands' do
     eval_package
     $conf.commands.map(&:info).join("\n").must_equal [

data/spec/lib/packages/passenger_nginx_spec.rb

@@ -2,7 +2,6 @@ require 'spec_helper'
 
 describe 'packages/passenger_nginx' do
   before(:each) do
-    load_package('passenger_nginx')
     $conf.from_hash(:webserver => {:path => 'nginx_dest', :version => '1.0.2'})
     $conf.password = 'pass'
     $conf.from_hash(:passenger => {:root => '/home/user/gems/passenger-1.2.3'})

data/spec/lib/packages/passenger_spec.rb

@@ -2,7 +2,6 @@ require 'spec_helper'
 
 describe 'packages/passenger' do
   before(:each) do
-    load_package('passenger')
     $conf.user_home = '/home/user'
     $conf.from_hash(:passenger => {:version => '3.0.7'})
     $conf.from_hash(:ruby => {:gems_path => 'ruby/gems', :executable => 'bin/ruby'})

data/spec/lib/packages/postfix_spec.rb

@@ -1,12 +1,8 @@
 require 'spec_helper'
 
 describe 'packages/postfix' do
-  before(:each) do
-    load_package('postfix')
-    $conf.from_hash(:mail => {:domain => 'domain'})
-  end
-
   it 'adds the following commands' do
+    $conf.from_hash(:mail => {:domain => 'domain'})
     eval_package
     $conf.commands.map(&:info).must_equal [
       "TASK   postfix - Install postfix mail",

data/spec/lib/packages/questions_spec.rb

@@ -2,24 +2,23 @@ require 'spec_helper'
 
 describe 'packages/questions' do
   before(:each) do
-    load_package('questions')
     $conf.machine = AppConf.new
   end
 
   it 'asks for a password' do
-    expects(:enter_password).with('users', false)
+    Core.any_instance.expects(:enter_password).with('users', false)
     eval_package
   end
 
   it 'does not ask for a password when machine is EC2' do
     $conf.machine.ec2 = {}
-    expects(:enter_password).never
+    Core.any_instance.expects(:enter_password).never
     eval_package
   end
 
   it 'sets password when logging' do
     $conf.log_only = true
-    expects(:enter_password).never
+    Core.any_instance.expects(:enter_password).never
     eval_package
     $conf.passwords.must_equal ['pa55word']
     $conf.password.must_equal 'pa55word'

data/spec/lib/packages/rbenv_spec.rb

@@ -2,24 +2,21 @@ require 'spec_helper'
 
 describe 'packages/rbenv' do
   before(:each) do
-    load_package('rbenv')
     $conf.ruby = AppConf.new
     $conf.ruby.version = '1.9.2'
     $conf.ruby.build = 'p290'
+    eval_package
   end
 
   it 'sets gems_path' do
-    eval_package
     $conf.ruby.gems_path.must_equal '.rbenv/versions/1.9.2-p290/lib/ruby/gems/1.9.1/gems'
   end
 
   it 'sets executable' do
-    eval_package
     $conf.ruby.executable.must_equal '.rbenv/versions/1.9.2-p290/bin/ruby'
   end
 
   it 'adds the following commands' do
-    eval_package
     $conf.commands.map(&:info).join("\n").must_equal [
       'TASK   rbenv - Install ruby-build, rbenv, ruby 1.9.2-p290 and Bundler',
       "SUDO   apt-get -q -y install git-core",

data/spec/lib/packages/rvm_spec.rb

@@ -2,23 +2,20 @@ require 'spec_helper'
 
 describe 'packages/rvm' do
   before(:each) do
-    load_package('rvm')
     $conf.from_hash(ruby: {version: '1.9.2', build: 'p290'})
     $conf.from_hash(rvm: {version:  '1.0'})
+    eval_package
   end
 
   it 'sets gems_path' do
-    eval_package
     $conf.ruby.gems_path.must_equal '.rvm/gems/1.9.2-p290/@global/gems'
   end
 
   it 'sets executable' do
-    eval_package
     $conf.ruby.executable.must_equal '.rvm/wrappers/1.9.2-p290@global/ruby'
   end
 
   it 'adds the following commands' do
-    eval_package
     $conf.commands.map(&:info).join("\n").must_equal [
       "TASK   rvm - Install RVM",
       "SUDO   apt-get -q -y install git-core",

data/spec/lib/packages/save_machines_spec.rb

@@ -2,7 +2,6 @@ require 'spec_helper'
 
 describe 'packages/save_machines' do
   before(:each) do
-    load_package('save_machines')
     $conf.machines_changed = true
     $conf.from_hash({'machines' => {'a_machine' => {'hostname' => 'something', 'environment' => 'development'}}})
   end

data/spec/lib/packages/slim_spec.rb

@@ -3,12 +3,11 @@ require 'spec_helper'
 describe 'packages/slim' do
   before(:each) do
     $conf.login_theme = 'custom'
-    load_package('slim')
     FileUtils.mkdir_p 'slim/themes'
+    eval_package
   end
 
   it 'adds the following commands' do
-    eval_package
     $conf.commands.map(&:info).must_equal [
       "TASK   slim - Install SLiM desktop manager",
       "SUDO   apt-get -q -y install slim",

data/spec/lib/packages/sqlserver_spec.rb

@@ -1,10 +1,6 @@
 require 'spec_helper'
 
 describe 'packages/sqlserver' do
-  before(:each) do
-    load_package('sqlserver')
-  end
-
   it 'adds the following commands' do
     eval_package
     $conf.commands.map(&:info).must_equal [

data/spec/lib/packages/timezone_spec.rb

@@ -2,7 +2,6 @@ require 'spec_helper'
 
 describe 'packages/timezone' do
   before(:each) do
-    load_package('timezone')
     $conf.timezone = 'GB'
   end
 
@@ -10,7 +9,7 @@ describe 'packages/timezone' do
     eval_package
     $conf.commands.map(&:info).must_equal [
       "TASK   timezone - Set timezone from config.yml",
-      "SUDO   ln -sf /etc/localtime /usr/share/zoneinfo/GB"
+      "SUDO   ln -sf /usr/share/zoneinfo/GB /etc/localtime"
     ]
   end
 
@@ -19,7 +18,7 @@ describe 'packages/timezone' do
     eval_package
     $conf.commands.map(&:info).must_equal [
       "TASK   timezone - Set timezone from config.yml",
-      "SUDO   ln -sf /etc/localtime /usr/share/zoneinfo/GB",
+      "SUDO   ln -sf /usr/share/zoneinfo/GB /etc/localtime",
       "SUDO   sed -i \"s/UTC=no/UTC=yes/\" /etc/default/rcS"
     ]
   end

data/spec/lib/packages/unison_spec.rb

@@ -2,13 +2,12 @@ require 'spec_helper'
 
 describe 'packages/unison' do
   before(:each) do
-    load_package('unison')
     $conf.machine = AppConf.new
     $conf.machine.user = 'username'
+    eval_package
   end
 
   it 'adds the following commands' do
-    eval_package
     $conf.commands.map(&:info).must_equal [
       "TASK   unison - Install and configure Unison (users/username/.unison/default.prf)",
       "SUDO   apt-get -q -y install unison",

data/spec/lib/packages/virtualbox_guest_spec.rb

@@ -1,10 +1,6 @@
 require 'spec_helper'
 
 describe 'packages/virtualbox_guest' do
-  before(:each) do
-    load_package('virtualbox_guest')
-  end
-
   it 'adds the following commands' do
     eval_package
     $conf.commands.map(&:info).must_equal [

data/spec/lib/packages/virtualbox_spec.rb

@@ -2,12 +2,11 @@ require 'spec_helper'
 
 describe 'packages/virtualbox' do
   before(:each) do
-    load_package('virtualbox')
     $conf.user = 'phil'
+    eval_package
   end
 
   it 'adds the following commands' do
-    eval_package
     $conf.commands.map(&:info).join("\n").must_equal [
       "TASK   virtualbox - Install VirtualBox",
       "SUDO   apt-get -q -y install dkms",

data/spec/lib/packages/webapps_spec.rb

@@ -2,11 +2,9 @@ require 'spec_helper'
 
 describe 'packages/webapps' do
   before(:each) do
-    load_package('webapps')
-
     $conf.from_hash(:user => {:name => 'username', :home => 'home_dir'}, :ruby => {:version => 'ruby_version'})
     $conf.webapps = {'application' =>
-      AppBuilder.new(
+      AppSettings::AppBuilder.new(
         'scm' => 'github.com/project',
         'branch' => 'master',
         'name' => 'application',

data/spec/spec_helper.rb

@@ -1,55 +1,52 @@
 $LOAD_PATH << 'lib'
 
 require 'bundler/setup'
-require 'minitest/spec'
-require 'mocha'
+require 'minitest/autorun'
+require 'mocha/setup'
 require 'stringio'
 require 'fakefs/safe'
 
 Dir['spec/support/*.rb'].each {|file| require File.join('./spec', 'support', File.basename(file)) }
 require 'machines'
-application_dir = $conf.application_dir
-
-include Machines::AppSettings
-
-# This is done so that Machines::Core.run doesn't collide with MiniTest::Unit::TestCase.run when included
-module Machines::Core
-  alias :run_command :run
-  remove_method :run
-end
-MiniTest::Spec.add_setup_hook do |klass|
-  klass.instance_eval do
-    alias :run :run_command if respond_to?(:run_command)
+$application_dir = $conf.application_dir
+
+include Machines
+modules = %w(Checks Configuration Database FileOperations Installation Questions Services)
+modules.each { |m| include eval("Machines::Commands::#{m}") }
+
+module MiniTestSetup
+  def before_setup
+    super
+    $conf.clear
+    $conf.passwords = []
+    $conf.commands = []
+    $conf.tasks = {}
+    $conf.application_dir = $application_dir
+
+    $input = StringIO.new
+    $output = StringIO.new
+    $terminal = HighLine.new($input, $output)
+
+    $debug = FakeOut.new
+    $file = FakeOut.new
+    $console = FakeOut.new
+    Machines::Command.debug = Machines::Logger.new $debug
+    Machines::Command.file = Machines::Logger.new $file
+    Machines::Command.console = Machines::Logger.new $console, :truncate => true
+
+    FakeFS.activate!
+    FileUtils.mkdir_p 'tmp'
   end
-end
-
-MiniTest::Spec.add_setup_hook do
-  include Machines::Checks
 
-  $conf.clear
-  $conf.passwords = []
-  $conf.commands = []
-  $conf.tasks = {}
-  $conf.application_dir = application_dir
-
-  $input = StringIO.new
-  $output = StringIO.new
-  $terminal = HighLine.new($input, $output)
-
-  $debug = FakeOut.new
-  $file = FakeOut.new
-  $console = FakeOut.new
-  Machines::Command.debug = Machines::Logger.new $debug
-  Machines::Command.file = Machines::Logger.new $file
-  Machines::Command.console = Machines::Logger.new $console, :truncate => true
-
-  FakeFS.activate!
-  FileUtils.mkdir_p 'tmp'
+  def after_teardown
+    FakeFS.deactivate!
+    FakeFS::FileSystem.clear
+    super
+  end
 end
 
-MiniTest::Spec.add_teardown_hook do
-  FakeFS.deactivate!
-  FakeFS::FileSystem.clear
+class MiniTest::Test
+  include MiniTestSetup
 end
 
 module MiniTest
@@ -61,32 +58,36 @@ module MiniTest
   end
 end
 
-class MiniTest::Spec::Package < MiniTest::Spec
-  include Machines
-  include AppSettings, CloudMachine, Commandline, Configuration, Core, Database
-  include FileOperations, Installation, Machinesfile, Questions, Services
+class Machines::Core
+  def eval_package content, name
+    eval content, nil, "eval: #{name}"
+  end
 end
 
-MiniTest::Spec.register_spec_type(/packages\//, MiniTest::Spec::Package)
+class MiniTest::Spec::Package < MiniTest::Spec
+  def core
+    @core ||= Core.new
+  end
 
-def RealFS &block
-  FakeFS.deactivate!
-  yield block
-ensure
-  FakeFS.activate!
-end
+  def load_package
+    FakeFS.deactivate!
+    @package_name = File.basename(self.class.name).split('::').first
+    @package = File.read File.join($conf.application_dir, 'packages', "#{@package_name}.rb")
+    FakeFS.activate!
+  end
 
-def load_package name
-  RealFS do
-    @package_path = File.join($conf.application_dir, File.join('packages', "#{name}.rb"))
-    @package = File.read(@package_path)
+  def eval_package
+    core.eval_package(@package, @package_name)
   end
-end
 
-def eval_package
-  eval @package, nil, @package_path
+  def before_setup
+    super
+    load_package
+  end
 end
 
+MiniTest::Spec.register_spec_type(/packages\//, MiniTest::Spec::Package)
+
 def save_yaml contents, path
   File.open(path, 'w') do |f|
     YAML.dump(contents, f)
@@ -98,6 +99,3 @@ def colored string, color
   string.sub!(/(\n|\r)$/, '')
   $terminal.color(string, color.to_sym) + ending.to_s
 end
-
-require 'minitest/autorun'
-

data/spec/support/minitest.rb

@@ -1,69 +1,11 @@
-# Standard minitest diff calls the OS's diff command. FakeFS breaks diff because
-# diff is looking for the files on disk but the files are written by Tempfile
-# while FakeFS is still active. The following modules provide a pure ruby diff
-# and override MiniTest::Assertions::diff to utilitize it.
-
-module Diff
-  attr_accessor :diffs, :sequences
-
-  def self.diffs(old, new)
-    new, old, @diffs = new.lines.to_a, old.lines.to_a, []
-    build_sequences(old, new)
-    find_diffs(old, new, old.size, new.size)
-  end
-
-  private
-
-  def self.find_diffs(old, new, row, col)
-    if row > 0 && col > 0 && old[row-1] == new[col-1]
-      find_diffs(old, new, row-1, col-1)
-      @diffs << { :line => row, :change => :same, :string => old[row-1].strip }
-    elsif col > 0 && (row == 0 || @sequences[row][col-1] >= @sequences[row-1][col])
-      find_diffs(old, new, row, col-1)
-      @diffs << { :line => col, :change => :add, :string => new[col-1].strip }
-    elsif row > 0 && (col == 0 || @sequences[row][col-1] < @sequences[row-1][col])
-      find_diffs(old, new, row-1, col)
-      @diffs << { :line => row, :change => :delete, :string => old[row-1].strip }
-    end
-  end
-
-  def self.build_sequences(old, new)
-    rows, cols = old.size+1, new.size+1
-    @sequences = rows.times.map{|x|[0]*(x+1)}
-    rows.times.each do |row|
-      cols.times.each do |col|
-        @sequences[row][col] = if old[row-1] == new[col-1]
-          @sequences[row-1][col-1] + 1
-        else
-          [@sequences[row][col-1].to_i, @sequences[row-1][col].to_i].max
-        end
-      end
-    end
-  end
-end
-
 module MiniTest
   module Assertions
-    SYMBOLS = {:add => '+', :delete => '-', :same => ' '}
+    alias :actual_diff :diff
 
     def diff exp, act
-      expect = mu_pp_for_diff exp
-      butwas = mu_pp_for_diff act
-      result = nil
-
-      need_to_diff =
-        (expect.include?("\n")    ||
-         butwas.include?("\n")    ||
-         expect.size > 30         ||
-         butwas.size > 30         ||
-         expect == butwas)
-
-      return "Expected: #{mu_pp exp}\n  Actual: #{mu_pp act}" unless need_to_diff
-
-      Diff.diffs(expect, butwas).map do |diff|
-        SYMBOLS[diff[:change]] + diff[:string]
-      end.join("\n")
+      FakeFS.without do
+        actual_diff exp, act
+      end
     end
   end
 end
-