coral_vagrant 0.2.2 → 0.2.3

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.3

data/coral_vagrant.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "coral_vagrant"
-  s.version = "0.2.2"
+  s.version = "0.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Adrian Webb"]
@@ -25,9 +25,10 @@ Gem::Specification.new do |s|
     "README.rdoc",
     "Rakefile",
     "VERSION",
-    "Vagrantfile",
     "bin/coral",
     "coral_vagrant.gemspec",
+    "example/Vagrantfile",
+    "example/cloud.json",
     "lib/coral_vagrant.rb",
     "lib/coral_vagrant/commands/coral/add.rb",
     "lib/coral_vagrant/commands/coral/config.rb",

data/{Vagrantfile → example/Vagrantfile}

@@ -10,7 +10,7 @@
 
 require 'coral_vagrant'
 
-Vagrant::Config.run do |config|
+Vagrant.configure("2") do |config|
 
   #-----------------------------------------------------------------------------
   # Server definitions (managed by ./config/cloud.json)
@@ -22,11 +22,11 @@ Vagrant::Config.run do |config|
       # Basic server settings      
       machine.vm.host_name = server.hostname
             
-      machine.vm.box       = cloud.get('vm_box')
-      machine.vm.box_url   = cloud.get('vm_box_url')
+      machine.vm.box       = cloud.search(server_name, 'vm_box')
+      machine.vm.box_url   = cloud.search(server_name, 'vm_box_url')
       
       # Network interfaces      
-      if cloud.get('vm_network_bridged', false, :test)
+      if cloud.search(server_name, 'vm_network_bridged', false, :test)
         machine.vm.network :bridged
       else
         machine.vm.network :hostonly, server.public_ip

data/example/cloud.json

@@ -0,0 +1,50 @@
+{
+  "repositories" : { 
+    "." : "cluster.git"  
+  },  
+  "puppet_manifest_path" : "puppet",
+  "puppet_manifest_file" : "site.pp",  
+  "puppet_module_path" : [ "modules" ],
+  "settings" : {
+    "core" : {      
+      "virtual_ip" : "172.4.4.4",
+      "virtual_hostname" : "base.loc"
+    },
+    "vagrant" : {
+      "vm_network_bridged" : "false",
+      "vm_box" : "precise64",
+      "vm_box_url" : "http://files.vagrantup.com/precise64.box",
+      "vm_cpus" : "1",
+      "vm_memory" : "512",
+      "facts" : {
+        "server_location" : "vagrant",
+        "server_environment" : "development"        
+      },
+      "shares" : [ "puppet_reports", "puppet_graphs", "coral_properties" ]
+    },
+    "debug" : {
+      "puppet_options" : [ "--debug", "--verbose" ]
+    }
+  },
+  "shares" : {
+    "puppet_reports" : {
+      "local_dir" : "share/log/puppet",
+      "remote_dir" : "/var/log/puppet/reports"
+    },
+    "puppet_graphs" : {
+      "local_dir" : "share/log/puppet/graphs",
+      "remote_dir" : "/var/lib/puppet/state/graphs"
+    },
+    "coral_properties" : {
+      "local_dir" : "share/log/coral",
+      "remote_dir" : "/var/log/coral"
+    }
+  },
+  "servers" : {
+    "core" : {
+      "hostname" : "server.loc",
+      "public_ip" : "172.0.0.10",
+      "settings" : [ "core", "vagrant" ]
+    }
+  }
+}

data/lib/plugin.rb

@@ -1,11 +1,24 @@
+
+begin
+  require "vagrant"
+rescue LoadError
+  raise "The Vagrant Coral plugin must be run within Vagrant."
+end
+
+# This is a sanity check to make sure no one is attempting to install
+# this into an early Vagrant version.
+if Vagrant::VERSION < "1.2.0"
+  raise "The Vagrant Coral plugin is only compatible with Vagrant 1.2+"
+end
+
 module VagrantPlugins
   module Coral
-    class Plugin < Vagrant.plugin('2')
+    class Plugin < ::Vagrant.plugin('2')
       name 'coral plugins'
       description 'The `coral` plugin provides an easy way to manage and sync coral clusters locally and on the cloud from within Vagrant.'
 
       command('coral') do
-        Coral::Vagrant::Command::CoralBase
+        ::Coral::Vagrant::Command::CoralBase
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: coral_vagrant
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2013-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coral_plan
-  requirement: &4990540 !ruby/object:Gem::Requirement
+  requirement: &9896120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '0.1'
   type: :runtime
   prerelease: false
-  version_requirements: *4990540
+  version_requirements: *9896120
 - !ruby/object:Gem::Dependency
   name: coral_cloud
-  requirement: &4882440 !ruby/object:Gem::Requirement
+  requirement: &9895060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '0.1'
   type: :runtime
   prerelease: false
-  version_requirements: *4882440
+  version_requirements: *9895060
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &4881580 !ruby/object:Gem::Requirement
+  requirement: &9893900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '1.2'
   type: :development
   prerelease: false
-  version_requirements: *4881580
+  version_requirements: *9893900
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &4880680 !ruby/object:Gem::Requirement
+  requirement: &9892940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '1.8'
   type: :development
   prerelease: false
-  version_requirements: *4880680
+  version_requirements: *9892940
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &4879740 !ruby/object:Gem::Requirement
+  requirement: &9892220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '2.10'
   type: :development
   prerelease: false
-  version_requirements: *4879740
+  version_requirements: *9892220
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &4878900 !ruby/object:Gem::Requirement
+  requirement: &9891680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *4878900
+  version_requirements: *9891680
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &4877940 !ruby/object:Gem::Requirement
+  requirement: &9891020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '0.8'
   type: :development
   prerelease: false
-  version_requirements: *4877940
+  version_requirements: *9891020
 - !ruby/object:Gem::Dependency
   name: vagrant
-  requirement: &4876980 !ruby/object:Gem::Requirement
+  requirement: &9890460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *4876980
+  version_requirements: *9890460
 description: ! "= coral_vagrant\n\nThis library contains various commands and exposes
   a data model to Vagrant\nthat allows for tightly integrated management of Virtual
   machines that are\nlinked to remote servers.  \n\nThis also allows for custom execution
@@ -129,9 +129,10 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
-- Vagrantfile
 - bin/coral
 - coral_vagrant.gemspec
+- example/Vagrantfile
+- example/cloud.json
 - lib/coral_vagrant.rb
 - lib/coral_vagrant/commands/coral/add.rb
 - lib/coral_vagrant/commands/coral/config.rb