web-facter 0.1.1 → 0.1.2

data/lib/web-facter.rb

@@ -6,10 +6,19 @@ require 'parseconfig'
 
 module  WebFacter
   class App
+
+    def initialize(filters=[])
+      @filters = filters
+    end
+
     def call(env)
       response = Rack::Response.new
       response.header['Content-Type'] = 'application/json'
-      response.write JSON.pretty_generate(Facter.to_hash)
+      facts = Facter.to_hash.dup
+      @filters.each do |filter|
+        facts.delete(filter.strip)
+      end
+      response.write JSON.pretty_generate(facts)
       response.finish
     end
 
@@ -25,13 +34,19 @@ module  WebFacter
     end
 
     def self.run!(options)
-      application = self.new
+
+      conf = options[:config] ? ParseConfig.new(options[:config]) : false
+
+      if conf && conf.get_value('filters')
+        application = self.new(conf.get_value('filters').split(','))
+      else
+        application = self.new
+      end
 
       daemonize = options[:daemonize]
       port = options[:port]
 
-      if options[:config]
-        conf = ParseConfig.new(options[:config])
+      if conf
         application = application.add_auth(conf) if conf.get_value('password')
         daemonize = conf.get_value('daemonize') ? conf.get_value('daemonize') == "true" : daemonize
         port = conf.get_value('port') ? conf.get_value('port') : port

data/lib/web-facter/version.rb

@@ -1,3 +1,3 @@
 module WebFacter
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/puppet/modules/web-facter/files/web-facter

@@ -0,0 +1,8 @@
+description "start and stop web-facter"
+author "Gareth Rushgrove"
+
+expect daemon
+
+env RUBY_BIN=/opt/ruby/bin
+
+exec $RUBY_BIN/web-facter --config /etc/web-facter.conf

data/puppet/modules/web-facter/manifests/init.pp

@@ -0,0 +1,32 @@
+class webfacter(
+  $port = '9294',
+  $username = nil,
+  $password = nil
+) {
+
+  package { "web-facter":
+    ensure   => installed,
+    provider => gem,
+  }
+
+  file { "/etc/web-facter.conf":
+    ensure  => present,
+    content => template('web-facter/web-facter.conf'),
+    notify  => Service['web-facter'],
+  }
+
+  file { "/etc/init/web-facter":
+    ensure  => present,
+    source  => "puppet:///modules/web-facter/web-facter",
+  }
+
+  service { "web-facter":
+    ensure   => running,
+    provider => upstart,
+    require  => [
+      Package["web-facter"],
+      File["/etc/init/web-facter"],
+    ]
+  }
+
+}

data/puppet/modules/web-facter/templates/web-facter.conf

@@ -0,0 +1,3 @@
+port=<%= port %>
+<% if username %>username=<%= username %><% end %>
+<% if password %>password=<%= password %><% end %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: web-facter
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-02 00:00:00.000000000Z
+date: 2011-11-07 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70126922955400 !ruby/object:Gem::Requirement
+  requirement: &70216156707440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70126922955400
+  version_requirements: *70216156707440
 - !ruby/object:Gem::Dependency
   name: facter
-  requirement: &70126922954980 !ruby/object:Gem::Requirement
+  requirement: &70216156707020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70126922954980
+  version_requirements: *70216156707020
 - !ruby/object:Gem::Dependency
   name: parseconfig
-  requirement: &70126922954560 !ruby/object:Gem::Requirement
+  requirement: &70216156706600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70126922954560
+  version_requirements: *70216156706600
 - !ruby/object:Gem::Dependency
   name: test-unit
-  requirement: &70126922954140 !ruby/object:Gem::Requirement
+  requirement: &70216156706180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70126922954140
+  version_requirements: *70216156706180
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70126922953720 !ruby/object:Gem::Requirement
+  requirement: &70216156705760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70126922953720
+  version_requirements: *70216156705760
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70126922953300 !ruby/object:Gem::Requirement
+  requirement: &70216156705340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70126922953300
+  version_requirements: *70216156705340
 description: Daemon which serves information from the facter gem as JSON over HTTP
 email:
 - gareth@morethanseven.net
@@ -93,6 +93,9 @@ files:
 - bin/web-facter
 - lib/web-facter.rb
 - lib/web-facter/version.rb
+- puppet/modules/web-facter/files/web-facter
+- puppet/modules/web-facter/manifests/init.pp
+- puppet/modules/web-facter/templates/web-facter.conf
 - test/integration_test.rb
 - test/test_helper.rb
 - web-facter.gemspec