facterdb 0.2.1 → 0.2.2

data/facts/3.1/ubuntu-15.10-x86_64.facts

@@ -0,0 +1,255 @@
+{
+  "augeas": {
+    "version": "1.4.0"
+  },
+  "disks": {
+    "sda": {
+      "model": "VBOX HARDDISK",
+      "size": "40.00 GiB",
+      "size_bytes": 42949672960,
+      "vendor": "ATA"
+    }
+  },
+  "dmi": {
+    "bios": {
+      "release_date": "12/01/2006",
+      "vendor": "innotek GmbH",
+      "version": "VirtualBox"
+    },
+    "board": {
+      "manufacturer": "Oracle Corporation",
+      "product": "VirtualBox",
+      "serial_number": "0"
+    },
+    "chassis": {
+      "type": "Other"
+    },
+    "manufacturer": "innotek GmbH",
+    "product": {
+      "name": "VirtualBox",
+      "serial_number": "0",
+      "uuid": "FA4ED213-6351-4238-9DDE-E28CF955AF7C"
+    }
+  },
+  "facterversion": "3.1.1",
+  "filesystems": "ext2,ext3,ext4,vfat",
+  "identity": {
+    "gid": 0,
+    "group": "root",
+    "uid": 0,
+    "user": "root"
+  },
+  "is_virtual": true,
+  "kernel": "Linux",
+  "kernelmajversion": "4.2",
+  "kernelrelease": "4.2.0-16-generic",
+  "kernelversion": "4.2.0",
+  "load_averages": {
+    "15m": 0.04,
+    "1m": 0.55,
+    "5m": 0.13
+  },
+  "memory": {
+    "system": {
+      "available": "336.66 MiB",
+      "available_bytes": 353009664,
+      "capacity": "31.14%",
+      "total": "488.91 MiB",
+      "total_bytes": 512659456,
+      "used": "152.25 MiB",
+      "used_bytes": 159649792
+    }
+  },
+  "mountpoints": {
+    "/": {
+      "available": "37.21 GiB",
+      "available_bytes": 39953924096,
+      "capacity": "4.22%",
+      "device": "/dev/sda1",
+      "filesystem": "ext4",
+      "options": [
+        "rw",
+        "relatime",
+        "data=ordered"
+      ],
+      "size": "38.85 GiB",
+      "size_bytes": 41712922624,
+      "used": "1.64 GiB",
+      "used_bytes": 1758998528
+    }
+  },
+  "networking": {
+    "dhcp": "10.0.2.2",
+    "domain": "example.com",
+    "fqdn": "foo.example.com",
+    "hostname": "foo",
+    "interfaces": {
+      "eth0": {
+        "bindings": [
+          {
+            "address": "10.0.2.15",
+            "netmask": "255.255.255.0",
+            "network": "10.0.2.0"
+          }
+        ],
+        "bindings6": [
+          {
+            "address": "fe80::a00:27ff:fe03:8001",
+            "netmask": "ffff:ffff:ffff:ffff::",
+            "network": "fe80::"
+          }
+        ],
+        "dhcp": "10.0.2.2",
+        "ip": "10.0.2.15",
+        "ip6": "fe80::a00:27ff:fe03:8001",
+        "mac": "08:00:27:03:80:01",
+        "mtu": 1500,
+        "netmask": "255.255.255.0",
+        "netmask6": "ffff:ffff:ffff:ffff::",
+        "network": "10.0.2.0",
+        "network6": "fe80::"
+      },
+      "lo": {
+        "bindings": [
+          {
+            "address": "127.0.0.1",
+            "netmask": "255.0.0.0",
+            "network": "127.0.0.0"
+          }
+        ],
+        "bindings6": [
+          {
+            "address": "::1",
+            "netmask": "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff",
+            "network": "::1"
+          }
+        ],
+        "ip": "127.0.0.1",
+        "ip6": "::1",
+        "mtu": 65536,
+        "netmask": "255.0.0.0",
+        "netmask6": "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff",
+        "network": "127.0.0.0",
+        "network6": "::1"
+      },
+      "lxcbr0": {
+        "bindings": [
+          {
+            "address": "10.0.3.1",
+            "netmask": "255.255.255.0",
+            "network": "10.0.3.0"
+          }
+        ],
+        "bindings6": [
+          {
+            "address": "fe80::9859:61ff:feb0:e064",
+            "netmask": "ffff:ffff:ffff:ffff::",
+            "network": "fe80::"
+          }
+        ],
+        "ip": "10.0.3.1",
+        "ip6": "fe80::9859:61ff:feb0:e064",
+        "mac": "9a:59:61:b0:e0:64",
+        "mtu": 1500,
+        "netmask": "255.255.255.0",
+        "netmask6": "ffff:ffff:ffff:ffff::",
+        "network": "10.0.3.0",
+        "network6": "fe80::"
+      }
+    },
+    "ip": "10.0.2.15",
+    "ip6": "fe80::a00:27ff:fe03:8001",
+    "mac": "08:00:27:03:80:01",
+    "mtu": 1500,
+    "netmask": "255.255.255.0",
+    "netmask6": "ffff:ffff:ffff:ffff::",
+    "network": "10.0.2.0",
+    "network6": "fe80::",
+    "primary": "eth0"
+  },
+  "os": {
+    "architecture": "amd64",
+    "distro": {
+      "codename": "wily",
+      "description": "Ubuntu 15.10",
+      "id": "Ubuntu",
+      "release": {
+        "full": "15.10",
+        "major": "15.10"
+      }
+    },
+    "family": "Debian",
+    "hardware": "x86_64",
+    "name": "Ubuntu",
+    "release": {
+      "full": "15.10",
+      "major": "15.10"
+    },
+    "selinux": {
+      "enabled": false
+    }
+  },
+  "partitions": {
+    "/dev/sda1": {
+      "filesystem": "ext4",
+      "label": "cloudimg-rootfs",
+      "mount": "/",
+      "partuuid": "0006d50e-01",
+      "size": "40.00 GiB",
+      "size_bytes": 42948607488,
+      "uuid": "20829231-1cab-41a3-9d95-4a0bc22b40c1"
+    }
+  },
+  "path": "/opt/puppetlabs/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",
+  "processors": {
+    "count": 1,
+    "isa": "x86_64",
+    "models": [
+      "Intel(R) Core(TM) i7-3520M CPU @ 2.90GHz"
+    ],
+    "physicalcount": 1
+  },
+  "ruby": {
+    "platform": "x86_64-linux",
+    "sitedir": "/opt/puppetlabs/puppet/lib/ruby/site_ruby/2.1.0",
+    "version": "2.1.7"
+  },
+  "ssh": {
+    "dsa": {
+      "fingerprints": {
+        "sha1": "SSHFP 2 1 5a670a1c93514d6ee55a99dab5145a681b664ed0",
+        "sha256": "SSHFP 2 2 48908cee3e84531c8a2f08590fb9fabe04e99f3830481a0cf0affdb98690fb73"
+      },
+      "key": "AAAAB3NzaC1kc3MAAACBAJylejKGL25K+qM26k35UubUXs3YF20X2ARfoC16McT7kzRaJXhYbDqE5jfxrWaSiRH8dSfXWEbYCGdYBSGKbv4ksmNynE1ztmxCC8aSwmfPDXpWIEamnXwr0drW/puLfB8I6tZP1FwjeBkNKMb51vVW/BlBT3LnLWXDVpYKyim1AAAAFQCnBi/d6xxDrfFKz4biNWPvuyHYxwAAAIADtddNIuva+q7gDDmItd0WQGkQE/XxLlUCkRFmvND1mDnxWKRrS3Vqn4YQUPHpTwRSU6RukFh8oKKWvC/ckC+wgUnpH2rdepDshWDCp8933+QPZWWRuhFY99XUsZGlUtwuIjxs0iQqJBEjQ2f+ZX3tNMfSswt/BcfzqKLNTDU/kQAAAIBLnAca7OJWgrTStDbClKriP0forBmQq+sKenbY5gnnE6tUmHLLCjqvuzdpl2wAvXhcerks1wsvnebLe40pucx/1MjqqZgCu8ki3nW5yn4vLG/y2JW17oET3gSj5ixLqSKqIXHQlUNptrDsVCPL+MEhYgY5ktMy9RF/JACmScxp9w=="
+    },
+    "ecdsa": {
+      "fingerprints": {
+        "sha1": "SSHFP 3 1 099830f601f15c2055dd608dd77caa44515aa028",
+        "sha256": "SSHFP 3 2 6eb39571c7e7766b97ff2814f2204b12ba696650079d7e2db267c2d853ecd0bd"
+      },
+      "key": "AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBMYtI5Sf67iAndcuuacxLqX2UM5m9qP81iZy7NDsI+HVA0yNV+T3OBQxYVlNq9UwX30I4J+Da20pM0iU4Ipn0xA="
+    },
+    "ed25519": {
+      "fingerprints": {
+        "sha1": "SSHFP 4 1 90655b7d1a5b0fd3ffb34fbbd4cde8bfdf0ec0bf",
+        "sha256": "SSHFP 4 2 574690e400a6291c17617aca181521d2d606198d24d9febf039fabfdcd28a83c"
+      },
+      "key": "AAAAC3NzaC1lZDI1NTE5AAAAIPTI/mTDnXgBs/nbiJ0zYHCfKrcBEVnckTg5pQsmzrUa"
+    },
+    "rsa": {
+      "fingerprints": {
+        "sha1": "SSHFP 1 1 997487332c9bc67b02c1536041c08c60fccdd403",
+        "sha256": "SSHFP 1 2 f8c898dcb8f0470058a25806def5775b318cd8c46320c7199c5feec45eb614f7"
+      },
+      "key": "AAAAB3NzaC1yc2EAAAADAQABAAABAQDZuid9vUZKhPJT3V6CC1DuyTOd4JbAjL83P66plKEKvWaml9RNry31AEsSRrD09cVFEbswv/z2kb2KKxTkMIg9EfPogAddh3XMOQOQgWbihFt0vRmJzG7MC8klxufs9nqaqGeQCyoXld3Xp1tvrY+izu/TaJvx2mrkl1XdtFGMDzRuPLNjmSNP4g6S47CfHA2c2foazz0I2/ERrpCCCf2DvYE/iIoDMZSUvu5Boa6xuRwAhZd3LBlr5GYffBGa920ZlJ+sq+9Nf5YT9EXkLRWQ09Uq8rvnLotQtaBUUZNx+YBDXw4k8gL+fBNZlh8xt6Jy0WuODjVe7DcNYARiV9eJ"
+    }
+  },
+  "system_uptime": {
+    "days": 0,
+    "hours": 0,
+    "seconds": 39,
+    "uptime": "0:00 hours"
+  },
+  "timezone": "UTC",
+  "virtual": "virtualbox"
+}

data/facts/Vagrantfile

@@ -4,20 +4,6 @@
 # Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
 VAGRANTFILE_API_VERSION = "2"
 
-$install_rvm = <<SCRIPT
-# Install mpapis public key
-gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 ||
-curl -sSL https://rvm.io/mpapis.asc | gpg --import - &&
-
-# Run the installer
-\\curl -sSL https://get.rvm.io | bash -s stable &&
-
-# Install Ruby
-source /etc/profile.d/rvm.sh &&
-rvm install 1.9.3 &&
-rvm use --create 1.9.3
-SCRIPT
-
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
 
   config.vm.hostname = "foo.example.com"
@@ -77,29 +63,30 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   end
   config.vm.define "ubuntu-15.04-x86_64" do |host|
     host.vm.box = "ubuntu/vivid64"
-    host.vm.provision "shell", inline: $install_rvm
+    host.vm.provision "file", source: "Gemfile", destination: "Gemfile"
+    host.vm.provision "shell", path: "get_facts.sh"
+    host.vm.provision "shell", inline: "/sbin/shutdown -h now"
+  end
+  config.vm.define "ubuntu-15.10-x86_64" do |host|
+    host.vm.box = "ubuntu/wily64"
     host.vm.provision "file", source: "Gemfile", destination: "Gemfile"
     host.vm.provision "shell", path: "get_facts.sh"
     host.vm.provision "shell", inline: "/sbin/shutdown -h now"
   end
   config.vm.define "centos-5-x86_64" do |host|
     host.vm.box = "puppetlabs/centos-5.11-64-nocm"
-    host.vm.provision "shell", inline: "curl -sSL https://rvm.io/mpapis.asc | gpg --import - && \\curl -sSL https://get.rvm.io | bash -s stable"
-    host.vm.provision "shell", inline: "source /etc/profile.d/rvm.sh && rvm install 1.9.3 && rvm use --create 1.9.3"
     host.vm.provision "file", source: "Gemfile", destination: "Gemfile"
     host.vm.provision "shell", path: "get_facts.sh"
     host.vm.provision "shell", inline: "/sbin/shutdown -h now"
   end
   config.vm.define "centos-6-x86_64" do |host|
     host.vm.box = "puppetlabs/centos-6.6-64-nocm"
-    host.vm.provision "shell", inline: "yum -y install ruby-devel rubygems"
     host.vm.provision "file", source: "Gemfile", destination: "Gemfile"
     host.vm.provision "shell", path: "get_facts.sh"
     host.vm.provision "shell", inline: "/sbin/shutdown -h now"
   end
   config.vm.define "centos-7-x86_64" do |host|
     host.vm.box = "puppetlabs/centos-7.0-64-nocm"
-    host.vm.provision "shell", inline: "yum -y install ruby ruby-devel"
     host.vm.provision "file", source: "Gemfile", destination: "Gemfile"
     host.vm.provision "shell", path: "get_facts.sh"
     host.vm.provision "shell", inline: "/sbin/shutdown -h now"
@@ -159,7 +146,6 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.define "gentoo-x86_64" do |host|
     host.vm.box = "cmiles/gentoo-amd64-minimal"
     host.vm.provision "shell", inline: "emerge-webrsync && emerge app-crypt/gnupg net-misc/curl"
-    host.vm.provision "shell", inline: $install_rvm
     host.vm.provision "file", source: "Gemfile", destination: "Gemfile"
     host.vm.provision "shell", path: "get_facts.sh"
     host.vm.provision "shell", inline: "/sbin/shutdown -h now"

data/facts/get_facts.sh

@@ -1,84 +1,61 @@
 #!/bin/bash
 
-set -e
-
-# Make Solaris use GNU tools by default
-export PATH=/usr/gnu/bin:$PATH
+export PATH=/opt/puppetlabs/bin:$PATH
+
+if test -f /usr/bin/apt-get; then
+  lsbdistcodename=$(lsb_release -sc)
+  operatingsystem=$(lsb_release -si)
+  operatingsystemmajrelease=$(lsb_release -sr)
+  osfamily='Debian'
+elif test -f /usr/bin/yum; then
+  operatingsystemmajrelease=$(cat /etc/redhat-release | cut -d' ' -f4 | cut -c1)
+  osfamily='RedHat'
+else
+  echo 'Could not detect OS family, aborting!'
+  exit 1
+fi
+
+case "${osfamily}" in
+'RedHat')
+  wget "https://yum.puppetlabs.com/puppetlabs-release-pc1-el-${operatingsystemmajrelease}.noarch.rpm" -O /tmp/puppetlabs-release-pc1.rpm
+  rpm -ivh /tmp/puppetlabs-release-pc1.rpm
+  for puppet_agent_version in 1.2.2 1.2.7; do
+    yum install -y puppet-agent-${puppet_agent_version}
+    output_file="/vagrant/$(facter --version | cut -c1-3)/$(facter operatingsystem | tr '[:upper:]' '[:lower:]')-$(facter operatingsystemmajrelease)-$(facter hardwaremodel).facts"
+    mkdir -p $(dirname ${output_file})
+    facter -j | tee ${output_file}
+  done
+  ;;
+
+'Debian')
+  if [[ "wily" =~ ${lsbdistcodename} ]]; then
+    lsbdistcodename='trusty'
+  fi
+  wget "https://apt.puppetlabs.com/puppetlabs-release-pc1-${lsbdistcodename}.deb" -O /tmp/puppetlabs-release-pc1.deb
+  dpkg --install /tmp/puppetlabs-release-pc1.deb
+  apt-get update
+  for puppet_agent_version in 1.2.2 1.2.7; do
+    apt-get -y --force-yes install puppet-agent=${puppet_agent_version}*
+    output_file="/vagrant/$(facter --version | cut -c1-3)/$(facter operatingsystem | tr '[:upper:]' '[:lower:]')-$(facter operatingsystemmajrelease)-$(facter hardwaremodel).facts"
+    mkdir -p $(dirname ${output_file})
+    facter -j | tee ${output_file}
+  done
+  ;;
+esac
 
-# Fix for squeeze, el7, arch, opensuse12, opensuse13 and solaris
-export PATH=$PATH:/var/lib/gems/1.8/bin/:/usr/local/bin:/root/.gem/ruby/2.1.0/bin:/usr/lib64/ruby/gems/1.9.1/gems/bundler-1.7.12/bin:/usr/lib64/ruby/gems/2.0.0/gems/bundler-1.7.12/bin:/usr/ruby/1.9/bin
+operatingsystem=$(facter operatingsystem | tr '[:upper:]' '[:lower:]')
+operatingsystemmajrelease=$(facter operatingsystemmajrelease)
+hardwaremodel=$(facter hardwaremodel)
 
-# Install latest version of facter
+PATH=/opt/puppetlabs/puppet/bin:$PATH
 gem install bundler --no-ri --no-rdoc --no-format-executable
 bundle install --path vendor/bundler
-operatingsystem=$(bundle exec facter operatingsystem | tr '[:upper:]' '[:lower:]')
-operatingsystemrelease=$(bundle exec facter operatingsystemrelease)
-operatingsystemmajrelease=$(bundle exec facter operatingsystemmajrelease)
-lsbdistcodename=$(bundle exec facter lsbdistcodename)
-hardwaremodel=$(bundle exec facter hardwaremodel)
-
-# Fix for FreeBSD
-[ "${hardwaremodel}" = 'amd64' ] && hardwaremodel='x86_64'
-
-# Fix for Solaris
-[ "${hardwaremodel}" = 'i86pc' ] && hardwaremodel='x86_64'
 
 for version in 1.6.0 1.7.0 2.0.0 2.1.0 2.2.0 2.3.0 2.4.0; do
   FACTER_GEM_VERSION="~> ${version}" bundle update
-  minor_version=$(echo $version | cut -c1-3)
-  output_dir="/vagrant/${minor_version}"
-  mkdir -p $output_dir
-  case "${operatingsystem}" in
-    archlinux|gentoo)
-      output_file="${output_dir}/${operatingsystem}-${hardwaremodel}.facts"
-      ;;
-    openbsd)
-      output_file="${output_dir}/${operatingsystem}-${operatingsystemrelease}-${hardwaremodel}.facts"
-      ;;
-    *)
-      output_file="${output_dir}/${operatingsystem}-${operatingsystemmajrelease}-${hardwaremodel}.facts"
-      ;;
-  esac
+  output_file="/vagrant/$(bundle exec facter --version | cut -c1-3)/${operatingsystem}-${operatingsystemmajrelease}-${hardwaremodel}.facts"
+  mkdir -p $(dirname $output_file)
   echo $version | grep -q -E '^1\.' &&
     FACTER_GEM_VERSION="~> ${version}" bundle exec facter -j | bundle exec ruby -e 'require "json"; jj JSON.parse gets' | tee $output_file ||
     FACTER_GEM_VERSION="~> ${version}" bundle exec facter -j | tee $output_file
 done
-
-minor_version=3.0
-output_dir="/vagrant/${minor_version}"
-mkdir -p $output_dir
-case "${operatingsystem}" in
-  archlinux|gentoo)
-    output_file="${output_dir}/${operatingsystem}-${hardwaremodel}.facts"
-    ;;
-  openbsd)
-    output_file="${output_dir}/${operatingsystem}-${operatingsystemrelease}-${hardwaremodel}.facts"
-    ;;
-  *)
-    output_file="${output_dir}/${operatingsystem}-${operatingsystemmajrelease}-${hardwaremodel}.facts"
-    ;;
-esac
-
-case "${operatingsystem}" in
-  redhat)
-    case "${operatingsystemmajrelease}" in
-      5)
-        curl "https://yum.puppetlabs.com/puppetlabs-release-pc1-el-${operatingsystemmajrelease}.noarch.rpm" > /tmp/puppetlabs-release-pc1.rpm
-        rpm -ivh /tmp/puppetlabs-release-pc1.rpm ;;
-      *)
-        rpm -ivh "https://yum.puppetlabs.com/puppetlabs-release-pc1-el-${operatingsystemmajrelease}.noarch.rpm"
-        yum -y install puppet-agent
-        ;;
-    esac
-
-    /opt/puppetlabs/bin/facter -j | tee $output_file
-    ;;
-  debian|ubuntu)
-    [ $lsbdistcodename = "lucid" ] && exit # puppet-agent is not supported on lucid
-    wget "https://apt.puppetlabs.com/puppetlabs-release-pc1-${lsbdistcodename}.deb" -O /tmp/puppetlabs-release-pc1.deb
-    dpkg --install /tmp/puppetlabs-release-pc1.deb
-    apt-get update
-    apt-get -y install puppet-agent
-    /opt/puppetlabs/bin/facter -j | tee $output_file
-    ;;
-esac

data/lib/facterdb/version.rb

@@ -1,5 +1,5 @@
 module FacterDB
   module Version
-    STRING = '0.2.1'
+    STRING = '0.2.2'
   end
 end

data/spec/facterdb_spec.rb

@@ -11,5 +11,41 @@ describe 'FacterDB' do
         expect(subject.select { |facts| facts.class != Hash }.size).to eq(0)
       end
     end
+
+    context 'without parameters' do
+      subject { FacterDB.get_os_facts() }
+      it "Should return an array of hashes with at least 1 element" do
+        expect(subject.class).to eq Array
+        expect(subject.size).not_to eq(0)
+        expect(subject.select { |facts| facts.class != Hash }.size).to eq(0)
+      end
+    end
+
+    context 'with an Array filter' do
+      subject { FacterDB.get_os_facts('*', [{:osfamily => 'Debian'}]) }
+      it "Should return an array of hashes with at least 1 element" do
+        expect(subject.class).to eq Array
+        expect(subject.size).not_to eq(0)
+        expect(subject.select { |facts| facts.class != Hash }.size).to eq(0)
+      end
+    end
+
+    context 'with a Hash filter' do
+      subject { FacterDB.get_os_facts('*', {:osfamily => 'Debian'}) }
+      it "Should return an array of hashes with at least 1 element" do
+        expect(subject.class).to eq Array
+        expect(subject.size).not_to eq(0)
+        expect(subject.select { |facts| facts.class != Hash }.size).to eq(0)
+      end
+    end
+
+    context 'with a String filter' do
+      subject { FacterDB.get_os_facts('*', 'osfamily=Debian') }
+      it "Should return an array of hashes with at least 1 element" do
+        expect(subject.class).to eq Array
+        expect(subject.size).not_to eq(0)
+        expect(subject.select { |facts| facts.class != Hash }.size).to eq(0)
+      end
+    end
   end
 end