machines 0.5.1 → 0.5.2

data/.yardopts

@@ -0,0 +1,2 @@
+--markup-provider=redcarpet
+--markup=markdown

data/README.md

@@ -1,6 +1,8 @@
-Machines - A custom Ubuntu system in less than 15 minutes
+Machines
 ===========================================================
 
+**A custom Ubuntu system in less than 15 minutes**
+
 Setup Ubuntu development and server **Machines** locally or in the cloud for developing and hosting Ruby, Rails and related environments.
 
 Run commands like:
@@ -21,7 +23,7 @@ Status
 
 September 2012
 
-* Released 0.5.1
+* Released 0.5.2 gem
 * Working development and server builds.
 * Cloud deployments to complete.
 
@@ -30,11 +32,17 @@ Features
 
 * An opinionated Ubuntu configuration script with sensible defaults
 * Easily override the defaults with configuration options and custom ruby
-* Supports several cloud services
+* Supports several cloud services [Not complete]
 * Default template supports Nginx, Passenger, Ruby, Rails, MySQL, Git, Monit, Logrotate
 * Preconfigured Ruby & Rails light development environment (Openbox or Subtle)
 * Bring up new instances fully configured in less than 15 minutes
 
+What it's Not
+-----------------------------------------------------------
+
+* It does not replace the base installation (Yet). A minimal Ubuntu must be installed prior to running the *Machines* install
+
+
 Motivation
 -----------------------------------------------------------
 
@@ -90,9 +98,8 @@ configuration settings for various programs, your `Machinesfile` and the various
   * [64bit ISO](http://archive.ubuntu.com/ubuntu/dists/precise/main/installer-amd64/current/images/netboot/mini.iso)
   * [32bit image](http://archive.ubuntu.com/ubuntu/dists/precise/main/installer-i386/current/images/netboot/boot.img.gz)
   * [32bit ISO](http://archive.ubuntu.com/ubuntu/dists/precise/main/installer-i386/current/images/netboot/mini.iso)
-* Images can be written to USB with (Be sure to eject the drive correctly):
-* `gunzip boot.img.gz && sudo dd if=boot.img of=/dev/sdX` where `sdX` is your USB device (use `dmesg` to get this)
-* Insert the USB stick and boot from it to install Ubuntu
+* Images can be written to USB with `gunzip boot.img.gz && sudo dd if=boot.img of=/dev/sdX` where `sdX` is your USB device (use `dmesg` to get this)
+* Insert the USB stick and boot from it to install Ubuntu (See **Setting up a test VM** below for installing on a Virtual Machine)
 * Install SSH Server & note the IP address
 
     sudo apt-get update && sudo apt-get -y install openssh-server && ifconfig
@@ -175,9 +182,10 @@ Make sure you've downloaded one of the ISOs from the list in *Prepare the target
   * Version: Ubuntu (64 bit)
 1. Settings -> Network -> Adapter 2 -> Enable Network Adapter
   * Attached to: Host-only Adapter
-1. Start -> Media Source Folder Icon -> mini.iso
-1. Installer boot menu -> Install -> Accept defaults except for:
-  * eth0 primary interface
+1. Start VM -> Next -> Media Source folder icon (next to dropdown) -> mini.iso -> Next -> Start
+1. Ubuntu Installer boot menu -> Install -> Accept defaults except for:
+  * Select correct country/keyboard
+  * Primary network interface: eth0
   * Full name for the new user: user
   * Username for your account: user
   * Choose a password for the new user: password
@@ -185,17 +193,18 @@ Make sure you've downloaded one of the ISOs from the list in *Prepare the target
   * YES to partition disks (choose partition entire disk if asked)
   * Add OpenSSH from application installer menu
 1. Devices -> CD/DVD Devices -> Uncheck mini.iso
-1. Reboot
-  * ubuntu Login: user
+1. Reboot and login
+  * <machine name> login: user
   * Password: password
-1. Run `ifconfig` and make a note of eth1 inet addr
+1. Run `ifconfig` and make a note of the `eth1` inet addr. It should be 192.168.56.101 if this is the first VM you've installed
+  * If you don't see `eth1` then `sudo nano /etc/network/interfaces` and add the lines `auto eth1` and `iface eth1 inet dhcp` as with `eth0`. Save and exit. Run `ifconfig` again and note the inet addr of `eth1`
 1. Take a snapshot (restore before each test run)
 
 
 What's happening under the hood
 -----------------------------------------------------------
 
-* An ssh connection is established to send all commands and uploads
+* An ssh connection is established to send all commands and uploads (similar to Capistrano)
 * Ssh uses the specified user and then sudo is added to commands that require it
 * When sudo is needed for file uploads. The file is uploaded to /tmp then sudo cp'd to the destination
 * When `package` is called in the `Machinesfile` that file is loaded either from the projects packages folder

data/lib/machines/commandline.rb

@@ -67,7 +67,7 @@ module Machines
     end
 
     def htpasswd options
-      path = File.join($conf.webserver, 'conf', 'htpasswd')
+      path = File.join($conf.webserver, 'htpasswd')
       say "Generate BasicAuth password and add to #{path}"
       username = ask('Username: ')
       password = enter_password 'users'

data/lib/machines/installation.rb

@@ -14,7 +14,7 @@ module Machines
     end
 
     # Adds a DEB source
-    # @param [String] source URL of the package. If YOUR_UBUNTU_VERSION_HERE is included then it
+    # @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

data/lib/machines/version.rb

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

data/machines.gemspec

@@ -19,15 +19,16 @@ Gem::Specification.new do |s|
   end
 
   %w(
-    bluecloth
     guard
     guard-bundler
     guard-minitest
     fakefs
     fog
+    github-markup
     minitest
     mocha
     rake
+    redcarpet
     rev
     simplecov
     yard

data/spec/lib/machines/commandline_spec.rb

@@ -189,7 +189,7 @@ describe Machines::Commandline do
       $conf.webserver = 'server'
       $input.string = "user\npass\npass\n"
       htpasswd nil
-      File.read('server/conf/htpasswd').must_match /user:.{13}/
+      File.read('server/htpasswd').must_match /user:.{13}/
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: machines
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-12 00:00:00.000000000 Z
+date: 2012-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -108,7 +108,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bluecloth
+  name: guard
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -124,7 +124,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: guard
+  name: guard-bundler
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -140,7 +140,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: guard-bundler
+  name: guard-minitest
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -156,7 +156,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: guard-minitest
+  name: fakefs
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -172,7 +172,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: fakefs
+  name: fog
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -188,7 +188,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: fog
+  name: github-markup
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -251,6 +251,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: redcarpet
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rev
   requirement: !ruby/object:Gem::Requirement
@@ -302,14 +318,14 @@ dependencies:
 description: Install and configure Ubuntu desktops, laptops, servers and cloud instances.
   Install software, configure settings, preferences, keys, projects, applications,
   scripts, etc...
-email: !binary |-
-  cGhpbEBlbGVjdHJpY3Zpc2lvbnMuY29t
+email: phil@electricvisions.com
 executables:
 - machines
 extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .yardopts
 - EXAMPLES.md
 - Gemfile
 - Guardfile
@@ -502,7 +518,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1626966073170658949
+      hash: 1670062508932557270
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: