boxgrinder-build 0.10.0 → 0.10.1

data/CHANGELOG

@@ -1,3 +1,14 @@
+v0.10.1
+
+* [BGBUILD-332] Add support for bash completion
+* [BGBUILD-338] Weed out non-deterministic tests
+* [BGBUILD-337] In SL if default repos are disabled, /etc/yum.repos.d folder is not created
+* [BGBUILD-344] New filesystem monitoring improvements (Fixes: Shifting failed. Permission denied issues)
+* [BGBUILD-345] Change sudo/chown magic so it only occurs when running without explicit sudo/su (or --change-to-user)
+* [BGBUILD-346] Confirm Ruby 1.9.3 support
+* [BGBUILD-348] Simplecov coverage testing for Ruby >=1.9
+* [BGBUILD-349] Use RbConfig instead of obsolete and deprecated Config deprecation warning with Ruby 1.9.3
+
 v0.10.0
 
 * [BGBUILD-313] boxgrinder build fails to build ec2 image if ec2-user already exists

data/Manifest

@@ -3,6 +3,7 @@ LICENSE
 Manifest
 README.md
 Rakefile
+bash_completion
 bin/boxgrinder-build
 boxgrinder-build.gemspec
 integ/appliances/gnome-fedora.appl
@@ -78,13 +79,11 @@ 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
+lib/boxgrinder-build/util/concurrent/get_set.rb
+lib/boxgrinder-build/util/permissions/fs-monitor.rb
+lib/boxgrinder-build/util/permissions/fs-observer.rb
+lib/boxgrinder-build/util/permissions/user-switcher.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-spe
+spec/help

data/Rakefile

@@ -40,7 +40,7 @@ desc "Run all integration tests"
 RSpec::Core::RakeTask.new('integ') do |t|
   t.rcov = false
   t.pattern = "integ/**/*-spec.rb"
-  t.rspec_opts = ['--colour', '--format', 'doc', '-b']
+  t.rspec_opts = ['-r boxgrinder-core', '-r rubygems', '--colour', '--format', 'doc', '-b']
   t.verbose = true
 end
 
@@ -49,16 +49,21 @@ RSpec::Core::RakeTask.new('spec') do |t|
   t.ruby_opts = "-I ../boxgrinder-core/lib"
   t.rcov = false
   t.pattern = "spec/**/*-spec.rb"
-  t.rspec_opts = ['--colour', '--format', 'doc', '-b']
+  t.rspec_opts = ['-r boxgrinder-core', '-r rubygems', '--colour', '--format', 'doc', '-b']
   t.verbose = true
 end
 
-desc "Run all tests and generate code coverage report"
 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.rspec_opts = ['-r spec_helper', '-r boxgrinder-core', '-r rubygems', '--colour', 
+    '--format', 'html', '--out', 'pkg/rspec_report.html', '-b']
   t.verbose = true
+
+  if RUBY_VERSION =~ /^1.8/
+    t.rcov = true
+    t.rcov_opts = ["-Ispec:lib spec/rcov_helper.rb", '--exclude', 'spec,teamcity/*,/usr/lib/ruby/,.gem/ruby,/boxgrinder-build/,/gems/']
+  else
+    ENV['COVERAGE'] = 'true'
+  end
 end

data/bash_completion

@@ -0,0 +1,37 @@
+_boxgrinder-build()
+{
+    local cur prev opts
+    COMPREPLY=()
+    cur="${COMP_WORDS[COMP_CWORD]}"
+    prev="${COMP_WORDS[COMP_CWORD-1]}"
+    opts="--help --version --platform --delivery --force --os-config --platform-config --delivery-config --plugins --debug --trace --backtrace"
+
+    if [[ ${cur} == -* ]] ; then
+        COMPREPLY=($(compgen -W "${opts}" -- ${cur}))
+        return 0
+    fi
+
+    case "${prev}" in
+        --os-config|--platform-config|--delivery-config|-l|--plugins)
+            return 0
+            ;;
+        -p|--platform)
+            local platform="ec2 virtualbox virtualpc vmware"
+            COMPREPLY=($(compgen -W "${platform}" -- ${cur}))
+            ;;
+        -d|--delivery)
+            local delivery="ami cloudfront ebs elastichosts libvirt local openstack s3 sftp"
+            COMPREPLY=($(compgen -W "${delivery}" -- ${cur}))
+            ;;
+        *)
+            if [[ ${COMP_CWORD} -eq 1 ]]; then
+                _filedir appl
+            else
+                COMPREPLY=($(compgen -W "${opts}" -- ${cur}))
+            fi
+            ;;
+    esac
+}
+
+complete -F _boxgrinder-build boxgrinder-build
+

data/bin/boxgrinder-build

@@ -26,13 +26,17 @@ require 'boxgrinder-core/models/config'
 require 'boxgrinder-core/helpers/log-helper'
 require 'boxgrinder-build/appliance'
 
+require 'boxgrinder-build/util/permissions/fs-observer'
+require 'boxgrinder-build/util/permissions/fs-monitor'
+
 options = OpenCascade.new(
     :platform => :none,
     :delivery => :none,
     :os_config => {},
     :platform_config => {},
     :delivery_config => {},
-    :additional_plugins => []
+    :additional_plugins => [],
+    :change_to_user => false
 )
 
 ARGV_DUP = ARGV.clone
@@ -135,6 +139,7 @@ EOB
       puts opts
       exit
     end
+
     opts.on_tail('--version', 'Print the version.') do
       puts "BoxGrinder Build #{File.read("#{File.dirname(__FILE__)}/../CHANGELOG").match(/^v(.*)/)[1]}"
 
@@ -148,16 +153,20 @@ EOB
 
       exit
     end
+
+    opts.on('--change-to-user', 'Change from root to local user after the OS plugin completes.') do
+      options[:change_to_user] = true
+    end
   end
 end
 
 def ensure_root
   unless Process.uid == 0
-    puts("Currently running as non-root user, BoxGrinder will attempt to re-launch under 'sudo -E'")
+    puts("Currently running as non-root user, BoxGrinder will re-launch under `sudo -E` and change to your local user after the OS plugin.")
     # http://blade.nagaokaut.ac.jp/cgi-bin/scat.rb/ruby/ruby-talk/151376
-    ruby = File.join(Config::CONFIG["bindir"],
-                     Config::CONFIG["RUBY_INSTALL_NAME"] + Config::CONFIG["EXEEXT"])
-    exec("sudo -E #{ruby} -I#{$:.join(':')} #{Pathname.new(__FILE__).realpath} #{ARGV_DUP.join(" ")}")
+    ruby = File.join(RbConfig::CONFIG["bindir"],
+                     RbConfig::CONFIG["RUBY_INSTALL_NAME"] + RbConfig::CONFIG["EXEEXT"])
+    exec("sudo -E #{ruby} -I#{$:.join(':')} #{Pathname.new(__FILE__).realpath} #{ARGV_DUP.join(" ")} --change-to-user")
   end
 end
 
@@ -183,6 +192,10 @@ begin
   end
 
   config = BoxGrinder::Config.new(options)
+  # Begin monitoring.
+  observer = config.change_to_user ? BoxGrinder::FSObserver.new(config.uid, config.gid) : nil
+  BoxGrinder::FSMonitor.instance.capture(observer)
+
   log = BoxGrinder::LogHelper.new(:level => config.log_level)
 
   begin
@@ -201,4 +214,6 @@ rescue => e
   puts
   puts e.message
   abort
+ensure
+  BoxGrinder::FSMonitor.instance.stop
 end

data/boxgrinder-build.gemspec

@@ -2,16 +2,16 @@
 
 Gem::Specification.new do |s|
   s.name = "boxgrinder-build"
-  s.version = "0.10.0"
+  s.version = "0.10.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Marek Goldmann"]
-  s.date = "2011-12-19"
+  s.date = "2012-03-19"
   s.description = "A tool for creating appliances from simple plain text files for various virtual environments."
   s.email = "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/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/helpers/sftp-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/libvirt/libvirt-capabilities.rb", "lib/boxgrinder-build/plugins/delivery/libvirt/libvirt-plugin.rb", "lib/boxgrinder-build/plugins/delivery/local/local-plugin.rb", "lib/boxgrinder-build/plugins/delivery/openstack/openstack-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/virtualpc/virtualpc-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", "integ/appliances/gnome-fedora.appl", "integ/appliances/jeos-centos5-files.appl", "integ/appliances/jeos-centos5.appl", "integ/appliances/jeos-centos6.appl", "integ/appliances/jeos-f15.appl", "integ/appliances/jeos-f16-files.appl", "integ/appliances/jeos-f16.appl", "integ/appliances/modular/_hardware_cpus.appl", "integ/appliances/modular/_hardware_memory.appl", "integ/appliances/modular/_hardware_partitions_home.appl", "integ/appliances/modular/_hardware_partitions_root.appl", "integ/appliances/modular/_os_password.appl", "integ/appliances/modular/_packages_groups_base.appl", "integ/appliances/modular/_packages_groups_core.appl", "integ/appliances/modular/_packages_squid.appl", "integ/appliances/modular/_packages_utils.appl", "integ/appliances/modular/_repos_boxgrinder_permanent_noarch.appl", "integ/appliances/modular/_repos_testlocal_ephemeral_noarch.appl", "integ/appliances/modular/_test_base.appl", "integ/appliances/modular/modular.appl", "integ/packages/ephemeral-repo-test-0.1-1.noarch.rpm", "integ/packages/local-repo-test.spec", "integ/spec/files-spec.rb", "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/helpers/sftp-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/libvirt/libvirt-capabilities.rb", "lib/boxgrinder-build/plugins/delivery/libvirt/libvirt-plugin.rb", "lib/boxgrinder-build/plugins/delivery/local/local-plugin.rb", "lib/boxgrinder-build/plugins/delivery/openstack/openstack-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/virtualpc/virtualpc-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/libvirt/libvirt-plugin-spec.rb", "spec/plugins/delivery/libvirt/libvirt_modified.xml", "spec/plugins/delivery/libvirt/libvirt_modify.sh", "spec/plugins/delivery/libvirt/libvirt_test.xml", "spec/plugins/delivery/local/local-plugin-spec.rb", "spec/plugins/delivery/openstack/openstack-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/virtualpc/virtualpc-plugin-spec.rb", "spec/plugins/platform/vmware/vmware-plugin-spec.rb", "spec/rspec-plugin-helper.rb", "boxgrinder-build.gemspec"]
+  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/helpers/sftp-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/libvirt/libvirt-capabilities.rb", "lib/boxgrinder-build/plugins/delivery/libvirt/libvirt-plugin.rb", "lib/boxgrinder-build/plugins/delivery/local/local-plugin.rb", "lib/boxgrinder-build/plugins/delivery/openstack/openstack-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/virtualpc/virtualpc-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", "lib/boxgrinder-build/util/concurrent/get_set.rb", "lib/boxgrinder-build/util/permissions/fs-monitor.rb", "lib/boxgrinder-build/util/permissions/fs-observer.rb", "lib/boxgrinder-build/util/permissions/user-switcher.rb"]
+  s.files = ["CHANGELOG", "LICENSE", "Manifest", "README.md", "Rakefile", "bash_completion", "bin/boxgrinder-build", "boxgrinder-build.gemspec", "integ/appliances/gnome-fedora.appl", "integ/appliances/jeos-centos5-files.appl", "integ/appliances/jeos-centos5.appl", "integ/appliances/jeos-centos6.appl", "integ/appliances/jeos-f15.appl", "integ/appliances/jeos-f16-files.appl", "integ/appliances/jeos-f16.appl", "integ/appliances/modular/_hardware_cpus.appl", "integ/appliances/modular/_hardware_memory.appl", "integ/appliances/modular/_hardware_partitions_home.appl", "integ/appliances/modular/_hardware_partitions_root.appl", "integ/appliances/modular/_os_password.appl", "integ/appliances/modular/_packages_groups_base.appl", "integ/appliances/modular/_packages_groups_core.appl", "integ/appliances/modular/_packages_squid.appl", "integ/appliances/modular/_packages_utils.appl", "integ/appliances/modular/_repos_boxgrinder_permanent_noarch.appl", "integ/appliances/modular/_repos_testlocal_ephemeral_noarch.appl", "integ/appliances/modular/_test_base.appl", "integ/appliances/modular/modular.appl", "integ/packages/ephemeral-repo-test-0.1-1.noarch.rpm", "integ/packages/local-repo-test.spec", "integ/spec/files-spec.rb", "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/helpers/sftp-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/libvirt/libvirt-capabilities.rb", "lib/boxgrinder-build/plugins/delivery/libvirt/libvirt-plugin.rb", "lib/boxgrinder-build/plugins/delivery/local/local-plugin.rb", "lib/boxgrinder-build/plugins/delivery/openstack/openstack-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/virtualpc/virtualpc-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", "lib/boxgrinder-build/util/concurrent/get_set.rb", "lib/boxgrinder-build/util/permissions/fs-monitor.rb", "lib/boxgrinder-build/util/permissions/fs-observer.rb", "lib/boxgrinder-build/util/permissions/user-switcher.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/libvirt/libvirt-plugin-spec.rb", "spec/plugins/delivery/libvirt/libvirt_modified.xml", "spec/plugins/delivery/libvirt/libvirt_modify.sh", "spec/plugins/delivery/libvirt/libvirt_test.xml", "spec/plugins/delivery/local/local-plugin-spec.rb", "spec/plugins/delivery/openstack/openstack-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/virtualpc/virtualpc-plugin-spec.rb", "spec/plugins/platform/vmware/vmware-plugin-spec.rb", "spec/rcov_helper.rb", "spec/rspec-plugin-helper.rb", "spec/spec_helper.rb", "spec/util/concurrent/get-set-spec.rb", "spec/util/permissions/fs-monitor-spec.rb", "spec/util/permissions/fs-observer-spec.rb", "spec/util/permissions/user-switcher-spec.rb"]
   s.homepage = "http://boxgrinder.org/"
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Boxgrinder-build", "--main", "README.md"]
   s.require_paths = ["lib"]

