boxgrinder-build 0.9.3 → 0.9.4

data/CHANGELOG

@@ -1,3 +1,15 @@
+v0.9.4
+
+* [BGBUILD-263] NoMethodError: undefined method `item' for nil:NilClass while creating EBS appliance
+* [BGBUILD-246] Detect when insufficient system memory is available for standard libguestfs, and reduce allocation.
+* [BGBUILD-269] RPM database is recreated after post section execution preventing installing RPM in post section
+* [BGBUILD-273] Move to RSpec2
+* [BGBUILD-272] Move from aws and amazon-ec2 to official aws-sdk gem
+* [BGBUILD-238] Stop AWS gem warnings
+* [BGBUILD-265] Resolve concurrency issues in S3 plugin for overwriting
+* [BGBUILD-249] Warning from S3 AMI plugin that BG is attempting to create a bucket that already exists
+* [BGBUILD-242]	Additional EBS overwrite edge cases
+
 v0.9.3
 
 * [BGBUILD-232] boxgrinder doesn't validate config early enough

data/Manifest

@@ -28,12 +28,15 @@ integ/spec/modular-spec.rb
 lib/boxgrinder-build.rb
 lib/boxgrinder-build/appliance.rb
 lib/boxgrinder-build/helpers/augeas-helper.rb
+lib/boxgrinder-build/helpers/aws-helper.rb
+lib/boxgrinder-build/helpers/ec2-helper.rb
 lib/boxgrinder-build/helpers/guestfs-helper.rb
 lib/boxgrinder-build/helpers/image-helper.rb
 lib/boxgrinder-build/helpers/linux-helper.rb
 lib/boxgrinder-build/helpers/package-helper.rb
 lib/boxgrinder-build/helpers/plugin-helper.rb
 lib/boxgrinder-build/helpers/qemu.wrapper
+lib/boxgrinder-build/helpers/s3-helper.rb
 lib/boxgrinder-build/managers/plugin-manager.rb
 lib/boxgrinder-build/plugins/base-plugin.rb
 lib/boxgrinder-build/plugins/delivery/ebs/ebs-plugin.rb
@@ -68,11 +71,13 @@ lib/boxgrinder-build/plugins/platform/vmware/vmware-plugin.rb
 rubygem-boxgrinder-build.spec
 spec/appliance-spec.rb
 spec/helpers/augeas-helper-spec.rb
+spec/helpers/ec2-helper-spec.rb
 spec/helpers/guestfs-helper-spec.rb
 spec/helpers/image-helper-spec.rb
 spec/helpers/linux-helper-spec.rb
 spec/helpers/package-helper-spec.rb
 spec/helpers/plugin-helper-spec.rb
+spec/helpers/s3-helper-spec.rb
 spec/managers/plugin-manager-spec.rb
 spec/plugins/base-plugin-spec.rb
 spec/plugins/delivery/ebs/ebs-plugin-spec.rb
@@ -85,8 +90,4 @@ spec/plugins/os/centos/centos-plugin-spec.rb
 spec/plugins/os/fedora/fedora-plugin-spec.rb
 spec/plugins/os/rhel/rhel-plugin-spec.rb
 spec/plugins/os/rpm-based/kickstart-spec.rb
-spec/plugins/os/rpm-based/rpm-based-os-plugin-spec.rb
-spec/plugins/os/rpm-based/rpm-dependency-validator-spec.rb
-spec/plugins/os/rpm-based/src/jeos-f13-plain.ks
-spec/plugins/os/rpm-based/src/jeos-f13-without-version.ks
-spec/plugins/os/rpm-based
+spec/plugins/os/rpm-based/rpm-based-os-plugin-spec.rb

data/README.md

@@ -129,6 +129,6 @@ Assuming that BoxGrinder had succeeded in building the prior image, the RAW file
 
 -----------------------
 
-    setarch i386 boxgrinder build fedora-14.appl
+    setarch i386 boxgrinder-build fedora-14.appl
 
 Build an i386 appliance (on an x86_64 machine).

data/Rakefile

@@ -17,12 +17,7 @@
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 
 require 'rubygems'
-
-begin
-  require 'rake/dsl'
-rescue LoadError
-end
-
+require 'rspec/core/rake_task'
 require 'echoe'
 
 Echoe.new("boxgrinder-build") do |p|
@@ -33,36 +28,34 @@ Echoe.new("boxgrinder-build") do |p|
   p.email = "info@boxgrinder.org"
   p.runtime_dependencies = [
       "boxgrinder-core ~>0.3.0",
-      'aws', # S3
-      'amazon-ec2', # EBS and S3
+      'aws-sdk', # EBS and S3
       'net-sftp', 'net-ssh', 'progressbar', # SFTP
       'rest-client' # ElasticHosts
   ]
 end
 
 desc "Run all integration tests"
-Spec::Rake::SpecTask.new('integ') do |t|
-  t.libs.unshift "../boxgrinder-core/lib"
+RSpec::Core::RakeTask.new('integ') do |t|
   t.rcov = false
-  t.spec_files = FileList["integ/**/*-spec.rb"]
-  t.spec_opts = ['--colour', '--format', 'specdoc', '-b']
+  t.pattern = "integ/**/*-spec.rb"
+  t.rspec_opts = ['--colour', '--format', 'doc', '-b']
   t.verbose = true
 end
 
 desc "Run all tests"
-Spec::Rake::SpecTask.new('spec') do |t|
-  t.libs.unshift "../boxgrinder-core/lib"
+RSpec::Core::RakeTask.new('spec') do |t|
+  t.ruby_opts = "-I ../boxgrinder-core/lib"
   t.rcov = false
-  t.spec_files = FileList["spec/**/*-spec.rb"]
-  t.spec_opts = ['--colour', '--format', 'specdoc', '-b']
+  t.pattern = "spec/**/*-spec.rb"
+  t.rspec_opts = ['--colour', '--format', 'doc', '-b']
   t.verbose = true
 end
 
 desc "Run all tests and generate code coverage report"
-Spec::Rake::SpecTask.new('spec:coverage') do |t|
-  t.libs.unshift "../boxgrinder-core/lib"
-  t.spec_files = FileList["spec/**/*-spec.rb"]
-  t.spec_opts = ['--colour', '--format', 'html:pkg/rspec_report.html', '-b']
+RSpec::Core::RakeTask.new('spec:coverage') do |t|
+  t.ruby_opts = "-I ../boxgrinder-core/lib"
+  t.pattern = "spec/**/*-spec.rb"
+  t.rspec_opts = ['--colour', '--format', 'html', '--out', 'pkg/rspec_report.html', '-b']
   t.rcov = true
   t.rcov_opts = ['--exclude', 'spec,teamcity/*,/usr/lib/ruby/,.gem/ruby,/boxgrinder-core/,/gems/']
   t.verbose = true

data/boxgrinder-build.gemspec

@@ -2,17 +2,17 @@
 
 Gem::Specification.new do |s|
   s.name = %q{boxgrinder-build}
-  s.version = "0.9.3"
+  s.version = "0.9.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Marek Goldmann"]
-  s.date = %q{2011-06-28}
+  s.date = %q{2011-08-17}
   s.default_executable = %q{boxgrinder-build}
   s.description = %q{A tool for creating appliances from simple plain text files for various virtual environments.}
   s.email = %q{info@boxgrinder.org}
   s.executables = ["boxgrinder-build"]
-  s.extra_rdoc_files = ["CHANGELOG", "LICENSE", "README.md", "bin/boxgrinder-build", "lib/boxgrinder-build.rb", "lib/boxgrinder-build/appliance.rb", "lib/boxgrinder-build/helpers/augeas-helper.rb", "lib/boxgrinder-build/helpers/guestfs-helper.rb", "lib/boxgrinder-build/helpers/image-helper.rb", "lib/boxgrinder-build/helpers/linux-helper.rb", "lib/boxgrinder-build/helpers/package-helper.rb", "lib/boxgrinder-build/helpers/plugin-helper.rb", "lib/boxgrinder-build/helpers/qemu.wrapper", "lib/boxgrinder-build/managers/plugin-manager.rb", "lib/boxgrinder-build/plugins/base-plugin.rb", "lib/boxgrinder-build/plugins/delivery/ebs/ebs-plugin.rb", "lib/boxgrinder-build/plugins/delivery/elastichosts/elastichosts-plugin.rb", "lib/boxgrinder-build/plugins/delivery/local/local-plugin.rb", "lib/boxgrinder-build/plugins/delivery/s3/s3-plugin.rb", "lib/boxgrinder-build/plugins/delivery/s3/src/cert-ec2.pem", "lib/boxgrinder-build/plugins/delivery/sftp/sftp-plugin.rb", "lib/boxgrinder-build/plugins/delivery/usb/usb-plugin.rb", "lib/boxgrinder-build/plugins/os/centos/centos-plugin.rb", "lib/boxgrinder-build/plugins/os/fedora/fedora-plugin.rb", "lib/boxgrinder-build/plugins/os/rhel/rhel-plugin.rb", "lib/boxgrinder-build/plugins/os/rpm-based/kickstart.rb", "lib/boxgrinder-build/plugins/os/rpm-based/rpm-based-os-plugin.rb", "lib/boxgrinder-build/plugins/os/rpm-based/rpm-dependency-validator.rb", "lib/boxgrinder-build/plugins/os/rpm-based/src/appliance.ks.erb", "lib/boxgrinder-build/plugins/os/rpm-based/src/base.repo", "lib/boxgrinder-build/plugins/os/rpm-based/src/motd.init", "lib/boxgrinder-build/plugins/os/sl/sl-plugin.rb", "lib/boxgrinder-build/plugins/platform/ec2/ec2-plugin.rb", "lib/boxgrinder-build/plugins/platform/ec2/src/fstab_32bit", "lib/boxgrinder-build/plugins/platform/ec2/src/fstab_64bit", "lib/boxgrinder-build/plugins/platform/ec2/src/ifcfg-eth0", "lib/boxgrinder-build/plugins/platform/ec2/src/menu.lst", "lib/boxgrinder-build/plugins/platform/ec2/src/rc_local", "lib/boxgrinder-build/plugins/platform/virtualbox/virtualbox-plugin.rb", "lib/boxgrinder-build/plugins/platform/vmware/src/README-enterprise", "lib/boxgrinder-build/plugins/platform/vmware/src/README-personal", "lib/boxgrinder-build/plugins/platform/vmware/src/base.vmdk", "lib/boxgrinder-build/plugins/platform/vmware/src/base.vmx", "lib/boxgrinder-build/plugins/platform/vmware/vmware-plugin.rb"]
-  s.files = ["CHANGELOG", "LICENSE", "Manifest", "README.md", "Rakefile", "bin/boxgrinder-build", "boxgrinder-build.gemspec", "integ/appliances/_hardware_cpus.appl", "integ/appliances/_hardware_memory.appl", "integ/appliances/_hardware_partitions_home.appl", "integ/appliances/_hardware_partitions_root.appl", "integ/appliances/_os_password.appl", "integ/appliances/_packages_groups_base.appl", "integ/appliances/_packages_groups_core.appl", "integ/appliances/_packages_squid.appl", "integ/appliances/_packages_utils.appl", "integ/appliances/_repos_boxgrinder_permanent_noarch.appl", "integ/appliances/_repos_testlocal_ephemeral_noarch.appl", "integ/appliances/_test_base.appl", "integ/appliances/gnome-fedora.appl", "integ/appliances/jeos-centos.appl", "integ/appliances/jeos-fedora.appl", "integ/appliances/modular.appl", "integ/packages/ephemeral-repo-test-0.1-1.noarch.rpm", "integ/packages/local-repo-test.spec", "integ/spec/jeos-spec.rb", "integ/spec/modular-spec.rb", "lib/boxgrinder-build.rb", "lib/boxgrinder-build/appliance.rb", "lib/boxgrinder-build/helpers/augeas-helper.rb", "lib/boxgrinder-build/helpers/guestfs-helper.rb", "lib/boxgrinder-build/helpers/image-helper.rb", "lib/boxgrinder-build/helpers/linux-helper.rb", "lib/boxgrinder-build/helpers/package-helper.rb", "lib/boxgrinder-build/helpers/plugin-helper.rb", "lib/boxgrinder-build/helpers/qemu.wrapper", "lib/boxgrinder-build/managers/plugin-manager.rb", "lib/boxgrinder-build/plugins/base-plugin.rb", "lib/boxgrinder-build/plugins/delivery/ebs/ebs-plugin.rb", "lib/boxgrinder-build/plugins/delivery/elastichosts/elastichosts-plugin.rb", "lib/boxgrinder-build/plugins/delivery/local/local-plugin.rb", "lib/boxgrinder-build/plugins/delivery/s3/s3-plugin.rb", "lib/boxgrinder-build/plugins/delivery/s3/src/cert-ec2.pem", "lib/boxgrinder-build/plugins/delivery/sftp/sftp-plugin.rb", "lib/boxgrinder-build/plugins/delivery/usb/usb-plugin.rb", "lib/boxgrinder-build/plugins/os/centos/centos-plugin.rb", "lib/boxgrinder-build/plugins/os/fedora/fedora-plugin.rb", "lib/boxgrinder-build/plugins/os/rhel/rhel-plugin.rb", "lib/boxgrinder-build/plugins/os/rpm-based/kickstart.rb", "lib/boxgrinder-build/plugins/os/rpm-based/rpm-based-os-plugin.rb", "lib/boxgrinder-build/plugins/os/rpm-based/rpm-dependency-validator.rb", "lib/boxgrinder-build/plugins/os/rpm-based/src/appliance.ks.erb", "lib/boxgrinder-build/plugins/os/rpm-based/src/base.repo", "lib/boxgrinder-build/plugins/os/rpm-based/src/motd.init", "lib/boxgrinder-build/plugins/os/sl/sl-plugin.rb", "lib/boxgrinder-build/plugins/platform/ec2/ec2-plugin.rb", "lib/boxgrinder-build/plugins/platform/ec2/src/fstab_32bit", "lib/boxgrinder-build/plugins/platform/ec2/src/fstab_64bit", "lib/boxgrinder-build/plugins/platform/ec2/src/ifcfg-eth0", "lib/boxgrinder-build/plugins/platform/ec2/src/menu.lst", "lib/boxgrinder-build/plugins/platform/ec2/src/rc_local", "lib/boxgrinder-build/plugins/platform/virtualbox/virtualbox-plugin.rb", "lib/boxgrinder-build/plugins/platform/vmware/src/README-enterprise", "lib/boxgrinder-build/plugins/platform/vmware/src/README-personal", "lib/boxgrinder-build/plugins/platform/vmware/src/base.vmdk", "lib/boxgrinder-build/plugins/platform/vmware/src/base.vmx", "lib/boxgrinder-build/plugins/platform/vmware/vmware-plugin.rb", "rubygem-boxgrinder-build.spec", "spec/appliance-spec.rb", "spec/helpers/augeas-helper-spec.rb", "spec/helpers/guestfs-helper-spec.rb", "spec/helpers/image-helper-spec.rb", "spec/helpers/linux-helper-spec.rb", "spec/helpers/package-helper-spec.rb", "spec/helpers/plugin-helper-spec.rb", "spec/managers/plugin-manager-spec.rb", "spec/plugins/base-plugin-spec.rb", "spec/plugins/delivery/ebs/ebs-plugin-spec.rb", "spec/plugins/delivery/ebs/ebs.yaml", "spec/plugins/delivery/elastichosts/elastichosts-plugin-spec.rb", "spec/plugins/delivery/local/local-plugin-spec.rb", "spec/plugins/delivery/s3/s3-plugin-spec.rb", "spec/plugins/delivery/sftp/sftp-plugin-spec.rb", "spec/plugins/os/centos/centos-plugin-spec.rb", "spec/plugins/os/fedora/fedora-plugin-spec.rb", "spec/plugins/os/rhel/rhel-plugin-spec.rb", "spec/plugins/os/rpm-based/kickstart-spec.rb", "spec/plugins/os/rpm-based/rpm-based-os-plugin-spec.rb", "spec/plugins/os/rpm-based/rpm-dependency-validator-spec.rb", "spec/plugins/os/rpm-based/src/jeos-f13-plain.ks", "spec/plugins/os/rpm-based/src/jeos-f13-without-version.ks", "spec/plugins/os/rpm-based/src/jeos-f13.ks", "spec/plugins/os/sl/sl-plugin-spec.rb", "spec/plugins/platform/ec2/ec2-plugin-spec.rb", "spec/plugins/platform/virtualbox/virtualbox-plugin-spec.rb", "spec/plugins/platform/vmware/vmware-plugin-spec.rb"]
+  s.extra_rdoc_files = ["CHANGELOG", "LICENSE", "README.md", "bin/boxgrinder-build", "lib/boxgrinder-build.rb", "lib/boxgrinder-build/appliance.rb", "lib/boxgrinder-build/helpers/augeas-helper.rb", "lib/boxgrinder-build/helpers/aws-helper.rb", "lib/boxgrinder-build/helpers/ec2-helper.rb", "lib/boxgrinder-build/helpers/guestfs-helper.rb", "lib/boxgrinder-build/helpers/image-helper.rb", "lib/boxgrinder-build/helpers/linux-helper.rb", "lib/boxgrinder-build/helpers/package-helper.rb", "lib/boxgrinder-build/helpers/plugin-helper.rb", "lib/boxgrinder-build/helpers/qemu.wrapper", "lib/boxgrinder-build/helpers/s3-helper.rb", "lib/boxgrinder-build/managers/plugin-manager.rb", "lib/boxgrinder-build/plugins/base-plugin.rb", "lib/boxgrinder-build/plugins/delivery/ebs/ebs-plugin.rb", "lib/boxgrinder-build/plugins/delivery/elastichosts/elastichosts-plugin.rb", "lib/boxgrinder-build/plugins/delivery/local/local-plugin.rb", "lib/boxgrinder-build/plugins/delivery/s3/s3-plugin.rb", "lib/boxgrinder-build/plugins/delivery/s3/src/cert-ec2.pem", "lib/boxgrinder-build/plugins/delivery/sftp/sftp-plugin.rb", "lib/boxgrinder-build/plugins/delivery/usb/usb-plugin.rb", "lib/boxgrinder-build/plugins/os/centos/centos-plugin.rb", "lib/boxgrinder-build/plugins/os/fedora/fedora-plugin.rb", "lib/boxgrinder-build/plugins/os/rhel/rhel-plugin.rb", "lib/boxgrinder-build/plugins/os/rpm-based/kickstart.rb", "lib/boxgrinder-build/plugins/os/rpm-based/rpm-based-os-plugin.rb", "lib/boxgrinder-build/plugins/os/rpm-based/rpm-dependency-validator.rb", "lib/boxgrinder-build/plugins/os/rpm-based/src/appliance.ks.erb", "lib/boxgrinder-build/plugins/os/rpm-based/src/base.repo", "lib/boxgrinder-build/plugins/os/rpm-based/src/motd.init", "lib/boxgrinder-build/plugins/os/sl/sl-plugin.rb", "lib/boxgrinder-build/plugins/platform/ec2/ec2-plugin.rb", "lib/boxgrinder-build/plugins/platform/ec2/src/fstab_32bit", "lib/boxgrinder-build/plugins/platform/ec2/src/fstab_64bit", "lib/boxgrinder-build/plugins/platform/ec2/src/ifcfg-eth0", "lib/boxgrinder-build/plugins/platform/ec2/src/menu.lst", "lib/boxgrinder-build/plugins/platform/ec2/src/rc_local", "lib/boxgrinder-build/plugins/platform/virtualbox/virtualbox-plugin.rb", "lib/boxgrinder-build/plugins/platform/vmware/src/README-enterprise", "lib/boxgrinder-build/plugins/platform/vmware/src/README-personal", "lib/boxgrinder-build/plugins/platform/vmware/src/base.vmdk", "lib/boxgrinder-build/plugins/platform/vmware/src/base.vmx", "lib/boxgrinder-build/plugins/platform/vmware/vmware-plugin.rb"]
+  s.files = ["CHANGELOG", "LICENSE", "Manifest", "README.md", "Rakefile", "bin/boxgrinder-build", "boxgrinder-build.gemspec", "integ/appliances/_hardware_cpus.appl", "integ/appliances/_hardware_memory.appl", "integ/appliances/_hardware_partitions_home.appl", "integ/appliances/_hardware_partitions_root.appl", "integ/appliances/_os_password.appl", "integ/appliances/_packages_groups_base.appl", "integ/appliances/_packages_groups_core.appl", "integ/appliances/_packages_squid.appl", "integ/appliances/_packages_utils.appl", "integ/appliances/_repos_boxgrinder_permanent_noarch.appl", "integ/appliances/_repos_testlocal_ephemeral_noarch.appl", "integ/appliances/_test_base.appl", "integ/appliances/gnome-fedora.appl", "integ/appliances/jeos-centos.appl", "integ/appliances/jeos-fedora.appl", "integ/appliances/modular.appl", "integ/packages/ephemeral-repo-test-0.1-1.noarch.rpm", "integ/packages/local-repo-test.spec", "integ/spec/jeos-spec.rb", "integ/spec/modular-spec.rb", "lib/boxgrinder-build.rb", "lib/boxgrinder-build/appliance.rb", "lib/boxgrinder-build/helpers/augeas-helper.rb", "lib/boxgrinder-build/helpers/aws-helper.rb", "lib/boxgrinder-build/helpers/ec2-helper.rb", "lib/boxgrinder-build/helpers/guestfs-helper.rb", "lib/boxgrinder-build/helpers/image-helper.rb", "lib/boxgrinder-build/helpers/linux-helper.rb", "lib/boxgrinder-build/helpers/package-helper.rb", "lib/boxgrinder-build/helpers/plugin-helper.rb", "lib/boxgrinder-build/helpers/qemu.wrapper", "lib/boxgrinder-build/helpers/s3-helper.rb", "lib/boxgrinder-build/managers/plugin-manager.rb", "lib/boxgrinder-build/plugins/base-plugin.rb", "lib/boxgrinder-build/plugins/delivery/ebs/ebs-plugin.rb", "lib/boxgrinder-build/plugins/delivery/elastichosts/elastichosts-plugin.rb", "lib/boxgrinder-build/plugins/delivery/local/local-plugin.rb", "lib/boxgrinder-build/plugins/delivery/s3/s3-plugin.rb", "lib/boxgrinder-build/plugins/delivery/s3/src/cert-ec2.pem", "lib/boxgrinder-build/plugins/delivery/sftp/sftp-plugin.rb", "lib/boxgrinder-build/plugins/delivery/usb/usb-plugin.rb", "lib/boxgrinder-build/plugins/os/centos/centos-plugin.rb", "lib/boxgrinder-build/plugins/os/fedora/fedora-plugin.rb", "lib/boxgrinder-build/plugins/os/rhel/rhel-plugin.rb", "lib/boxgrinder-build/plugins/os/rpm-based/kickstart.rb", "lib/boxgrinder-build/plugins/os/rpm-based/rpm-based-os-plugin.rb", "lib/boxgrinder-build/plugins/os/rpm-based/rpm-dependency-validator.rb", "lib/boxgrinder-build/plugins/os/rpm-based/src/appliance.ks.erb", "lib/boxgrinder-build/plugins/os/rpm-based/src/base.repo", "lib/boxgrinder-build/plugins/os/rpm-based/src/motd.init", "lib/boxgrinder-build/plugins/os/sl/sl-plugin.rb", "lib/boxgrinder-build/plugins/platform/ec2/ec2-plugin.rb", "lib/boxgrinder-build/plugins/platform/ec2/src/fstab_32bit", "lib/boxgrinder-build/plugins/platform/ec2/src/fstab_64bit", "lib/boxgrinder-build/plugins/platform/ec2/src/ifcfg-eth0", "lib/boxgrinder-build/plugins/platform/ec2/src/menu.lst", "lib/boxgrinder-build/plugins/platform/ec2/src/rc_local", "lib/boxgrinder-build/plugins/platform/virtualbox/virtualbox-plugin.rb", "lib/boxgrinder-build/plugins/platform/vmware/src/README-enterprise", "lib/boxgrinder-build/plugins/platform/vmware/src/README-personal", "lib/boxgrinder-build/plugins/platform/vmware/src/base.vmdk", "lib/boxgrinder-build/plugins/platform/vmware/src/base.vmx", "lib/boxgrinder-build/plugins/platform/vmware/vmware-plugin.rb", "rubygem-boxgrinder-build.spec", "spec/appliance-spec.rb", "spec/helpers/augeas-helper-spec.rb", "spec/helpers/ec2-helper-spec.rb", "spec/helpers/guestfs-helper-spec.rb", "spec/helpers/image-helper-spec.rb", "spec/helpers/linux-helper-spec.rb", "spec/helpers/package-helper-spec.rb", "spec/helpers/plugin-helper-spec.rb", "spec/helpers/s3-helper-spec.rb", "spec/managers/plugin-manager-spec.rb", "spec/plugins/base-plugin-spec.rb", "spec/plugins/delivery/ebs/ebs-plugin-spec.rb", "spec/plugins/delivery/ebs/ebs.yaml", "spec/plugins/delivery/elastichosts/elastichosts-plugin-spec.rb", "spec/plugins/delivery/local/local-plugin-spec.rb", "spec/plugins/delivery/s3/s3-plugin-spec.rb", "spec/plugins/delivery/sftp/sftp-plugin-spec.rb", "spec/plugins/os/centos/centos-plugin-spec.rb", "spec/plugins/os/fedora/fedora-plugin-spec.rb", "spec/plugins/os/rhel/rhel-plugin-spec.rb", "spec/plugins/os/rpm-based/kickstart-spec.rb", "spec/plugins/os/rpm-based/rpm-based-os-plugin-spec.rb", "spec/plugins/os/rpm-based/rpm-dependency-validator-spec.rb", "spec/plugins/os/rpm-based/src/jeos-f13-plain.ks", "spec/plugins/os/rpm-based/src/jeos-f13-without-version.ks", "spec/plugins/os/rpm-based/src/jeos-f13.ks", "spec/plugins/os/sl/sl-plugin-spec.rb", "spec/plugins/platform/ec2/ec2-plugin-spec.rb", "spec/plugins/platform/virtualbox/virtualbox-plugin-spec.rb", "spec/plugins/platform/vmware/vmware-plugin-spec.rb"]
   s.homepage = %q{http://boxgrinder.org/}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Boxgrinder-build", "--main", "README.md"]
   s.require_paths = ["lib"]
@@ -26,16 +26,14 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<boxgrinder-core>, ["~> 0.3.0"])
-      s.add_runtime_dependency(%q<aws>, [">= 0"])
-      s.add_runtime_dependency(%q<amazon-ec2>, [">= 0"])
+      s.add_runtime_dependency(%q<aws-sdk>, [">= 0"])
       s.add_runtime_dependency(%q<net-sftp>, [">= 0"])
       s.add_runtime_dependency(%q<net-ssh>, [">= 0"])
       s.add_runtime_dependency(%q<progressbar>, [">= 0"])
       s.add_runtime_dependency(%q<rest-client>, [">= 0"])
     else
       s.add_dependency(%q<boxgrinder-core>, ["~> 0.3.0"])
-      s.add_dependency(%q<aws>, [">= 0"])
-      s.add_dependency(%q<amazon-ec2>, [">= 0"])
+      s.add_dependency(%q<aws-sdk>, [">= 0"])
       s.add_dependency(%q<net-sftp>, [">= 0"])
       s.add_dependency(%q<net-ssh>, [">= 0"])
       s.add_dependency(%q<progressbar>, [">= 0"])
@@ -43,8 +41,7 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<boxgrinder-core>, ["~> 0.3.0"])
-    s.add_dependency(%q<aws>, [">= 0"])
-    s.add_dependency(%q<amazon-ec2>, [">= 0"])
+    s.add_dependency(%q<aws-sdk>, [">= 0"])
     s.add_dependency(%q<net-sftp>, [">= 0"])
     s.add_dependency(%q<net-ssh>, [">= 0"])
     s.add_dependency(%q<progressbar>, [">= 0"])

data/lib/boxgrinder-build/helpers/aws-helper.rb

@@ -0,0 +1,81 @@
+#
+# Copyright 2010 Red Hat, Inc.
+#
+# This is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation; either version 3 of
+# the License, or (at your option) any later version.
+#
+# This software is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this software; if not, write to the Free
+# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+
+require 'aws-sdk'
+
+module BoxGrinder
+  class AWSHelper
+    #Setting value of a key to nil in opts_defaults forces non-nil value of key in opts_in
+    def parse_opts(opts_in, opts_defaults)
+      diff_id = opts_in.keys - opts_defaults.keys
+      raise ArgumentError, "Unrecognised argument(s): #{diff_id.join(", ")}" if diff_id.any?
+
+      (opts_in.keys & opts_defaults.keys).each do |k|
+        raise ArgumentError, "Argument #{k.to_s} must not be nil" if opts_defaults[k] == nil and opts_in[k] == nil
+      end
+
+      (opts_defaults.keys - opts_in.keys).each do |k|
+        raise ArgumentError, "Argument #{k.to_s} must not be nil" if opts_defaults[k] == nil
+        opts_in.merge!(k => opts_defaults[k])
+      end
+      opts_in
+    end
+
+    def wait_with_timeout(cycle_seconds, timeout_seconds)
+      Timeout::timeout(timeout_seconds) do
+        while not yield
+          sleep cycle_seconds
+        end
+      end
+    end
+
+    def select_aki(region, pattern)
+      candidates = region.images.with_owner('amazon').
+          filter('manifest-location','*pv-grub*').
+          sort().
+          reverse
+
+      candidates.each do |image|
+        return image.id if image.location =~ pattern
+      end
+    end
+
+    #Currently there is no API call for discovering S3 endpoint addresses
+    #but the base is presently the same as the EC2 endpoints, so this somewhat better
+    #than manually maintaining the data.
+    #S3 = /hd0-.*i386/, EBS = /hd00-.*i386/
+    def endpoints(service_name, aki_pattern)
+      endpoints = {}
+      AWS.memoize do
+        @ec2.regions.each do |region|
+          endpoints.merge!({
+              region.name => {
+                :endpoint => "#{service_name}.#{region.name}.amazonaws.com",
+                :location => region.name, #or alias?
+                :kernel => {
+                  :i386 => select_aki(region, aki_pattern),
+                  :x86_64 => select_aki(region, aki_pattern)
+                }
+              }
+          })
+        end
+      end
+    end
+
+  end
+end

data/lib/boxgrinder-build/helpers/ec2-helper.rb

@@ -0,0 +1,182 @@
+#
+# Copyright 2010 Red Hat, Inc.
+#
+# This is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation; either version 3 of
+# the License, or (at your option) any later version.
+#
+# This software is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this software; if not, write to the Free
+# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+
+require 'boxgrinder-build/helpers/aws-helper'
+require 'aws-sdk'
+require 'timeout'
+
+module BoxGrinder
+  class EC2Helper < AWSHelper
+    
+    DEF_POLL_FREQ = 1
+    DEF_TIMEOUT = 1000
+    HTTP_TIMEOUT = 10
+
+    def initialize(ec2, opts={})
+      raise ArgumentError, "ec2 argument must not be nil" if ec2.nil?
+      @ec2 = ec2
+      @log = opts[:log] || LogHelper.new
+    end
+
+    # Wait cycles
+
+    def wait_for_image_state(state, ami, opts={})
+      #First wait for the AMI to be confirmed to exist (after creating, an immediate query can cause an error)
+      opts = parse_opts(opts, {:frequency => DEF_POLL_FREQ, :timeout => DEF_TIMEOUT})
+      wait_with_timeout(opts[:frequency], opts[:timeout]){ ami.exists? }
+      wait_with_timeout(opts[:frequency], opts[:timeout]){ ami.state == state }
+    end
+
+    def wait_for_image_death(ami, opts={})
+      opts = parse_opts(opts, {:frequency => DEF_POLL_FREQ, :timeout => DEF_TIMEOUT})
+      wait_with_timeout(opts[:frequency], opts[:timeout]){ !ami.exists? }
+    rescue AWS::EC2::Errors::InvalidImageID::NotFound
+    end
+
+    def wait_for_instance_status(status, instance, opts={})
+      opts = parse_opts(opts, {:frequency => DEF_POLL_FREQ, :timeout => DEF_TIMEOUT})
+      wait_with_timeout(opts[:frequency], opts[:timeout]){ instance.status == status }
+    end
+
+    #Being serial shouldn't be much slower as we are blocked by the slowest stopper anyway
+    def wait_for_instance_death(instance, opts={})
+      wait_for_instance_status(:terminated, instance, opts) if instance.exists?
+    rescue AWS::EC2::Errors::InvalidInstanceID::NotFound
+    end
+
+    def wait_for_snapshot_status(status, snapshot, opts={})
+      opts = parse_opts(opts, {:frequency => DEF_POLL_FREQ, :timeout => DEF_TIMEOUT})
+      progress = -1
+      wait_with_timeout(opts[:frequency], opts[:timeout]) do
+        current_progress = snapshot.progress || 0
+          unless progress == current_progress
+            @log.info "Progress: #{current_progress}%"
+            progress = current_progress
+          end
+        snapshot.status == status
+      end
+    rescue Exception
+      @log.debug "Polling of snapshot #{snapshot.id} for status '#{status}' failed" unless snapshot.nil?
+      raise
+    end
+
+    def wait_for_volume_status(status, volume, opts={})
+      opts = parse_opts(opts, {:frequency => DEF_POLL_FREQ, :timeout => DEF_TIMEOUT})
+      wait_with_timeout(opts[:frequency], opts[:timeout]) do
+        volume.status == status
+      end
+    end
+
+    # EC2 meta-data queries
+
+    def self.get_meta_data(path)
+      timeout(HTTP_TIMEOUT) do
+        req = Net::HTTP::Get.new(path)
+        res = Net::HTTP.start('169.254.169.254', 80) {|http| http.request(req)}
+        return res.body if  Net::HTTPSuccess
+        res.error!
+      end
+    end
+
+    def self.current_availability_zone
+      get_meta_data('/latest/meta-data/placement/availability-zone/')
+    end
+
+    def self.current_instance_id
+      get_meta_data('/latest/meta-data/instance-id')
+    end
+
+    def self.availability_zone_to_region(availability_zone)
+      availability_zone.scan(/((\w+)-(\w+)-(\d+))/).flatten.first
+    end
+
+    # EC2 queries
+
+    def ami_by_name(name, account_number)
+      q = @ec2.images.with_owner(account_number).
+          filter("name", name)
+      return nil unless q.any?
+      q.first
+    end
+
+    def snapshot_by_id(snapshot_id)
+     q = @ec2.snapshots.filter('snapshot-id', snapshot_id)
+     return nil unless q.any?
+     q.first
+    end
+
+    def live_instances(ami)
+      q = @ec2.instances.filter('image-id', ami.id)
+      return q.select{|a| a.status != :terminated} if q.any?
+      nil
+    end
+
+    # EC2 Endpoints
+
+    def self.endpoints
+      SERVICES
+    end
+
+    SERVICES = {
+          'eu-west-1' => {
+            :endpoint => 'ec2.eu-west-1.amazonaws.com',
+            :location => 'EU',
+            :kernel => {
+              :i386 => {:aki => 'aki-4deec439'},
+              :x86_64 => {:aki => 'aki-4feec43b'}
+            }
+          },
+
+          'ap-southeast-1' => {
+            :endpoint => 'ec2.ap-southeast-1.amazonaws.com',
+            :location => 'ap-southeast-1',
+            :kernel => {
+              :i386 => {:aki => 'aki-13d5aa41'},
+              :x86_64 => {:aki => 'aki-11d5aa43'}
+            }
+          },
+
+          'ap-northeast-1' => {
+            :endpoint => 'ec2.ap-northeast-1.amazonaws.com',
+            :location => 'ap-northeast-1',
+            :kernel => {
+              :i386 => {:aki => 'aki-d209a2d3'},
+              :x86_64 => {:aki => 'aki-d409a2d5'}
+            }
+          },
+
+          'us-west-1' => {
+            :endpoint => 'ec2.us-west-1.amazonaws.com',
+            :location => 'us-west-1',
+            :kernel => {
+              :i386 => {:aki => 'aki-99a0f1dc'},
+              :x86_64 => {:aki => 'aki-9ba0f1de'}
+            }
+          },
+
+          'us-east-1' => {
+            :endpoint => 'ec2.amazonaws.com',
+            :location => '',
+            :kernel => {
+              :i386 => {:aki => 'aki-407d9529'},
+              :x86_64 => {:aki => 'aki-427d952b'}
+            }
+          }
+        }
+  end
+end

data/lib/boxgrinder-build/helpers/guestfs-helper.rb

@@ -132,6 +132,10 @@ module BoxGrinder
       @guestfs.set_verbose(1)
       @guestfs.set_trace(1)
 
+      # https://issues.jboss.org/browse/BGBUILD-246
+      memsize = ENV['LIBGUESTFS_MEMSIZE'].nil? ? 300 : ENV['LIBGUESTFS_MEMSIZE'].to_i
+      @guestfs.set_memsize(memsize)
+
       # https://bugzilla.redhat.com/show_bug.cgi?id=502058
       @guestfs.set_append("noapic")
 
@@ -291,4 +295,4 @@ module BoxGrinder
       AugeasHelper.new(@guestfs, self, :log => @log).edit(&block)
     end
   end
-end
+end