machines 0.5.4 → 0.5.6

data/spec/lib/machines/{checks_spec.rb → commands/checks_spec.rb}

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'Checks' do
+describe Commands::Checks do
   describe 'echo_result' do
     it do
       echo_result.must_equal '&& echo CHECK PASSED || echo CHECK FAILED'

data/spec/lib/machines/{configuration_spec.rb → commands/configuration_spec.rb}

@@ -1,8 +1,6 @@
 require 'spec_helper'
 
-describe 'Configuration' do
-  include Machines::Core
-  include Machines::Configuration
+describe Commands::Configuration do
 
   describe 'add_user' do
     it do
@@ -20,6 +18,7 @@ describe 'Configuration' do
 
   describe 'add' do
     it 'add an existing user to a group' do
+      stubs(:required_options)
       command = add :user => 'phil', :to => 'group'
       command.command.must_equal 'usermod -a -G group phil'
     end

data/spec/lib/machines/{database_spec.rb → commands/database_spec.rb}

@@ -1,12 +1,6 @@
 require 'spec_helper'
 
-describe 'Database' do
-  include Machines::Core
-  include Machines::Configuration
-  include Machines::Database
-  include Machines::AppSettings
-  include Machines::FileOperations
-
+describe Commands::Database do
   describe 'write_database_yml' do
     before do
       $conf.environment = 'staging'
@@ -15,7 +9,7 @@ describe 'Database' do
     end
 
     it 'supplies correct parameters' do
-      file = write_database_yml AppBuilder.new(:name => 'app', :password => 'password', :path => 'path')
+      file = write_database_yml AppSettings::AppBuilder.new(:name => 'app', :password => 'password', :path => 'path')
       file.local.read.must_equal <<-EOF
 ---
 staging:
@@ -29,12 +23,12 @@ EOF
     end
 
     it 'writes file to specified path' do
-      file = write_database_yml AppBuilder.new(:name => 'app', :password => 'password', :path => 'path')
+      file = write_database_yml AppSettings::AppBuilder.new(:name => 'app', :password => 'password', :path => 'path')
       file.remote.must_equal 'path/shared/config/database.yml'
     end
 
     it 'overrides database name when supplied' do
-      file = write_database_yml AppBuilder.new(:name => 'app', :password => 'password', :username => 'phil', :database => 'myapp', :path => 'path')
+      file = write_database_yml AppSettings::AppBuilder.new(:name => 'app', :password => 'password', :username => 'phil', :database => 'myapp', :path => 'path')
       file.local.read.must_equal <<-EOF
 ---
 staging:

data/spec/lib/machines/{file_operations_spec.rb → commands/file_operations_spec.rb}

@@ -1,9 +1,6 @@
 require 'spec_helper'
 
-describe 'FileOperations' do
-  include Machines::FileOperations
-  include Machines::Core
-
+describe Commands::FileOperations do
   describe 'append' do
     it 'escapes backslashes (\\)' do
       subject = append '\\', :to => 'file'
@@ -62,11 +59,9 @@ describe 'FileOperations' do
   end
 
   describe 'create_from' do
-    include Machines::AppSettings
-
     it 'loads ERB template, applies settings and writes to remote machine' do
       File.expects(:read).with('erb_path').returns('<%= method_on_binding %>')
-      app_builder = AppBuilder.new(:method_on_binding => 'result')
+      app_builder = AppSettings::AppBuilder.new(:method_on_binding => 'result')
       expects(:write).with('result', {:settings => app_builder, :to => 'file', :name => 'erb_path'})
       create_from('erb_path', :settings => app_builder, :to => 'file')
     end
@@ -107,6 +102,7 @@ describe 'FileOperations' do
   end
 
   describe 'replace' do
+    before { stubs(:required_options) }
     subject { replace('something', :with => 'some/path', :in => 'file') }
     it { subject.command.must_equal "sed -i \"s/something/some\\/path/\" file" }
     it { lambda{replace('something')}.must_raise ArgumentError }

data/spec/lib/machines/{installation_spec.rb → commands/installation_spec.rb}

@@ -1,9 +1,6 @@
 require 'spec_helper'
 
-describe 'Installation' do
-  include Machines::Core
-  include Machines::Installation
-  include Machines::Configuration
+describe Commands::Installation do
 
   describe 'add_ppa' do
     it 'adds a ppa' do
@@ -166,6 +163,15 @@ describe 'Installation' do
         'apt-get -q -y install package2'
       ]
     end
+
+    it 'download and run make clean install' do
+      subject = install 'http://some.url/package_name.tar.gz', make: true
+      subject.map(&:command).join("\n").must_equal [
+        'cd /tmp && wget http://some.url/package_name.tar.gz && tar -zxf package_name.tar.gz && rm package_name.tar.gz && cd -',
+        'mv -f /tmp/package_name /usr/local/src',
+        'cd /usr/local/src/package_name && make clean install'
+      ].join("\n")
+    end
   end
 
   describe 'uninstall' do

data/spec/lib/machines/{questions_spec.rb → commands/questions_spec.rb}

@@ -1,8 +1,6 @@
 require 'spec_helper'
 
-describe 'Questions' do
-  include Machines::Questions
-
+describe Machines::Commands::Questions do
   describe 'enter_password' do
     before(:each) do
       stubs(:ask).returns 'pa55word'

data/spec/lib/machines/{services_spec.rb → commands/services_spec.rb}

@@ -1,9 +1,6 @@
 require 'spec_helper'
 
-describe 'Services' do
-  include Machines::Core
-  include Machines::FileOperations
-  include Machines::Services
+describe Commands::Services do
 
   describe 'restart' do
     subject { restart 'daemon' }

data/spec/lib/machines/core_spec.rb

@@ -1,8 +1,8 @@
 require 'spec_helper'
 
-describe Machines::Core do
-  include Machines::Core
-  include Machines::FileOperations
+describe Core do
+
+  subject { Core.new }
 
   before do
     @command1 = Machines::Command.new('command 1', 'check 1')
@@ -12,28 +12,54 @@ describe Machines::Core do
   describe 'generate_password' do
     it 'generates a random password' do
       WEBrick::Utils.stubs(:random_string).with(20).returns '01234567890123456789'
-      generate_password.must_equal '01234567890123456789'
+      subject.generate_password.must_equal '01234567890123456789'
+    end
+  end
+
+  describe 'package' do
+    it 'raises specific error when failing to load Machinesfile' do
+      File.expects(:read).never
+      lambda{ subject.package 'Machinesfile' }.must_raise LoadError, /Cannot find Machinesfile/
+    end
+
+    it 'loads custom package when it exists' do
+      custom_package = "packages/custom_package.rb"
+      FileUtils.mkdir_p File.dirname(custom_package)
+      FileUtils.touch custom_package
+      subject.package :custom_package
+    end
+
+    it 'loads built-in package when no custom package' do
+      builtin_package = "#{$conf.application_dir}/packages/builtin_package.rb"
+      FileUtils.mkdir_p File.dirname(builtin_package)
+      FileUtils.touch builtin_package
+      subject.package :builtin_package
+    end
+
+    it 'raises when no custom and no built-in package' do
+      File.expects(:read).never
+      lambda { subject.package :builtin_package}.must_raise LoadError, /Cannot find .* package builtin_package/
     end
   end
 
   describe 'task' do
     it 'yields' do
       yielded = false
-      task :name do
+      subject.task :name do
         yielded = true
       end
       yielded.must_equal true
     end
 
     it 'logs the task' do
-      task :name, 'description' do
+      subject.task :name, 'description' do
       end
       $conf.commands.first.info.must_equal "TASK   name - description"
     end
 
     it 'stores task' do
       block = Proc.new {}
-      task :name, 'description', &block
+      subject.task :name, 'description', &block
       $conf.tasks.must_equal :name => {:description => 'description', :block => block}
     end
 
@@ -42,7 +68,7 @@ describe Machines::Core do
       block = Proc.new { block_run_count += 1 }
       $conf.tasks[:task1] = {:block => block}
       $conf.tasks[:task2] = {:block => block}
-      task [:task1, 'task2']
+      subject.task [:task1, 'task2']
       block_run_count.must_equal 2
     end
 
@@ -50,7 +76,7 @@ describe Machines::Core do
       block_run = false
       block = Proc.new { block_run = true }
       $conf.tasks[:task] = {:block => block}
-      task :task
+      subject.task :task
       block_run.must_equal true
     end
 
@@ -62,8 +88,8 @@ describe Machines::Core do
 
       describe 'exists' do
         before(:each) do
-          store_task :dependent_task, nil
-          task :name, nil, :if => :dependent_task, &@block
+          subject.store_task :dependent_task, nil
+          subject.task :name, nil, :if => :dependent_task, &@block
         end
 
         it { @yielded.must_equal true }
