freighthop 0.0.5 → 0.0.6

data/Vagrantfile

@@ -22,13 +22,13 @@ Vagrant.configure('2') do |config|
 
     node_config.vm.provider :vmware_fusion do |v|
       v.vmx['displayName'] = Freighthop.hostname
-      v.vmx['memsize']     = 2048
-      v.vmx['numvcpus']    = 4
+      v.vmx['memsize']     = Freighthop.ram
+      v.vmx['numvcpus']    = Freighthop.cpus
     end
 
     node_config.vm.provider :virtualbox do |v|
-      v.customize ['modifyvm', :id, '--memory', '2048']
-      v.customize ['modifyvm', :id, '--cpus', '4']
+      v.customize ['modifyvm', :id, '--memory', Freighthop.ram]
+      v.customize ['modifyvm', :id, '--cpus', Freighthop.cpus]
     end
 
     node_config.vm.synced_folder(

data/bin/fh

@@ -1,46 +1,80 @@
 #!/usr/bin/env ruby
 
-FREIGHTHOP_VARGANT_DOTFILE_PATH = File.expand_path('~/.freighthop.d/vagrant')
-FREIGHTHOP_VARGANT_CWD          = File.expand_path(File.dirname(__FILE__))
+FREIGHTHOP_VAGRANT_DOTFILE_PATH = File.expand_path('~/.freighthop.d/vagrant')
+FREIGHTHOP_VAGRANT_CWD          = File.expand_path(File.dirname(__FILE__))
 
-unless File.directory?(FREIGHTHOP_VARGANT_DOTFILE_PATH)
+unless File.directory?(FREIGHTHOP_VAGRANT_DOTFILE_PATH)
   require 'fileutils'
-  FileUtils.mkdir_p(FREIGHTHOP_VARGANT_DOTFILE_PATH)
+  FileUtils.mkdir_p(FREIGHTHOP_VAGRANT_DOTFILE_PATH)
 end
 
-ENV['VAGRANT_DOTFILE_PATH'] = FREIGHTHOP_VARGANT_DOTFILE_PATH
-ENV['VAGRANT_CWD']          = FREIGHTHOP_VARGANT_CWD
+ENV['VAGRANT_DOTFILE_PATH'] = FREIGHTHOP_VAGRANT_DOTFILE_PATH
+ENV['VAGRANT_CWD']          = FREIGHTHOP_VAGRANT_CWD
 
 PROJECT_NAME = File.basename(Dir.pwd)
 PROJECT_DIR  = "/srv/#{PROJECT_NAME}"
 
-def vagrant_ssh(cmd)
-  %Q(/usr/bin/vagrant ssh -c 'sudo /bin/bash -l -c "cd #{PROJECT_DIR}; #{cmd}"')
-end
+def print_usage
+  puts <<USAGETEXT
+NAME
+  fh - freighthop's friendly helper
+
+DESCRIPTION
+  The fh command is used to interact with a freighthop-managed vm from the root
+  of your project directory.
+
+SYNOPSIS
+  fh <COMMAND> [args...]
+
+COMMANDS
+  up        - boot freighthop vm
+  halt      - shutdown freighthop vm
+  destroy   - shutdown and delete vm
+  provision - rerun provisioning on a booted freighthop vm
+  reload    - restart freighthop vm (picks up new config changes)
+  status    - check the current status of the freighthop vm
+  ssh       - opens a root shell inside the project dir of the freighthop vm
+  (other)   - see below
+  help      - this help
+
+PASSTHROUGH TO VM
+  Anything that does not match the above list will be passed through to the
+  freighthop vm.
+
+  The command will be run in a bash shell, as root, from inside the shared
+  project directory.
+
+  This allows you to specify relative commands like ./script/server and expect
+  them to behave properly.
 
-def console_command
-  if File.exist?('./bin/rails')
-    './bin/rails console'
-  elsif File.exist?('./script/console')
-    './script/console'
-  else
-    './script/rails console'
-  end
+EXAMPLES
+  Install gem dependencies:
+    fh bundle install
+
+  Start a Rails 4 server:
+    fh ./bin/rails server
+
+  Run a ruby test:
+    fh ruby -Itest test/unit/object_test.rb
+
+  Install leiningen dependencies:
+    fh lein deps
+
+  Run a ring server:
+    fh lein ring server-headless
+USAGETEXT
 end
 
 subcommand, *rest = ARGV
 case subcommand
-when 'run' then
-  `vagrant ssh-config > /tmp/freighthop.ssh-config`
-  exec %Q(ssh -t -F /tmp/freighthop.ssh-config #{PROJECT_NAME} 'cd #{PROJECT_DIR}; sudo /bin/bash -l -c "#{rest.join(' ')}"')
-when 'console' then
-  `vagrant ssh-config > /tmp/freighthop.ssh-config`
-  exec %Q(ssh -t -F /tmp/freighthop.ssh-config #{PROJECT_NAME} 'sudo /bin/bash -l -c "cd #{PROJECT_DIR}; #{console_command} #{rest.join(' ')}"')
-when 'rake' then
-  exec vagrant_ssh("bundle exec rake #{rest.join(' ')}")
+when 'help' then
+  print_usage
+when 'up', 'halt', 'destroy', 'provision', 'reload', 'status' then
+  exec %Q(vagrant #{subcommand} #{rest.join(' ')})
 when 'ssh' then
   `vagrant ssh-config > /tmp/freighthop.ssh-config`
   exec %Q(ssh -t -F /tmp/freighthop.ssh-config #{PROJECT_NAME} 'cd #{PROJECT_DIR}; sudo /bin/bash -l -i')
 else
-  exec "/usr/bin/vagrant #{ARGV.join(' ')}"
+  `vagrant ssh-config > /tmp/freighthop.ssh-config`
+  exec %Q(ssh -t -F /tmp/freighthop.ssh-config #{PROJECT_NAME} 'cd #{PROJECT_DIR}; sudo /bin/bash -l -c "#{rest.unshift(subcommand).join(' ')}"')
 end

data/lib/freighthop/version.rb

@@ -1,3 +1,3 @@
 module Freighthop
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/lib/freighthop.rb

@@ -48,6 +48,14 @@ module Freighthop
         ]
       end
     end
+
+    def cpus
+      Freighthop::Config.fetch('freighthop::cpus', 2)
+    end
+
+    def ram
+      Freighthop::Config.fetch('freighthop::ram', 1024)
+    end
   end
 end
 

data/local_modules/freighthop/manifests/packages.pp

@@ -18,5 +18,6 @@ class freighthop::packages(
 
   package { $packages:
     ensure  => installed,
+    require => Apt::Ppa[$ppas]
   }
 }

data/local_modules/freighthop/manifests/params.pp

@@ -2,9 +2,9 @@ class freighthop::params {
   $database_flavors = []
   $databases        = []
   $database_users   = []
-  $packages         = ['git-core']
+  $packages         = []
   $ppas             = []
-  $languages        = ['ruby']
+  $languages        = []
   $ruby_version     = '1.9.3-p392'
   $app_name         = $::hostname
   $app_root         = "/srv/${app_name}"

data/modules/freighthop/manifests/packages.pp

@@ -18,5 +18,6 @@ class freighthop::packages(
 
   package { $packages:
     ensure  => installed,
+    require => Apt::Ppa[$ppas]
   }
 }

data/modules/freighthop/manifests/params.pp

@@ -2,9 +2,9 @@ class freighthop::params {
   $database_flavors = []
   $databases        = []
   $database_users   = []
-  $packages         = ['git-core']
+  $packages         = []
   $ppas             = []
-  $languages        = ['ruby']
+  $languages        = []
   $ruby_version     = '1.9.3-p392'
   $app_name         = $::hostname
   $app_root         = "/srv/${app_name}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: freighthop
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-26 00:00:00.000000000 Z
+date: 2013-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -650,18 +650,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2753549700317476048
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2753549700317476048
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -670,3 +664,4 @@ specification_version: 3
 summary: ! 'Vagrant on Rails: quickly spin up a Vagrant VM to serve your rack-compatible
   app.'
 test_files: []
+has_rdoc: