facter 1.6.1 → 1.6.2

data/spec/watchr.rb

@@ -0,0 +1,125 @@
+ENV["WATCHR"] = "1"
+ENV['AUTOTEST'] = 'true'
+
+def run_comp(cmd)
+  puts cmd
+  results = []
+  old_sync = $stdout.sync
+  $stdout.sync = true
+  line = []
+  begin
+    open("| #{cmd}", "r") do |f|
+      until f.eof? do
+        c = f.getc
+        putc c
+        line << c
+        if c == ?\n
+          results << if RUBY_VERSION >= "1.9" then
+              line.join
+            else
+              line.pack "c*"
+            end
+          line.clear
+        end
+      end
+    end
+  ensure
+    $stdout.sync = old_sync
+  end
+  results.join
+end
+
+def clear
+  #system("clear")
+end
+
+def growl(message, status)
+  # Strip the color codes
+  message.gsub!(/\[\d+m/, '')
+
+  growlnotify = `which growlnotify`.chomp
+  return if growlnotify.empty?
+  title = "Watchr Test Results"
+  image = status == :pass ? "autotest/images/pass.png" : "autotest/images/fail.png"
+  options = "-w -n Watchr --image '#{File.expand_path(image)}' -m '#{message}' '#{title}'"
+  system %(#{growlnotify} #{options} &)
+end
+
+def file2specs(file)
+  %w{spec/unit spec/integration}.collect { |d|
+    file.sub('lib/facter', d).sub('.rb', '_spec.rb')
+  }.find_all { |f|
+    FileTest.exist?(f)
+  }
+end
+
+def run_spec(command)
+  clear
+  result = run_comp(command).split("\n").last
+  status = result.include?('0 failures') ? :pass : :fail
+  growl result, status
+end
+
+def run_spec_files(files)
+  files = Array(files)
+  return if files.empty?
+  opts = File.readlines('.rspec').collect { |l| l.chomp }.join(" ")
+  begin
+    run_spec("rspec --tty #{opts} #{files.join(' ')}")
+  rescue => detail
+    puts detail.backtrace
+    warn "Failed to run #{files.join(', ')}: #{detail}"
+  end
+end
+
+def run_suite
+  files = files("unit") + files("integration")
+  opts = File.readlines('.rspec').collect { |l| l.chomp }.join(" ")
+  run_spec("rspec --tty #{opts} #{files.join(' ')}")
+end
+
+def files(dir)
+  require 'find'
+
+  result = []
+  Find.find(File.join("spec", dir)) do |path|
+    result << path if path =~ /\.rb/
+  end
+  
+  result
+end
+
+watch('spec/spec_helper.rb') { run_suite }
+watch(%r{^spec/(unit|integration)/.*\.rb$}) { |md| run_spec_files(md[0]) }
+watch(%r{^lib/facter/(.*)\.rb$}) { |md|
+  run_spec_files(file2specs(md[0]))
+}
+watch(%r{^spec/lib/spec.*}) { |md| run_suite }
+watch(%r{^spec/lib/monkey_patches/.*}) { |md| run_suite }
+
+# Ctrl-\
+Signal.trap 'QUIT' do
+  puts " --- Running all tests ---\n\n"
+  run_suite
+end
+
+@interrupted = false
+
+# Ctrl-C
+Signal.trap 'INT' do
+  if @interrupted
+    @wants_to_quit = true
+    abort("\n")
+  else
+    puts "Interrupt a second time to quit; wait for rerun of tests"
+    @interrupted = true
+    Kernel.sleep 1.5
+    # raise Interrupt, nil # let the run loop catch it
+    begin
+      run_suite
+    rescue => detail
+      puts detail.backtrace
+      puts "Could not run suite: #{detail}"
+    end
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: facter
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: 
   segments: 
   - 1
   - 6
-  - 1
-  version: 1.6.1
+  - 2
+  version: 1.6.2
 platform: ruby
 authors: 
 - Puppet Labs
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-28 00:00:00 Z
+date: 2011-10-10 00:00:00 Z
 dependencies: []
 
 description: 
@@ -66,6 +66,7 @@ files:
 - lib/facter/network.rb
 - lib/facter/operatingsystem.rb
 - lib/facter/operatingsystemrelease.rb
+- lib/facter/osfamily.rb
 - lib/facter/path.rb
 - lib/facter/physicalprocessorcount.rb
 - lib/facter/processor.rb
@@ -95,6 +96,7 @@ files:
 - lib/facter/util/plist/generator.rb
 - lib/facter/util/plist/parser.rb
 - lib/facter/util/plist.rb
+- lib/facter/util/processor.rb
 - lib/facter/util/resolution.rb
 - lib/facter/util/uptime.rb
 - lib/facter/util/values.rb
@@ -112,6 +114,15 @@ files:
 - conf/redhat/facter.spec
 - conf/solaris/pkginfo
 - etc/facter.conf
+- spec/fixtures/cpuinfo/amd64dual
+- spec/fixtures/cpuinfo/amd64quad
+- spec/fixtures/cpuinfo/amd64solo
+- spec/fixtures/cpuinfo/amd64tri
+- spec/fixtures/cpuinfo/bbg3-armel
+- spec/fixtures/cpuinfo/beaglexm-armel
+- spec/fixtures/cpuinfo/panda-armel
+- spec/fixtures/cpuinfo/ppc64
+- spec/fixtures/cpuinfo/sparc
 - spec/fixtures/ifconfig/bsd_ifconfig_all_with_multiple_interfaces
 - spec/fixtures/ifconfig/centos_5_5
 - spec/fixtures/ifconfig/centos_5_5_eth0
@@ -147,6 +158,8 @@ files:
 - spec/fixtures/netstat/open_solaris_10
 - spec/fixtures/netstat/open_solaris_b132
 - spec/fixtures/netstat/ubuntu_7_04
+- spec/fixtures/processorcount/solaris-sparc-kstat-cpu-info
+- spec/fixtures/processorcount/solaris-x86_64-kstat-cpu-info
 - spec/fixtures/unit/util/loader/nosuchfact.rb
 - spec/fixtures/uptime/kstat_boot_time
 - spec/fixtures/uptime/sysctl_kern_boottime_big_endian
@@ -159,6 +172,7 @@ files:
 - spec/fixtures/virtual/proc_self_status/vserver_2_3/host
 - spec/integration/facter_spec.rb
 - spec/spec_helper.rb
+- spec/unit/architecture_spec.rb
 - spec/unit/data/6.0-STABLE_FreeBSD_ifconfig
 - spec/unit/data/darwin_ifconfig_all_with_multiple_interfaces
 - spec/unit/data/darwin_ifconfig_single_interface
@@ -200,6 +214,7 @@ files:
 - spec/unit/util/macaddress_spec.rb
 - spec/unit/util/macosx_spec.rb
 - spec/unit/util/manufacturer_spec.rb
+- spec/unit/util/processor_spec.rb
 - spec/unit/util/resolution_spec.rb
 - spec/unit/util/uptime_spec.rb
 - spec/unit/util/virtual_spec.rb
@@ -207,6 +222,7 @@ files:
 - spec/unit/util/wmi_spec.rb
 - spec/unit/util/xendomains_spec.rb
 - spec/unit/virtual_spec.rb
+- spec/watchr.rb
 homepage: http://puppetlabs.com
 licenses: []