web-facter 0.0.3 → 0.1.0

data/Gemfile

@@ -1,6 +1,12 @@
-# A sample Gemfile
-source "http://rubygems.org"
+source :rubygems
 
 gem "facter"
 gem "rack"
+gem "rake"
 gem "parseconfig"
+
+group :test do
+  gem "test-unit"
+  gem "rack-test"
+  gem "mocha"
+end

data/Rakefile

@@ -1 +1,10 @@
 require "bundler/gem_tasks"
+require "rake/testtask"
+
+Rake::TestTask.new do |t|
+  t.libs << "test"
+  t.test_files = FileList["test/**/*_test.rb"]
+  t.verbose = true
+end
+
+task :default => :test

data/bin/web-facter

@@ -3,9 +3,8 @@
 require 'rack'
 require 'optparse'
 require 'web-facter'
-require 'parseconfig'
 
-options = {}
+options = {:daemonize => true, :port => 9294, :config => false}
 
 optparse = OptionParser.new do |opts|
   opts.banner = 'Usage: web-facter [options] ...'
@@ -13,17 +12,14 @@ optparse = OptionParser.new do |opts|
   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
@@ -36,29 +32,7 @@ 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
+  WebFacter::App.run!(options)
 rescue OptionParser::InvalidArgument, OptionParser::InvalidOption, OptionParser::MissingArgument
   puts $!.to_s
   puts optparse

data/lib/web-facter.rb

@@ -2,14 +2,45 @@ require "web-facter/version"
 require 'rack'
 require 'facter'
 require 'json'
+require 'parseconfig'
 
 module  WebFacter
   class App
-    def call env
+    def call(env)
       response = Rack::Response.new
       response.header['Content-Type'] = 'application/json'
       response.write JSON.pretty_generate(Facter.to_hash)
       response.finish
     end
+
+    def add_auth(conf)
+      application = Rack::Auth::Basic.new(self) do |username, password|
+        stored_username = conf.get_value('username')
+        username_check = stored_username ? stored_username == username : true
+        password_check = conf.get_value('password') == password
+        username_check && password_check
+      end
+      application.realm = 'Web Facter'
+      application
+    end
+
+    def self.run!(options)
+      application = self.new
+
+      daemonize = options[:daemonize]
+      port = options[:port]
+
+      if options[:config]
+        conf = ParseConfig.new(options[:config])
+        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
+      end
+
+      Rack::Server.new(:app => application, :Port => port, :daemonize => daemonize).start
+r
+    end
   end
 end
+
+

data/lib/web-facter/version.rb

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

data/test/integration_test.rb

@@ -0,0 +1,46 @@
+require "test_helper"
+require "web-facter"
+
+class SearchTest < Test::Unit::TestCase
+  include Rack::Test::Methods
+
+  def app
+    WebFacter::App.new
+  end
+
+  def test_view_renders_successfully
+    get "/"
+    assert last_response.ok?
+  end
+
+  def test_view_returns_json
+    get "/"
+    json = JSON.load(last_response.body)
+    assert json.keys.include?("architecture")
+  end
+
+end
+
+class AuthenticationTest < Test::Unit::TestCase
+  include Rack::Test::Methods
+
+  def app
+    conf = mock()
+    conf.expects(:get_value).with('username').returns("admin")
+    conf.expects(:get_value).with('password').returns("password")
+    WebFacter::App.new().add_auth(conf)
+  end
+
+  def test_view_requires_authentication
+    authorize 'evil', 'password'
+    get "/"
+    assert_equal 401, last_response.status
+  end
+
+  def test_view_renders_with_auth_details
+    authorize 'admin', 'password'
+    get "/"
+    assert last_response.ok?
+  end
+
+end

data/test/test_helper.rb

@@ -0,0 +1,9 @@
+ENV['RACK_ENV'] = 'test'
+
+require "test/unit"
+require "rack/test"
+require "mocha"
+
+%w[ lib ].each do |path|
+  $:.unshift path unless $:.include?(path)
+end

data/web-facter.gemspec

@@ -20,4 +20,9 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency "rack"
   s.add_runtime_dependency "facter"
+  s.add_runtime_dependency "parseconfig"
+
+  s.add_development_dependency "test-unit"
+  s.add_development_dependency "rack-test"
+  s.add_development_dependency "mocha"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: web-facter
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-31 00:00:00.000000000Z
+date: 2011-11-02 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70139598663080 !ruby/object:Gem::Requirement
+  requirement: &70273794104500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70139598663080
+  version_requirements: *70273794104500
 - !ruby/object:Gem::Dependency
   name: facter
-  requirement: &70139598662660 !ruby/object:Gem::Requirement
+  requirement: &70273794104080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,51 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70139598662660
+  version_requirements: *70273794104080
+- !ruby/object:Gem::Dependency
+  name: parseconfig
+  requirement: &70273794103660 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70273794103660
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: &70273794103240 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70273794103240
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: &70273794102820 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70273794102820
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: &70273794102400 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70273794102400
 description: Daemon which serves information from the facter gem as JSON over HTTP
 email:
 - gareth@morethanseven.net
@@ -49,6 +93,8 @@ files:
 - bin/web-facter
 - lib/web-facter.rb
 - lib/web-facter/version.rb
+- test/integration_test.rb
+- test/test_helper.rb
 - web-facter.gemspec
 homepage: https://github.com/garethr/web-facter
 licenses: []
@@ -74,4 +120,6 @@ rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Display Facter information as JSON over HTTP
-test_files: []
+test_files:
+- test/integration_test.rb
+- test/test_helper.rb