vagrant-pe_build 0.0.3 → 0.1.0

data/lib/pe_build/unpack/tar.rb

@@ -0,0 +1,38 @@
+require 'archive/tar/minitar'
+require 'zlib'
+
+module PEBuild
+module Unpack
+class Tar
+
+  # @param src [String]
+  # @param dst [String]
+  def initialize(src, dst)
+    @src, @dst = src, dst
+  end
+
+  def unpack
+    ::Archive::Tar::Minitar.unpack(zip, @dst)
+  end
+
+  # @return [String] The base directory contained in the tar archive
+  def dirname
+    input = ::Archive::Tar::Minitar::Input.new(zip)
+
+    base = nil
+    input.each do |entry|
+      path = entry.name
+      base = path.split(File::SEPARATOR).first
+    end
+
+    base
+  end
+
+  private
+
+  def zip
+    Zlib::GzipReader.new(File.open(@src, 'rb'))
+  end
+end
+end
+end

data/lib/pe_build/util/config.rb

@@ -0,0 +1,29 @@
+module PEBuild
+module Util
+module Config
+
+  # Merge configuration classes together with the "local" object overwriting any
+  # values set in the "other" object. This uses the default merging in the Vagrant
+  # plugin config class. The builtin merge function is not straight forward however.
+  # It needs to be called on the object being overwritten. When using a subclass of
+  # a global config for a provisioner config, the builtin merge method cannot actually
+  # merge them in the direction that would be needed.
+  #
+  # This function assumes that the "local" object is of the same class or at the very
+  # least a subclass of "other".
+  #
+  # @param local [Vagrant::Plugin::V2::Config] Local configuration class to merge
+  # @param other [Vagrant::Plugin::V2::Config] Other configuration class to merge
+  # @return [Vagrant::Plugin::V2::Config] New object of the same class as Local that represents the merged result
+  #
+  def self.local_merge(local, other)
+    if other.class >= local.class
+      result = local.class.new
+
+      result = result.merge(other)
+      result = result.merge(local)
+    end
+  end
+end
+end
+end

data/lib/pe_build/version.rb

@@ -1,3 +1,3 @@
 module PEBuild
-  VERSION = '0.0.3'
+  VERSION = '0.1.0'
 end

data/templates/answers/agent.txt.erb

@@ -2,7 +2,7 @@ q_install=y
 q_puppet_cloud_install=n
 q_puppet_enterpriseconsole_install=n
 q_puppet_symlinks_install=y
-q_puppetagent_certname=<%= @env[:vm].name %>
+q_puppetagent_certname=<%= @machine.name %>
 q_puppetagent_install=y
 q_puppetagent_server=<%= config.master %>
 q_puppetmaster_install=n

data/templates/answers/master-existing-db.txt.erb

@@ -33,9 +33,9 @@ q_puppet_enterpriseconsole_smtp_user_auth=n
 q_puppet_enterpriseconsole_smtp_username=
 
 q_puppet_symlinks_install=y
-q_puppetagent_certname=<%= @env[:vm].name %>
+q_puppetagent_certname=<%= @machine.name %>
 q_puppetagent_install=y
-q_puppetagent_server=<%= @env[:vm].name %>
+q_puppetagent_server=<%= @machine.name %>
 q_puppetca_install=y
 q_puppetmaster_certname=master
 q_puppetmaster_dnsaltnames=master,puppet

data/templates/answers/master.txt.erb

@@ -27,9 +27,9 @@ q_puppet_enterpriseconsole_smtp_use_tls=n
 q_puppet_enterpriseconsole_smtp_user_auth=n
 q_puppet_enterpriseconsole_smtp_username=
 
-q_puppetagent_certname=<%= @env[:vm].name %>
+q_puppetagent_certname=<%= @machine.name %>
 q_puppetagent_install=y
-q_puppetagent_server=<%= @env[:vm].name %>
+q_puppetagent_server=<%= @machine.name %>
 q_puppetca_install=y
 q_puppetmaster_certname=master
 q_puppetmaster_dnsaltnames=master,puppet

data/templates/locales/en.yml

@@ -0,0 +1,7 @@
+en:
+  pebuild:
+    archive:
+      no_installer_source: |-
+        No installer source is available. Please provide a download_root
+        to retrieve the installer from or use 'vagrant pe-build' to provide
+        the installer...

data/vagrant-pe_build.gemspec

@@ -13,7 +13,8 @@ Gem::Specification.new do |gem|
 
   gem.summary     = "Vagrant provisioner for installing Puppet Enterprise"
 
-  gem.add_dependency 'vagrant', '~> 1.0.0'
+  gem.add_dependency 'progressbar'
+  gem.add_dependency 'minitar'
 
   gem.files        = %x{git ls-files -z}.split("\0")
   gem.require_path = 'lib'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-pe_build
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,24 +9,40 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-20 00:00:00.000000000 Z
+date: 2013-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: vagrant
+  name: progressbar
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitar
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email: adrien@somethingsinistral.net
 executables: []
@@ -36,8 +52,6 @@ files:
 - Gemfile
 - LICENSE
 - README.markdown
-- bootstrap/base/provision/install_puppet_enterprise.sh
-- bootstrap/master/post/relocate_puppet.sh
 - doc/answers/README.markdown
 - doc/answers/agent.txt
 - doc/answers/master-1.1.txt
@@ -45,21 +59,29 @@ files:
 - doc/answers/master-2.5.0.txt
 - doc/answers/master-db.txt
 - lib/pe_build.rb
-- lib/pe_build/action.rb
-- lib/pe_build/action/download.rb
-- lib/pe_build/action/unpackage.rb
+- lib/pe_build/archive.rb
+- lib/pe_build/archive_collection.rb
 - lib/pe_build/command.rb
+- lib/pe_build/command/copy.rb
 - lib/pe_build/command/download.rb
 - lib/pe_build/command/list.rb
-- lib/pe_build/config.rb
-- lib/pe_build/provisioners.rb
-- lib/pe_build/provisioners/puppet_enterprise.rb
-- lib/pe_build/provisioners/puppet_enterprise_bootstrap.rb
+- lib/pe_build/config/global.rb
+- lib/pe_build/config/pe_bootstrap.rb
+- lib/pe_build/config_default.rb
+- lib/pe_build/idempotent.rb
+- lib/pe_build/plugin.rb
+- lib/pe_build/provisioner/pe_bootstrap.rb
+- lib/pe_build/transfer/file.rb
+- lib/pe_build/transfer/uri.rb
+- lib/pe_build/unpack/tar.rb
+- lib/pe_build/util/config.rb
 - lib/pe_build/version.rb
-- lib/vagrant_init.rb
+- lib/vagrant-pe_build.rb
 - templates/answers/agent.txt.erb
 - templates/answers/master-existing-db.txt.erb
 - templates/answers/master.txt.erb
+- templates/locales/en.yml
+- templates/scripts/relocate_installation.sh
 - vagrant-pe_build.gemspec
 homepage: https://github.com/adrienthebo/vagrant-pe_build
 licenses: []
@@ -86,3 +108,4 @@ signing_key:
 specification_version: 3
 summary: Vagrant provisioner for installing Puppet Enterprise
 test_files: []
+has_rdoc: 

data/bootstrap/base/provision/install_puppet_enterprise.sh

@@ -1,10 +0,0 @@
-if [ -f /opt/puppet/bin/puppet ]; then
-  echo "Puppet Enterprise already present, version $(/opt/puppet/bin/puppet --version)"
-  echo "Skipping installation."
-else
-  <%= @installer_cmd %>
-  echo
-  echo
-  echo " -- Notice: scheduling Puppet run in one minute to install mcollective"
-  echo "/opt/puppet/bin/puppet agent --onetime --noop" | at next minute
-fi

data/lib/pe_build/action.rb

@@ -1,20 +0,0 @@
-require 'vagrant'
-require 'vagrant/action/builder'
-require 'pe_build'
-
-module PEBuild::Action
-end
-
-require 'pe_build/action/download'
-require 'pe_build/action/unpackage'
-
-builder = Vagrant::Action::Builder.new do
-  use PEBuild::Action::Download
-end
-
-Vagrant.actions.register :download_pe_build, builder
-
-Vagrant.actions.register(:prep_build, Vagrant::Action::Builder.new do
-  use PEBuild::Action::Download
-  use PEBuild::Action::Unpackage
-end)

data/lib/pe_build/action/download.rb

@@ -1,56 +0,0 @@
-require 'pe_build'
-require 'pe_build/action'
-require 'vagrant'
-require 'fileutils'
-
-class PEBuild::Action::Download
-  # Downloads a PE build to a temp directory
-
-  def initialize(app, env)
-    @app, @env = app, env
-    load_variables
-  end
-
-  def call(env)
-    @env = env
-    perform_download
-    @app.call(@env)
-  end
-
-  private
-
-  # Determine system state and download a PE build accordingly.
-  #
-  # If we are applying actions within the context of a single box, then we
-  # should try to prefer and box level configuration options first. If
-  # anything is unset then we should fall back to the global settings.
-  def load_variables
-    if @env[:box_name]
-      @root     = @env[:vm].pe_build.download_root
-      @version  = @env[:vm].pe_build.version
-      @filename = @env[:vm].pe_build.filename
-    end
-
-    @root     ||= @env[:global_config].pe_build.download_root
-    @version  ||= @env[:global_config].pe_build.version
-    @filename ||= @env[:global_config].pe_build.filename
-
-    @archive_path = File.join(PEBuild.archive_directory, @filename)
-  end
-
-  # @return [String] The full URL to download, based on the config
-  def url
-    [@root, @version, @filename].join('/')
-  end
-
-  def perform_download
-    if File.exist? @archive_path
-      @env[:ui].info "#{@filename} cached, skipping download."
-    else
-      FileUtils.mkdir_p PEBuild.archive_directory unless File.directory? PEBuild.archive_directory
-      cmd = %{curl -L -A "Vagrant/PEBuild (v#{PEBuild::VERSION})" -O #{url}}
-      @env[:ui].info "Executing '#{cmd}'"
-      Dir.chdir(PEBuild.archive_directory) { %x{#{cmd}} }
-    end
-  end
-end

data/lib/pe_build/action/unpackage.rb

@@ -1,70 +0,0 @@
-require 'vagrant'
-require 'pe_build/action'
-require 'fileutils'
-
-class PEBuild::Action::Unpackage
-  def initialize(app, env)
-    @app, @env = app, env
-    load_variables
-  end
-
-  def call(env)
-    @env = env
-    @extracted_dir = File.join(@env[:unpack_directory], destination_directory)
-    extract_build
-    @app.call(@env)
-  end
-
-  private
-
-  def load_variables
-    if @env[:box_name]
-      @root     = @env[:vm].pe_build.download_root
-      @version  = @env[:vm].pe_build.version
-      @filename = @env[:vm].pe_build.version
-    end
-
-    @root     ||= @env[:global_config].pe_build.download_root
-    @version  ||= @env[:global_config].pe_build.version
-    @filename ||= @env[:global_config].pe_build.filename
-
-    @archive_path = File.join(PEBuild.archive_directory, @filename)
-  end
-
-  # Sadly, shelling out is more sane than trying to use the facilities
-  # provided.
-  def extract_build
-    if File.directory? @extracted_dir
-      @env[:ui].info "#{destination_directory} already present, skipping extraction."
-    else
-      cmd = %{tar xf #{@archive_path} -C #{@env[:unpack_directory]}}
-      @env[:ui].info "Extracting #{@archive_path} to #{@env[:unpack_directory]}"
-      %x{#{cmd}}
-    end
-  rescue => e
-    # If anything goes wrong while extracting, nuke the extracted directory
-    # as it could be incomplete. If we do this, then we can ensure that if
-    # the extracted directory already exists then it will be in a good state.
-    @env[:ui].info "Removing possibly damaged installer directory '#{@extracted_dir}'"
-    FileUtils.rm_r @extracted_dir
-  end
-
-  # Determine the name of the top level directory by peeking into the tarball
-  def destination_directory
-    raise Errno::ENOENT, "No such file \"#{@archive_path}\"" unless File.file? @archive_path
-
-    firstline = nil
-    dir       = nil
-    dir_regex = %r[^(.*?)/]
-    IO.popen(%{tar -tf #{@archive_path}}) { |out| firstline = out.gets }
-
-    if firstline.nil? or firstline.empty?
-      raise "Could not get a directory listing from the installer tarfile #{File.basename @archive_path}"
-    elsif (match = firstline.match dir_regex)
-      dir = match[1]
-    else
-      raise "Could not determine the base directory name from #{firstline} - doesn't match #{dir_regex.to_s}"
-    end
-    dir
-  end
-end

data/lib/pe_build/config.rb

@@ -1,35 +0,0 @@
-require 'vagrant'
-require 'uri'
-require 'pe_build'
-
-class PEBuild::Config < Vagrant::Config::Base
-  attr_writer :download_root
-  attr_writer :version
-  attr_writer :filename
-  attr_writer :suffix
-
-  def download_root
-    @download_root
-  end
-
-  def version
-    @version
-  end
-
-  def filename
-    @filename
-  end
-
-  def suffix
-    @suffix || :all
-  end
-
-  def validate(env, errors)
-    URI.parse(download_root)
-  rescue
-    # TODO I18n
-    errors.add("Invalid download root '#{download_root.inspect}'")
-  end
-end
-
-Vagrant.config_keys.register(:pe_build) { PEBuild::Config }

data/lib/pe_build/provisioners.rb

@@ -1,9 +0,0 @@
-require 'pe_build'
-require 'vagrant'
-
-module PEBuild::Provisioners; end
-
-require 'pe_build/provisioners/puppet_enterprise_bootstrap'
-#require 'pe_build/provisioners/puppet_enterprise'
-
-Vagrant.provisioners.register(:puppet_enterprise_bootstrap) { PEBuild::Provisioners::PuppetEnterpriseBootstrap}