@@ -73,7 +99,7 @@ describe Machines::Core do
       end
 
       describe 'does not exist' do
-        before(:each) { task :name, nil, :if => :dependent_task, &@block }
+        before(:each) { subject.task :name, nil, :if => :dependent_task, &@block }
         it { @yielded.must_equal false }
         it 'task not stored' do
           $conf.tasks.wont_include :name
@@ -89,9 +115,9 @@ describe Machines::Core do
 
       describe 'all exist' do
         before(:each) do
-          store_task :dependent_task, nil
-          store_task :another_dependent, nil
-          task :name, nil, :if => [:dependent_task, :another_dependent], &@block
+          subject.store_task :dependent_task, nil
+          subject.store_task :another_dependent, nil
+          subject.task :name, nil, :if => [:dependent_task, :another_dependent], &@block
         end
 
         it { @yielded.must_equal true }
@@ -102,8 +128,8 @@ describe Machines::Core do
 
       describe 'all but one exist' do
         before(:each) do
-          store_task :another_dependent, nil
-          task :name, nil, :if => [:dependent_task, :another_dependent], &@block
+          subject.store_task :another_dependent, nil
+          subject.task :name, nil, :if => [:dependent_task, :another_dependent], &@block
         end
 
         it { @yielded.must_equal false }
@@ -114,30 +140,20 @@ describe Machines::Core do
     end
   end
 
-  describe 'list_tasks' do
-    it 'displays a list of tasks' do
-      task :name, 'description', &Proc.new {}
-      task :another, 'another description', &Proc.new {}
-      lambda { list_tasks }.must_output '  name                description
-  another             another description
-'
-    end
-  end
-
   describe 'only' do
     it 'yields when matched' do
-      expects(:matched).with('options').returns true
+      subject.expects(:matched).with('options').returns true
       yielded = false
-      only 'options' do
+      subject.only 'options' do
         yielded = true
       end
       yielded.must_equal true
     end
 
     it 'does not yield when not matched' do
-      expects(:matched).with('options').returns false
+      subject.expects(:matched).with('options').returns false
       yielded = false
-      only 'options' do
+      subject.only 'options' do
         yielded = true
       end
       yielded.must_equal false
@@ -146,7 +162,7 @@ describe Machines::Core do
     it 'yields when symbol matches string' do
       $conf.environment = 'development'
       yielded = false
-      only :environment => :development do
+      subject.only :environment => :development do
         yielded = true
       end
       yielded.must_equal true
@@ -155,18 +171,18 @@ describe Machines::Core do
 
   describe 'except' do
     it 'does not yield when matched' do
-      expects(:matched).with('options').returns true
+      subject.expects(:matched).with('options').returns true
       yielded = false
-      except 'options' do
+      subject.except 'options' do
         yielded = true
       end
       yielded.must_equal false
     end
 
     it 'yields when not matched' do
-      expects(:matched).with('options').returns false
+      subject.expects(:matched).with('options').returns false
       yielded = false
-      except 'options' do
+      subject.except 'options' do
         yielded = true
       end
       yielded.must_equal true
@@ -179,9 +195,9 @@ describe Machines::Core do
         $conf.string_param = 'matched'
       end
 
-      it { matched(:string_param => :matched).must_equal true }
-      it { matched(:string_param => 'matched').must_equal true }
-      it { matched(:string_param => :unmatched).wont_equal true }
+      it { subject.matched(:string_param => :matched).must_equal true }
+      it { subject.matched(:string_param => 'matched').must_equal true }
+      it { subject.matched(:string_param => :unmatched).wont_equal true }
     end
 
     describe '$conf values are arrays' do
@@ -190,23 +206,23 @@ describe Machines::Core do
       end
 
       describe 'options values are arrays of symbols' do
-        it { matched({:params_array => [:matched]}).must_equal true }
-        it { matched({:params_array => [:unmatched]}).wont_equal true }
+        it { subject.matched({:params_array => [:matched]}).must_equal true }
+        it { subject.matched({:params_array => [:unmatched]}).wont_equal true }
       end
 
       describe 'options values are arrays of strings' do
-        it { matched({'params_array' => ['matched']}).must_equal true }
-        it { matched({'params_array' => ['unmatched']}).wont_equal true }
+        it { subject.matched({'params_array' => ['matched']}).must_equal true }
+        it { subject.matched({'params_array' => ['unmatched']}).wont_equal true }
       end
 
       describe 'options values are symbols' do
