boxgrinder-build 0.5.0 → 0.5.1

data/CHANGELOG

@@ -1,7 +1,10 @@
 
+v0.5.1
+
+* [BGBUILD-40] Fix for running Augeas in Libguestfs
+
 v0.5.0
 
 * Plugins externalized from BoxGrinder Build
-* TODO
 
 v0.4.0

data/Manifest

@@ -0,0 +1,26 @@
+CHANGELOG
+LICENSE
+Manifest
+README
+Rakefile
+bin/boxgrinder-build
+lib/boxgrinder-build/appliance.rb
+lib/boxgrinder-build/helpers/appliance-customize-helper.rb
+lib/boxgrinder-build/helpers/augeas-helper.rb
+lib/boxgrinder-build/helpers/guestfs-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/managers/plugin-manager.rb
+lib/boxgrinder-build/plugins/base-plugin.rb
+spec/Rakefile
+spec/appliance-spec.rb
+spec/helpers/appliance-customize-helper-spec.rb
+spec/helpers/augeas-helper-spec.rb
+spec/helpers/guestfs-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/rspec/src/appliances/jeos-f13.appl

data/Rakefile

@@ -7,5 +7,5 @@ Echoe.new("boxgrinder-build") do |p|
   p.url         = "http://www.jboss.org/stormgrind/projects/boxgrinder.html"
   p.email       = "info@boxgrinder.org"
   p.ignore_pattern = /^(pkg|doc)|\.svn|CVS|\.bzr|\.DS|\.git|\.log/
-  p.runtime_dependencies = ["commander >=4.0.3", "boxgrinder-core >=0.0.20"]
+  p.runtime_dependencies = ["commander ~>4.0.3", "boxgrinder-core ~>0.0.22"]
 end

data/bin/boxgrinder-build

@@ -39,7 +39,7 @@ end
 require 'commander/import'
 
 program :name, 'BoxGrinder Build'
-program :version, '0.5.0'
+program :version, '0.5.1'
 program :description, "A tool for building VM images from simple definition files."
 program :help, 'Hompepage', 'http://www.jboss.org/stormgrind/projects/boxgrinder/build.html'
 program :help, 'Documentation', 'http://community.jboss.org/docs/DOC-14358'

data/boxgrinder-build.gemspec

@@ -2,17 +2,17 @@
 
 Gem::Specification.new do |s|
   s.name = %q{boxgrinder-build}
-  s.version = "0.5.0"
+  s.version = "0.5.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Marek Goldmann"]
-  s.date = %q{2010-07-21}
+  s.date = %q{2010-08-23}
   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", "bin/boxgrinder-build", "lib/boxgrinder-build/appliance.rb", "lib/boxgrinder-build/helpers/appliance-customize-helper.rb", "lib/boxgrinder-build/helpers/guestfs-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/managers/plugin-manager.rb", "lib/boxgrinder-build/plugins/base-plugin.rb"]
-  s.files = ["CHANGELOG", "LICENSE", "Manifest", "README", "Rakefile", "bin/boxgrinder-build", "lib/boxgrinder-build/appliance.rb", "lib/boxgrinder-build/helpers/appliance-customize-helper.rb", "lib/boxgrinder-build/helpers/guestfs-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/managers/plugin-manager.rb", "lib/boxgrinder-build/plugins/base-plugin.rb", "spec/Rakefile", "spec/appliance-spec.rb", "spec/helpers/appliance-customize-helper-spec.rb", "spec/helpers/guestfs-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/rspec/src/appliances/jeos-f13.appl", "boxgrinder-build.gemspec"]
+  s.extra_rdoc_files = ["CHANGELOG", "LICENSE", "README", "bin/boxgrinder-build", "lib/boxgrinder-build/appliance.rb", "lib/boxgrinder-build/helpers/appliance-customize-helper.rb", "lib/boxgrinder-build/helpers/augeas-helper.rb", "lib/boxgrinder-build/helpers/guestfs-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/managers/plugin-manager.rb", "lib/boxgrinder-build/plugins/base-plugin.rb"]
+  s.files = ["CHANGELOG", "LICENSE", "Manifest", "README", "Rakefile", "bin/boxgrinder-build", "lib/boxgrinder-build/appliance.rb", "lib/boxgrinder-build/helpers/appliance-customize-helper.rb", "lib/boxgrinder-build/helpers/augeas-helper.rb", "lib/boxgrinder-build/helpers/guestfs-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/managers/plugin-manager.rb", "lib/boxgrinder-build/plugins/base-plugin.rb", "spec/Rakefile", "spec/appliance-spec.rb", "spec/helpers/appliance-customize-helper-spec.rb", "spec/helpers/augeas-helper-spec.rb", "spec/helpers/guestfs-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/rspec/src/appliances/jeos-f13.appl", "boxgrinder-build.gemspec"]
   s.homepage = %q{http://www.jboss.org/stormgrind/projects/boxgrinder.html}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Boxgrinder-build", "--main", "README"]
   s.require_paths = ["lib"]
@@ -25,14 +25,14 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<commander>, [">= 4.0.3"])
-      s.add_runtime_dependency(%q<boxgrinder-core>, [">= 0.0.20"])
+      s.add_runtime_dependency(%q<commander>, ["~> 4.0.3"])
+      s.add_runtime_dependency(%q<boxgrinder-core>, ["~> 0.0.22"])
     else
-      s.add_dependency(%q<commander>, [">= 4.0.3"])
-      s.add_dependency(%q<boxgrinder-core>, [">= 0.0.20"])
+      s.add_dependency(%q<commander>, ["~> 4.0.3"])
+      s.add_dependency(%q<boxgrinder-core>, ["~> 0.0.22"])
     end
   else
-    s.add_dependency(%q<commander>, [">= 4.0.3"])
-    s.add_dependency(%q<boxgrinder-core>, [">= 0.0.20"])
+    s.add_dependency(%q<commander>, ["~> 4.0.3"])
+    s.add_dependency(%q<boxgrinder-core>, ["~> 0.0.22"])
   end
 end

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

@@ -0,0 +1,76 @@
+# JBoss, Home of Professional Open Source
+# Copyright 2009, Red Hat Middleware LLC, and individual contributors
+# by the @authors tag. See the copyright.txt in the distribution for a
+# full listing of individual contributors.
+#
+# 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 2.1 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 'logger'
+
+module BoxGrinder
+  class AugeasHelper
+    def initialize( guestfs, guestfs_helper, options = {})
+      @guestfs        = guestfs
+      @guestfs_helper = guestfs_helper
+      @log            = options[:log] || Logger.new(STDOUT)
+
+      @files = {}
+    end
+
+    def edit( &block )
+      @log.debug "Changing configuration files using augeas..."
+
+      instance_eval &block if block
+
+      if @files.empty?
+        @log.debug "No files specified to change, skipping..."
+        return
+      end
+
+      @guestfs.aug_init( "/", 32 )
+
+      unload = []
+
+      @files.keys.each do |file_name|
+        unload << ". != '#{file_name}'"
+      end
+
+      @guestfs.aug_rm( "/augeas/load//incl[#{unload.join(' and ')}]" )
+      @guestfs.aug_load
+
+      @files.each do |file, changes|
+        changes.each do |key, value|
+
+          @guestfs.aug_set("/files#{file}/#{key}", value)
+        end
+      end
+
+      @guestfs.aug_save
+
+      @log.debug "Augeas changes saved."
+    end
+
+    def set( name, key, value )
+      unless @guestfs.exists( name ) != 0
+        @log.debug "File '#{name}' doesn't exists, skipping augeas changes..."
+        return
+      end
+
+      @files[name] = {} unless @files.has_key?( name )
+      @files[name][key] = value
+    end
+  end
+end

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

@@ -18,6 +18,7 @@
 # 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/augeas-helper'
 require 'guestfs'
 require 'logger'
 
@@ -197,5 +198,9 @@ module BoxGrinder
         mount_partition( partition, @guestfs.sh( "/sbin/e2label #{partition}" ).chomp.strip )
       end
     end
+
+    def augeas( &block )
+      AugeasHelper.new( @guestfs, self, :log => @log ).edit( &block )
+    end
   end
 end

data/spec/helpers/augeas-helper-spec.rb

@@ -0,0 +1,64 @@
+require 'boxgrinder-build/helpers/augeas-helper'
+
+module BoxGrinder
+  describe AugeasHelper do
+
+    before(:each) do
+      @log    = Logger.new('/dev/null')
+
+      @guestfs = mock('GuestFS')
+      @guestfs_helper = mock('GuestFSHelper')
+
+      @helper = AugeasHelper.new( @guestfs, @guestfs_helper, :log => @log)
+    end
+
+    it "should not execute augeas commands if there a no files to change" do
+      @helper.edit do
+      end
+    end
+
+    it "should change configuration for one file" do
+      @guestfs.should_receive(:exists).with('/etc/ssh/sshd_config').and_return(1)
+      @guestfs.should_receive(:aug_init).with('/', 32)
+      @guestfs.should_receive(:aug_rm).with("/augeas/load//incl[. != '/etc/ssh/sshd_config']")
+      @guestfs.should_receive(:aug_load)
+      @guestfs.should_receive(:aug_set).with("/files/etc/ssh/sshd_config/UseDNS", "no")
+      @guestfs.should_receive(:aug_save)
+
+      @helper.edit do
+        set( '/etc/ssh/sshd_config', 'UseDNS', 'no')
+      end
+    end
+
+    it "should change configuration for two files" do
+      @guestfs.should_receive(:exists).with('/etc/ssh/sshd_config').and_return(1)
+      @guestfs.should_receive(:exists).with('/etc/sysconfig/selinux').and_return(1)
+      @guestfs.should_receive(:aug_init).with('/', 32)
+      @guestfs.should_receive(:aug_rm).with("/augeas/load//incl[. != '/etc/ssh/sshd_config' and . != '/etc/sysconfig/selinux']")
+      @guestfs.should_receive(:aug_load)
+      @guestfs.should_receive(:aug_set).with("/files/etc/ssh/sshd_config/UseDNS", "no")
+      @guestfs.should_receive(:aug_set).with("/files/etc/sysconfig/selinux/SELINUX", "permissive")
+      @guestfs.should_receive(:aug_save)
+
+      @helper.edit do
+        set( '/etc/ssh/sshd_config', 'UseDNS', 'no')
+        set( '/etc/sysconfig/selinux', 'SELINUX', 'permissive')
+      end
+    end
+
+    it "should change one configuration for two files because one file doesn't exists" do
+      @guestfs.should_receive(:exists).with('/etc/ssh/sshd_config').and_return(1)
+      @guestfs.should_receive(:exists).with('/etc/sysconfig/selinux').and_return(0)
+      @guestfs.should_receive(:aug_init).with('/', 32)
+      @guestfs.should_receive(:aug_rm).with("/augeas/load//incl[. != '/etc/ssh/sshd_config']")
+      @guestfs.should_receive(:aug_load)
+      @guestfs.should_receive(:aug_set).with("/files/etc/ssh/sshd_config/UseDNS", "no")
+      @guestfs.should_receive(:aug_save)
+
+      @helper.edit do
+        set( '/etc/ssh/sshd_config', 'UseDNS', 'no')
+        set( '/etc/sysconfig/selinux', 'SELINUX', 'permissive')
+      end
+    end
+  end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 5
-  - 0
-  version: 0.5.0
+  - 1
+  version: 0.5.1
 platform: ruby
 authors: 
 - Marek Goldmann
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-21 00:00:00 +02:00
+date: 2010-08-23 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,7 +22,7 @@ dependencies:
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
         - 4
@@ -36,13 +36,13 @@ dependencies:
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
         - 0
         - 0
-        - 20
-        version: 0.0.20
+        - 22
+        version: 0.0.22
   type: :runtime
   version_requirements: *id002
 description: A tool for creating appliances from simple plain text files for various virtual environments.
@@ -58,6 +58,7 @@ extra_rdoc_files:
 - bin/boxgrinder-build
 - lib/boxgrinder-build/appliance.rb
 - lib/boxgrinder-build/helpers/appliance-customize-helper.rb
+- lib/boxgrinder-build/helpers/augeas-helper.rb
 - lib/boxgrinder-build/helpers/guestfs-helper.rb
 - lib/boxgrinder-build/helpers/linux-helper.rb
 - lib/boxgrinder-build/helpers/package-helper.rb
@@ -73,6 +74,7 @@ files:
 - bin/boxgrinder-build
 - lib/boxgrinder-build/appliance.rb
 - lib/boxgrinder-build/helpers/appliance-customize-helper.rb
+- lib/boxgrinder-build/helpers/augeas-helper.rb
 - lib/boxgrinder-build/helpers/guestfs-helper.rb
 - lib/boxgrinder-build/helpers/linux-helper.rb
 - lib/boxgrinder-build/helpers/package-helper.rb
@@ -82,6 +84,7 @@ files:
 - spec/Rakefile
 - spec/appliance-spec.rb
 - spec/helpers/appliance-customize-helper-spec.rb
+- spec/helpers/augeas-helper-spec.rb
 - spec/helpers/guestfs-helper-spec.rb
 - spec/helpers/linux-helper-spec.rb
 - spec/helpers/package-helper-spec.rb