machines 0.5.4 → 0.5.6

data/spec/lib/packages/abiword_spec.rb

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

data/spec/lib/packages/amazon_mp3_spec.rb

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

data/spec/lib/packages/awstats_spec.rb

@@ -2,14 +2,13 @@ require 'spec_helper'
 
 describe 'packages/awstats' do
   before(:each) do
-    load_package('awstats')
-    $conf.webapps = {'name' => AppBuilder.new({:name => 'appname', :path => 'apppath'})}
+    $conf.webapps = {'name' => AppSettings::AppBuilder.new({:name => 'appname', :path => 'apppath'})}
     FileUtils.mkdir('misc')
-    File.open('misc/awstats.conf.erb', 'w') {}
+    FileUtils.touch('misc/awstats.conf.erb')
+    eval_package
   end
 
   it 'adds the following commands' do
-    eval_package
     $conf.commands.map(&:info).join("\n").must_equal [
       "TASK   awstats - Install AWStats",
       "SUDO   apt-get -q -y install awstats",

data/spec/lib/packages/base_spec.rb

@@ -2,7 +2,6 @@ require 'spec_helper'
 
 describe 'packages/base' do
   it 'adds the following commands' do
-    load_package('base')
     eval_package
     $conf.commands.map(&:info).join("\n").must_equal [
       "TASK   base - Install base packages for compiling Ruby and libraries",

data/spec/lib/packages/chrome_spec.rb

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

data/spec/lib/packages/cruisecontrol_spec.rb

@@ -2,10 +2,9 @@ require 'spec_helper'
 
 describe 'packages/cruisecontrol' do
   before(:each) do
-    load_package('cruisecontrol')
     $conf.from_hash(ruby: {gems_path: 'ruby/gems'})
     $conf.webapps = {'application' =>
-      AppBuilder.new(
+      AppSettings::AppBuilder.new(
         'scm' => 'github.com/project',
         'title' => 'Application'
       )

data/spec/lib/packages/dependencies_spec.rb

@@ -2,12 +2,11 @@ require 'spec_helper'
 
 describe 'packages/dependencies' do
   before(:each) do
-    load_package('dependencies')
     $conf.hostname = 'hostname'
+    eval_package
   end
 
   it 'adds the following commands' do
-    eval_package
     $conf.commands.map(&:info).must_equal [
       "TASK   dependencies - Dependencies required for various commands to run",
       "SUDO   apt-get -q -y update > /tmp/apt-update.log",

data/spec/lib/packages/docky_spec.rb

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

data/spec/lib/packages/dotfiles_spec.rb

@@ -2,7 +2,6 @@ require 'spec_helper'
 
 describe 'packages/dotfiles' do
   before(:each) do
-    load_package('dotfiles')
     $conf.machine = AppConf.new
     $conf.machine.user = 'username'
     $conf.appsroot = 'appsroot'
@@ -18,7 +17,7 @@ describe 'packages/dotfiles' do
     eval_package
     $conf.commands.map(&:info).join("\n").must_equal [
       "TASK   dotfiles - Upload users/username/dotfiles and set some env vars",
-      "UPLOAD #{File.expand_path('users/username/dotfiles/bashrc')} to .bashrc",
+      "UPLOAD users/username/dotfiles/bashrc to .bashrc",
       "RUN    mkdir -p $HOME/.ssh",
       "RUN    chmod 700 $HOME/.ssh",
       "RUN    ssh-keyscan -H somehost >> $HOME/.ssh/known_hosts",
@@ -32,13 +31,15 @@ describe 'packages/dotfiles' do
   it 'sets RAILS_ENV when specified in set_rails_env_for' do
     $conf.set_rails_env_for = ['railsenv']
     eval_package
-    $conf.commands.map(&:info).join("\n").must_match /RUN    grep \"export RAILS_ENV=railsenv\" .profile || echo \"export RAILS_ENV=railsenv\" >> .profile/
+    expected = /RUN    grep \"export RAILS_ENV=railsenv\" .profile || echo \"export RAILS_ENV=railsenv\" >> .profile/
+    $conf.commands.map(&:info).join("\n").must_match expected
   end
 
   it 'RAILS_ENV not set when not specified in set_rails_env_for' do
     $conf.set_rails_env_for = ['some_other_env']
     eval_package
-    $conf.commands.map(&:info).join("\n").wont_match /RUN    grep \"export RAILS_ENV=railsenv\" .profile \|\| echo \"export RAILS_ENV=railsenv\" >> .profile/
+    expected = /RUN    grep \"export RAILS_ENV=railsenv\" .profile \|\| echo \"export RAILS_ENV=railsenv\" >> .profile/
+    $conf.commands.map(&:info).join("\n").wont_match expected
   end
 end
 

data/spec/lib/packages/dwm_spec.rb

@@ -0,0 +1,23 @@
+require 'spec_helper'
+
+describe 'packages/dwm' do
+  before do
+    $conf.dwm = AppConf.new
+    $conf.dwm.version = '6.0'
+  end
+
+  it 'adds the following commands' do
+    eval_package
+    $conf.commands.map(&:info).join("\n").must_equal [
+      "TASK   dwm - Download, compile and install dwm",
+      "SUDO   apt-get -q -y install build-essential",
+      "SUDO   apt-get -q -y install libx11-dev",
+      "SUDO   apt-get -q -y install libxinerama-dev",
+      "SUDO   apt-get -q -y install sharutils",
+      "SUDO   cd /tmp && wget http://dl.suckless.org/dwm/dwm-6.0.tar.gz && tar -zxf dwm-6.0.tar.gz && rm dwm-6.0.tar.gz && cd -",
+      "SUDO   mv -f /tmp/dwm-6.0 /usr/local/src",
+      "SUDO   cd /usr/local/src/dwm-6.0 && make clean install"
+    ].join("\n")
+  end
+end
+

data/spec/lib/packages/file_roller_spec.rb

@@ -1,10 +1,6 @@
 require 'spec_helper'
 
-describe 'packages/apps' do
-  before(:each) do
-    load_package('file_roller')
-  end
-
+describe 'packages/file_roller' do
   def append_command text
     "RUN    grep \"#{text}\" .local/share/applications/mimeapps.list || echo \"#{text}\" >> .local/share/applications/mimeapps.list"
   end

data/spec/lib/packages/firefox_spec.rb

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

data/spec/lib/packages/gedit_spec.rb

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

data/spec/lib/packages/git_spec.rb

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

data/spec/lib/packages/gmate_spec.rb

@@ -1,12 +1,8 @@
 require 'spec_helper'
 
 describe 'packages/gmate' do
-  before(:each) do
-    load_package('gmate')
-    $conf.appsroot = 'apps_root'
-  end
-
   it 'adds the following commands' do
+    $conf.appsroot = 'apps_root'
     eval_package
     $conf.commands.map(&:info).must_equal [
       "TASK   gmate - Clone and install gmate for gEdit from Github and set some preferences and plugins",

data/spec/lib/packages/gnome_spec.rb

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

data/spec/lib/packages/gnumeric_spec.rb

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

data/spec/lib/packages/hosts_spec.rb

@@ -2,7 +2,6 @@ require 'spec_helper'
 
 describe 'packages/hosts' do
   before(:each) do
-    load_package('hosts')
     $conf.machine = AppConf.new
     $conf.machine.hostname = 'hostname'
     $conf.from_hash(:hosts => {'some.domain' => '1.2.3.4'})

data/spec/lib/packages/load_machines_spec.rb

@@ -1,21 +1,20 @@
 require 'spec_helper'
 
 describe 'packages/load_machines' do
-  let(:settings) do
+  let(:settings) {
     {'machines' => {'a_machine' => {'hostname' => 'something', 'user' => 'phil', 'address' => '1.2.3.4'}}}
-  end
+  }
 
   def save_settings
     File.open('machines.yml', 'w') {|f| f.puts settings.to_yaml }
   end
 
   before(:each) do
-    load_package('load_machines')
     $conf.machine_name = 'a_machine'
     $conf.from_hash('appsroots' => {'phil' => '/home/phil'})
-    stubs(:load_app_settings)
-    stubs(:connect)
-    stubs(:run_instance)
+    core.stubs(:load_app_settings)
+    core.stubs(:connect)
+    core.stubs(:run_instance)
   end
 
   describe 'loading machines.yml' do
@@ -46,10 +45,13 @@ describe 'packages/load_machines' do
   end
 
   describe 'setting address' do
+    #TODO: should move from load_machines
+    class Core::ConfigError < StandardError; end
+
     it 'raises an exception when no address' do
       settings['machines']['a_machine']['address'] = nil
       save_settings
-      lambda { eval_package }.must_raise ConfigError
+      lambda { eval_package }.must_raise Core::ConfigError
     end
 
     describe 'when EC2' do
@@ -59,29 +61,29 @@ describe 'packages/load_machines' do
 
       it 'does not throw or connect when address set' do
         save_settings
-        expects(:connect).never
+        core.expects(:connect).never
         eval_package
       end
 
       it 'starts a new instance when no address' do
         settings['machines']['a_machine']['address'] = nil
         save_settings
-        expects(:connect).returns true
-        expects(:run_instance)
+        core.expects(:connect).returns true
+        core.expects(:run_instance)
         eval_package
       end
     end
   end
 
   it 'sets root_pass when not set' do
-    stubs(:generate_password).returns '1234'
+    core.stubs(:generate_password).returns '1234'
     save_settings
     eval_package
     $conf.machines.a_machine.root_pass.must_equal '1234'
   end
 
   it 'sets $conf.machines_changed when passwords are generated' do
-    stubs(:generate_password).returns '1234'
+    core.stubs(:generate_password).returns '1234'
     save_settings
     eval_package
     $conf.machines_changed.wont_equal nil
@@ -95,7 +97,7 @@ describe 'packages/load_machines' do
   end
 
   it 'does not overwrite root_pass' do
-    expects(:generate_password).never
+    core.expects(:generate_password).never
     settings['machines']['a_machine']['root_pass'] = 'something'
     save_settings
     eval_package
@@ -111,8 +113,7 @@ describe 'packages/load_machines' do
   it 'loads app settings' do
     settings['machines']['a_machine']['apps'] = ['app1', 'app2']
     save_settings
-    expects(:load_app_settings).with(['app1', 'app2'])
+    core.expects(:load_app_settings).with(['app1', 'app2'])
     eval_package
   end
 end
-

data/spec/lib/packages/monit_spec.rb

@@ -2,7 +2,6 @@ require 'spec_helper'
 
 describe 'packages/monit' do
   before(:each) do
-    load_package('monit')
     FileUtils.mkdir_p 'monit/conf.d'
     File.open('monit/monitrc.erb', 'w') {}
     File.open('monit/upstart.conf.erb', 'w') {}

data/spec/lib/packages/mysql_spec.rb

@@ -2,8 +2,6 @@ require 'spec_helper'
 
 describe 'packages/mysql' do
   before(:each) do
-    load_package('mysql')
-
     $conf.from_hash(:machine => {
       :address => 'DB_IP',
       :root_pass => 'DB_PASS',
@@ -38,7 +36,7 @@ describe 'packages/mysql' do
   describe 'dbmaster role' do
     it 'sets permissions for each app to access database and grants replication rights for slave' do
       $conf.roles = :dbmaster
-      $conf.webapps = {'name' => AppBuilder.new({:name => 'name', :password => 'PASSWORD'})}
+      $conf.webapps = {'name' => AppSettings::AppBuilder.new({:name => 'name', :password => 'PASSWORD'})}
       eval_package
       $conf.commands.map(&:info).must_equal [
         "TASK   dbperms - Grant applications access to the database",

data/spec/lib/packages/nginx_logrotate_spec.rb

@@ -2,8 +2,7 @@ require 'spec_helper'
 
 describe 'packages/nginx_logrotate' do
   before(:each) do
-    load_package('nginx_logrotate')
-    $conf.webapps = {'name' => AppBuilder.new({:name => 'appname', :path => 'apppath'})}
+    $conf.webapps = {'name' => AppSettings::AppBuilder.new({:name => 'appname', :path => 'apppath'})}
     FileUtils.mkdir_p 'logrotate'
     File.open('logrotate/nginx.erb', 'w') {|f| f.puts 'nginx template' }
     File.open('logrotate/app.erb', 'w') {|f| f.puts 'app template' }
@@ -28,51 +27,51 @@ describe 'packages/nginx_logrotate' do
 
   describe 'nginx logs template' do
     before(:each) do
+      skip
       nginx_template = nil
-      RealFS do
-        nginx_template = File.read 'lib/template/logrotate/nginx.erb'
-      end
+      FakeFS.deactivate!
+      nginx_template = File.read 'lib/template/logrotate/nginx.erb'
+      FakeFS.activate!
       File.open('logrotate/nginx.erb', 'w') {|f| f.puts nginx_template }
     end
 
     describe 'when awstats set' do
       it 'generates stats command' do
-        skip
         settings = stub 'AppBuilder'
         stats_prerotate = '/usr/lib/cgi-bin/awstats.pl -update -config=appname stats_path/appname > /dev/null'
         stats_postrotate = '/usr/local/bin/awstats_render riskplatform.insidemedia.net /home/risk/riskplatform_stats/public > /dev/null'
         options = {:log_path => '/var/log/nginx/appname.access.log', stats_prerotate: stats_prerotate, stats_postrotate: stats_postrotate}
-        AppBuilder.stubs(:new)
-        AppBuilder.expects(:new).with(options).returns settings
+        AppSettings::AppBuilder.stubs(:new)
+        AppSettings::AppBuilder.expects(:new).with(options).returns settings
         options = {:log_path => '/var/log/nginx/appname.error.log', stats_prerotate: nil, stats_postrotate: nil}
-        AppBuilder.expects(:new).with(options).returns settings
+        AppSettings::AppBuilder.expects(:new).with(options).returns settings
         options = {:settings => settings, :to => '/etc/logrotate.d/appname_nginx_access'}
-        expects(:create_from).with('logrotate/nginx.erb', options).returns Machines::Command.new 'command', 'check'
+        core.expects(:create_from).with('logrotate/nginx.erb', options).returns Command.new 'command', 'check'
         eval_package
       end
     end
 
     describe 'when awstats not set' do
       it 'does not generate stats command' do
-        skip
         settings = stub 'AppBuilder'
-        AppBuilder.stubs(:new)
+        AppSettings::AppBuilder.stubs(:new)
         options = {:log_path => '/var/log/nginx/appname.access.log', :stats_command => nil}
-        AppBuilder.expects(:new).with(options).returns settings
+        AppSettings::AppBuilder.expects(:new).with(options).returns settings
         options = {:settings => settings, :to => '/etc/logrotate.d/appname_nginx_access'}
-        expects(:create_from).with('logrotate/nginx.erb', options).returns Command.new 'command', 'check'
+        core.expects(:create_from).with('logrotate/nginx.erb', options).returns Command.new 'command', 'check'
         eval_package
       end
     end
   end
+
   describe 'apps logs template' do
     it 'generates correct template' do
       mock_settings = mock 'AppBuilder'
-      stubs(:create_from).returns Machines::Command.new 'command', 'check'
-      AppBuilder.stubs(:new)
-      AppBuilder.expects(:new).with(:log_path => 'apppath/shared/log/*.log').returns mock_settings
+      core.stubs(:create_from).returns Machines::Command.new 'command', 'check'
+      AppSettings::AppBuilder.stubs(:new)
+      AppSettings::AppBuilder.expects(:new).with(:log_path => 'apppath/shared/log/*.log').returns mock_settings
       options = {:settings => mock_settings, :to => '/etc/logrotate.d/appname_app'}
-      expects(:create_from).with('logrotate/app.erb', options).returns Machines::Command.new 'command', 'check'
+      core.expects(:create_from).with('logrotate/app.erb', options).returns Command.new 'command', 'check'
       eval_package
     end
   end