-        it { matched({:params_array => :matched}).must_equal true }
-        it { matched({:params_array => :unmatched}).wont_equal true }
+        it { subject.matched({:params_array => :matched}).must_equal true }
+        it { subject.matched({:params_array => :unmatched}).wont_equal true }
       end
 
       describe 'options values are strings' do
-        it { matched({:params_array => 'matched'}).must_equal true }
-        it { matched({:params_array => 'unmatched'}).wont_equal true }
+        it { subject.matched({:params_array => 'matched'}).must_equal true }
+        it { subject.matched({:params_array => 'unmatched'}).wont_equal true }
       end
     end
 
@@ -216,37 +232,37 @@ describe Machines::Core do
       end
 
       describe 'options values are arrays' do
-        it { matched({:single_param => [:matched]}).must_equal true }
-        it { matched({:single_param => [:unmatched]}).wont_equal true }
+        it { subject.matched({:single_param => [:matched]}).must_equal true }
+        it { subject.matched({:single_param => [:unmatched]}).wont_equal true }
       end
 
       describe 'options values are symbols' do
-        it { matched({:single_param => :matched}).must_equal true }
-        it { matched({:single_param => :unmatched}).wont_equal true }
+        it { subject.matched({:single_param => :matched}).must_equal true }
+        it { subject.matched({:single_param => :unmatched}).wont_equal true }
       end
     end
   end
 
   describe 'run' do
     it 'adds a command to the commands array' do
-      run @command1
+      subject.run @command1
       $conf.commands.must_equal [@command1]
     end
 
     it 'appends several commands' do
-      run @command1
-      run @command2
+      subject.run @command1
+      subject.run @command2
       $conf.commands.must_equal [@command1, @command2]
     end
 
     it 'appends several commands in a single call' do
-      run @command1, @command2
+      subject.run @command1, @command2
       $conf.commands.must_equal [@command1, @command2]
     end
 
     describe 'when commands are two strings' do
       it 'creates a Command' do
-        run 'command', 'check'
+        subject.run 'command', 'check'
         $conf.commands.first.command.must_equal 'command'
         $conf.commands.first.check.must_equal 'check'
       end
@@ -257,12 +273,12 @@ describe Machines::Core do
     it 'wraps a command in a sudo with password call' do
       $conf.password = 'password'
       @command1.expects(:use_sudo)
-      sudo @command1
+      subject.sudo @command1
     end
 
     describe 'when commands are two strings' do
       it 'creates a Command' do
-        sudo 'command', 'check'
+        subject.sudo 'command', 'check'
         $conf.commands.first.command.must_equal 'command'
         $conf.commands.first.check.must_equal 'check'
       end
@@ -270,15 +286,15 @@ describe Machines::Core do
   end
 
   describe 'upload' do
-    subject { upload 'source', 'dest' }
-    it { subject.local.must_equal 'source' }
-    it { subject.remote.must_equal 'dest' }
+    let(:upload) { subject.upload 'source', 'dest' }
+    it { upload.local.must_equal 'source' }
+    it { upload.remote.must_equal 'dest' }
   end
 
   describe 'sudo upload' do
     it 'modifies Upload to send it to a temp file and sudos to copy it to destination' do
       File.stubs(:directory?).returns false
-      sudo upload 'source', 'dest'
+      subject.sudo subject.upload 'source', 'dest'
 
       $conf.commands.map(&:command).must_equal [nil, "cp -rf /tmp/dest dest", "rm -rf /tmp/dest"]
       $conf.commands.map(&:check).must_equal [
@@ -290,18 +306,18 @@ describe Machines::Core do
 
     it 'adds /. to the end of folder paths' do
       File.stubs(:directory?).with('source').returns true
-      sudo upload 'source', 'dest'
+      subject.sudo subject.upload 'source', 'dest'
       $conf.commands.map(&:command).must_equal [nil, "cp -rf /tmp/dest/. dest", "rm -rf /tmp/dest"]
     end
   end
 
   describe 'required_options' do
     it 'does not raise when option exists' do
-      required_options({:required => :option}, [:required])
+      subject.required_options({:required => :option}, [:required])
     end
 
     it 'raises when option does not exist' do
-      lambda{required_options({}, [:required])}.must_raise(ArgumentError)
+      lambda{ subject.required_options({}, [:required]) }.must_raise(ArgumentError)
     end
   end
 end