machines 0.5.4 → 0.5.6

data/lib/machines/commands/questions.rb

@@ -0,0 +1,16 @@
+module Machines
+  module Commands
+    module Questions
+      def enter_password(type, confirm = true)
+        begin
+          password = ask("Enter #{type} password: ") { |question| question.echo = false }
+          break unless confirm
+          password_confirmation = ask('Confirm the password: ') { |question| question.echo = false }
+          say "Passwords do not match, please re-enter" unless password == password_confirmation
+        end while password != password_confirmation
+        $conf.passwords << password if $conf.passwords && password.size > 4 && password != 'password'
+        password
+      end
+    end
+  end
+end

data/lib/machines/commands/services.rb

@@ -0,0 +1,26 @@
+module Machines
+  module Commands
+    module Services
+      # Stop a daemon
+      # @param [String] daemon Name of the service to stop
+      def stop daemon
+        Command.new("service #{daemon} stop", check_daemon(daemon, false))
+      end
+
+      # Start a daemon
+      # @param [String] daemon Name of the service to start
+      # @param [Hash] options
+      # @option options [Boolean] :check Set to false to disable the check (e.g. start hostname, :check => false)
+      def start daemon, options = {}
+        check = options[:check] || check_daemon(daemon)
+        Command.new("service #{daemon} start", check)
+      end
+
+      # Restart a daemon
+      # @param [String] daemon Name of the service to restart
+      def restart daemon
+        Command.new("service #{daemon} restart", check_daemon(daemon))
+      end
+    end
+  end
+end

data/lib/machines/core.rb

@@ -1,5 +1,13 @@
 module Machines
-  module Core
+  class Core
+    include Commands::Checks
+    include Commands::Configuration
+    include Commands::Database
+    include Commands::FileOperations
+    include Commands::Installation
+    include Commands::Questions
+    include Commands::Services
+
     # If a block is given, store the task, log it and run it
     # If no block is given, sets commands to only those of the specified tasks so they can be run standalone
     # @param [Symbol, String, Array] name Name of the task or array of task names
@@ -26,12 +34,6 @@ module Machines
       $conf.tasks[name] = {:description => description, :block => block}
     end
 
-    def list_tasks
-      $conf.tasks.each do |name, task|
-        say "  #{"%-20s" % name}#{task[:description]}"
-      end
-    end
-
     def generate_password
       WEBrick::Utils.random_string(20)
     end
@@ -46,25 +48,22 @@ module Machines
       yield unless matched(options)
     end
 
-    def matched options
-      options.each do |key, value|
-        value = value.is_a?(Array) ? value.map{|o| o.to_s } : value.to_s
-        if $conf[key].is_a?(Array)
-          values = $conf[key].map{|o| o.to_s }
-          if value.is_a?(Array)
-            return unless values.reject{ |symbol| !value.include?(symbol.to_s) }.any?
-          else
-            return unless values.include?(value)
-          end
-        else
-          if value.is_a?(Array)
-            return unless value.include?($conf[key].to_s)
-          else
-            return unless value == $conf[key].to_s
-          end
-        end
+    def load_app_settings(apps)
+      AppSettings.new.load_app_settings(apps)
+    end
+
+    # Loads the Machinesfile or a package
+    def package name
+      if name == 'Machinesfile'
+        custom_name = builtin_name = 'Machinesfile'
+        error = "Cannot find 'Machinesfile'. Use `machines new` to create a template."
+      else
+        custom_name = File.join('packages', "#{name}.rb")
+        builtin_name = File.join($conf.application_dir, 'packages', "#{name}.rb")
+        error = "Cannot find custom or built-in package '#{name}'."
       end
-      true
+      package = load_and_eval(custom_name) || load_and_eval(builtin_name)
+      package || raise(LoadError, error, caller)
     end
 
     # Queue up command(s) to run remotely
@@ -112,9 +111,40 @@ module Machines
       end
     end
 
+  #TODO: Move matched into separate class to test
+    def matched options
+      options.each do |key, value|
+        value = value.is_a?(Array) ? value.map{|o| o.to_s } : value.to_s
+        if $conf[key].is_a?(Array)
+          values = $conf[key].map{|o| o.to_s }
+          if value.is_a?(Array)
+            return unless values.reject{ |symbol| !value.include?(symbol.to_s) }.any?
+          else
+            return unless values.include?(value)
+          end
+        else
+          if value.is_a?(Array)
+            return unless value.include?($conf[key].to_s)
+          else
+            return unless value == $conf[key].to_s
+          end
+        end
+      end
+      true
+    end
+
+  private
+    def load_and_eval package_name
+      if File.exists?(package_name)
+        eval(File.read(package_name), nil, "eval: #{package_name}")
+        true
+      end
+    end
+
     def command_from_string commands
       commands.first.is_a?(String) ? [Command.new(commands[0], commands[1])] : commands
     end
+
   end
 end
 

data/lib/machines/logger.rb

@@ -1,5 +1,3 @@
-require 'date'
-
 module Machines
   class Logger
     HighLine.color_scheme = HighLine::ColorScheme.new do |cs|

data/lib/machines/named_buffer.rb

@@ -1,9 +1,10 @@
-class NamedBuffer < StringIO
-  attr_reader :name
+module Machines
+  class NamedBuffer < StringIO
+    attr_reader :name
 
-  def initialize name, string
-    super string
-    @name = name
+    def initialize name, string
+      super string
+      @name = name
+    end
   end
 end
-

data/lib/machines/version.rb

@@ -1,4 +1,4 @@
 module Machines
-  VERSION = '0.5.4'
+  VERSION = '0.5.6'
 end
 

data/lib/packages/awstats.rb

@@ -4,7 +4,7 @@ task :awstats, 'Install AWStats' do
   local_file = '/usr/local/bin/awstats_render'
   sudo "wget #{remote_file} -O #{local_file}", check_file(local_file)
   sudo chmod '+x', local_file
-  
+
   $conf.webapps.each do |app_name, app|
     stats_path = "/etc/awstats/awstats.#{app.server_name}.conf"
     sudo create_from 'misc/awstats.conf.erb', settings: app,  to: stats_path
@@ -13,4 +13,4 @@ task :awstats, 'Install AWStats' do
     run mkdir "#{app_stats}/public"
   end
 end
-	
+

data/lib/packages/docky.rb

@@ -33,4 +33,3 @@ task :docky, 'Install and configure Docky a dock and app launcher' do
   run configure '/apps/docky-2/WeatherDocklet/WeatherPreferences/Location' => ['London\\, United Kingdom']
   run configure '/apps/docky-2/WeatherDocklet/WeatherPreferences/Metric' => true
 end
-

data/lib/packages/dwm.rb

@@ -0,0 +1,5 @@
+task :dwm, 'Download, compile and install dwm' do
+  sudo install %w(build-essential libx11-dev libxinerama-dev sharutils)
+
+  sudo install "http://dl.suckless.org/dwm/dwm-#{$conf.dwm.version}.tar.gz", make: true
+end

data/lib/packages/nginx_logrotate.rb

@@ -7,7 +7,7 @@ task :logrotate_nginx, 'Logrotate nginx access and error logs and optionally gen
       else
         stats_prerotate = stats_postrotate = nil
       end
-      settings = Machines::AppSettings::AppBuilder.new(
+      settings = AppSettings::AppBuilder.new(
         log_path: "/var/log/nginx/#{app.name}.#{type}.log",
         stats_prerotate: stats_prerotate,
         stats_postrotate: stats_postrotate
@@ -19,7 +19,7 @@ end
 
 task :logrotate_apps, 'Logrotate Rails app logs' do
   $conf.webapps.each do |app_name, app|
-    settings = Machines::AppSettings::AppBuilder.new(log_path: File.join(app.path, 'shared', 'log', '*.log'))
+    settings = AppSettings::AppBuilder.new(log_path: File.join(app.path, 'shared', 'log', '*.log'))
     sudo create_from 'logrotate/app.erb', settings: settings, to: File.join('/etc', 'logrotate.d', "#{app.name}_app")
   end
 end

data/lib/packages/timezone.rb

@@ -1,10 +1,8 @@
 task :timezone, 'Set timezone from config.yml' do
-  sudo link '/etc/localtime', "/usr/share/zoneinfo/#{$conf.timezone}"
-
-  # Ensure UTC is used or not
+  sudo link "/usr/share/zoneinfo/#{$conf.timezone}", '/etc/localtime'
+  # Ensure UTC is configured
   if !$conf.clock_utc.nil?
     options = {false => 'no', true => 'yes'}
     sudo replace "UTC=#{options[!$conf.clock_utc]}", :with => "UTC=#{options[$conf.clock_utc]}", :in => '/etc/default/rcS'
   end
 end
-

data/lib/template/Machinesfile

@@ -30,7 +30,8 @@ end
 
 only :user => 'phil' do
   package :sudo_mods
-  package :subtle
+  package :slim
+  package :dwm
   package :chrome
   package :firefox
   package :gedit

data/lib/template/config.yml

@@ -23,6 +23,9 @@ cloud:
   aws_access_key_id: 123
   aws_secret_access_key: 456
 
+dwm:
+  version: 6.0
+
 # IP hosts. These are added to /etc/hosts by the hosts task in the base package
 # They are also added to known hosts but the host must be accessible at this point
 # Note:

data/spec/lib/machines/app_settings_spec.rb

@@ -1,13 +1,14 @@
 require 'spec_helper'
 
-describe 'AppSettings' do
-  include Machines::AppSettings
+describe AppSettings do
+
+  subject { AppSettings.new }
 
   describe 'load_and_generate_passwords_for_webapps' do
     it 'generates passwords and saves to webapps.yml' do
       File.open('webapps.yml', 'w') {|f| f.puts "###\n\n---\nwebapps:\n  my_app:\n    development:\n      password: \n" }
-      stubs(:generate_password).returns 'random'
-      load_and_generate_passwords_for_webapps
+      subject.stubs(:generate_password).returns 'random'
+      subject.load_and_generate_passwords_for_webapps
       File.read('webapps.yml').must_equal "###\n\n---\nwebapps:\n  my_app:\n    development:\n      password: random\n"
     end
   end
@@ -30,9 +31,9 @@ EOF
     end
 
     it 'loads the app settings for selected apps' do
-      load_app_settings ['app']
+      subject.load_app_settings ['app']
       $conf.webapps.must_equal({
-        'app' => AppBuilder.new(
+        'app' => AppSettings::AppBuilder.new(
           :scm => 'scm://project.git',
           :name => 'app',
           :path => '/home/user/app',
@@ -45,9 +46,9 @@ EOF
 
     it 'handles ssl settings' do
       File.open('webapps.yml', 'w') {|f| f.puts @settings }
-      load_app_settings ['app']
+      subject.load_app_settings ['app']
       $conf.webapps.must_equal({
-        'app' => AppBuilder.new(
+        'app' => AppSettings::AppBuilder.new(
           :name => 'app',
           :scm => 'scm://project.git',
           :path => '/home/user/app',
@@ -64,7 +65,7 @@ EOF
 
     it 'does not fail when settings not included for specified environment' do
       File.open('webapps.yml', 'w') {|f| f.puts "---\nwebapps:\n  app:\n    path: path\n" }
-      load_app_settings(['app'])
+      subject.load_app_settings(['app'])
     end
 
     it 'loads settings for all apps when none specified' do
@@ -83,16 +84,16 @@ webapps:
       password: secure
       EOF
       File.open('webapps.yml', 'w') {|f| f.puts settings }
-      load_app_settings nil
+      subject.load_app_settings nil
       $conf.webapps.must_equal({
-        'app' => AppBuilder.new(
+        'app' => AppSettings::AppBuilder.new(
           :name => 'app',
           :path => '/home/user/app',
           :scm => 'scm://project.git',
           :root => '/home/user/app/current/public',
           :setting => 'setting',
           :password => 'secure'),
-        'other' => AppBuilder.new(
+        'other' => AppSettings::AppBuilder.new(
           :name => 'other',
           :root => '/home/user/other/current/public',
           :scm => 'scm://other_project',

data/spec/lib/machines/cloud_machine_spec.rb

@@ -1,8 +1,9 @@
 require 'spec_helper'
 require 'fog'
 
-describe 'CloudMachine' do
-  include Machines::CloudMachine
+describe CloudMachine do
+
+  subject { CloudMachine.new }
 
   before do
     Fog.mock!
@@ -11,11 +12,11 @@ describe 'CloudMachine' do
   end
 
   it 'displays an error message when fog gem is not available' do
-    stubs(:require)
-    expects(:require).with('fog').raises LoadError
+    subject.stubs(:require)
+    subject.expects(:require).with('fog').raises LoadError
     lambda do
       begin
-        connect_to_cloud
+        subject.connect_to_cloud
       rescue LoadError
       end
     end.must_output "fog gem required to use cloud features.
@@ -24,13 +25,13 @@ Please \"gem install fog\".
   end
 
   it 'sets correct options and connects' do
-    connect_to_cloud
+    subject.connect_to_cloud
     $conf.cloud.connection.must_be_kind_of Fog::Compute::AWS::Mock
   end
 
   it 'creates a server' do
-    connect_to_cloud
-    create_server
+    subject.connect_to_cloud
+    subject.create_server
   end
 end
 

data/spec/lib/machines/commandline_spec.rb

@@ -1,11 +1,12 @@
 require 'spec_helper'
 
-describe Machines::Commandline do
-  include Machines::Core
-  include Machines::Commandline
-  include Machines::Questions
+describe Commandline do
+
+  subject { Commandline.new }
 
   before(:each) do
+    subject
+    Commandline.stubs(:new).returns subject
     $conf.log_only = false
     File.open('config.yml', 'w') {|f| f.puts "timezone: GB" }
     FileUtils.mkdir_p 'log'
@@ -13,7 +14,7 @@ describe Machines::Commandline do
 
   describe 'build' do
     before(:each) do
-      stubs(:init)
+      subject.stubs(:init)
       FileUtils.touch('Machinesfile')
       $conf.machine = AppConf.new
       $conf.machine.address = 'target'
@@ -25,18 +26,18 @@ describe Machines::Commandline do
     end
 
     it 'displays syntax when no machine name specified' do
-      lambda { build [] }.must_output Machines::Help.new.syntax
+      lambda { subject.build [] }.must_output Help.new.syntax
     end
 
     it 'sets machine_name' do
-      build ['machine']
+      subject.build ['machine']
       $conf.machine_name.must_equal 'machine'
     end
 
     it 'starts an SCP session using password authentication' do
       options = {paranoid: false, password: 'userpass'}
       Net::SSH.expects(:start).with('target', 'username', options).returns @ssh_stub
-      build ['machine']
+      subject.build ['machine']
     end
 
     it 'starts an SCP session using key based authentication' do
@@ -46,52 +47,53 @@ describe Machines::Commandline do
       options = {paranoid: false, keys: ['path/to/private_key']}
       Net::SSH.expects(:start).with('target', 'ubuntu', options).returns @ssh_stub
 
-      build ['machine']
+      subject.build ['machine']
     end
 
     it 'runs each command' do
-      mock_command = mock 'Machines::Command'
+      mock_command = mock 'Command'
       $conf.commands = [mock_command]
 
       mock_command.expects(:run)
 
-      build ['machine']
+      subject.build ['machine']
     end
 
     it 'flushes log file after running command' do
       $conf.log_only = false
-      command_stub = stub('Machines::Command', :run => nil)
+      command_stub = stub('command', :run => nil)
       $conf.commands = [command_stub]
 
-      Machines::Command.file.expects(:flush)
-      build ['machine']
+      Command.file.expects(:flush)
+      subject.build ['machine']
     end
 
     it 'only run specified tasks' do
-      command_will_run = Machines::Command.new '', ''
-      command_also_run = Machines::Command.new '', ''
-      command_wont_run = Machines::Command.new '', ''
-      $conf.tasks = { 
-        :task1 => {:block => Proc.new { run command_will_run }},
-        :task2 => {:block => Proc.new { run command_also_run }}
+      command_will_run = Command.new 'will run', ''
+      command_also_run = Command.new 'also run', ''
+      command_wont_run = Command.new 'wont run', ''
+      $conf.tasks = {
+        :task1 => {:block => lambda { $conf.commands << command_will_run }},
+        :task2 => {:block => lambda { $conf.commands << command_also_run }},
+        :task3 => {:block => lambda { $conf.commands << command_wont_run }}
       }
 
-      build ['machine', 'task1', 'task2']
+      subject.build ['machine', 'task1', 'task2']
 
       $conf.commands.must_equal [command_will_run, command_also_run]
     end
 
     it 'logs instead of SSHing and running commands' do
       Net::SCP.expects(:start).never
-      $conf.commands = [mock('Machines::Command')]
+      $conf.commands = [mock('command')]
       $conf.commands.first.expects(:run)
       $conf.log_only = true
-      build ['machine']
+      subject.build ['machine']
     end
 
     describe 'interrupts' do
       before(:each) do
-        mock_command = mock 'Machines::Command'
+        mock_command = mock 'command'
         $conf.commands = [mock_command]
 
         mock_command.stubs(:run)
@@ -99,14 +101,13 @@ describe Machines::Commandline do
       end
 
       it 'handles CTRL+C and calls handler' do
-        expects(:prepare_to_exit)
+        subject.expects(:prepare_to_exit)
         Kernel.expects(:trap).with('INT').yields
-        build ['machine']
+        subject.build ['machine']
       end
 
-
       it 'sets exit flag and displays message' do
-        prepare_to_exit
+        subject.send :prepare_to_exit
         $exit_requested.must_equal true
         message = "\nEXITING after current command completes...\n"
         $console.next.must_equal colored(message, :warning)
@@ -114,15 +115,15 @@ describe Machines::Commandline do
 
       it 'second request to exit exits immediately' do
         $exit_requested = true
-        expects(:exit)
-        prepare_to_exit
+        subject.expects(:exit)
+        subject.send :prepare_to_exit
       end
 
       it 'exits when exit requested' do
         $exit_requested = true
-        expects(:exit)
+        subject.expects(:exit)
 
-        build ['machine']
+        subject.build ['machine']
       end
     end
   end
@@ -130,54 +131,54 @@ describe Machines::Commandline do
   describe 'dryrun' do
     it 'asks build to only log commands' do
       options = []
-      expects(:build).with options
-      dryrun options
+      subject.expects(:build).with options
+      subject.dryrun options
       $conf.log_only.must_equal true
     end
 
     it 'passes tasks to build' do
       options = ['machine', 'task']
-      expects(:build).with options
-      dryrun options
+      subject.expects(:build).with options
+      subject.dryrun options
     end
   end
 
   describe 'execute' do
     it 'calls specified action' do
-      Machines::Help.new.actions.reject{|a| a == 'new'}.each do |action|
-        expects action
-        execute [action]
+      Help.new.actions.reject{|a| a == 'new'}.each do |action|
+        subject.expects action
+        Commandline.execute [action]
       end
     end
 
     it 'calls generate with folder' do
-      expects(:generate).with(['dir'])
-      execute ['new', 'dir']
+      subject.expects(:generate).with(['dir'])
+      Commandline.execute ['new', 'dir']
     end
 
     it 'calls generate without folder' do
-      expects(:generate).with([])
-      execute ['new']
+      subject.expects(:generate).with([])
+      Commandline.execute ['new']
     end
 
     it 'calls help when no matching command' do
-      lambda { execute ['anything'] }.must_output Machines::Help.new.syntax
+      lambda { Commandline.execute ['anything'] }.must_output Help.new.syntax
     end
   end
 
   describe 'generate' do
     it 'copies the template within ./' do
-      expects(:ask).with("Overwrite './' (y/n)? ").returns 'y'
+      subject.expects(:ask).with("Overwrite './' (y/n)? ").returns 'y'
       FileUtils.expects(:cp_r).with("#{$conf.application_dir}/template/.", './')
       FileUtils.expects(:mkdir_p).with('./packages')
-      generate []
+      subject.generate []
     end
 
     it 'copies the template within dir' do
       FileUtils.expects(:cp_r).with("#{$conf.application_dir}/template/.", 'dir')
       FileUtils.expects(:mkdir_p).with(File.join('dir', 'packages'))
-      expects(:say).with('Project created at dir/')
-      generate ['dir']
+      subject.expects(:say).with('Project created at dir/')
+      subject.generate ['dir']
     end
 
     describe 'when folder exists' do
@@ -186,17 +187,17 @@ describe Machines::Commandline do
       end
 
       it 'is overwritten after user confirmation' do
-        expects(:ask).with("Overwrite 'dir' (y/n)? ").returns 'y'
+        subject.expects(:ask).with("Overwrite 'dir' (y/n)? ").returns 'y'
         FileUtils.expects(:cp_r).with("#{$conf.application_dir}/template/.", 'dir')
         FileUtils.expects(:mkdir_p).with(File.join('dir', 'packages'))
-        generate ['dir']
+        subject.generate ['dir']
       end
 
       it 'generation is aborted at user request' do
-        expects(:ask).with("Overwrite 'dir' (y/n)? ").returns 'n'
+        subject.expects(:ask).with("Overwrite 'dir' (y/n)? ").returns 'n'
         FileUtils.expects(:cp_r).never
         FileUtils.expects(:mkdir_p).never
-        generate ['dir']
+        subject.generate ['dir']
       end
     end
   end
@@ -205,54 +206,32 @@ describe Machines::Commandline do
     it 'htpasswd is generated and saved' do
       $conf.webserver = 'server'
       $input.string = "user\npass\npass\n"
-      htpasswd nil
+      subject.htpasswd nil
       File.read('server/htpasswd').must_match /user:.{13}/
     end
   end
 
   describe 'init' do
     it 'initializes some $conf settings and loads configs' do
-      Machines::Command.file = nil
-      Machines::Command.console = nil
-      Machines::Command.debug = nil
-      init
+      Command.file = nil
+      Command.console = nil
+      Command.debug = nil
+      subject.init
       $conf.passwords.must_equal []
       $conf.commands.must_equal []
       $conf.tasks.must_equal({})
       $conf.timezone.must_equal 'GB'
       File.exists?('log/output.log').must_equal true
-      Machines::Command.file.must_be_instance_of Machines::Logger
-      Machines::Command.console.must_be_instance_of Machines::Logger
-      Machines::Command.debug.must_be_instance_of Machines::Logger
+      Command.file.must_be_instance_of Machines::Logger
+      Command.console.must_be_instance_of Machines::Logger
+      Command.debug.must_be_instance_of Machines::Logger
     end
   end
 
   describe 'list' do
     it 'lists machines' do
       File.open('machines.yml', 'w') {|f| f.puts({'machines' => {'machine_1' => {}, 'machine_2' => {}}}.to_yaml) }
-      lambda { list nil }.must_output "Machines from machines.yml:\n  machine_1\n  machine_2\n"
-    end
-  end
-
-  describe 'load_machinesfile' do
-    it 'raises LoadError with custom message when no Machinesfile' do
-      File.expects(:read).with("Machinesfile").raises LoadError.new('Machinesfile not found')
-
-      begin
-        load_machinesfile
-      rescue LoadError => e
-        e.message.must_equal 'Machinesfile does not exist. Use `machines new <DIR>` to create a template.'
-      end
-    end
-
-    it 'raises normal LoadError on other files' do
-      File.expects(:read).with("Machinesfile").raises LoadError
-
-      begin
-        load_machinesfile
-      rescue LoadError => e
-        e.message.must_equal 'LoadError'
-      end
+      lambda { subject.list nil }.must_output "Machines from machines.yml:\n  machine_1\n  machine_2\n"
     end
   end
 
@@ -264,7 +243,7 @@ describe Machines::Commandline do
     end
 
     it 'copies package to project folder' do
-      override ['base']
+      subject.override ['base']
       File.exists?('packages/base.rb').must_equal true
     end
 
@@ -275,14 +254,14 @@ describe Machines::Commandline do
 
       it 'terminates when user answer no' do
         $input.string = "n\n"
-        lambda { override ['base'] }.must_output 'Project package already exists. Overwrite? (y/n)
+        lambda { subject.override ['base'] }.must_output 'Project package already exists. Overwrite? (y/n)
 Aborted.
 '
       end
 
       it 'overwrites project package with default package' do
         $input.string = "y\n"
-        lambda { override ['base'] }.must_output 'Project package already exists. Overwrite? (y/n)
+        lambda { subject.override ['base'] }.must_output 'Project package already exists. Overwrite? (y/n)
 Package copied to packages/base.rb
 '
       end
@@ -295,7 +274,7 @@ Package copied to packages/base.rb
       FileUtils.mkdir_p 'packages'
       FileUtils.touch File.join($conf.application_dir, 'packages', 'base.rb')
       FileUtils.touch File.join('packages', 'apps.rb')
-      lambda { packages nil }.must_output 'Default packages
+      lambda { subject.packages nil }.must_output 'Default packages
  * base
 Project packages
  * apps
@@ -305,14 +284,14 @@ Project packages
 
   describe 'tasks' do
     it 'displays a list of tasks' do
-      expects(:init)
-      expects(:load_machinesfile)
+      subject.expects(:init)
+      Core.any_instance.expects(:package).with 'Machinesfile'
       $conf.tasks = {
         :task1 => {:description => 'description 1'},
         :task2 =>  {:description => 'description 2'},
         :task3 => {:description => 'description 3'}
       }
-      lambda { tasks ['machine'] }.must_output 'Tasks
+      lambda { subject.tasks ['machine'] }.must_output 'Tasks
   task1                description 1
   task2                description 2
   task3                description 3