hotspotlogin 0.1.1 → 0.1.1.1

data/README.rdoc

@@ -22,11 +22,11 @@ On the command-line:
 
 ==== Options
 
-  --daemon		daemonize
+  --[no-]daemon		daemonize [by default, executes in foreground]
 
-  --log			log file (ignored when no --daemon)
+  --log			log file (ignored when --no-daemon)
 
-  --pid			pid file (ignored when no --daemon)
+  --pid			pid file (ignored when --no-daemon)
 
   --port 		[default 4990]
 
@@ -50,7 +50,7 @@ See also chilli.conf(5) manual page.
 
 (The MIT License)
 
-Copyright (c) 2010 Guido De Rosa
+Copyright (c) 2010 Guido De Rosa <job*guidoderosa.net>
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/bin/hotspotlogin.rb

@@ -16,26 +16,35 @@ require File.expand_path(
   File.dirname(file) + "/../lib/hotspotlogin"
 )
 
-config = HotSpotLogin.config!
-
-if config['daemon']
-  pid = fork do
-    if config['log'] 
-      STDOUT.reopen(config['log'], 'a')
-      STDERR.reopen(config['log'], 'a') 
-      Signal.trap('USR1') do
-        STDOUT.flush
-        STDERR.flush
+# The $0 hack also would break the following code :-/
+
+# RubyGems sucks 'cause it includes bin/ directories into the $LOAD_PATH
+#
+# So, this file may be actually used to just 'require' the 
+# hotspotlogin library (in this case $0 != __FILE__) 
+
+if $0 == __FILE__ # actually start hotspotlogin service
+  config = HotSpotLogin.config!
+
+  if config['daemon']
+    pid = fork do
+      if config['log'] 
+        STDOUT.reopen(config['log'], 'a')
+        STDERR.reopen(config['log'], 'a') 
+        Signal.trap('USR1') do
+          STDOUT.flush
+          STDERR.flush
+        end
       end
+      HotSpotLogin::App.run!
+      FileUtils.rm config['pid'] if config['pid'] and File.exists? config['pid']
     end
-    HotSpotLogin::App.run!
-    FileUtils.rm config['pid'] if config['pid'] and File.exists? config['pid']
-  end
-  if config['pid'] =~ /\S/ 
-    File.open config['pid'], 'w' do |f|
-      f.write pid 
+    if config['pid'] =~ /\S/ 
+      File.open config['pid'], 'w' do |f|
+        f.write pid 
+      end
     end
+  else # run in foreground
+    HotSpotLogin::App.run!
   end
-else
-  HotSpotLogin::App.run!
 end

data/lib/hotspotlogin/config.rb

@@ -28,8 +28,8 @@ module HotSpotLogin
 
       # Command line switches override configuration file.
 
-      opts.on('--daemon', 'become a daemon') do
-        @@config['daemon'] = true
+      opts.on('--[no-]daemon', 'become a daemon') do |daemonize|
+        @@config['daemon'] = daemonize
       end
 
       opts.on('--log FILE', 'log file (overwrite existing)') do |filename|

data/lib/hotspotlogin/constants.rb

@@ -1,6 +1,6 @@
 module HotSpotLogin
 
-  VERSION = '0.1.1'
+  VERSION = '0.1.1.1'
 
   DEFAULT_CONFIG = {
     'listen-address'    => '0.0.0.0',

metadata

@@ -1,12 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: hotspotlogin
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 1
-  version: 0.1.1
+  version: 0.1.1.1
 platform: ruby
 authors: 
 - Guido De Rosa
@@ -14,25 +9,23 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-04 00:00:00 +00:00
+date: 2010-03-04 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sinatra
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
-  type: :runtime
-  version_requirements: *id001
+    version: 
 description: Traditionally, a PHP or Perl/CGI web page has been used to login unauthenticated users to a Network Access Controller like ChilliSpot; this hotspotlogin implementation is based on Ruby and Sinatra (the classy web framework).
 email: guidoderosa@gmail.com
-executables: []
-
+executables: 
+- hotspotlogin.rb
 extensions: []
 
 extra_rdoc_files: 
@@ -64,20 +57,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
+  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
+  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Ruby/Sinatra implementation of the login page used with ChilliSpot and friends.