engineyard-local 0.2.1 → 1.0.1

data/config/locales/en.yml

@@ -1,6 +1,22 @@
 # i18n
 en:
   eylocal:
+    terminate:
+      destroying: "Your ey-local instance is being destroyed ... "
+      not_created: "ey-local can not find a VM to terminate. If you wish to start a new VM, run 'ey-local up'."
+    stop:
+      saved: "The VM is already suspended. To resume it, issue an 'ey-local start'."
+      not_stopable: "The VM state is '%{state}'. 'ey-local stop' only works on running VMs. To start it, try 'ey-local up'."
+      not_created: "The VM has not been created. Use 'ey-local up' to start a new VM."
+    start:
+      running: "The VM is already running."
+      not_startable: "The VM state is '%{state}'. 'ey-local start' only works on VMs that have been suspended with 'ey-local stop'. To start it, try 'ey-local up'."
+      not_created: "The VM has not been created. Use 'ey-local up' to start a new VM."
+    update:
+      updating: "Updating the instance's cookbooks."
+      nothing: "The instance is current. There are no updates to apply."     
+      fail: "The cookbook update failed."
+      success: "The instance's cookbooks have been updated."
     up:
       box_exists: A box named %{name} already exists.
       root_path: Using %{root_path} as the application directory.
@@ -9,6 +25,7 @@ en:
       bundling: Creating bundle if Gemfile|Gemfile.lock is present ...
       rails:
         db: Creating and migrating the db, rake tasks permitting ...
+        assets: Precompiling assets ...
       dna: Creating instance DNA ...
       chef: Initiating Chef run ...
     tag: Tagging vm as managed by ey-local ...
@@ -23,35 +40,103 @@ en:
           moving it to a new subnet in the Vagrantfile with:
 
               config.vm.network :hostonly, "33.33.<new subnet>.10"
+  vagrant:
+    commands:
+      status:
+        cookbooks_outdated: |-
+          --------------------------------------------------------------------
+          ALERT - The instance's cookbook version, %{version}, is out of date.
+          To fetch and deploy current version, run 'ey-local update'.
+
+          The current version, %{new_version}, includes the following changes:
+
+          %{changelog}
+
+          --------------------------------------------------------------------
+
+        cookbooks_current: |-
+          The instance's cookbook version, %{version}, is current.
+        output: |-
+          Current VM states:
+
+          %{states}
+
+          %{message}
+
+          %{alerts}
+        running: |-
+          The instance is running normally.
+        saved: |-
+          To resume this VM, simply run `ey-local start`.
+    errors:
+      ssh_connection_refused: |-
+        SSH connection was refused! This may happen if the VM failed to boot properly.
+        To fix this, try running 'ey-local down' followed up 'ey-local up' to see if
+        your system restarts properly.
 
 :commands:
   :eylocal:
     - eylocal
     - Commands to handle Engine Yard Local VM management
   :up:
-    - up [NAME] [URI] [--no-bundle] [--no-db-setup]
-    - Download an Eyx base box, provision a virtual machine, and handle project setup
+    - up [NAME] [URI] [--no-dna] [--no-chef] [--no-bundle] [--no-db-setup]
+    - |-
+      Download an EY Local base box, provision a virtual machine, and handle
+      project setup. For an existing, halted VM, it will restart without
+      downloading a new box image. If the VM is currently running, this will
+      rerun the provisioning steps for the instance. 
+
+      Provisioning starts with configuring the instance's DNA. This step
+      can be skipped with the --no-dna flag.
+
+      After the DNA is configured, chef will be ran on the instance to
+      complete package setup and configuration. This step can be skipped
+      with the --no-chef flag.
+
+      Following the chef run, bundler will be ran on the application. This
+      step can be skipped with the --no-bundle flag.
+
+      Once that is complete, provisioning finishes with database setup.
+      Skip that step with the --no-db-setup flag.
+  :down:
+    - down
+    - This shuts the VM down, and powers it off. Restart it with 'ey-local up'.
+  :destroy:
+    - destroy
+    - Shuts down the VM, and removes the box image. Restarting with 'ey-local up' will do a full rebuild/reprovision of the VM.
+  :reload:
+    - reload
+    - Reboots the VM, allowing configuration changes that were made in the Vagrantfile to take effect.
   :rails:
     - rails COMMAND [--version ~> 3.1.0]
     - Make sure the rails gem is installed and run rails commands in the project directory share on the guest
   :exec:
     - exec COMMAND
