web-facter 0.0.1 → 0.0.3

data/Gemfile

@@ -3,3 +3,4 @@ source "http://rubygems.org"
 
 gem "facter"
 gem "rack"
+gem "parseconfig"

data/Gemfile.lock

@@ -2,6 +2,7 @@ GEM
   remote: http://rubygems.org/
   specs:
     facter (1.6.2)
+    parseconfig (0.5.2)
     rack (1.3.5)
 
 PLATFORMS
@@ -9,4 +10,5 @@ PLATFORMS
 
 DEPENDENCIES
   facter
+  parseconfig
   rack

data/README

@@ -2,4 +2,26 @@ A tiny ruby rack application which exposes the data from facter as JSON over HTT
 
     gem install web-facter
 
-Currently this is pretty raw. I plan on making it a little more configurable shortly at which point I'll write a proper README.
+Provides a simple command line tool which runs a built in web server. On accessing
+the specified port you should get a JSON response containing the current facts.
+
+    web-facter --help
+    Usage: web-facter [options] ...
+
+    Configuration options:
+            --no-daemonize               Don't daemonize the web server process
+        -p, --port PORT                  The port to run web-facter on
+        -c, --config FILE                The file to load with configuration options
+        -h, --help                       Display this screenp
+
+
+You can configure web-facter using a configuration file, using the following format, and
+specifying the filename with the --config option above.
+
+    username=gilbert
+    password=george
+    port=3009
+    daemonize=true
+
+Note that the port and daemonize options will override those on the command line.
+The username and password options enable HTTP basic authentication using those details.

data/bin/web-facter

@@ -1,6 +1,69 @@
 #!/usr/bin/env ruby
 
 require 'rack'
+require 'optparse'
 require 'web-facter'
+require 'parseconfig'
 
-Rack::Server.new(:app => WebFacter::App.new, :Port => 9294, :daemonize => true).start
+options = {}
+
+optparse = OptionParser.new do |opts|
+  opts.banner = 'Usage: web-facter [options] ...'
+
+  opts.separator ''
+  opts.separator 'Configuration options:'
+
+  options[:daemonize] = true
+  opts.on( '--no-daemonize', "Don't daemonize the web server process") do |_|
+    options[:daemonize] = false
+  end
+
+  options[:port] = 9294
+  opts.on( '-p', '--port PORT', 'The port to run web-facter on') do |port|
+    options[:port] = port
+  end
+
+  options[:config] = false
+  opts.on( '-c', '--config FILE', 'The file to load with configuration options') do |file|
+    options[:config] = file
+  end
+
+  opts.on_tail('-h', '--help', 'Display this screen') do
+    puts opts
+    exit
+  end
+end
+
+begin
+  optparse.parse!
+
+  application = WebFacter::App.new
+
+  daemonize = options[:daemonize]
+  port = options[:port]
+
+  if options[:config]
+    conf = ParseConfig.new(options[:config])
+
+    if conf.get_value('password')
+      application = Rack::Auth::Basic.new(application) do |username, password|
+        username_check = conf.get_value('username') ? conf.get_value('username') == username : true
+        password_check = conf.get_value('password') == password
+        username_check && password_check
+      end
+      application.realm = 'Web Facter'
+    end
+
+    port = conf.get_value('port') ? conf.get_value('port') : port
+    daemonize = conf.get_value('daemonize') ? conf.get_value('daemonize') == "true" : daemonize
+  end
+
+  Rack::Server.new(:app => application, :Port => port, :daemonize => daemonize).start
+rescue OptionParser::InvalidArgument, OptionParser::InvalidOption, OptionParser::MissingArgument
+  puts $!.to_s
+  puts optparse
+  exit
+rescue Errno::EACCES
+  puts $!.to_s
+  exit
+end

data/lib/web-facter/version.rb

@@ -1,3 +1,3 @@
 module WebFacter
-  VERSION = "0.0.1"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: web-facter
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-30 00:00:00.000000000Z
+date: 2011-10-31 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70344602869480 !ruby/object:Gem::Requirement
+  requirement: &70139598663080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70344602869480
+  version_requirements: *70139598663080
 - !ruby/object:Gem::Dependency
   name: facter
-  requirement: &70344602869060 !ruby/object:Gem::Requirement
+  requirement: &70139598662660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70344602869060
+  version_requirements: *70139598662660
 description: Daemon which serves information from the facter gem as JSON over HTTP
 email:
 - gareth@morethanseven.net