data/lib/boxgrinder-build.rb

@@ -16,4 +16,5 @@
 # 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/appliance'
+require 'boxgrinder-core'
+require 'boxgrinder-build/appliance'

data/lib/boxgrinder-build/appliance.rb

@@ -25,6 +25,9 @@ require 'boxgrinder-core/helpers/appliance-definition-helper'
 require 'boxgrinder-core/helpers/appliance-config-helper'
 require 'boxgrinder-build/helpers/plugin-helper'
 require 'boxgrinder-build/managers/plugin-manager'
+require 'boxgrinder-build/util/permissions/fs-monitor'
+require 'boxgrinder-build/util/permissions/fs-observer'
+require 'boxgrinder-build/util/permissions/user-switcher'
 
 module BoxGrinder
   class Appliance
@@ -72,7 +75,7 @@ module BoxGrinder
 
       if delivery_selected?
         delivery_plugin, delivery_plugin_info = PluginManager.instance.initialize_plugin(:delivery, @config.delivery)
-        # Here we need to specify additionaly the type of the plugin, as some delivery plugins
+        # Here we need to specify additionally the type of the plugin, as some delivery plugins
         # can have multiple types of delivery implemented. See s3-plugin.rb for example.
         initialize_plugin(delivery_plugin, delivery_plugin_info, :type => @config.delivery)
       end
@@ -118,7 +121,14 @@ module BoxGrinder
 
     def execute_plugin_chain
       @log.info "Building '#{@appliance_config.name}' appliance for #{@appliance_config.hardware.arch} architecture."
-      @plugin_chain.each { |p| execute_plugin(p[:plugin], p[:param]) }
+
+      @plugin_chain.each do |p|
+        if @config.change_to_user
+          execute_with_userchange(p)
+        else
+          execute_without_userchange(p)
+        end
+      end
     end
 
     # This creates the appliance by executing the plugin chain.
@@ -127,7 +137,7 @@ module BoxGrinder
     # and every plugin in the chain is initialized and validated. The next step
     # is the execution of the plugin chain, step by step.
     #
-    # Below you can find the whole process of bootstraping a plugin.
+    # Below you can find the whole process of bootstrapping a plugin.
     #
     #   Call            Scope
     #   ------------------------------------------
@@ -178,31 +188,23 @@ module BoxGrinder
 
         @log.debug "#{plugin.plugin_info[:type].to_s.capitalize} plugin executed."
       end
-      if plugin.plugin_info[:type] == :os
-        FileUtils.chown_R(@config.uid, @config.gid, File.join(@config.dir.root, @config.dir.build))
-        @log.debug "Lowering from root to user."
-        change_user(@config.uid, @config.gid)
-      end
     end
 
-    def change_user(u, g)
-      begin
-        if Process::Sys.respond_to?(:setresgid) && Process::Sys.respond_to?(:setresuid)
-          Process::Sys.setresgid(g, g, g)
-          Process::Sys.setresuid(u, u, u)
-          return
-        end
-      rescue NotImplementedError
-      end
+    private
 
-      begin
-        # JRuby doesn't support saved ids, use this instead.
-        Process.gid = g
-        Process.egid = g
-        Process.uid = u
-        Process.euid = u
-      rescue NotImplementedError
+    def execute_with_userchange(p)
+      # Set ids to root if the next plugin requires root permissions
+      uid, gid = p[:plugin].plugin_info[:require_root] ? [0, 0] : [@config.uid, @config.gid]
+
+      UserSwitcher.change_user(uid, gid) do
+        execute_plugin(p[:plugin], p[:param])
       end
+      # Trigger ownership change before next plugin
+      FSMonitor.instance.trigger      
+    end
+    
+    def execute_without_userchange(p)
+      execute_plugin(p[:plugin], p[:param])
     end
   end
 end

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

@@ -47,7 +47,7 @@ module BoxGrinder
 
       unload = []
 
-      @files.keys.each do |file_name|
+      @files.keys.sort.each do |file_name|
         unload << ". != '#{file_name}'"
       end
 

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

@@ -191,8 +191,8 @@ module BoxGrinder
             :endpoint => 'ec2.sa-east-1.amazonaws.com',
             :location => 'sa-east-1',
             :kernel => {
-              :i386 => {:aki => 'aki-803ce39d'},
-              :x86_64 => {:aki => 'aki-d03ce3cd'}
+              :i386 => {:aki => 'aki-863ce39b'},
+              :x86_64 => {:aki => 'aki-d63ce3cb'}
           }
          }
         }

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

@@ -27,7 +27,7 @@ require 'timeout'
 module BoxGrinder
   class GuestFSHelper
     def initialize(disks, appliance_config, config, options = {})
-      @disks = disks
+      @disks = Array(disks)
       @appliance_config = appliance_config
       @config = config
       @log = options[:log] || LogHelper.new

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

@@ -127,8 +127,8 @@ module BoxGrinder
         :endpoint => 's3-sa-east-1.amazonaws.com',
         :location => 'sa-east-1',
         :kernel => {
-          :i386 => {:aki => 'aki-803ce39d'},
-          :x86_64 => {:aki => 'aki-d03ce3cd'}
+          :i386 => {:aki => 'aki-863ce39b'},
+          :x86_64 => {:aki => 'aki-d63ce3cb'}
         }
       }
     }

data/lib/boxgrinder-build/managers/plugin-manager.rb

@@ -38,7 +38,7 @@ module BoxGrinder
     end
 
     def register_plugin(clazz, info)
-      info.merge!(:class => clazz)
+      info = {:class => clazz, :require_root => false}.merge(info)
 
       validate_plugin_info(info)
 

data/lib/boxgrinder-build/plugins/delivery/ebs/ebs-plugin.rb

@@ -32,7 +32,7 @@ module BoxGrinder
     TIMEOUT = 1000 #seconds
     EC2_HOSTNAME_LOOKUP_TIMEOUT = 10
 
-    plugin :type => :delivery, :name => :ebs, :full_name => "Elastic Block Storage"
+    plugin :type => :delivery, :name => :ebs, :full_name => "Elastic Block Storage", :require_root => true
 
     def validate
       @ec2_endpoints = EC2Helper::endpoints

data/lib/boxgrinder-build/plugins/delivery/elastichosts/elastichosts-plugin.rb

@@ -52,7 +52,7 @@ module BoxGrinder
     def hash_to_request(h)
       body = ""
 
-      h.each do |k, v|
+      h.sort.each do |k, v|
         body << "#{k} #{v.to_s}\n"
       end
 
@@ -205,7 +205,7 @@ module BoxGrinder
         @log.info "Server was registered with '#{ret['name']}' name as '#{ret['server']}' UUID. Use web UI or API tools to start your server."
       rescue => e
         @log.error e.info
-        raise PluginError, "An error occured while creating the server, #{e.message}. See logs for more info."
+        raise PluginError, "An error occurred while creating the server, #{e.message}. See logs for more info."
       end
     end
   end

data/lib/boxgrinder-build/plugins/delivery/openstack/openstack-plugin.rb

@@ -68,12 +68,12 @@ module BoxGrinder
 
       if @previous_plugin_info[:type] == :platform
         case @previous_plugin_info[:name]
-          when :ec2:
+          when :ec2
             disk_format = :ami
             container_format = :ami
-          when :vmware:
+          when :vmware
             disk_format = :vmdk
-          when :virtualbox:
+          when :virtualbox
             disk_format = :vmdk
         end
       end

data/lib/boxgrinder-build/plugins/delivery/s3/s3-plugin.rb

@@ -75,7 +75,7 @@ module BoxGrinder
         # If there is an existing bucket, determine whether its location_constraint matches the region selected
         if existing_bucket = asset_bucket(false)
           raise PluginValidationError, "Existing bucket #{@plugin_config['bucket']} has a location constraint that does not match the region selected. " <<
-          "AMI region and bucket location constraint must match." unless constraint_equal?(@s3_endpoints[@plugin_config['region']][:location], existing_bucket.location_constraint)
+            "AMI region and bucket location constraint must match." unless constraint_equal?(@plugin_config['region'], existing_bucket.location_constraint)
         end
       end
 
@@ -175,7 +175,16 @@ module BoxGrinder
     def upload_image(ami_dir)
       @log.info "Uploading #{@appliance_config.name} AMI to bucket '#{@plugin_config['bucket']}'..."
 
-      @exec_helper.execute("euca-upload-bundle -U #{@plugin_config['url'].nil? ? "http://#{@s3_endpoints[@plugin_config['region']][:endpoint]}" : @plugin_config['url']} -b #{@plugin_config['bucket']}/#{ami_dir} -m #{@ami_manifest} -a #{@plugin_config['access_key']} -s #{@plugin_config['secret_access_key']}", :redacted => [@plugin_config['access_key'], @plugin_config['secret_access_key']])
+      endpoint = @plugin_config['url'] || "http://#{@s3_endpoints[@plugin_config['region']][:endpoint]}"
+
+      cmd_str = "euca-upload-bundle " << 
+        "-U #{endpoint} " <<
+        "-b #{@plugin_config['bucket']}/#{ami_dir} " <<
+        "-m #{@ami_manifest} " <<
+        "-a #{@plugin_config['access_key']} " << 
+        "-s #{@plugin_config['secret_access_key']}"
+
+      @exec_helper.execute(cmd_str, :redacted => [@plugin_config['access_key'], @plugin_config['secret_access_key']])
     end
 
     def register_image(ami_manifest_key)
@@ -212,21 +221,18 @@ module BoxGrinder
 
       @log.info "Determining snapshot name"
       snapshot = 1
-      while @s3helper.stub_s3obj(@bucket, "#{base_path}-SNAPSHOT-#{snapshot}/#{@appliance_config.hardware.arch}/").exists?
+      while @s3helper.stub_s3obj(@bucket, "#{base_path}-snapshot-#{snapshot}/#{@appliance_config.hardware.arch}/").exists?
         snapshot += 1
       end
       # Reuse the last key (if there was one)
       snapshot -=1 if snapshot > 1 and @plugin_config['overwrite']
 
-      "#{base_path}-SNAPSHOT-#{snapshot}/#{@appliance_config.hardware.arch}"
+      "#{base_path}-snapshot-#{snapshot}/#{@appliance_config.hardware.arch}"
     end
 
-    #US constraint is often represented as '' or nil
-    def constraint_equal?(a, b)
-      [a, b].collect!{|c| c.nil? ? '': c}
-      a == b
+    # US default constraint is often represented as '' or nil
+    def constraint_equal?(region, constraint) 
+      [region, constraint].collect{ |v| v.nil? || v == '' ? 'us-east-1' : v }.reduce(:==)
     end
-
   end
 end
-