-    - execute an arbitrary command from the project directory in the vm
+    - Execute an arbitrary command from the project directory in the vm
   :vagrant:
     - COMMAND
-    - any commands not listed will be passed through to Vagrant for execution
+    - Any commands not listed will be passed through to Vagrant for execution
   :log:
     - log [--environment=development] [--lines=100]
-    - dump the log files under PROJECT_DIR/log/
+    - Dump the log files under PROJECT_DIR/log/
   :help:
     - help
-    - ""
+    - Provide usage information. 'ey-local help COMMAND' for detailed information.
   :list:
     - list [--format=(full|short)]
-    - lists all vms under ey-local management. Formatting can be either full or short
+    - Lists all vms under ey-local management. This command provides data in a short form, and in a full form. The short form provides the ID of the VM, and the path to it's root. The full form also provides the VirtualBox name of the instance.
   :start:
     - start
-    - starts a stopped (suspended) vm
+    - Restart a stopped VM, resuming operation at the point where the 'stop' occured.
   :stop:
     - stop
-    - stops (suspends) a running vm
+    - Suspend a running VM, leaving the the disk image so that it can be started again quickly. Resume a stopped vm using 'ey-local start'.
+  :status:
+    - status
+    - Report the operational status of an instance, including whether it requires any stack updates.
+  :update:
+    - update
+    - Apply infrastructure and cookbook updates to the instance.
+  :terminate:
+    - terminate
+    - Power the VM off, and then tear it down, removing all the disk image and unregistering the VM from VirtualBox. The Vagrantfile is left in the project directory as it may be needed again.

data/config/patches/chef-ey-1.1.336.patch

@@ -0,0 +1,55 @@
+diff -r -u recipes.orig/cookbooks/ey-backup/recipes/postgres.rb recipes/cookbooks/ey-backup/recipes/postgres.rb
+--- recipes.orig/cookbooks/ey-backup/recipes/postgres.rb	2012-11-13 11:02:08.000000000 +0000
++++ recipes/cookbooks/ey-backup/recipes/postgres.rb	2012-11-13 11:10:55.000000000 +0000
+@@ -32,7 +32,7 @@
+ else
+   if ['db_slave'].include?(node[:instance_role]) && node['backup_window'] != 0
+     db_slave1_fqdn=node['db_slaves'].first
+-    if node[:ec2][:local_hostname] == db_slave1_fqdn
++    if (node[:ec2] ? node[:ec2][:local_hostname] : `hostname`.split(".").first) == db_slave1_fqdn
+       backup_cron "postgresql" do
+         command 'eybackup -e postgresql >> /var/log/eybackup.log'
+         month   '*'
+diff -r -u recipes.orig/cookbooks/ey-base/recipes/bootstrap.rb recipes/cookbooks/ey-base/recipes/bootstrap.rb
+--- recipes.orig/cookbooks/ey-base/recipes/bootstrap.rb	2012-11-13 11:02:08.000000000 +0000
++++ recipes/cookbooks/ey-base/recipes/bootstrap.rb	2012-11-13 11:29:33.000000000 +0000
+@@ -19,7 +19,7 @@
+ 
+ link "/dev/xvda3" do
+   to "/dev/sda3"
+-  only_if { File.exists?("/dev/sda3") and node[:ec2][:instance_type] == "m1.small" and node[:kernel][:release].include?("2.6.18")}
++  only_if { File.exists?("/dev/sda3") and (node[:instance_role] == 'eylocal' || node[:ec2][:instance_type] == "m1.small") and node[:kernel][:release].include?("2.6.18")}
+ end
+ 
+ bash "make-swap-sdc" do
+@@ -56,7 +56,7 @@
+     swapon /dev/xvda3
+     echo "/dev/xvda3 swap swap sw 0 0" >> /etc/fstab
+   EOH
+-  only_if { node[:kernel][:machine] == 'x86_64' and node[:memory][:swap][:total] == '0kB' and File.exists?("/dev/xvda3") and node[:ec2][:instance_type] == "m1.small"}
++  only_if { node[:kernel][:machine] == 'x86_64' and node[:memory][:swap][:total] == '0kB' and File.exists?("/dev/xvda3") and (node[:instance_role] == 'eylocal' || node[:ec2][:instance_type] == "m1.small") }
+ end
+ 
+ bash "make-swap-64-medium" do
+@@ -67,7 +67,7 @@
+     swapon /mnt/engineyard/swapfile
+     echo "/mnt/engineyard/swapfile swap swap sw 0 0 " >> /etc/fstab
+   EOH
+-  only_if {  node[:kernel][:machine] == 'x86_64' and node[:memory][:swap][:total] == '0kB' and node[:ec2][:instance_type].include?("medium") }
++  only_if { node[:kernel][:machine] == 'x86_64' and node[:memory][:swap][:total] == '0kB' and (node[:instance_role] == 'eylocal' || node[:ec2][:instance_type].include?("medium")) }
+ end
+ 
+ directory "/data" do
+diff -r -u recipes.orig/cookbooks/nginxtcp/libraries/get_nginx_nodejs_process_count.rb recipes/cookbooks/nginxtcp/libraries/get_nginx_nodejs_process_count.rb
+--- recipes.orig/cookbooks/nginxtcp/libraries/get_nginx_nodejs_process_count.rb	2012-11-13 11:02:08.000000000 +0000
++++ recipes/cookbooks/nginxtcp/libraries/get_nginx_nodejs_process_count.rb	2012-11-13 11:12:14.000000000 +0000
+@@ -5,7 +5,8 @@
+     # and is not bound by any other constraints (memory, etc)
+     # For Amazon AWS, see http://aws.amazon.com/ec2/instance-types/
+     def get_nginx_nodejs_per_cpu_process_count
+-      case node[:ec2][:instance_type]
++      instance_type = node[:instance_role] == 'eylocal' ? 'm1.small' : node[:ec2][:instance_type]
++      case instance_type
+         when "m1.small"
+           1
+         when "m1.large"

