vagrant-pe_build 0.0.3 → 0.1.0

data/Gemfile

@@ -1 +1,3 @@
+source 'https://rubygems.org'
+
 gemspec

data/README.markdown

@@ -12,19 +12,19 @@ on Vagrant boxes to rapidly build a functioning Puppet environment.
 Usage
 -----
 
-    Vagrant::Config.run do |config|
+    Vagrant.configure('2') do |config|
       config.pe_build.download_root = 'http://my.pe.download.mirror/installers'
       config.pe_build.version       = '2.7.0'
       config.pe_build.filename      = 'puppet-enterprise-2.7.0-all.tar.gz'
 
       config.vm.define 'master' do |node|
-        node.vm.provision :puppet_enterprise_bootstrap do |provisioner|
+        node.vm.provision :pe_bootstrap do |provisioner|
           provisioner.role = :master
         end
       end
 
       config.vm.define 'agent1' do |node|
-        node.vm.provision :puppet_enterprise_bootstrap do |provisioner|
+        node.vm.provision :pe_bootstrap do |provisioner|
           provisioner.role = :agent
         end
       end
@@ -33,20 +33,20 @@ Usage
 Requirements
 ------------
 
-`vagrant-pe_build` shells out to `curl` and `tar` so you'll need those
-available.
-
 [vagranthosts]: https://github.com/adrienthebo/vagrant-hosts
 
 Puppet Enterprise relies on SSL for security so you'll need to ensure that your
 SSL configuration isn't borked. [vagrant-hosts][vagranthosts] is recommended to
 configure VMs with semi-sane DNS.
 
+Guest VMs need to be able to directly communicate. You'll need to ensure that
+they have private network interfaces prepared.
+
 Contact
 -------
 
-  * Source code: https://github.com/adrienthebo/vagrant-pe\_build
-  * Issue tracker: https://github.com/adrienthebo/vagrant-pe\_build/issues
+  * [Source code](https://github.com/adrienthebo/vagrant-pe_build)
+  * [Issue tracker](https://github.com/adrienthebo/vagrant-pe_build/issues)
 
-If you have questions or concerns about this module, contact finch on #vagrant
-on Freenode, or email adrien@puppetlabs.com.
+If you have questions or concerns about this module, contact finch on on
+Freenode, or email adrien@puppetlabs.com.

data/lib/pe_build.rb

@@ -1,17 +1,25 @@
 require 'vagrant'
 
 module PEBuild
-  def self.archive_directory
-    File.expand_path(File.join(ENV['HOME'], '.vagrant.d', 'pe_builds'))
+
+  # Return the path to the archived PE builds
+  #
+  # @param env [Vagrant::Environment]
+  def self.archive_directory(env)
+    File.expand_path('pe_builds', env.home_path)
   end
 
   def self.source_root
-    @source_root ||= File.expand_path('..', File.dirname(__FILE__))
+    File.expand_path('..', File.dirname(__FILE__))
+  end
+
+  def self.template_dir
+    File.expand_path('templates', source_root)
   end
 end
 
+# I18n to load the en locale
+I18n.load_path << File.expand_path("locales/en.yml", PEBuild.template_dir)
+
+require 'pe_build/plugin'
 require 'pe_build/version'
-require 'pe_build/action'
-require 'pe_build/config'
-require 'pe_build/command'
-require 'pe_build/provisioners'

data/lib/pe_build/archive.rb

@@ -0,0 +1,112 @@
+require 'pe_build'
+require 'pe_build/idempotent'
+require 'pe_build/archive_collection'
+
+require 'pe_build/transfer/file'
+require 'pe_build/transfer/uri'
+
+require 'pe_build/unpack/tar'
+
+require 'fileutils'
+
+module PEBuild
+
+class ArchiveNoInstallerSource < Vagrant::Errors::VagrantError
+  error_key(:no_installer_source, "pebuild.archive")
+end
+
+class Archive
+  # Represents a packed Puppet Enterprise archive
+
+  include PEBuild::Idempotent
+
+  # @!attribute [rw] version
+  #   @return [String] The version of Puppet Enterprise
+  attr_accessor :version
+
+  # @!attribute [rw] filename
+  #   @return [String] The filename. Thing
+  attr_accessor :filename
+
+  attr_accessor :env
+
+  # @param filename [String] The uninterpolated filename
+  # @param env [Hash]
+  def initialize(filename, env)
+    @filename = filename
+    @env      = env
+  end
+
+  # @param fs_dir [String] The base directory to extract the installer to
+  def unpack_to(fs_dir)
+    tar  = PEBuild::Unpack::Tar.new(archive_path, fs_dir)
+    path = File.join(fs_dir, tar.dirname)
+
+    idempotent(path, "Unpacked archive #{versioned_path filename}") do
+      tar.unpack
+    end
+  end
+
+  # @param fs_dir [String] The base directory holding the archive
+  def copy_from(fs_dir)
+    file_path = versioned_path(File.join(fs_dir, filename))
+
+    idempotent(archive_path, "Installer #{versioned_path @filename}") do
+      prepare_for_copy!
+      transfer = PEBuild::Transfer::File.new(file_path, archive_path)
+      transfer.copy
+    end
+  end
+
+  # @param download_dir [String] The URL base containing the archive
+  def download_from(download_dir)
+    idempotent(archive_path, "Installer #{versioned_path @filename}") do
+      if download_dir.nil?
+        @env.ui.error "Installer #{versioned_path @filename} is not available."
+
+        archive_dir = PEBuild.archive_directory(@env)
+
+        collection = PEBuild::ArchiveCollection.new(archive_dir, @env)
+        collection.display
+
+        raise PEBuild::ArchiveNoInstallerSource
+      else
+        str = versioned_path("#{download_dir}/#{@filename}")
+
+        prepare_for_copy!
+        transfer = PEBuild::Transfer::URI.new(str, archive_path)
+        transfer.copy
+      end
+    end
+  end
+
+  private
+
+  # Initialize the PE directory
+  #
+  # @todo respect Vagrant home setting
+  def prepare_for_copy!
+    archive_dir = PEBuild.archive_directory(@env)
+
+    if not File.directory? archive_dir
+      FileUtils.mkdir_p archive_dir
+    end
+  end
+
+
+  # @return [String] The interpolated archive path
+  def archive_path
+    archive_dir = PEBuild.archive_directory(@env)
+    path = File.join(archive_dir, @filename)
+    versioned_path(path)
+  end
+
+  def versioned_path(path)
+    if @version
+      path.gsub(/:version/, @version)
+    else
+      path
+    end
+  end
+end
+end

data/lib/pe_build/archive_collection.rb

@@ -0,0 +1,43 @@
+require 'pe_build/archive'
+
+module PEBuild
+
+class ArchiveCollection
+
+  #ARCHIVE_REGEX = %r[puppet-enterprise-([\d.])-(.*?)\.(?:tar\.gz|msi)]
+
+  attr_reader :path
+
+  def initialize(path, env)
+    @path, @env = path, env
+    @archives = []
+
+    load_archives
+  end
+
+  def archives
+    @archives
+  end
+
+  include Enumerable
+  def each(&blk)
+    @archives.each { |archive| yield archive }
+  end
+
+  def display
+    @archives.each do |archive|
+      @env.ui.info "  - #{archive.filename}"
+    end
+  end
+
+  private
+
+  def load_archives
+    dir = File.join(path, '*')
+    Dir.glob(dir).sort.each do |path|
+      basename = File.basename(path)
+      @archives << PEBuild::Archive.new(basename, @env)
+    end
+  end
+end
+end

data/lib/pe_build/command.rb

@@ -1,17 +1,16 @@
-require 'pe_build'
 require 'vagrant'
 
-class PEBuild::Command < Vagrant::Command::Base
+module PEBuild
+class Command < Vagrant.plugin(2, :command)
+
   def initialize(argv, env)
-    @argv, @env = argv, env
+    super
 
     @main_args, @subcommand, @sub_args = split_main_and_subcommand(argv)
 
-    # Is this even remotely sane? Are we verging on cargo cult programming?
     @subcommands = Vagrant::Registry.new
 
-    @subcommands.register('download') { PEBuild::Command::Download }
-    @subcommands.register('list')     { PEBuild::Command::List }
+    register_subcommands
   end
 
   def execute
@@ -20,12 +19,50 @@ class PEBuild::Command < Vagrant::Command::Base
     elsif @subcommand
       raise "Unrecognized subcommand #{@subcommand}"
     else
-      PEBuild::Command::List.new(@argv, @env).execute
+      print_help
     end
   end
-end
 
-require 'pe_build/command/list'
-require 'pe_build/command/download'
+  private
+
+  def register_subcommands
+    @subcommands.register('copy') do
+      require_relative 'command/copy'
+      PEBuild::Command::Copy
+    end
+
+    @subcommands.register('download') do
+      require_relative 'command/download'
+      PEBuild::Command::Download
+    end
+
+    @subcommands.register('list') do
+      require_relative 'command/list'
+      PEBuild::Command::List
+    end
+  end
 
-Vagrant.commands.register(:pe_build) { PEBuild::Command }
+  def print_help
+    cmd = 'vagrant pe-build'
+    opts = OptionParser.new do |opts|
+      opts.banner = "Usage: #{cmd} <command> [<args>]"
+      opts.separator ""
+      opts.separator "Available subcommands:"
+
+      # Add the available subcommands as separators in order to print them
+      # out as well.
+      keys = []
+      @subcommands.each { |key, value| keys << key.to_s }
+
+      keys.sort.each do |key|
+        opts.separator "     #{key}"
+      end
+
+      opts.separator ""
+      opts.separator "For help on any individual command run `#{cmd} COMMAND -h`"
+    end
+
+    @env.ui.info(opts.help, :prefix => false)
+  end
+end
+end

data/lib/pe_build/command/copy.rb

@@ -0,0 +1,38 @@
+require 'vagrant'
+require 'optparse'
+require 'pe_build/archive'
+
+module PEBuild
+class Command
+class Copy < Vagrant.plugin(2, :command)
+
+  def execute
+
+    options = {}
+
+    parser = OptionParser.new do |o|
+      o.banner = "Usage: vagrant pe-build copy path/to/installer.tar.gz"
+      o.separator ''
+
+      o.on('-v', '--version=val', String, "The version of PE to fetch") do |val|
+        options[:version] = val
+      end
+    end
+
+    argv = parse_options(parser)
+    fpath = argv.last
+
+    basename = File.basename(fpath)
+    dirname  = File.dirname(fpath)
+
+    #unless options[:version]
+    #  raise Vagrant::Errors::CLIInvalidUsage, :help => parser.help.chomp
+    #end
+
+    archive = PEBuild::Archive.new(fpath, @env)
+    archive.version = options[:version]
+    archive.copy_from(dirname)
+  end
+end
+end
+end

data/lib/pe_build/command/download.rb

@@ -1,8 +1,39 @@
-require 'pe_build'
 require 'vagrant'
+require 'optparse'
+require 'pe_build/archive'
+
+module PEBuild
+class Command
+class Download < Vagrant.plugin(2, :command)
 
-class PEBuild::Command::Download < Vagrant::Command::Base
   def execute
-    @env.action_runner.run(:download_pe_build)
+
+    options = {}
+
+    parser = OptionParser.new do |o|
+      o.banner = "Usage: vagrant pe-build download --version <version> --dir <dir>"
+      o.separator ''
+
+      o.on('-v', '--version=val', String, "The version of PE to fetch") do |val|
+        options[:version] = val
+      end
+
+      o.on('-d', '--dir=val', String, 'The URL basedir containing the file') do |val|
+        options[:dir] = val
+      end
+    end
+
+    argv = parse_options(parser)
+    filename = argv.last
+
+    unless options[:version]
+      raise Vagrant::Errors::CLIInvalidUsage, :help => parser.help.chomp
+    end
+
+    archive = PEBuild::Archive.new(filename, @env)
+    archive.version = options[:version]
+    archive.download_from(options[:dir])
   end
 end
+end
+end

data/lib/pe_build/command/list.rb

@@ -1,10 +1,22 @@
 require 'vagrant'
-class PEBuild::Command::List < Vagrant::Command::Base
+require 'pe_build/archive_collection'
+
+module PEBuild
+class Command
+class List < Vagrant.plugin(2, :command)
   def execute
-    if File.directory? PEBuild.archive_directory and (entries = Dir["#{PEBuild.archive_directory}/*"])
-      puts entries.join("\n")
+    archive_dir = PEBuild.archive_directory(@env)
+
+    if File.directory? archive_dir
+      @env.ui.info "PE versions available (at #{archive_dir})"
+      @env.ui.info "---"
+
+      collection = PEBuild::ArchiveCollection.new(archive_dir, @env)
+      collection.display
     else
-      warn "No PE versions downloaded."
+      @env.ui.warn "No PE versions available at #{archive_dir}"
     end
   end
 end
+end
+end

data/lib/pe_build/config/global.rb

@@ -0,0 +1,69 @@
+require 'uri'
+require 'vagrant'
+
+require 'pe_build/config_default'
+
+module PEBuild
+module Config
+
+class Global < Vagrant.plugin('2', :config)
+
+  # @todo This value should be discovered based on what versions of the
+  #       installer are cached.
+  #DEFAULT_PE_VERSION = '2.7.2'
+
+  # @!attribute download_root
+  attr_accessor :download_root
+
+  # @!attribute version
+  attr_accessor :version
+
+  # @!attribute suffix
+  attr_accessor :suffix
+
+  # @!attribute filename
+  attr_accessor :filename
+
+  def initialize
+    @download_root = UNSET_VALUE
+    @version       = UNSET_VALUE
+    @suffix        = UNSET_VALUE
+    @filename      = UNSET_VALUE
+  end
+
+  include PEBuild::ConfigDefault
+
+  def finalize!
+    set_default :@suffix,   'all'
+    #set_default :@version,  DEFAULT_PE_VERSION
+    set_default :@filename, "puppet-enterprise-:version-#{suffix}.tar.gz"
+
+    set_default :@download_root, nil
+  end
+
+  # @todo Convert error strings to I18n
+  def validate(machine)
+    errors = []
+
+    # Allow Global version to be unset, rendering it essentially optional. If it is
+    # discovered to be unset by a configuration on the next level up who cannot provide a
+    # value, it is that configuration's job to take action.
+    if @version.kind_of? String
+      unless @version.match /\d+\.\d+(\.\d+)?/
+        errors << "version must be a valid version string, got #{@version.inspect}"
+      end
+    elsif @version != UNSET_VALUE
+      errors << "version only accepts a string, got #{@version.class}"
+    end
+
+    uri = URI.parse(@download_root) rescue nil
+    unless @download_root == UNSET_VALUE or @download_root.nil? or File.directory?(File.expand_path(@download_root)) or uri.kind_of? (URI::HTTP||URI::HTTPS) or uri.kind_of? URI::FTP
+      errors << "download_root must be valid URL or present local file path, got #{@download_root}"
+    end
+
+    {"PE Build global config" => errors}
+  end
+end
+
+end
+end