machines 0.5.2 → 0.5.3

data/CHANGELOG.md

@@ -0,0 +1,17 @@
+== 0.5.3
+
+* Implement `list` command to list available machines from machines.yml
+* Display syntax when `build` called with no machine
+* Support running multiple tasks - e.g. `machines build machine passenger passenger_nginx nginx`
+* modify git_clone to pull if the repo already exists
+
+== 0.5.2
+
+* Bug fixes
+
+
+== 0.5.1
+
+* Added opensource flag to allow alternatives to be installed (e.g. Chrome/Chromium)
+* Added config.yml option to autostart VBoxClient for WMs that don't use XDG autostart
+* Only append lines in a file if they do not exist (allows repeat running of commands)

data/EXAMPLES.md

@@ -1,3 +1,6 @@
+Adding new packages
+=======================================
+
 It's easy to add new packages if you need something new on your current install.
 I added the following to `packages/printer.rb`:
 
@@ -16,3 +19,23 @@ Then ran it locally:
 
 Now the drivers for my printer are installed.
 
+
+Running individual tasks
+=======================================
+
+Here is an example of upgrading Ruby, passenger and Nginx. First we check what commands will be run with the `dryrun` command.
+
+    machines dryrun phil rbenv passenger passenger_nginx nginx webapps
+    cat log/output.log
+
+    2% SUDO   apt-get -q -y install git-core
+    4% SUDO   apt-get -q -y install curl
+    5% RUN    test -d ruby-build && (cd ruby-build && git pull) || git clone --quiet git://github.com...
+    7% SUDO   cd ~/ruby-build && ./install.sh
+    ...
+
+We can see that git and curl are installed as part of the rbenv install (although they will be ignored as they're already installed). the latest ruby-build is then pulled as it's already on the machine and the installer run.
+
+All looks good so we'll run the build:
+
+    machines build phil rbenv passenger passenger_nginx nginx webapps

data/TODO.md

@@ -1,7 +1,8 @@
 TODO next
 ----------------------------------------
 
-Support missing environment (e.g. scm machine)
+Handle unknown tasks and display a proper error message (at the moment we get an obscure undefined method on NilClass)
+Support missing environment (e.g. source repo machine)
 `machines dryrun/build` with no machine name should list the machines available
 DRY up per user config by creating a "common" user config that all users pull default config from
 DRY up further by having default templates in the same way that packages default to built-in ones
@@ -9,6 +10,8 @@ DRY up further by having default templates in the same way that packages default
 Complement this by providing a command to view packages and templates
 Move dotfiles to a repo so they can be managed across projects
 Handle apt-get error 110 and retry
+Move packages into a separate gem
+Move template into a separate gem
 
 
 Cloud
@@ -34,7 +37,6 @@ EC2 - Look at assigning and freeing elastic IP addresses
 Package and Task Tasks
 ----------------------------------------
 
-Support running multiple tasks - e.g. `machines build passenger passenger_nginx nginx`
 Any methods other than `append` that cannot be repeatedly run?
 Display additional install notes for a particular package (at the end of installation) - e.g. printer setup requires Windows share to be setup
 CODE/DOC: Describe difference between package and task or merge packages with tasks if possible

data/lib/machines/commandline.rb

@@ -3,11 +3,11 @@ module Machines
     # Loads Machinesfile, opens an SCP connection and runs all commands and file uploads
     def build options
       $conf.machine_name = options.shift
-      $conf.task = options.shift
+      return say(Help.new.syntax) unless $conf.machine_name
       init
       load_machinesfile
 
-      task $conf.task.to_sym if $conf.task
+      task options if options.any?
 
       ssh_options = {:paranoid => false}
       if $conf.machine.cloud
@@ -44,7 +44,7 @@ module Machines
     end
 
     # Execute a given command e.g. dryrun, build, generate, htpasswd, packages, override, tasks
-    def execute(options)
+    def execute options
       help = Help.new
       action = options.shift
       if help.actions.include?(action)
@@ -90,6 +90,10 @@ module Machines
       Command.console ||= Machines::Logger.new STDOUT, :truncate => true
     end
 
+    def list notused
+      say Help.new.machine_list
+    end
+
     def load_machinesfile
       eval File.read('Machinesfile'), nil, "eval: Machinesfile"
     rescue LoadError => e
@@ -126,7 +130,10 @@ module Machines
       end
     end
 
-    def tasks
+    def tasks options
+      $conf.machine_name = options.shift
+      return say(Help.new.syntax) unless $conf.machine_name
+
       $conf.log_only = true
       init
       load_machinesfile

data/lib/machines/core.rb

@@ -1,8 +1,8 @@
 module Machines
   module Core
     # 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 task so they can be run standalone
-    # @param [Symbol] name Name of the task
+    # 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
     # @param [String] description Describe the task
     # @param [Hash] options
     # @option options [Symbol, Array] :if Dependent tasks that must already have been added for this task to be added
@@ -14,8 +14,11 @@ module Machines
         $conf.commands << LogCommand.new(name, description)
         yield
       else
+        tasks = [name].flatten
         $conf.commands = []
-        $conf.tasks[name][:block].call
+        tasks.each do |name|
+          $conf.tasks[name.to_sym][:block].call
+        end
       end
     end
 

data/lib/machines/help.rb

@@ -4,9 +4,9 @@ module Machines
       @actions = {
         'htpasswd' => 'Generates basic auth in webserver/conf/htpasswd',
         'new <DIR>' => 'Generates an example machines project in DIR',
-        'dryrun <machine>' => 'Logs commands but does not run them',
-        'tasks' => 'Lists the available tasks',
-        'build <machine> [task]' => 'Builds your chosen machine. Optionally, build just one task',
+        'dryrun <machine> [tasks]' => 'Display commands that would be run. Optionally, specify tasks to run',
+        'tasks <machine>' => 'Lists the available tasks for the specified machine',
+        'build <machine> [tasks]' => 'Builds your chosen machine. Optionally, specify tasks to run',
         'list' => 'Lists the available machines',
         'packages' => 'Lists the available packages',
         'override <PACKAGE>' => 'Copies the default package into project/packages so it can be edited/overidden'
@@ -17,8 +17,17 @@ module Machines
       @actions.keys.map{|key| key.gsub(/ .*/, '')}
     end
 
+    def machine_list
+      $conf.machines = AppConf.new
+      $conf.load('machines.yml')
+      <<-LIST
+Machines from machines.yml:
+#{$conf.machines.keys.map{|machine| "  #{machine}" }.join("\n")}
+LIST
+    end
+
     def syntax
-      <<HELP
+      <<-HELP
 machines v#{Machines::VERSION} - Ubuntu/Ruby configuration tool.
 machines COMMAND
 COMMAND can be:

data/lib/machines/installation.rb

@@ -73,7 +73,7 @@ module Machines
       Command.new("gem update #{options}", nil)
     end
 
-    # Clone a project from a Git repository
+    # Clone (or update) a project from a Git repository
     # @param [String] url URL to clone
     # @param [Hash] options
     # @option options [Optional String] :to Folder to clone to
@@ -83,7 +83,8 @@ module Machines
       raise ArgumentError.new('git_clone Must include a url and folder') if url.nil? || url.empty?
       raise ArgumentError.new('specifying :tag also requires :to') if options[:tag] && options[:to].nil?
       branch = "--branch #{options[:branch]} " if options[:branch]
-      command = "git clone --quiet #{branch}#{url}"
+      dir = options[:to] || url.gsub(/^.*\/|.git/, '')
+      command = "test -d #{dir} && (cd #{dir} && git pull) || git clone --quiet #{branch}#{url}"
       command << " #{options[:to]}" if options[:to]
       command = Command.new(command, check_dir(options[:to]))
       command = [command, Command.new("cd #{options[:to]} && git checkout #{options[:tag]}", "git name-rev --name-only HEAD | grep #{options[:tag]}")] if options[:tag]

data/lib/machines/version.rb

@@ -1,4 +1,4 @@
 module Machines
-  VERSION = '0.5.2'
+  VERSION = '0.5.3'
 end
 

data/lib/packages/abiword.rb

@@ -2,7 +2,7 @@ task :abiword, 'Install a lightweight word processor' do
   sudo install ['abiword']
 end
 
-task :abiword_associations, 'Setup file associations for Abiword' do
+task :abiword_assoc, 'Setup file associations for Abiword' do
   mimetypes = 'application/x-abiword;application/msword;application/rtf;'
   mimetypes.split(';').each do |mimetype|
     run append "#{mimetype}=abiword.desktop", :to => '.local/share/applications/mimeapps.list'

data/lib/packages/dotfiles.rb

@@ -1,6 +1,6 @@
 username = $conf.machine.user
 
-task :dotfiles, "Upload files in users/#{username}/dotfiles, prepend a dot and substitute some bashrc vars" do
+task :dotfiles, "Upload users/#{username}/dotfiles and set some env vars" do
   Dir["users/#{username}/dotfiles/*"].each do |source|
     run upload source, ".#{File.basename(source)}" if File.exists?(source)
   end

data/lib/packages/file_roller.rb

@@ -3,7 +3,7 @@ task :file_roller, 'Install file-roller archive manager' do
 end
 
 # Mimetypes can be discovered by looking in /usr/share/applications/*.desktop
-task :file_roller_associations, 'Setup file associations for file-roller' do
+task :file_roller_assoc, 'Setup file associations for file-roller' do
   mimetypes = 'application/x-7z-compressed;application/x-7z-compressed-tar;application/x-ace;application/x-alz;application/x-ar;application/x-arj;application/x-bzip;application/x-bzip-compressed-tar;application/x-bzip1;application/x-bzip1-compressed-tar;application/x-cabinet;application/x-cbr;application/x-cbz;application/x-cd-image;application/x-compress;application/x-compressed-tar;application/x-cpio;application/x-deb;application/x-ear;application/x-ms-dos-executable;application/x-gtar;application/x-gzip;application/x-gzpostscript;application/x-java-archive;application/x-lha;application/x-lhz;application/x-lrzip;application/x-lrzip-compressed-tar;application/x-lzip;application/x-lzip-compressed-tar;application/x-lzma;application/x-lzma-compressed-tar;application/x-lzop;application/x-lzop-compressed-tar;application/x-rar;application/x-rar-compressed;application/x-rpm;application/x-rzip;application/x-tar;application/x-tarz;application/x-stuffit;application/x-war;application/x-xz;application/x-xz-compressed-tar;application/x-zip;application/x-zip-compressed;application/x-zoo;application/zip;'
   mimetypes.split(';').each do |mimetype|
     run append "#{mimetype}=file-roller.desktop", :to => '.local/share/applications/mimeapps.list'

data/lib/packages/gnumeric.rb

@@ -2,7 +2,7 @@ task :gnumeric, 'Install gnumeric lightweight spreadsheet' do
   sudo install ['gnumeric']
 end
 
-task :gnumeric_associations, 'Setup file associations for Gnumeric' do
+task :gnumeric_assoc, 'Setup file associations for Gnumeric' do
   mimetypes = 'application/x-gnumeric;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;text/csv;application/msexcel'
   mimetypes.split(';').each do |mimetype|
     run append "#{mimetype}=gnumeric.desktop", :to => '.local/share/applications/mimeapps.list'

data/lib/packages/nginx.rb

@@ -1,8 +1,8 @@
 task :nginx, 'Download and configure Nginx' do
-  sudo extract $conf.webserver.url
+  sudo extract "http://nginx.org/download/nginx-#{$conf.webserver.version}.tar.gz"
   modules = "#{$conf.webserver.modules} --add-module=#{$conf.passenger.nginx}"
   commands = [
-    "cd #{$conf.webserver.src_path}",
+    "cd /usr/local/src/nginx-#{$conf.webserver.version}",
     "./configure #{modules}",
     "make",
     "make install"

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 = AppBuilder.new(
+      settings = Machines::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 = AppBuilder.new(log_path: File.join(app.path, 'shared', 'log', '*.log'))
+    settings = Machines::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/rbenv.rb

@@ -1,4 +1,4 @@
-task :rbenv, "Install ruby-build, rbenv, ruby #{$conf.ruby.version} and Bundler" do
+task :rbenv, "Install ruby-build, rbenv, ruby #{$conf.ruby.version}-#{$conf.ruby.build} and Bundler" do
   sudo install ['git-core', 'curl']
   run git_clone 'git://github.com/sstephenson/ruby-build.git'
   sudo 'cd ~/ruby-build && ./install.sh', check_file('/usr/local/bin/ruby-build')
@@ -16,9 +16,14 @@ task :rbenv, "Install ruby-build, rbenv, ruby #{$conf.ruby.version} and Bundler"
   run append path, :to => '~/.profile'
   rbenv = '$HOME/.rbenv/bin/rbenv'
 
-  run "#{rbenv} install #{$conf.ruby.full_version}", check_command("#{rbenv} versions", $conf.ruby.version)
+  full_version = "#{$conf.ruby.version}-#{$conf.ruby.build}"
+
+  $conf.ruby.gems_path = ".rbenv/versions/#{full_version}/lib/ruby/gems/1.9.1/gems"
+  $conf.ruby.executable = ".rbenv/versions/#{full_version}/bin/ruby"
+
+  run "#{rbenv} install #{full_version}", check_command("#{rbenv} versions", $conf.ruby.version)
   run "#{rbenv} rehash", check_command("#{path} which gem", '.rbenv/shims/gem')
-  run "#{rbenv} global #{$conf.ruby.full_version}", check_command("#{rbenv} exec ruby -v", $conf.ruby.version)
+  run "#{rbenv} global #{full_version}", check_command("#{rbenv} exec ruby -v", $conf.ruby.version)
 
   run write "gem: --no-rdoc --no-ri", :to => '.gemrc', :name => '.gemrc'
   run "#{rbenv} exec gem install bundler", check_command("#{rbenv} exec gem list", 'bundler')

data/lib/packages/rvm.rb

@@ -1,4 +1,8 @@
 task :rvm, 'Install RVM' do
+  full_version = "#{$conf.ruby.version}-#{$conf.ruby.build}"
+  $conf.ruby.gems_path = ".rvm/gems/#{full_version}/@global/gems"
+  $conf.ruby.executable = ".rvm/wrappers/#{full_version}@global/ruby"
+
   sudo install ['git-core']
   installer = "bash -s #{$conf.rvm.version} < <(wget -q https://raw.github.com/wayneeseguin/rvm/master/binscripts/rvm-installer )"
   run installer, check_file('~/.rvm/bin/rvm')
@@ -11,7 +15,7 @@ task :rvm_prompt_off, 'turn off trust prompting for new .rvmrc files' do
   run append 'export rvm_trust_rvmrcs_flag=1', :to => '.rvmrc'
 end
 
-task :ruby, "Install Ruby, make #{$conf.ruby.version}@global the default and install Bundler" do
+task :ruby, "Install Ruby, make #{$conf.ruby.version}-#{$conf.ruby.build}@global the default and install Bundler" do
   run "rvm install #{$conf.ruby.version}", "rvm #{$conf.ruby.version} #{echo_result}"
   run "rvm #{$conf.ruby.version}@global --default", "ruby -v | grep #{$conf.ruby.version} #{echo_result}"
   run write "gem: --no-rdoc --no-ri", :to => '.gemrc', :name => '.gemrc'

data/lib/packages/sudo_mods.rb

@@ -1,4 +1,4 @@
-task :shutdown_without_password, 'Ensure we can shutdown/reboot without needing a password for sudo' do
+task :shutdown_no_password, 'Ensure we can shutdown/reboot without needing a password for sudo' do
   sudo append 'ALL   ALL=NOPASSWD:/sbin/shutdown', :to => '/etc/sudoers.d/shutdown'
   sudo append 'ALL   ALL=NOPASSWD:/sbin/reboot', :to => '/etc/sudoers.d/shutdown'
   sudo chmod 440, '/etc/sudoers.d/shutdown'

data/lib/packages/unison.rb

@@ -1,4 +1,4 @@
-task :unison, 'Install unison two way file sync and set it to run hourly. Config in users/user/.unison/default.prf' do
+task :unison, "Install and configure Unison (users/#{$conf.machine.user}/.unison/default.prf)" do
   sudo install 'unison'
   run "echo '30 18 * * * /usr/bin/unison' | crontab", check_command('crontab -l', 'unison')
 end

data/lib/packages/webapps.rb

@@ -1,4 +1,4 @@
-task :webapps, 'Sets up Web apps in config/webapps.yml using app_server.conf.erb. Copies SSL certs.' do
+task :webapps, 'Sets up Web apps in config/webapps.yml using app_server.conf.erb' do
   sudo mkdir File.join($conf.webserver.path, $conf.webserver.servers_dir) if $conf.webserver.servers_dir
   $conf.webapps.each do |app_name, app|
     if $conf.environment == 'development'

data/lib/template/config.yml

@@ -54,25 +54,20 @@ monit:
 # Latest version including preferred nginx version:
 # https://github.com/FooBarWidget/passenger/blob/master/NEWS
 passenger:
-  version: 3.0.11
-# Set in passenger.rb package
-#  root: Points to passenger path in rubygems
-#  ruby: Points to the ruby executable in rbenv, rvm, compiled or installed by your package manager
+  version: 3.0.17
+  # Set in passenger.rb package
+  #  root: Points to passenger path in rubygems
+  #  ruby: Points to the ruby executable in rbenv, rvm, compiled or installed by your package manager
 
 # Uncomment to use RVM
 # Ruby will be installed using RVM
 # Passenger will be installed using rvmsudo
 #rvm:
-#  url: https://rvm.beginrescueend.com/install/rvm
 #  version: 1.9.2
 
 ruby:
-  version: 1.9.2
-  full_version: 1.9.2-p290
-#  gems_path: '.rvm/gems/1.9.2-p290/@global/gems'
-#  executable: .rvm/wrappers/1.9.2-p290@global/ruby
-  gems_path: .rbenv/versions/1.9.2-p290/lib/ruby/gems/1.9.1/gems
-  executable: .rbenv/versions/1.9.2-p290/bin/ruby
+  version: 1.9.3
+  build: p194
 
 set_rails_env_for:
   - qa
@@ -90,7 +85,7 @@ use_opensource: true
 webserver:
   name: nginx
   modules: --with-http_ssl_module
-  version: 1.0.11
+  version: 1.2.3
   url: http://nginx.org/download/nginx-1.0.11.tar.gz
   src_path: /usr/local/src/nginx-1.0.11
   path: /usr/local/nginx

data/spec/lib/machines/commandline_spec.rb

@@ -7,7 +7,7 @@ describe Machines::Commandline do
 
   before(:each) do
     $conf.log_only = false
-    File.open('config.yml', 'w') { |f| f.puts "timezone: GB" }
+    File.open('config.yml', 'w') {|f| f.puts "timezone: GB" }
     FileUtils.mkdir_p 'log'
   end
 
@@ -24,23 +24,29 @@ describe Machines::Commandline do
       Net::SSH.stubs(:start).returns @ssh_stub
     end
 
+    it 'displays syntax when no machine name specified' do
+      lambda { build [] }.must_output Machines::Help.new.syntax
+    end
+
     it 'sets machine_name' do
       build ['machine']
       $conf.machine_name.must_equal 'machine'
     end
 
     it 'starts an SCP session using password authentication' do
-      Net::SSH.expects(:start).with('target', 'username', :paranoid => false, :password => 'userpass').returns @ssh_stub
-      build []
+      options = {paranoid: false, password: 'userpass'}
+      Net::SSH.expects(:start).with('target', 'username', options).returns @ssh_stub
+      build ['machine']
     end
 
     it 'starts an SCP session using key based authentication' do
       $conf.machine.cloud = AppConf.new
       $conf.machine.cloud.private_key_path = 'path/to/private_key'
       $conf.machine.cloud.username = 'ubuntu'
-      Net::SSH.expects(:start).with('target', 'ubuntu', :paranoid => false, :keys => ['path/to/private_key']).returns @ssh_stub
+      options = {paranoid: false, keys: ['path/to/private_key']}
+      Net::SSH.expects(:start).with('target', 'ubuntu', options).returns @ssh_stub
 
-      build []
+      build ['machine']
     end
 
     it 'runs each command' do
@@ -49,7 +55,7 @@ describe Machines::Commandline do
 
       mock_command.expects(:run)
 
-      build []
+      build ['machine']
     end
 
     it 'flushes log file after running command' do
@@ -58,17 +64,21 @@ describe Machines::Commandline do
       $conf.commands = [command_stub]
 
       Machines::Command.file.expects(:flush)
-      build []
+      build ['machine']
     end
 
-    it 'replaces commands with the single task when supplied' do
+    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 = { :task => {:block => Proc.new { run command_will_run }} }
+      $conf.tasks = { 
+        :task1 => {:block => Proc.new { run command_will_run }},
+        :task2 => {:block => Proc.new { run command_also_run }}
+      }
 
-      build ['machine', 'task']
+      build ['machine', 'task1', 'task2']
 
-      $conf.commands.must_equal [command_will_run]
+      $conf.commands.must_equal [command_will_run, command_also_run]
     end
 
     it 'logs instead of SSHing and running commands' do
@@ -76,7 +86,7 @@ describe Machines::Commandline do
       $conf.commands = [mock('Machines::Command')]
       $conf.commands.first.expects(:run)
       $conf.log_only = true
-      build []
+      build ['machine']
     end
 
     describe 'interrupts' do
@@ -91,14 +101,15 @@ describe Machines::Commandline do
       it 'handles CTRL+C and calls handler' do
         expects(:prepare_to_exit)
         Kernel.expects(:trap).with('INT').yields
-        build []
+        build ['machine']
       end
 
 
       it 'sets exit flag and displays message' do
         prepare_to_exit
         $exit_requested.must_equal true
-        $console.next.must_equal colored("\nEXITING after current command completes...\n", :warning)
+        message = "\nEXITING after current command completes...\n"
+        $console.next.must_equal colored(message, :warning)
       end
 
       it 'second request to exit exits immediately' do
@@ -111,7 +122,7 @@ describe Machines::Commandline do
         $exit_requested = true
         expects(:exit)
 
-        build []
+        build ['machine']
       end
     end
   end
@@ -123,6 +134,12 @@ describe Machines::Commandline do
       dryrun options
       $conf.log_only.must_equal true
     end
+
+    it 'passes tasks to build' do
+      options = ['machine', 'task']
+      expects(:build).with options
+      dryrun options
+    end
   end
 
   describe 'execute' do
@@ -210,6 +227,13 @@ describe Machines::Commandline do
     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')
@@ -288,11 +312,12 @@ Project packages
         :task2 =>  {:description => 'description 2'},
         :task3 => {:description => 'description 3'}
       }
-      lambda { tasks }.must_output 'Tasks
+      lambda { tasks ['machine'] }.must_output 'Tasks
   task1                description 1
   task2                description 2
   task3                description 3
 '
+      $conf.machine_name.must_equal 'machine'
     end
   end
 end

data/spec/lib/machines/core_spec.rb

@@ -37,12 +37,21 @@ describe Machines::Core do
       $conf.tasks.must_equal :name => {:description => 'description', :block => block}
     end
 
-    it 'sets commands to only run those from the specified task' do
-      block_ran = false
-      block = Proc.new { block_ran = true }
-      $conf.tasks[:name] = {:block => block}
-      task :name, nil
-      block_ran.must_equal true
+    it 'sets commands to only run those from the specified tasks' do
+      block_run_count = 0
+      block = Proc.new { block_run_count += 1 }
+      $conf.tasks[:task1] = {:block => block}
+      $conf.tasks[:task2] = {:block => block}
+      task [:task1, 'task2']
+      block_run_count.must_equal 2
+    end
+
+    it 'sets commands to only run those of a single task' do
+      block_run = false
+      block = Proc.new { block_run = true }
+      $conf.tasks[:task] = {:block => block}
+      task :task
+      block_run.must_equal true
     end
 
     describe 'when dependent task' do

data/spec/lib/machines/help_spec.rb

@@ -7,6 +7,13 @@ describe Machines::Help do
     it { subject.actions.must_equal ['htpasswd', 'new', 'dryrun', 'tasks', 'build', 'list', 'packages', 'override'] }
   end
 
+  describe 'machine_list' do
+    it 'lists the machines from machines.yml' do
+      File.open('machines.yml', 'w') {|f| f.puts({'machines' => {'machine_1' => {}, 'machine_2' => {}}}.to_yaml) }
+      subject.machine_list.must_equal "Machines from machines.yml:\n  machine_1\n  machine_2\n"
+    end
+  end
+
   describe 'syntax' do
     it 'includes version' do
       subject.syntax.must_match /machines v0\.[0-9]+\.[0-9]+ - Ubuntu\/Ruby configuration tool\./
@@ -15,7 +22,7 @@ describe Machines::Help do
     it 'includes syntax' do
       subject.syntax.must_match /machines COMMAND/
       subject.syntax.must_match /COMMAND can be:/
-      subject.syntax.must_match /build <machine> \[task\]   Builds your chosen machine\. Optionally, build just one task/
+      subject.syntax.must_match /build \<machine\> \[tasks\]  Builds your chosen machine/
     end
   end
 end

data/spec/lib/machines/installation_spec.rb

@@ -82,12 +82,12 @@ describe 'Installation' do
   describe 'git_clone' do
     it 'instaniates a command to clone a git repository' do
       subject = git_clone 'http://git_url.git'
-      subject.command.must_equal 'git clone --quiet http://git_url.git'
+      subject.command.must_equal 'test -d git_url && (cd git_url && git pull) || git clone --quiet http://git_url.git'
     end
 
     it 'instaniates a command to clone a git repository to a specified folder' do
       subject = git_clone 'http://git_url.git', :to => 'dir'
-      subject.command.must_equal 'git clone --quiet http://git_url.git dir'
+      subject.command.must_equal 'test -d dir && (cd dir && git pull) || git clone --quiet http://git_url.git dir'
     end
 
     it 'raises when no url supplied' do
@@ -98,7 +98,7 @@ describe 'Installation' do
     describe ':branch option' do
       it 'clones to a specific branch' do
         subject = git_clone 'http://git_url.git', :branch => 'other'
-        subject.command.must_equal 'git clone --quiet --branch other http://git_url.git'
+        subject.command.must_equal 'test -d git_url && (cd git_url && git pull) || git clone --quiet --branch other http://git_url.git'
       end
     end
 
@@ -106,7 +106,7 @@ describe 'Installation' do
       it 'checks out a specific tag' do
         subject = git_clone 'http://git_url.git', :to => 'dir', :tag => 'v1.0'
         subject.map(&:command).must_equal [
-          'git clone --quiet http://git_url.git dir',
+          'test -d dir && (cd dir && git pull) || git clone --quiet http://git_url.git dir',
           'cd dir && git checkout v1.0'
         ]
       end

data/spec/lib/packages/abiword_spec.rb

@@ -10,7 +10,7 @@ describe 'packages/apps' do
     $conf.commands.map(&:info).must_equal [
       "TASK   abiword - Install a lightweight word processor",
       "SUDO   apt-get -q -y install abiword",
-      "TASK   abiword_associations - Setup file associations for Abiword",
+      "TASK   abiword_assoc - Setup file associations for Abiword",
       "RUN    grep \"application/x-abiword=abiword.desktop\" .local/share/applications/mimeapps.list || echo \"application/x-abiword=abiword.desktop\" >> .local/share/applications/mimeapps.list",
       "RUN    grep \"application/msword=abiword.desktop\" .local/share/applications/mimeapps.list || echo \"application/msword=abiword.desktop\" >> .local/share/applications/mimeapps.list",
       "RUN    grep \"application/rtf=abiword.desktop\" .local/share/applications/mimeapps.list || echo \"application/rtf=abiword.desktop\" >> .local/share/applications/mimeapps.list"

data/spec/lib/packages/cruisecontrol_spec.rb

@@ -19,7 +19,7 @@ describe 'packages/cruisecontrol' do
     eval_package
     $conf.commands.map(&:info).join("\n").must_equal [
       "TASK   cruisecontrol - Install, configure and set to start on boot",
-      "RUN    git clone --quiet https://github.com/thoughtworks/cruisecontrol.rb.git",
+      "RUN    test -d cruisecontrol.rb && (cd cruisecontrol.rb && git pull) || git clone --quiet https://github.com/thoughtworks/cruisecontrol.rb.git",
       "RUN    cd cruisecontrol.rb &&  bundle",
       "RUN    cd cruisecontrol.rb &&  ruby ./cruise add Application -r github.com/project",
       "SUDO   cp -rf cruisecontrol.rb/daemon/cruise /etc/init.d/cruise",

data/spec/lib/packages/dotfiles_spec.rb

@@ -17,7 +17,7 @@ describe 'packages/dotfiles' do
   it 'adds the following commands' do
     eval_package
     $conf.commands.map(&:info).join("\n").must_equal [
-      "TASK   dotfiles - Upload files in users/username/dotfiles, prepend a dot and substitute some bashrc vars",
+      "TASK   dotfiles - Upload users/username/dotfiles and set some env vars",
       "UPLOAD #{File.expand_path('users/username/dotfiles/bashrc')} to .bashrc",
       "RUN    mkdir -p $HOME/.ssh",
       "RUN    chmod 700 $HOME/.ssh",

data/spec/lib/packages/file_roller_spec.rb

@@ -14,7 +14,7 @@ describe 'packages/apps' do
     $conf.commands.map(&:info).must_equal [
       "TASK   file_roller - Install file-roller archive manager",
       "SUDO   apt-get -q -y install file-roller",
-      "TASK   file_roller_associations - Setup file associations for file-roller",
+      "TASK   file_roller_assoc - Setup file associations for file-roller",
       append_command('application/x-7z-compressed=file-roller.desktop'),
       append_command('application/x-7z-compressed-tar=file-roller.desktop'),
       append_command('application/x-ace=file-roller.desktop'),

data/spec/lib/packages/gmate_spec.rb

@@ -12,7 +12,7 @@ describe 'packages/gmate' do
       "TASK   gmate - Clone and install gmate for gEdit from Github and set some preferences and plugins",
       "SUDO   apt-get -q -y install python-pyinotify",
       "SUDO   apt-get -q -y install ack-grep",
-      "RUN    git clone --quiet git://github.com/gmate/gmate.git apps_root/gmate",
+      "RUN    test -d apps_root/gmate && (cd apps_root/gmate && git pull) || git clone --quiet git://github.com/gmate/gmate.git apps_root/gmate",
       "RUN    cd apps_root/gmate && echo \\n | ./install.sh",
       'RUN    gconftool-2 --set "/apps/gedit-2/plugins/active-plugins" --type list --list-type=string ["text_tools","smart_indent","align","rails_hotkeys","trailsave","gemini","rubyonrailsloader","gedit_openfiles","quickhighlightmode","completion","time","docinfo","filebrowser","snippets","spell","indent","tabswitch"]',
       'RUN    gconftool-2 --set "/apps/gedit-2/plugins/smart_indent/haml_tab_size" --type int 2',

data/spec/lib/packages/gnumeric_spec.rb

@@ -10,7 +10,7 @@ describe 'packages/apps' do
     $conf.commands.map(&:info).must_equal [
       "TASK   gnumeric - Install gnumeric lightweight spreadsheet",
       "SUDO   apt-get -q -y install gnumeric",
-      "TASK   gnumeric_associations - Setup file associations for Gnumeric",
+      "TASK   gnumeric_assoc - Setup file associations for Gnumeric",
       "RUN    grep \"application/x-gnumeric=gnumeric.desktop\" .local/share/applications/mimeapps.list || echo \"application/x-gnumeric=gnumeric.desktop\" >> .local/share/applications/mimeapps.list",
       "RUN    grep \"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet=gnumeric.desktop\" .local/share/applications/mimeapps.list || echo \"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet=gnumeric.desktop\" >> .local/share/applications/mimeapps.list",
       "RUN    grep \"text/csv=gnumeric.desktop\" .local/share/applications/mimeapps.list || echo \"text/csv=gnumeric.desktop\" >> .local/share/applications/mimeapps.list",

data/spec/lib/packages/nginx_spec.rb

@@ -3,8 +3,8 @@ require 'spec_helper'
 describe 'packages/nginx' do
   before(:each) do
     load_package('nginx')
-    $conf.from_hash(:webserver => {:name => 'nginx', :version => '1.0.2', :path => 'nginx_path', :conf_path => 'conf',
-      :url => 'nginx_url/package', :src_path => '/usr/local/src/nginx-1.2.3', :modules => '--with-http_ssl_module'})
+    $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'})
     FileUtils.mkdir_p 'nginx'
     File.open('nginx/nginx.conf.erb', 'w') {|f| f.puts 'the template' }
@@ -16,7 +16,7 @@ describe 'packages/nginx' do
     eval_package
     $conf.commands.map(&:info).join("\n").must_equal [
       "TASK   nginx - Download and configure Nginx",
-      "SUDO   cd /usr/local/src && wget nginx_url/package && tar -zxf package && rm package && cd -",
+      "SUDO   cd /usr/local/src && wget http://nginx.org/download/nginx-1.2.3.tar.gz && tar -zxf nginx-1.2.3.tar.gz && rm nginx-1.2.3.tar.gz && cd -",
       'SUDO   cd /usr/local/src/nginx-1.2.3 && ./configure --with-http_ssl_module --add-module=/passenger/path/ext/nginx && make && make install',
       "UPLOAD buffer from nginx/nginx.conf.erb to /tmp/nginx.conf",
       "SUDO   cp -rf /tmp/nginx.conf nginx_path/conf/nginx.conf",
@@ -32,7 +32,7 @@ describe 'packages/nginx' do
     eval_package
     $conf.commands.map(&:info).join("\n").must_equal [
       "TASK   nginx - Download and configure Nginx",
-      "SUDO   cd /usr/local/src && wget nginx_url/package && tar -zxf package && rm package && cd -",
+      "SUDO   cd /usr/local/src && wget http://nginx.org/download/nginx-1.2.3.tar.gz && tar -zxf nginx-1.2.3.tar.gz && rm nginx-1.2.3.tar.gz && cd -",
       'SUDO   cd /usr/local/src/nginx-1.2.3 && ./configure --with-http_ssl_module --add-module=/passenger/path/ext/nginx && make && make install',
       "UPLOAD buffer from nginx/nginx.conf.erb to /tmp/nginx.conf",
       "SUDO   cp -rf /tmp/nginx.conf nginx_path/conf/nginx.conf",

data/spec/lib/packages/rbenv_spec.rb

@@ -5,18 +5,28 @@ describe 'packages/rbenv' do
     load_package('rbenv')
     $conf.ruby = AppConf.new
     $conf.ruby.version = '1.9.2'
-    $conf.ruby.full_version = '1.9.2-p290'
+    $conf.ruby.build = 'p290'
+  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 and Bundler',
+      'TASK   rbenv - Install ruby-build, rbenv, ruby 1.9.2-p290 and Bundler',
       "SUDO   apt-get -q -y install git-core",
       "SUDO   apt-get -q -y install curl",
-      'RUN    git clone --quiet git://github.com/sstephenson/ruby-build.git',
+      'RUN    test -d ruby-build && (cd ruby-build && git pull) || git clone --quiet git://github.com/sstephenson/ruby-build.git',
       'SUDO   cd ~/ruby-build && ./install.sh',
-      'RUN    git clone --quiet git://github.com/sstephenson/rbenv.git ~/.rbenv',
+      'RUN    test -d ~/.rbenv && (cd ~/.rbenv && git pull) || git clone --quiet git://github.com/sstephenson/rbenv.git ~/.rbenv',
       'RUN    grep "PATH=.bin/safe/../../.bin:\\$HOME/.rbenv/bin:\\$HOME/.rbenv/shims:\\$PATH" ~/.profile || echo "PATH=.bin/safe/../../.bin:\\$HOME/.rbenv/bin:\\$HOME/.rbenv/shims:\\$PATH" >> ~/.profile',
 
       'RUN    $HOME/.rbenv/bin/rbenv install 1.9.2-p290',

data/spec/lib/packages/rvm_spec.rb

@@ -3,13 +3,23 @@ require 'spec_helper'
 describe 'packages/rvm' do
   before(:each) do
     load_package('rvm')
-    $conf.from_hash(:ruby => {:version => '1.9'})
-    $conf.from_hash(:rvm => {:url => 'rvm_url', :version => '1.0'})
+    $conf.from_hash(ruby: {version: '1.9.2', build: 'p290'})
+    $conf.from_hash(rvm: {version:  '1.0'})
+  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).must_equal [
+    $conf.commands.map(&:info).join("\n").must_equal [
       "TASK   rvm - Install RVM",
       "SUDO   apt-get -q -y install git-core",
       'RUN    bash -s 1.0 < <(wget -q https://raw.github.com/wayneeseguin/rvm/master/binscripts/rvm-installer )',
@@ -20,12 +30,12 @@ describe 'packages/rvm' do
       "TASK   rvm_prompt_off - turn off trust prompting for new .rvmrc files",
       "RUN    grep \"export rvm_trust_rvmrcs_flag=1\" .rvmrc || echo \"export rvm_trust_rvmrcs_flag=1\" >> .rvmrc",
 
-      'TASK   ruby - Install Ruby, make 1.9@global the default and install Bundler',
-      'RUN    rvm install 1.9',
-      'RUN    rvm 1.9@global --default',
+      'TASK   ruby - Install Ruby, make 1.9.2-p290@global the default and install Bundler',
+      'RUN    rvm install 1.9.2',
+      'RUN    rvm 1.9.2@global --default',
       'UPLOAD buffer from .gemrc to .gemrc',
       'RUN    gem install bundler'
-    ]
+    ].join("\n")
   end
 end
 

data/spec/lib/packages/sqlserver_spec.rb

@@ -9,7 +9,7 @@ describe 'packages/sqlserver' do
     eval_package
     $conf.commands.map(&:info).must_equal [
       "TASK   sqlserver - Download and build sqlserver driver",
-      "RUN    git clone --quiet git://github.com/rails-sqlserver/tiny_tds.git",
+      "RUN    test -d tiny_tds && (cd tiny_tds && git pull) || git clone --quiet git://github.com/rails-sqlserver/tiny_tds.git",
       "RUN    cd tiny_tds && rake compile && rake native gem"
     ]
   end

data/spec/lib/packages/unison_spec.rb

@@ -3,12 +3,14 @@ require 'spec_helper'
 describe 'packages/unison' do
   before(:each) do
     load_package('unison')
+    $conf.machine = AppConf.new
+    $conf.machine.user = 'username'
   end
 
   it 'adds the following commands' do
     eval_package
     $conf.commands.map(&:info).must_equal [
-      "TASK   unison - Install unison two way file sync and set it to run hourly. Config in users/user/.unison/default.prf",
+      "TASK   unison - Install and configure Unison (users/username/.unison/default.prf)",
       "SUDO   apt-get -q -y install unison",
       "RUN    echo '30 18 * * * /usr/bin/unison' | crontab"
     ]

data/spec/lib/packages/webapps_spec.rb

@@ -27,7 +27,7 @@ describe 'packages/webapps' do
     $conf.environment = 'production'
     eval_package
     $conf.commands.map(&:info).join("\n").must_equal [
-      "TASK   webapps - Sets up Web apps in config/webapps.yml using app_server.conf.erb. Copies SSL certs.",
+      "TASK   webapps - Sets up Web apps in config/webapps.yml using app_server.conf.erb",
       "SUDO   mkdir -p nginx_path/servers",
       "RUN    mkdir -p /home/users/application/releases",
       "RUN    mkdir -p /home/users/application/shared/config",
@@ -54,9 +54,9 @@ describe 'packages/webapps' do
     eval_package
     commandline = $conf.commands.map(&:info).join("\n")
     commandline.must_equal [
-      "TASK   webapps - Sets up Web apps in config/webapps.yml using app_server.conf.erb. Copies SSL certs.",
+      "TASK   webapps - Sets up Web apps in config/webapps.yml using app_server.conf.erb",
       "SUDO   mkdir -p nginx_path/servers",
-      "RUN    git clone --quiet --branch master github.com/project /home/users/application",
+      "RUN    test -d /home/users/application && (cd /home/users/application && git pull) || git clone --quiet --branch master github.com/project /home/users/application",
       "RUN    cd /home/users/application && $HOME/.rbenv/bin/rbenv exec bundle",
       "RUN    cd /home/users/application && $HOME/.rbenv/bin/rbenv exec bundle --binstubs=.bin",
       "UPLOAD buffer from nginx/app_server.conf.erb to /tmp/application.conf",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: machines
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-13 00:00:00.000000000 Z
+date: 2012-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -318,7 +318,8 @@ dependencies:
 description: Install and configure Ubuntu desktops, laptops, servers and cloud instances.
   Install software, configure settings, preferences, keys, projects, applications,
   scripts, etc...
-email: phil@electricvisions.com
+email: !binary |-
+  cGhpbEBlbGVjdHJpY3Zpc2lvbnMuY29t
 executables:
 - machines
 extensions: []
@@ -326,6 +327,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .yardopts
+- CHANGELOG.md
 - EXAMPLES.md
 - Gemfile
 - Guardfile
@@ -518,7 +520,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1670062508932557270
+      hash: 4483574387537312947
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: