machines 0.5.4 → 0.5.6

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: machines
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-09 00:00:00.000000000 Z
+date: 2013-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -339,23 +339,21 @@ files:
 - bin/machines
 - lib/machines.rb
 - lib/machines/app_settings.rb
-- lib/machines/base.rb
-- lib/machines/checks.rb
 - lib/machines/cloud_machine.rb
 - lib/machines/command.rb
 - lib/machines/commandline.rb
-- lib/machines/configuration.rb
+- lib/machines/commands/checks.rb
+- lib/machines/commands/configuration.rb
+- lib/machines/commands/database.rb
+- lib/machines/commands/file_operations.rb
+- lib/machines/commands/installation.rb
+- lib/machines/commands/questions.rb
+- lib/machines/commands/services.rb
 - lib/machines/core.rb
-- lib/machines/database.rb
-- lib/machines/file_operations.rb
 - lib/machines/help.rb
-- lib/machines/installation.rb
 - lib/machines/log_command.rb
 - lib/machines/logger.rb
-- lib/machines/machinesfile.rb
 - lib/machines/named_buffer.rb
-- lib/machines/questions.rb
-- lib/machines/services.rb
 - lib/machines/upload.rb
 - lib/machines/version.rb
 - lib/packages/abiword.rb
@@ -367,6 +365,7 @@ files:
 - lib/packages/dependencies.rb
 - lib/packages/docky.rb
 - lib/packages/dotfiles.rb
+- lib/packages/dwm.rb
 - lib/packages/file_roller.rb
 - lib/packages/finalise.rb
 - lib/packages/firefox.rb
@@ -446,21 +445,20 @@ files:
 - machines.gemspec
 - spec/acceptance/dev_machine_spec.rb
 - spec/lib/machines/app_settings_spec.rb
-- spec/lib/machines/checks_spec.rb
 - spec/lib/machines/cloud_machine_spec.rb
 - spec/lib/machines/command_spec.rb
 - spec/lib/machines/commandline_spec.rb
-- spec/lib/machines/configuration_spec.rb
+- spec/lib/machines/commands/checks_spec.rb
+- spec/lib/machines/commands/configuration_spec.rb
+- spec/lib/machines/commands/database_spec.rb
+- spec/lib/machines/commands/file_operations_spec.rb
+- spec/lib/machines/commands/installation_spec.rb
+- spec/lib/machines/commands/questions_spec.rb
+- spec/lib/machines/commands/services_spec.rb
 - spec/lib/machines/core_spec.rb
-- spec/lib/machines/database_spec.rb
-- spec/lib/machines/file_operations_spec.rb
 - spec/lib/machines/help_spec.rb
-- spec/lib/machines/installation_spec.rb
 - spec/lib/machines/log_command_spec.rb
 - spec/lib/machines/logger_spec.rb
-- spec/lib/machines/machinesfile_spec.rb
-- spec/lib/machines/questions_spec.rb
-- spec/lib/machines/services_spec.rb
 - spec/lib/machines/upload_spec.rb
 - spec/lib/packages/abiword_spec.rb
 - spec/lib/packages/amazon_mp3_spec.rb
@@ -471,6 +469,7 @@ files:
 - spec/lib/packages/dependencies_spec.rb
 - spec/lib/packages/docky_spec.rb
 - spec/lib/packages/dotfiles_spec.rb
+- spec/lib/packages/dwm_spec.rb
 - spec/lib/packages/file_roller_spec.rb
 - spec/lib/packages/firefox_spec.rb
 - spec/lib/packages/gedit_spec.rb
@@ -520,7 +519,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3397019508806936970
+      hash: 2425270342975201528
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -537,21 +536,20 @@ summary: Simple configuration of development, staging and production computers o
 test_files:
 - spec/acceptance/dev_machine_spec.rb
 - spec/lib/machines/app_settings_spec.rb
-- spec/lib/machines/checks_spec.rb
 - spec/lib/machines/cloud_machine_spec.rb
 - spec/lib/machines/command_spec.rb
 - spec/lib/machines/commandline_spec.rb
-- spec/lib/machines/configuration_spec.rb
+- spec/lib/machines/commands/checks_spec.rb
+- spec/lib/machines/commands/configuration_spec.rb
+- spec/lib/machines/commands/database_spec.rb
+- spec/lib/machines/commands/file_operations_spec.rb
+- spec/lib/machines/commands/installation_spec.rb
+- spec/lib/machines/commands/questions_spec.rb
+- spec/lib/machines/commands/services_spec.rb
 - spec/lib/machines/core_spec.rb
-- spec/lib/machines/database_spec.rb
-- spec/lib/machines/file_operations_spec.rb
 - spec/lib/machines/help_spec.rb
-- spec/lib/machines/installation_spec.rb
 - spec/lib/machines/log_command_spec.rb
 - spec/lib/machines/logger_spec.rb
-- spec/lib/machines/machinesfile_spec.rb
-- spec/lib/machines/questions_spec.rb
-- spec/lib/machines/services_spec.rb
 - spec/lib/machines/upload_spec.rb
 - spec/lib/packages/abiword_spec.rb
 - spec/lib/packages/amazon_mp3_spec.rb
@@ -562,6 +560,7 @@ test_files:
 - spec/lib/packages/dependencies_spec.rb
 - spec/lib/packages/docky_spec.rb
 - spec/lib/packages/dotfiles_spec.rb
+- spec/lib/packages/dwm_spec.rb
 - spec/lib/packages/file_roller_spec.rb
 - spec/lib/packages/firefox_spec.rb
 - spec/lib/packages/gedit_spec.rb

data/lib/machines/base.rb

@@ -1,13 +0,0 @@
-module Machines
-  class Base
-    files = Dir[File.join($conf.application_dir, 'machines/**/*.rb')]
-    files.reject!{|name| File.basename(name) == 'base.rb' }
-    files.sort.each do |lib|
-      require lib
-      path = ActiveSupport::Inflector.camelize(File.basename(lib, '.rb'))
-      module_or_class = eval(path, nil, "eval: #{path}") rescue nil
-      include module_or_class unless module_or_class.nil? || module_or_class.is_a?(Class)
-    end
-  end
-end
-

data/lib/machines/checks.rb

@@ -1,63 +0,0 @@
-module Machines
-  module Checks
-    def echo_result
-      '&& echo CHECK PASSED || echo CHECK FAILED'
-    end
-
-    def check_package package, exists = true
-      "dpkg --get-selections | grep #{package}.*#{exists ? '' : 'de'}install #{echo_result}"
-    end
-
-    def check_gem gem, version = nil
-      version = " -v #{version}" if version
-      "gem search #{gem}#{version} --installed #{echo_result}"
-    end
-
-    def check_file file, exists = true
-      "test #{exists ? '' : '! '}-s #{file} #{echo_result}"
-    end
-
-    def check_link link
-      "test -L #{link} #{echo_result}"
-    end
-
-    def check_dir dir, exists = true
-      "test #{exists ? '' : '! '}-d #{dir} #{echo_result}"
-    end
-
-    def check_perms perms, path
-      perms = perms.to_s
-      mods = %w(--- --x -w- -wx r-- r-x rw- rwx)
-      "ls -la #{path} | grep #{mods[perms[0..0].to_i]}#{mods[perms[1..1].to_i]}#{mods[perms[2..2].to_i]} #{echo_result}"
-    end
-
-    def check_owner user, path
-      "ls -la #{path} | grep \"#{user}.*#{user}\" #{echo_result}"
-    end
-
-    def check_string string, file
-      "grep \"#{string}\" #{file} #{echo_result}"
-    end
-
-    def check_daemon daemon, exists = true
-      command = 'ps aux'
-      search_for = "| grep #{daemon}"
-      remove_grep = '| grep -v grep'
-      negative = "| grep -v #{daemon} " unless exists
-      "#{command} #{search_for} #{remove_grep} #{negative}#{echo_result}"
-    end
-
-    def check_init_d name
-      "test -L /etc/rc0.d/K20#{name} #{echo_result}"
-    end
-
-    def check_command command, match = nil
-      if match
-        "#{command} | grep #{match} #{echo_result}"
-      else
-        "#{command} #{echo_result}"
-      end
-    end
-  end
-end
-

data/lib/machines/configuration.rb

@@ -1,49 +0,0 @@
-module Machines
-  module Configuration
-    # Add a new user
-    # (uses the lowlevel useradd so doesn't set a password unless specified)
-    # @param [String] login User name to create
-    # @param [Hash] options
-    # @option options [String] :password
-    # @option options [Boolean] :admin Adds the user to the admin group when true
-    def add_user login, options = {}
-      password = "-p #{`openssl passwd #{options[:password]}`.gsub("\n", '')} " if options[:password]
-      admin = "-G admin " if options[:admin]
-      Command.new(
-        "useradd -s /bin/bash -d /home/#{login} -m #{password}#{admin}#{login}",
-        check_dir("/home/#{login}")
-      )
-    end
-
-    # Add an existing user to a secondary group
-    # @param [Hash] options
-    # @option options [String] :user The user to add
-    # @option options [String] :to Adds an existing user to the specified group
-    def add options
-      required_options options, [:user, :to]
-      Command.new("usermod -a -G #{options[:to]} #{options[:user]}", check_command("groups #{options[:user]}", options[:to]))
-    end
-
-    # Sets gconf key value pairs
-    # @param [Hash] options One or many key/value pairs to set
-    def configure options
-      options.map do |key, value|
-        types = {String => 'string', Fixnum => 'int', TrueClass => 'bool',
-          FalseClass => 'bool', Float => 'float', Array => 'list --list-type=string'}
-        type = types[value.class]
-        raise 'Invalid type for configure' unless type
-        value = value.to_json if value.is_a?(Array)
-        value = %("#{value}") if type == 'string'
-        check = "gconftool-2 --get \"#{key}\" | grep #{value} #{echo_result}"
-        Command.new("gconftool-2 --set \"#{key}\" --type #{type} #{value}", check)
-      end
-    end
-
-    # Removes a user, home and any other related files
-    # @param [String] login User name to remove
-    def del_user login
-      Command.new("deluser #{login} --remove-home -q", check_file('/home/login', false))
-    end
-  end
-end
-

data/lib/machines/database.rb

@@ -1,17 +0,0 @@
-module Machines
-  module Database
-    # Write the database.yml file from webapps.yml
-    # @param [AppBuilder] app
-    def write_database_yml app
-      yml = {$conf.environment.to_s => {
-        'adapter' => 'mysql',
-        'database' => app.database || app.name,
-        'username' => app.username || app.name,
-        'password' => app.password,
-        'host' => $conf.db_server.address,
-        'encoding' => 'utf8'}}.to_yaml
-      write yml, :to => File.join(app.path, 'shared/config/database.yml'), :name => 'database.yml'
-    end
-  end
-end
-

data/lib/machines/file_operations.rb

@@ -1,104 +0,0 @@
-module Machines
-  module FileOperations
-    # Add a line of text to the end of a file unless it already exists
-    # @param [String] text Text to add
-    # @param [Hash] options
-    # @option options [String] :to File to append to
-    def append text, options
-      text = text.gsub(/([\\$"`])/, '\\\\\1')
-      Command.new("grep \"#{text}\" #{options[:to]} || echo \"#{text}\" >> #{options[:to]}", check_string(text, options[:to]))
-    end
-
-    # Change permissions of a path
-    # @param [String, Integer] mode chmod permissions to set
-    # @param [String] path Path to set
-    def chmod mode, path
-      Command.new("chmod #{mode} #{path}", check_perms(mode, path))
-    end
-
-    # Change ownership of a path
-    # @param [String] user sets user and group unless user:group is specified
-    # @param [String] path Path to set
-    # @param [Hash] options
-    # @option options [String] :recursive Chowns recursively if true
-    def chown user, path, options = {}
-      recursive = '-R ' if options[:recursive]
-      user = "#{user}:#{user}" unless user.index(':')
-      Command.new("chown #{recursive}#{user} #{path}", check_owner(user, path))
-    end
-
-    # Copy a remote file or folder (will overwrite)
-    # @param [String] from Existing path
-    # @param [String] to Path to copy to
-    def copy from, to
-      Command.new("cp -rf #{from} #{to}", check_file(to))
-    end
-
-    # Write a file from an ERB template
-    # @param [String] erb_path Path to the ERB file to process
-    # @param [Hash] options
-    # @option options [AppBuilder] :settings Contains the settings as OpenStruct method calls for calling from the template
-    # @option options [String] :to File to write to
-    def create_from erb_path, options
-      erb = ERB.new(File.read(erb_path), nil, '<>')
-      binding = options[:settings] ? options[:settings].get_binding : nil
-      options[:name] = erb_path
-      write erb.result(binding), options
-    end
-
-    # Add a symlink
-    # @param [String] target Existing path to link
-    # @param [String] link_name path name for the link
-    def link target, link_name
-      Command.new("ln -sf #{target} #{link_name}", check_link(link_name))
-    end
-
-    # Create a path or paths on the remote host (Uses -p to be safe and create full path)
-    # @param [String, Array] dirs A single path, multiple paths or array of paths to create
-    def mkdir *dirs
-      dirs.flatten.map do |dir|
-        Command.new("mkdir -p #{dir}", check_dir(dir))
-      end
-    end
-
-    # Rename a remote file or folder
-    # @param [String] oldname Existing filename
-    # @param [String] newname Rename to this
-    def rename oldname, newname
-      Command.new("mv -f #{oldname} #{newname}", check_file(newname))
-    end
-
-    # Remove a remote file or folder
-    # @param [String] file or folder to remove (uses rm with -rf which ignores non-existent files and is recursive)
-    def remove file
-      Command.new("rm -rf #{file}", check_file(file, false))
-    end
-
-    # Take off the version numbers from a path name
-    # @param [String] name Name of the path to rename
-    def remove_version_info name
-      Command.new("find . -maxdepth 1 -name \"#{name}*\" -a -type d | xargs -I xxx mv xxx #{name}", check_file(name))
-    end
-
-    # Replace some text in a file
-    # @param [String] regex The expression to search for
-    # @param [Hash] options
-    # @option options [String] :with Text to use as the replacement
-    # @option options [String] :in Filename to replace text in
-    def replace regex, options
-      required_options options, [:with, :in]
-      with = options[:with].gsub(/([\n\/\\$"`])/, '\\\\\1')
-      Command.new("sed -i \"s/#{regex}/#{with}/\" #{options[:in]}", check_string(with, options[:in]))
-    end
-
-    # (Over)write a file with the specified content
-    # @param [String] text Text to add
-    # @param [Hash] options
-    # @option options [String] :to File to write to
-    # @option options [String] :name Give the buffer a displayable name (e.g. when generated from a template)
-    def write text, options
-      Upload.new(NamedBuffer.new(options[:name], text), options[:to], check_string(text, options[:to]))
-    end
-  end
-end
-

data/lib/machines/installation.rb

@@ -1,171 +0,0 @@
-module Machines
-  module Installation
-    include FileOperations
-
-    APTGET_QUIET = 'apt-get -q -y'
-
-    # Adds a PPA source and updates apt
-    # @param [String] name Name of the PPA
-    # @param [String] key_name What to check in apt-key list to ensure it installed
-    #     add_ppa 'mozillateam/firefox-stable', 'mozilla'
-    def add_ppa name, key_name
-      [
-        Command.new("add-apt-repository ppa:#{name}", "apt-key list | grep -i #{key_name} #{echo_result}"),
-        update
-      ]
-    end
-
-    # Adds a DEB source
-    # @param [String] source URL of the package. If `YOUR_UBUNTU_VERSION_HERE` is included then it
-    #                 is replaced by the Ubuntu version name
-    # @param [Hash] options
-    # @option options [String] :key URL of key
-    # @option options [String] :name Used to check `apt-key list` to ensure it installed
-    #     sudo deb 'http://dl.google.com/linux/deb/ stable main',
-    #       :key => 'https://dl-ssl.google.com/linux/linux_signing_key.pub',
-    #       :name => 'Google'
-    def deb source, options
-      command = "echo deb #{source} >> /etc/apt/sources.list"
-      if source =~ /YOUR_UBUNTU_VERSION_HERE/
-        command = "expr substr `cat /etc/lsb-release | grep DISTRIB_CODENAME` 18 20 | xargs -I YOUR_UBUNTU_VERSION_HERE #{command}"
-      end
-      [
-        Command.new(command, check_string(source.gsub(/ .*$/, ''), '/etc/apt/sources.list')),
-        Command.new("wget -q #{options[:key]} -O - | apt-key add -", "apt-key list | grep -i #{options[:name]} #{echo_result}"),
-        update
-      ]
-    end
-
-    # Preseed debconf to allow silent installs
-    # @param [String] app Name of application to configure
-    # @param [String] setting The setting to set
-    # @param [String] type Data type of the value
-    # @param value The value to set (Ruby types supported)
-    def debconf app, setting, type, value
-      command = "echo #{app} #{setting} #{type} #{value} | debconf-set-selections"
-      check = "debconf-get-selections | grep #{app} #{echo_result}"
-      Command.new(command, check)
-    end
-
-    # Download, extract, and remove an archive. Currently supports `zip`, `tar.gz`, `tar.bz2`.
-    # @param [String] package Package name to extract
-    # @param [Hash] options
-    # @option options [Optional String] :to folder to clone or extract to (defaults to /usr/local/src)
-    def extract package, options = {}
-      name = File.basename(package)
-      if package[/.zip/]
-        cmd = 'unzip -qq'
-      elsif package[/.tar.gz/]
-        cmd = 'tar -zxf'
-      elsif package[/.tar.bz2/]
-        cmd = 'tar -jxf'
-      else
-        raise "extract: Unknown extension for #{package}"
-      end
-      dir = cmd =~ /unzip/ ? File.basename(name, '.zip') : File.basename(name).gsub(/\.tar.*/, '')
-      dest = options[:to] || '/usr/local/src'
-      Command.new("cd #{dest} && wget #{package} && #{cmd} #{name} && rm #{name} && cd -", check_dir("#{File.join(dest, dir)}"))
-    end
-
-    # Install a gem
-    # @param [String] package Name of the gem
-    # @param [Hash] options
-    # @option options [String] :version Optional version number
-    def gem package, options = {}
-      version =  " -v \"#{options[:version]}\"" if options[:version]
-      Command.new("gem install #{package}#{version}", check_gem(package, options[:version]))
-    end
-
-    # Update gems
-    # @example Update Rubygems
-    #     gem_update '--system'
-    def gem_update options = ''
-      Command.new("gem update #{options}", nil)
-    end
-
-    # 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
-    # @option options [Optional String] :tag Checkout this tag after cloning (requires :to)
-    # @option options [Optional String] :branch Switch this branch when cloning
-    def git_clone url, options = {}
-      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]
-      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]
-      command
-    end
-
-    # Installs one or more packages using apt, deb or git clone and install.sh (Ignores architecture differences)
-    # (See `extract` to just uncompress tar.gz or zip files)
-    # @param [Symbol, String, Array] packages can be:
-    #   URL::
-    #     Download from URL and run `dpkg` (if `:as => :dpkg`)
-    #     Download URL to `/usr/local/lib` and link `:bin` to `/usr/local/bin`
-    #   Array or string (with no URL)::
-    #     Run `apt` to install specified packages in the array or string
-    #       Packages are installed separately to aid progress feedback
-    #       Ensure this is the main package as dpkg get-selections is used to validate installation
-    #     install %w(build-essential libssl-dev mysql-server) #=> Installs apt packages
-    #     install 'http://example.com/my_package.deb', :cleanup => true #=> Installs a deb using dpkg then removes the deb
-    # @param [Hash] options
-    # @option options [Optional Symbol] :as Identify the package type so appropriate command can run. Currently supports `:dpkg` only
-    # @option options [Optional String] :bin Specify the bin file to link to (e.g. '/bin/executable' will create a link /usr/local/bin/executable that points to /usr/local/lib/bin/executable)
-    def install packages, options = {}
-      if packages.is_a?(String)
-        if packages =~ /^http:\/\//
-          commands = []
-          if packages =~ /\.deb$/i
-            name = File.basename(packages)
-            commands << Command.new("cd /tmp && wget #{packages} && dpkg -i --force-architecture #{name} && rm #{name} && cd -", nil)
-          elsif options[:as] == :dpkg
-            commands << extract(packages, :to => '/tmp')
-            name = File.basename(packages).gsub(/\.(tar|zip).*/, '')
-            commands << Command.new("cd /tmp/#{name} && dpkg -i --force-architecture *.deb && cd - && rm -rf /tmp/#{name}", nil)
-          elsif options[:bin]
-            commands << extract(packages, :to => '/tmp')
-            name = File.basename(packages).gsub(/\.(tar|zip).*/, '')
-            commands << rename("/tmp/#{name}", "/usr/local/lib")
-            commands << link("/usr/local/lib/#{name}/#{options[:bin]}", "/usr/local/bin/#{File.basename(options[:bin])}")
-          end
-          return commands
-        else
-          packages = [packages]
-        end
-      end
-
-      if packages.is_a?(Array)
-        commands = packages.map do |package|
-          Command.new("#{APTGET_QUIET} install #{package}", check_package(package))
-        end
-      end
-      commands
-    end
-
-    # Remove one or more packages
-    # @param [Array] packages Packages to remove
-    def uninstall packages
-      packages.map do |package|
-        Command.new("#{APTGET_QUIET} purge #{package}", check_package(package, false))
-      end
-    end
-
-    def update
-      Command.new("#{APTGET_QUIET} update > /tmp/apt-update.log", check_string('Reading package lists', '/tmp/apt-update.log'))
-    end
-
-    # Update, upgrade, autoremove, autoclean apt packages
-    # TODO: Check that check_command really checks the correct command with 'echo $?'
-    def upgrade
-      %w(update upgrade autoremove autoclean).map do |command|
-        Command.new("#{APTGET_QUIET} #{command}", check_command('echo $?', '0'))
-      end
-    end
-  end
-end
-