rs_vagrant_shim 0.0.2 → 0.1.0

data/README.rdoc

@@ -9,23 +9,24 @@ Install it
 Create a new project
 
     rs_vagrant_shim init a_new_project
+    cd a_new_project
 
-Add some stuff to the default runlist found at a_new_project/runlists/default/default.json
+Add some stuff to the default runlist found at runlists/default/default.json
 
 Fire up the vagrant box
 
-    bundle exec vagrant up default
+    bundle exec vagrant up
 
-Create some new runlists at a_new_project/runlists/default/new_runlist.json
+Create some new runlists at runlists/default/new_runlist.json
 
-Run some of the other runlists by copying them to a_new_project/rs_vagrant_shim/default/dispatch
+Run some of the other runlists by copying them to rs_vagrant_shim/default/dispatch
 
-    cp a_new_project/runlists/default/new_runlist.json a_new_project/rs_vagrant_shim/default/dispatch/
-    bundle exec vagrant provision default
+    cp runlists/default/new_runlist.json rs_vagrant_shim/default/dispatch/
+    bundle exec vagrant provision
 
 Or specifying a "runlist" environment variable
 
-    runlist=new_runlist bundle exec vagrant provision default
+    runlist=new_runlist bundle exec vagrant provision
 
 === Multi VMs
 

data/lib/rs_vagrant_shim/cli.rb

@@ -26,6 +26,9 @@ module RsVagrantShim
     option :vmnames,
            :desc => "The name of one more many VMs to add to the Vagrantfile",
            :type => :array
+    option :storage,
+           :desc => "Sets up the VM(s) to have a 10GB storage volume attached on boot",
+           :type => :boolean
     def init(projectname)
       if File.directory? projectname
         puts "A directory named #{projectname} already exists, please specify a different project name"
@@ -58,6 +61,26 @@ Vagrant::Config.run do |config|
       chef.run_list_dir = "runlists/<%= vmname %>"
       chef.shim_dir = "rs_vagrant_shim/<%= vmname %>"
     end
+
+    <% if options[:storage] %>
+    hdd_file = "rs_vagrant_shim/<%= vmname %>/storage.vdi"
+    unless File.exists?(hdd_file)
+      <%= vmname %>_config.vm.customize [
+        "createhd",
+        "--filename", hdd_file,
+        "--size", 10240
+      ]
+      <%= vmname %>_config.vm.customize [
+        "storageattach",
+        :id,
+        "--storagectl", "SATA Controller",
+        "--port", 1,
+        "--type", "hdd",
+        "--medium", hdd_file
+      ]
+    end
+    <% end %>
+
     <% idx += 1 %>
   end
   <% end %>
@@ -66,7 +89,7 @@ end
 
       default_runlist_template = <<-EOF
 {
-  "cloud": { "provider": "vagrant" },
+  "cloud": { "provider": "vagrant", "public_ips": [], "private_ips": [] },
   "rightscale": { "instance_uuid": "uuid-<%= box %>" },
   "run_list": [
     "recipe[rs_vagrant_shim]"
@@ -101,7 +124,7 @@ source :rubygems
 
 # This is probably a bad idea during dev, you might wanna consider specifying
 # a specific rs_vagrant_shim
-gem "rs_vagrant_shim", "~> 0.0.1"
+gem "rs_vagrant_shim", "~> 0.1.0"
 
 gem "berkshelf", "~> 1.1"
 gem "vagrant", "~> 1.0.5"

data/lib/rs_vagrant_shim/vagrant/rs_vagrant_shim/provisioners/rs_vagrant_shim.rb

@@ -36,6 +36,7 @@ module Vagrant
             errors.add(I18n.t("vagrant.config.rs_vagrant_shim.run_list_dir_missing")) if !@run_list_dir || @run_list_dir.empty?
 
             if @shim_dir && !@shim_dir.empty? && @run_list_dir && !@run_list_dir.empty?
+              node_js_file = File.join(Dir.pwd, @shim_dir, 'node.js')
               dispatch_dir = File.join(Dir.pwd, @shim_dir, 'dispatch')
               FileUtils.mkdir_p dispatch_dir unless File.directory? dispatch_dir
 
@@ -43,6 +44,10 @@ module Vagrant
 
               runlist = JSON.parse(File.read(File.join(Dir.pwd, @run_list_dir, 'default.json')))
 
+              if File.exist? node_js_file
+                runlist.merge! JSON.parse(File.read(node_js_file))["normal"]
+              end
+
               # A specified runlist trumps all, but still inherits from default
               if ENV['runlist']
                 runlist_file = File.join(Dir.pwd, @run_list_dir, "#{ENV['runlist']}.json")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rs_vagrant_shim
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-14 00:00:00.000000000 Z
+date: 2013-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: berkshelf
@@ -90,7 +90,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4153397398819252318
+      hash: -2372396189431750141
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -99,7 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4153397398819252318
+      hash: -2372396189431750141
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24