data/config/settings.yml

@@ -1,9 +1,12 @@
 :box_defaults:
   # TODO replace with cdn backed url
   :uri: https://s3.amazonaws.com/ey-local-images/ey-local-gentoo12.box
-  :cookbook_uri: http://s3.amazonaws.com/ey-local-cookbooks/chef2012032901.tar.bz2
+  :cookbook_uri: http://ey-cloud.s3.amazonaws.com/chef-ey-1.1.336.tgz
+  :cookbook_version: 1.1.336
   :name: ey-gentoo-rack
   :network_tag_default: no-networks-defined
+  :patches:
+    - chef-ey-1.1.336.patch
 
 :rvm:
   :ruby_env_const: RVM_RUBY
@@ -16,3 +19,5 @@
 
 :managed_vm_key: "EY-LOCAL/project-root"
 :network_ip_key: "EY-LOCAL/network-ip"
+
+:la_brea_bridge: labrea-bridge.engineyard.com

data/engineyard-local.gemspec

@@ -6,16 +6,17 @@ Gem::Specification.new do |s|
   s.name        = "engineyard-local"
   s.version     = Engineyard::Local::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.authors     = ["John Bender"]
-  s.email       = ["john.m.bender@gmail.com"]
+  s.authors     = ["Kirk Haines"]
+  s.email       = ["khaines@engineyard.com"]
   s.homepage    = ""
-  s.summary     = %q{A plugin to streamline ruby web application development with Vagrant}
+  s.summary     = %q{Engine Yard Local allows you to develop and test locally on your own computer using a virtual machine with an Engine Yard environment.}
   s.description = s.summary
 
   s.rubyforge_project = "engineyard-local"
 
-  s.add_dependency "vagrant", "= 1.0.1"
+  s.add_dependency "vagrant", "= 1.0.5"
   s.add_dependency "thor", "~> 0.14.6"
+  s.add_dependency "nokogiri", ">= 1.5.2"
 
   s.files         = `git ls-files | grep -v "^boxes"`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/install/osx/README.md

@@ -2,15 +2,53 @@
 
 Originally the project was using PackageMaker to build its installers. After some trouble moving over to the [Packages utility](http://s.sudre.free.fr/Software/Packages/about.html) proved to be a huge time saver. The Packages projects are described below.
 
-# Rake tasks
+## Rake tasks
 
 The only task that is currently automated is the install of cached gems into the directory that the Packages project expects them for inclusion in the package. It will bundle install to a vendor directory in `install/osx/` and then copy the cached gems into `tmp/engineyard-local-installer` which Packages will use to install to `/tmp/engineyard-local-installer/` for the end user.
 
-# vagrant installer
+## Post rake steps
 
-*TODO requires rework*
+Once the rake task has created the tmp directory used by the package, you can take the following steps to build the mpkg.
 
-# engineyard-local installer
+1. Open `$PROJECT_DIR/install/osx/engineyard-local/engineyard-local.pkproj` with the Packages utility (See link above)
+2. Build the project from the menu `Build > Build` or `Command-B`
+3. Mount the current `.dmg`
+4. Remove the existing Engineyard Local `.mpkg`
+5. Empty your waste bin to make sure it's removed, there is limited space in the `.dmg`.
+6. Take the output of the build, `$PROJECT_DIR/install/osx/engineyard-local.mpkg` and add it to the mounted `.dmg`.
+7. Unmount the Engineyard Local `.dmg`
+
+
+## DMG Background
+
+Both the icons and dmg background are stored in the `$PROJECT_DIR/install/osx/images/` directory. In use, background image is stored in the `.dmg` itself to be used as a relative reference when setting the background in the OSX view options for the mounted `.dmg` folder. To set the dmg background properly do the following:
+
+1. Show hidden files in the finder `defaults write com.apple.finder AppleShowAllFiles YES`
+2. Relaunch the finder using Option-Right Click on the icon in the OSX dock.
+3. Copy the background into the mounted `.dmg` using the finder or `cp $PROJECT_DIR/install/osx/images/dmg_background.png $DMG_MOUNT_DIR/.dmg_background.png`
+4. Right click the background on the mounted `.dmg` folder window and select `Show View Options`.
+5. At the bottom select the `Picture` radio option
+6. Drag the dmg background file in the the "Drag image here" area.
+7. Reposition VirtualBox and Engineyard Local `.dmg` files.
+8. Resize accordingly
+9. Unmount the Engineyard Local `.dmg`
+
+
+## DMG Icon
+
+Using the icon with the mounted `.dmg` drive is simple once you know the steps:
+
+1. Mount the `.dmg` you wish to modify the icon for
+2. Right click on the mounted folder for the `.dmg`, generally a small white disk drive icon.
+3. Click the existing icon in the top left of the Get Info dialog.
+4. Open the `dmg_icons.icns` file in `$PROJECT_DIR/install/osx/images/` with Preview
+5. Click the largest version of the icon (generally toward the top)
+6. Use Command-C to copy it
+7. Focus the Get Info window that was open previously, the existing white drive icon should be surounded by a faint blue focus highlight
+8. Hit Command-V to change the icon image
+9. Unmount the Engineyard Local `.dmg`
+
+## How it works
 
 The engineyard local installer creates a directory in `/tmp/engineyard-local-installer` (`/tmp` is symlink to `/privat/tmp` in osx) where the gem packages for engineyard local and all its dependencies are installed. From there the `scripts/postinstall` handles installing them into the right places in the following order:
 

data/install/osx/engineyard-local/engineyard-local.pkgproj

@@ -497,7 +497,7 @@
 				<key>OVERWRITE_PERMISSIONS</key>
 				<false/>
 				<key>VERSION</key>
-				<string>0.1</string>
+				<string>0.2.1</string>
 			</dict>
 			<key>UUID</key>
 			<string>EC51373A-7505-433D-AA05-580997D6373B</string>
@@ -517,9 +517,9 @@
 			ZW50LVN0eWxlLVR5cGUiIGNvbnRlbnQ9InRleHQvY3NzIj4KPHRp
 			dGxlPjwvdGl0bGU+CjxtZXRhIG5hbWU9IkdlbmVyYXRvciIgY29u
 			dGVudD0iQ29jb2EgSFRNTCBXcml0ZXIiPgo8bWV0YSBuYW1lPSJD
-			b2NvYVZlcnNpb24iIGNvbnRlbnQ9IjExMzgiPgo8c3R5bGUgdHlw
-			ZT0idGV4dC9jc3MiPgo8L3N0eWxlPgo8L2hlYWQ+Cjxib2R5Pgo8
-			L2JvZHk+CjwvaHRtbD4K
+			b2NvYVZlcnNpb24iIGNvbnRlbnQ9IjExMzguMzIiPgo8c3R5bGUg
+			dHlwZT0idGV4dC9jc3MiPgo8L3N0eWxlPgo8L2hlYWQ+Cjxib2R5
+			Pgo8L2JvZHk+CjwvaHRtbD4K
 			</data>
 		</dict>
 		<key>PROJECT_PRESENTATION</key>
@@ -625,7 +625,36 @@
 		<key>PROJECT_REQUIREMENTS</key>
 		<dict>
 			<key>LIST</key>
-			<array/>
+			<array>
+				<dict>
+					<key>BEHAVIOR</key>
+					<integer>3</integer>
+					<key>DICTIONARY</key>
+					<dict>
+						<key>IC_REQUIREMENT_DISKSPACE_MINIMUM_SIZE_UNIT</key>
+						<integer>0</integer>
+						<key>IC_REQUIREMENT_DISKSPACE_MINIMUM_SIZE_VALUE</key>
+						<integer>1600</integer>
+					</dict>
+					<key>IC_REQUIREMENT_CHECK_TYPE</key>
+					<integer>1</integer>
+					<key>IDENTIFIER</key>
+					<string>fr.whitebox.Packages.requirement.diskspace</string>
+					<key>MESSAGE</key>
+					<array>
+						<dict>
+							<key>LANGUAGE</key>
+							<string>English</string>
+							<key>VALUE</key>
+							<string>This volume does not have enough disk space to support the installation. The EngineYard virtual machine requires enough space to install to the disk and then duplicated on import.</string>
+						</dict>
+					</array>
+					<key>NAME</key>
+					<string>Available Disk Space</string>
+					<key>STATE</key>
+					<true/>
+				</dict>
+			</array>
 			<key>POSTINSTALL_PATH</key>
 			<dict/>
 			<key>PREINSTALL_PATH</key>
@@ -633,7 +662,7 @@
 			<key>RESOURCES</key>
 			<array/>
 			<key>ROOT_VOLUME_ONLY</key>
-			<false/>
+			<true/>
 		</dict>
 		<key>PROJECT_SETTINGS</key>
 		<dict>

data/lib/engineyard-local.rb

@@ -2,9 +2,55 @@ require "vagrant"
 require "pathname"
 require "yaml"
 
+# Monkey patch CheckBox to fix an error: https://github.com/mitchellh/vagrant/issues/564
+
+module Vagrant
+  module Action
+    module VM
+      class CheckBox
+
+        def call(env)
+          box_name = env[:vm].config.vm.box
+          raise Errors::BoxNotSpecified if !box_name
+
+          if !env[:box_collection].find(box_name)
+            box_url = env[:vm].config.vm.box_url
+            raise Errors::BoxSpecifiedDoesntExist, :name => box_name if !box_url
+
+            # Add the box then reload the box collection so that it becomes
+            # aware of it.
+            env[:ui].info I18n.t("vagrant.actions.vm.check_box.not_found", :name => box_name)
+            env[:box_collection].add(box_name, box_url)
+
+            # Reload the configuration for all our VMs, since this box
+            # may be used for other VMs.
+            env.env.vms.each do |name, vm|
+              vm.env.reload_config!
+            end
+
+            # Reload the environment and set the VM to be the new loaded VM.
+            env[:vm].env.reload!
+            env[:vm] = env[:vm].env.vms[env[:vm].name]
+          end
+
+          @app.call(env)
+        end
+      end
+    end
+  end
+end
+
 # TODO settings object/management will be needed shortly
 module Engineyard
   module Local
+    def self.cookbook_version_verified?
+      @cookbook_version_verification || false
+    end
+
+    def self.cookbook_version_verified
+      @cookbook_version_verification = true
+    end
+
     def self.project_root
       @project_root ||= Pathname.new(File.expand_path('../../', __FILE__))
     end
@@ -17,6 +63,24 @@ module Engineyard
       @config ||= load_config_yaml("settings.yml")
     end
 
+    def self.tmp_dir
+      unless @tmp_dir
+        @tmp_dir = "/tmp"
+        # Give priority to /tmp.
+        unless File.exists?("/tmp")
+          tmpvars = ENV.each_key.select {|k|
+            ['TMPDIR','TEMP','TEMPDIR','TMP'].include?(k.upcase)
+          }
+          @tmp_dir = ENV[tmpvars.at(0)] if tmpvars.length > 0
+          # Put the proper slash at the end so File.join works properly
+          unless @tmp_dir.end_with?("\\")
+            @tmp_dir += "\\" if @tmp_dir.include?("\\")
+          end
+        end
+      end
+      @tmp_dir
+    end
+
     # default to en until something more inteligent is required
     # NOTE all locale information is contained in a single yaml
     #      file in anticipation of relatively minimal use