hotspotlogin 0.1.1.2 → 0.1.1.4

data/README.rdoc

@@ -1,4 +1,4 @@
-= hotspotlogin.rb
+= hotspotlogin
 
 == DESCRIPTION:
 
@@ -12,13 +12,11 @@ http://github.com/gderosa/hotspotlogin.rb
 
 Installation:
 
-  sudo gem source --add http://rubygems.org
-
   sudo gem install hotspotlogin
   
 On the command-line:
   
-  $ hotspotlogin.rb [options]
+  $ hotspotlogin [options]
 
 ==== Options
 
@@ -50,7 +48,7 @@ See also chilli.conf(5) manual page.
 
 (The MIT License)
 
-Copyright (c) 2010 Guido De Rosa <job*guidoderosa.net>
+Copyright (c) 2010 Guido De Rosa <guido.derosa*vemarsas.it>
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/bin/hotspotlogin

@@ -0,0 +1,38 @@
+#!/usr/bin/env ruby
+
+require 'rubygems'
+require 'sinatra/base'
+
+if File.symlink? __FILE__
+  file = File.readlink __FILE__
+else
+  file = __FILE__
+end
+
+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
+      end
+    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 
+    end
+  end
+else # run in foreground
+  HotSpotLogin::App.run!
+end

data/lib/hotspotlogin/constants.rb

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

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 1
   - 1
-  - 2
-  version: 0.1.1.2
+  - 4
+  version: 0.1.1.4
 platform: ruby
 authors: 
 - Guido De Rosa
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-08 00:00:00 +01:00
+date: 2010-03-09 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -31,9 +31,9 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 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
+email: guido.derosa@vemarsas.it
 executables: 
-- hotspotlogin.rb
+- hotspotlogin
 extensions: []
 
 extra_rdoc_files: 
@@ -45,7 +45,7 @@ files:
 - views/hotspotlogin.erb
 - views/404.erb
 - views/_login_form.erb
-- bin/hotspotlogin.rb
+- bin/hotspotlogin
 - lib/hotspotlogin.rb
 - lib/hotspotlogin/constants.rb
 - lib/hotspotlogin/config.rb

data/bin/hotspotlogin.rb

@@ -1,50 +0,0 @@
-#!/usr/bin/env ruby
-
-# Don'use this hack, since it breaks /proc/<pid>/cmdline
-# $0 = 'hotspotlogin.rb'
-
-require 'rubygems'
-require 'sinatra/base'
-
-if File.symlink? __FILE__
-  file = File.readlink __FILE__
-else
-  file = __FILE__
-end
-
-require File.expand_path(
-  File.dirname(file) + "/../lib/hotspotlogin"
-)
-
-# 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
-    if config['pid'] =~ /\S/ 
-      File.open config['pid'], 'w' do |f|
-        f.write pid 
-      end
-    end
-  else # run in foreground
-    HotSpotLogin::App.run!
-  end
-end