facter 1.6.12.rc2 → 1.6.12

data/CHANGELOG

@@ -1,11 +1,8 @@
-1.6.12-rc2
+1.6.12
 ===
 398b111 (Maint) Extract common elements of selinux tests
 c534126 (#10819) Avoid reading from /proc/self/mounts in ruby
 b95ea54 fix yum repo path in yaml file
-
-1.6.12rc1
-===
 3ad05f1 Remove version test from facter
 fce4b01 fix redhat spec release template variable
 903b1d9 Stop using sed to generate the preflight erb

data/ext/packaging/tasks/00_utils.rb

@@ -105,6 +105,23 @@ def get_dash_version
   end
 end
 
+def get_ips_version
+  if File.exists?('.git')
+    desc = %x{git describe}.chomp
+    osrelease = %x{uname -r}.chomp
+    varr = desc.gsub(/[a-zA-Z]+/,' ').split(' ')
+    ver = varr[0].gsub('-', '')
+    res = case varr[1]
+    when /(\d+)-(\d+)/    # rcX-build
+      "#{ver},#{osrelease}-#{$1}.#{$2}"
+    else
+      "#{ver},#{osrelease}"
+    end
+  else
+    get_pwd_version
+  end
+end
+
 def get_dot_version
   if File.exists?('.git')
     %x{git describe}.chomp.gsub('-', '.').split('.')[0..3].join('.').gsub('v', '')
@@ -118,7 +135,7 @@ def get_pwd_version
 end
 
 def get_debversion
-  (@version.include?("rc") ? @version.sub(/rc[0-9]+/, '0.1\0') : "#{@version}-1") + "#{@packager}#{get_debrelease}"
+  (@version.include?("rc") ? @version.sub(/rc[0-9]+/, '0.1\0') : "#{@version.gsub('-','.')}-1") + "#{@packager}#{get_debrelease}"
 end
 
 def get_origversion
@@ -130,7 +147,13 @@ def get_rpmversion
 end
 
 def get_version_file_version
-  File.open( @version_file ) {|io| io.grep(/VERSION = /)}[0].split()[-1]
+  # Match version files containing 'VERSION = "x.x.x"' and just x.x.x
+  contents = IO.read(@version_file)
+  if version_string = contents.match(/VERSION =.*/)
+    version_string.to_s.split()[-1]
+  else
+    contents
+  end
 end
 
 def get_debrelease
@@ -212,3 +235,8 @@ def ship_gem(file)
   %x{gem push #{file}}
 end
 
+def x(v)
+  puts %[#{v}]
+  print %x[#{v}]
+end
+

data/ext/packaging/tasks/10_setupvars.rake

@@ -1,6 +1,3 @@
-require 'rubygems'
-require 'rubygems/package_task'
-require 'rspec/core/rake_task'
 require 'yaml'
 require 'erb'
 
@@ -45,6 +42,7 @@ begin
   @apt_host       = @pkg_defaults['apt_host']
   @apt_repo_url   = @pkg_defaults['apt_repo_url']
   @apt_repo_path  = @pkg_defaults['apt_repo_path']
+  @ips_repo       = @pkg_defaults['ips_repo']
 rescue
   STDERR.puts "There was an error loading the packaging defaults from the 'ext/build_defaults.yaml' file."
   exit 1
@@ -53,6 +51,7 @@ end
 @build_root   ||= Dir.pwd
 @version      ||= get_dash_version
 @gemversion   ||= get_dot_version
+@ipsversion   ||= get_ips_version
 @debversion   ||= get_debversion
 @origversion  ||= get_origversion
 @rpmversion   ||= get_rpmversion

data/ext/packaging/tasks/ips.rake

@@ -0,0 +1,79 @@
+require 'erb'
+namespace :package do
+  namespace :ips do
+    workdir = "pkg/ips"
+    proto = workdir + '/proto'
+
+    # Create a source repo
+    # We dont clean the base pkg directory only ips work dir.
+    task :clean do
+      %x[rm -rf #{workdir}]
+    end
+
+    # Create an installation image at ips/proto
+    task :prepare => :clean do
+      check_tool('pkgsend')
+      x %[mkdir -p #{workdir}]
+      x %[gmake -f ext/ips/rules DESTDIR=#{proto} 2>#{workdir}/build.out ]
+    end
+
+    # Process templates and write the initial manifest
+    task :prototmpl do
+      erb("ext/ips/#{@name}.p5m.erb", workdir + '/' + @name + '.p5m.x')
+    end
+
+    # Update manifest to include the installation image information.
+    task :protogen => :prototmpl do
+      x %[pkgsend generate #{proto} >> #{workdir}/#{@name}.p5m.x ]
+      os=%x[uname -p].chomp
+    end
+
+    # Generate and resolve dependency list
+    task :protodeps => :protogen do
+      x %[pkgdepend generate -d #{proto} #{workdir}/#{@name}.p5m.x > #{workdir}/#{@name}.depends ]
+      x %[pkgdepend resolve -m #{workdir}/#{@name}.depends ]
+      x %[cat #{workdir}/#{@name}.depends.res >> #{workdir}/#{@name}.p5m.x]
+    end
+
+    # Mogrify manifest to remove unncecessary info, and other kinds of transforms.
+    task :protomogrify => :protodeps do
+      x %[pkgmogrify ./ext/ips/transforms ./#{workdir}/#{@name}.p5m.x| pkgfmt >> #{workdir}/#{@name}.p5m ]
+    end
+
+    # Generate and resolve dependency list
+    task :license => :protomogrify do
+      x %[cp LICENSE #{proto}/#{@name}.license]
+    end
+
+    # Ensure that our manifest is sane.
+    task :lint => :license do
+      x %[pkglint #{workdir}/#{@name}.p5m]
+    end
+
+    # the older versions may require --fmri-in-manifest
+    task :package => :lint do
+      x %[pkgsend -s #{@ips_repo} publish -d #{proto} --fmri-in-manifest #{workdir}/#{@name}.p5m]
+    end
+
+    task :retrieve do
+      %x[rm #{workdir}/#{@name}.p5p]
+      x %[pkgrecv -s #{@ips_repo} -a -d #{workdir}/#{@name}.p5p #{@name}@#{@ipsversion}]
+      x %[pkg list -n -g #{workdir}/#{@name}.p5p #{@name}@#{@ipsversion}]
+    end
+
+    task :dry_install => :retrieve do
+      x %[pkg install -nv -g #{workdir}/#{@name}.p5p #{@name}@#{@ipsversion}]
+    end
+
+    task :install_cmd => :retrieve do
+      puts %x[pkg install -nv -g #{workdir}/#{@name}.p5p #{@name}@#{@ipsversion}]
+    end
+  end
+
+  desc "Uploads an ips version"
+  task :ips do
+    Rake::Task['package:ips:prepare'].invoke
+    Rake::Task['package:ips:package'].invoke
+  end
+
+end

data/ext/packaging/tasks/release.rake

@@ -6,8 +6,10 @@ namespace :package do
     new_version = '"' + @version.to_s.strip + '"'
     if contents.match("VERSION = #{old_version}")
       contents.gsub!("VERSION = #{old_version}", "VERSION = #{new_version}")
-    else
+    elsif contents.match("#{@name.upcase}VERSION = #{old_version}")
       contents.gsub!("#{@name.upcase}VERSION = #{old_version}", "#{@name.upcase}VERSION = #{new_version}")
+    else
+      contents.gsub!(old_version, @version)
     end
     file = File.open(@version_file, 'w')
     file.write contents

data/ext/packaging/tasks/ship.rake

@@ -15,11 +15,12 @@ namespace :pl do
     rsync_to('pkg/deb/', @apt_host, @apt_repo_path)
   end
 
-  desc "Ship built gem to rubygems"
-  task :ship_gem do
-    ship_gem("pkg/#{@name}-#{@gemversion}.gem")
+  if @build_gem == TRUE or @build_gem == 'true' or @build_gem == 'TRUE'
+    desc "Ship built gem to rubygems"
+    task :ship_gem do
+      ship_gem("pkg/#{@name}-#{@gemversion}.gem")
+    end
   end
-
 end
 
 

data/ext/packaging/tasks/tar.rake

@@ -1,6 +1,7 @@
 namespace :package do
   desc "Create a source tar archive"
   task :tar => [ :clean ] do
+    tar = ENV['TAR'] || 'tar'
     workdir = "pkg/#{@name}-#{@version}"
     mkdir_p(workdir)
     FileList[@files.split(' ')].each do |f|
@@ -10,7 +11,7 @@ namespace :package do
     erb("#{workdir}/ext/debian/changelog.erb", "#{workdir}/ext/debian/changelog")
     rm_rf(FileList["#{workdir}/ext/debian/*.erb", "#{workdir}/ext/redhat/*.erb"])
     cd "pkg" do
-      sh "tar --exclude=.gitignore --exclude=ext/#{@packaging_repo} -zcf #{@name}-#{@version}.tar.gz #{@name}-#{@version}"
+      sh "#{tar} --exclude=.gitignore --exclude=ext/#{@packaging_repo} -zcf #{@name}-#{@version}.tar.gz #{@name}-#{@version}"
     end
     rm_rf(workdir)
     puts

data/lib/facter/version.rb

@@ -1,6 +1,6 @@
 module Facter
   if not defined? FACTERVERSION then
-    FACTERVERSION = '1.6.12-rc2'
+    FACTERVERSION = '1.6.12'
   end
 
   def self.version

metadata

@@ -1,15 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: facter
 version: !ruby/object:Gem::Version 
-  hash: 4099510959
-  prerelease: 7
+  hash: 23
+  prerelease: 
   segments: 
   - 1
   - 6
   - 12
-  - rc
-  - 2
-  version: 1.6.12.rc2
+  version: 1.6.12
 platform: ruby
 authors: 
 - Puppet Labs
@@ -17,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-31 00:00:00 Z
+date: 2012-09-11 00:00:00 Z
 dependencies: []
 
 description: You can prove anything with facts!
@@ -62,6 +60,7 @@ files:
 - ext/packaging/tasks/clean.rake
 - ext/packaging/tasks/deb.rake
 - ext/packaging/tasks/gem.rake
+- ext/packaging/tasks/ips.rake
 - ext/packaging/tasks/mock.rake
 - ext/packaging/tasks/release.rake
 - ext/packaging/tasks/rpm.rake
@@ -311,14 +310,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: