oscar 0.2.0alpha1 → 0.2.0alpha2

data/README.markdown

@@ -1,97 +1,10 @@
-Instapants
-==========
+Oscar
+=====
 
-Create a full Puppet Enterprise environment from vagrant base boxes.
-
-Versions
---------
-
-Right now, the master branch of soupkitchen is going through a major rewrite.
-The codebase is in flux and thus the documentation is really going to be based
-on inline comments.
-
-All of the supported behavior before the write has been tagged as version 0.0.1
-and is the reference point for the following documentation.
-
-Prerequisites
--------------
-
-  * Vagrant 1.0
-  * Virtualbox 4.x (4.0 strongly recommended for OSX 10.7)
+Oscar helps you build a full Puppet Enterprise environment from vagrant base boxes.
 
 Installation
 ------------
 
-    git clone git://github.com/adrienthebo/soupkitchen
-    git checkout 0.0.1
-    cd soupkitchen
-
-    # You'll need a config.yaml to specify how to build the environment. Contact your
-    # friendly neighborhood Puppet support monkey on where this is located. Place
-    # this file in the insta-pe directory.
-    wget http://your.web.server/insta-pe/config.yaml
-
-    # You'll also need the extracted universal installers for Puppet Enterprise.
-    # Place the extracted installers in insta-pe/files.
-    cd soupkitchen/files
-    tar xvf puppet-enterprise-X.Y.Z.tar.gz
-
-    # soupkitchen assumes the you either have all your vagrant boxes already added or
-    # are hosted on a webserver.
-    vagrant up
-
-Configuration
--------------
-
-Configuration is provided through a yaml file. (Yes, the vagrant config file
-has a config file. Deal with it.) The top level values are all keys. You'll
-have something like this:
-
-    ---
-    # Configuration settings for Puppet Enterprise.
-    pe:
-      # The version of PE to install. Using a version of 0.0.0 disables the installation
-      version: 2.5.1
-      installer_path: /vagrant/files/puppet-enterprise-%s-all/puppet-enterprise-installer
-      installer:
-        # The program to execute to run the PE install. You can insert 'bash -x' to do a trace
-        # of the installation. Any string containing :version will be replaced with the current version.
-        executable: /vagrant/files/puppet-enterprise-:version-all/puppet-enterprise-installer
-        args:
-          # Additional arguments to pass to the installer
-          - "-l /root/puppet-enterprise-installer.log"
-          - "-D"
-          - "| tee /root/installer-all.log"
-
-    # Profiles are generic configurations for a basebox
-    profiles:
-      # One or more key/value pairs, where the name is the profile name and the values are hashes.
-      debian:
-        # The vagrant base box to use.
-        boxname: debian-6.0.4-i386
-        # The URL that the box can be downloaded from. This is optional
-        boxurl: http://your.web.server/insta-pe/debian-6.0.4-i386.box
-      # add more profiles as necessary
-
-    # Your actual node definitions. This is an array of hashes
-    nodes:
-      -
-        # name: the name of the node to address with vagrant commands
-        name: master
-        # role: one of (master, agent). Self explanatory.
-        role: master
-        # The name of the profile to use in the previous section.
-        profile: debian
-        # The IP address to assign for the host
-        address: 10.16.1.2
-        # A hash where the keys are VM port names and the values are hypervisor port names. Optional.
-        # You'll want to forward 443 on the master to your hypervisor for access to the PEC.
-        forwards:
-          443: 20443
-
-You can also view the config.yaml.example in this directory.
-
-Caveats
--------
-
-Do not look at the Vagrantfile in this directory. You'll go blind.
+    gem install --pre oscar
+    # magic!

data/Vagrantfile

@@ -1,6 +1,5 @@
 # lol shim
 $LOAD_PATH << "#{File.dirname(__FILE__)}/lib"
-require 'pe_build'
 require 'oscar'
 
-Oscar.facehug! File.dirname(__FILE__)
+Oscar.load! File.dirname(__FILE__)

data/lib/oscar/version.rb

@@ -1,3 +1,3 @@
 module Oscar
-  VERSION = '0.2.0alpha1'
+  VERSION = '0.2.0alpha2'
 end

data/lib/oscar.rb

@@ -1,7 +1,7 @@
 
 module Oscar
 
-  def self.facehug!(directory)
+  def self.load!(directory)
     env = Oscar::Environment.new
     env.config.load! directory
     env.run!

data/lib/pe_build/config.rb

@@ -12,7 +12,7 @@ class PEBuild::Config < Vagrant::Config::Base
   end
 
   def version
-    @version || '2.5.3'
+    @version || '2.5.2'
   end
 
   def filename

data/lib/pe_build/provisioners/puppet_enterprise_bootstrap.rb

@@ -81,12 +81,11 @@ class PEBuild::Provisioners::PuppetEnterpriseBootstrap < Vagrant::Provisioners::
     @archive_path = File.join(PEBuild.archive_directory, @filename)
   end
 
-  # @todo use absolute path for locating answers file template
   def prepare_answers_file
     FileUtils.mkdir_p @answers_dir unless File.directory? @answers_dir
     @env[:ui].info "Creating answers file, node:#{@env[:vm].name}, role: #{config.role}"
 
-    template = File.read("#{@env[:root_path]}/templates/answers/#{config.role}.txt.erb")
+    template = File.read("#{PEBuild.source_root}/templates/answers/#{config.role}.txt.erb")
     dest     = "#{@answers_dir}/#{@env[:vm].name}.txt"
 
     contents = ERB.new(template).result(binding)

data/lib/pe_build.rb

@@ -4,6 +4,10 @@ module PEBuild
   def self.archive_directory
     File.expand_path(File.join(ENV['HOME'], '.vagrant.d', 'pe_builds'))
   end
+
+  def self.source_root
+    @source_root ||= File.expand_path(File.join(File.dirname(__FILE__), '..'))
+  end
 end
 
 require 'pe_build/version'

data/lib/vagrant_init.rb

@@ -0,0 +1,2 @@
+require 'oscar'
+require 'pe_build'

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: oscar
 version: !ruby/object:Gem::Version 
-  hash: 3134727173
+  hash: 2754431913
   prerelease: 5
   segments: 
   - 0
   - 2
   - 0
   - alpha
-  - 1
-  version: 0.2.0alpha1
+  - 2
+  version: 0.2.0alpha2
 platform: ruby
 authors: 
 - Adrien Thebo
@@ -43,7 +43,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 1796845819
+        hash: -459699854
         segments: 
         - 0
         - 0
@@ -130,6 +130,7 @@ files:
 - lib/pe_build/provisioners/puppet_enterprise.rb
 - lib/pe_build/provisioners/puppet_enterprise_bootstrap.rb
 - lib/pe_build/version.rb
+- lib/vagrant_init.rb
 - manifests/.gitignore
 - modules/.gitignore
 - oscar.gemspec