vagrant-pe_build 0.8.1 → 0.8.2

data/CHANGELOG

@@ -1,6 +1,19 @@
 vagrant-pe_build
 ================
 
+0.8.2
+-----
+
+2013-01-13
+
+This is a backwards compatible bugfix release.
+
+  * Download and copy commands have been refactored to reduce duplication confusion.
+  * Support for Puppet Enterprise versions 3.1.1 and 2.8.4
+  * Safely access @env[:home_path] in middleware
+
+Thanks to Gary Larizza for his help in tracking down issues in this release.
+
 0.8.1
 -----
 

data/Gemfile

@@ -11,5 +11,9 @@ group :development do
   # We depend on Vagrant for development, but we don't add it as a
   # gem dependency because we expect to be installed within the
   # Vagrant environment itself using `vagrant plugin`.
-  gem "vagrant", :git => "git://github.com/mitchellh/vagrant.git"
+  gem "vagrant", :git => "git://github.com/mitchellh/vagrant.git", :tag => 'v1.4.0'
+end
+
+if File.exists? "#{__FILE__}.local"
+  eval(File.read("#{__FILE__}.local"), binding)
 end

data/lib/pe_build/action/pe_build_dir.rb

@@ -3,15 +3,16 @@ class PEBuild::Action::PEBuildDir
 
   def initialize(app, env)
     @app, @env = app, env
-
-    @build_dir = @env[:home_path].join('pe_builds')
   end
 
   def call(env)
     @env = env
 
-    @build_dir.mkpath unless @build_dir.exist?
-    @env[:pe_build_dir] = @build_dir
+    if @env[:home_path]
+      build_dir = @env[:home_path].join('pe_builds')
+      build_dir.mkpath unless build_dir.exist?
+      @env[:pe_build_dir] = build_dir
+    end
 
     @app.call(@env)
   end

data/lib/pe_build/command/copy.rb

@@ -16,8 +16,7 @@ class PEBuild::Command::Copy < Vagrant.plugin(2, :command)
     archive = PEBuild::Archive.new(filename, @env)
     archive.version = @options[:version]
 
-    uri = URI.parse src_dir
-    archive.fetch(uri)
+    archive.fetch(src_dir)
 
     @env.ui.info "pe-build: #{archive} has been added and is ready for use!", :prefix => true
   end
@@ -26,12 +25,28 @@ class PEBuild::Command::Copy < Vagrant.plugin(2, :command)
 
   def parser
     OptionParser.new do |o|
-      o.banner = "Usage: vagrant pe-build copy path/to/installer.tar.gz"
+      o.banner = <<-BANNER
+      Usage: vagrant pe-build copy installer-uri
+
+      Examples:
+
+          # Copy a local file
+          vagrant pe-build copy path/to/installer.tar.gz"
+
+          # Download a file via http
+          vagrant pe-build copy http://site-downloads.local/path/to/installer.tar.gz"
+      BANNER
+
       o.separator ''
 
       o.on('-v', '--version=val', String, "The version of PE to fetch") do |val|
         @options[:version] = val
       end
+
+      o.on('-h', '--help', 'Display this help') do
+        puts o
+        exit(0)
+      end
     end
   end
 end

data/lib/pe_build/command/download.rb

@@ -1,35 +1,10 @@
 require 'pe_build/archive'
+require 'pe_build/command/copy'
 
 class PEBuild::Command::Download < Vagrant.plugin(2, :command)
 
   def execute
-
-    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
-
-    uri = URI.parse(options[:dir])
-
-    archive = PEBuild::Archive.new(filename, @env)
-    archive.version = options[:version]
-    archive.fetch(options[:dir])
+    @env.ui.warn "vagrant pe-build download is deprecated, use vagrant pe-build copy", :prefix => true
+    PEBuild::Command::Copy.new(@argv, @env).execute
   end
 end

data/lib/pe_build/release.rb

@@ -33,6 +33,6 @@ module PEBuild
     require 'pe_build/release/3_0'
     require 'pe_build/release/3_1'
 
-    LATEST_VERSION = '3.1.0'
+    LATEST_VERSION = '3.1.1'
   end
 end

data/lib/pe_build/release/2_8.rb

@@ -35,4 +35,5 @@ module PEBuild::Release
   @releases['2.8.1'] = two_eight_x
   @releases['2.8.2'] = two_eight_x
   @releases['2.8.3'] = two_eight_x
+  @releases['2.8.4'] = two_eight_x
 end

data/lib/pe_build/release/3_1.rb

@@ -2,7 +2,7 @@ require 'pe_build/release'
 
 module PEBuild::Release
 
-  three_one_oh = newrelease do
+  three_one_x = newrelease do
 
     add_release :debian, '6'
 
@@ -34,6 +34,7 @@ module PEBuild::Release
     set_answer_file :agent,  File.join(PEBuild.template_dir, 'answers', 'agent-3.x.txt.erb')
   end
 
-  @releases['3.1.0'] = three_one_oh
+  @releases['3.1.0'] = three_one_x
+  @releases['3.1.1'] = three_one_x
 end
 

data/lib/pe_build/version.rb

@@ -1,3 +1,3 @@
 module PEBuild
-  VERSION = '0.8.1'
+  VERSION = '0.8.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-pe_build
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-06 00:00:00.000000000 Z
+date: 2014-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: progressbar
@@ -148,3 +148,4 @@ signing_key:
 specification_version: 3
 summary: Vagrant provisioner for installing Puppet Enterprise
 test_files: []
+has_rdoc: