titech-pubnet-auth 0.1.8 → 0.1.9

data/README.md

@@ -1,7 +1,7 @@
 # Titech-Pubnet-Auth
 ## これはなに？
 
-東工大の titech-pubnet の認証を自動で行なうための gem です。
+titech-pubnet の認証を自動で行なうための gem です。
 
 Mac OS X Mountain Lion, Ruby1.9.3 で動作確認済みです。たぶん Ruby1.9 じゃないと動きません。
 
@@ -14,6 +14,8 @@ titech-pubnet の認証の仕様に依存しているため、仕様が変われ
 
 ![](https://raw.github.com/Altech/titech-pubnet-auth/master/capture.png)
 
+titech-pubnet に接続すると自動で認証が行われる（デスクトップアラートは Mac のみ）。
+
 ## 使い方
 
 参考：Ruby1.9 のインストール（Mac OS Xの場合）。

data/bin/titech-pubnet-auth

@@ -10,11 +10,11 @@ require 'terminal-notifier' if OS_X
 
 opt = OptionParser.new
 
-interval = TitechPubnetAuth::INTERVAL
+interval = 2
 opt.on('-i','--interval=SECONDS','Specify the polling interval.[3]'){|v|
   interval = v.to_i
 }
-
+        
 daemon = false
 opt.on('-d','--daemon','Execute as a daemon.'){
   daemon = true
@@ -30,6 +30,11 @@ opt.on('-c','--config','Set your username and password.'){
   configure = true
 }
 
+debug = false
+opt.on('-dd','--debug','Debug-mode.'){
+  debug = true
+}
+
 opt.parse!(ARGV)
 
 
@@ -60,21 +65,32 @@ notifier = ->{TerminalNotifier.notify(nil,:title => 'Titech Punet Auth', :subtit
 error_notifier = ->(e){TerminalNotifier.notify(e.inspect,:title => 'Titech Punet Auth',:subtitle => 'Caught an unexpected error!') if OS_X}
 
 pubnet_auth = TitechPubnetAuth.new
-loop do
+retry_count = 0
+loop do |t|
   begin
-    mputs 'network_available?', pubnet_auth.network_available?
-    mputs 'is_connected?', pubnet_auth.is_connected? if pubnet_auth.network_available?
-    mputs 'auth', pubnet_auth.auth and notifier.call if pubnet_auth.network_available? and not pubnet_auth.is_connected?
+    if mputs 'network_available?', pubnet_auth.network_available? and
+      if not mputs 'is_connected?', pubnet_auth.is_connected?
+        if mputs 'auth', pubnet_auth.auth
+          notifier.call
+          retry_count = 0
+          pubnet_auth = TitechPubnetAuth.new(open_timeout: 3)
+        end
+      end
+    end
   rescue => e
-    mputs 'unexpected error', e.class and error_notifier.call(e)
+    mputs 'unexpected error', e.class
     puts "  == Message =="
     puts "  #{e.message}"
     puts "  == Stack Trace =="
     puts e.backtrace.map{|l| "  #{l}"}.join("\n")
+    error_notifier.call(e) if debug
+
+    pubnet_auth = TitechPubnetAuth.new(open_timeout: 10)
+    retry_count += 1
   ensure
     print "\n"
     $stdout.flush
-    sleep interval
+    sleep interval unless retry_count == 1
   end
   break if single
 end

data/lib/titech_pubnet_auth/version.rb

@@ -1,3 +1,3 @@
 class TitechPubnetAuth
-  VERSION = '0.1.8'
+  VERSION = '0.1.9'
 end

data/lib/titech_pubnet_auth.rb

@@ -11,46 +11,44 @@ require 'titech_pubnet_auth/extension'
 class TitechPubnetAuth
   BASE_DIR = File.expand_path('..',File.dirname(__FILE__))
 
-  SAMPLE_URI = URI.parse('http://github.com')
+  SAMPLE_URI = ->{%w[www.titech.ac.jp github.com twitter.com].map{|uri| URI.parse("http://#{uri}")}[rand(3)]}
   
   HTTP_PROXY = {ip: '131.112.125.238', port: 3128}
-  OPEN_TIMEOUT = 5
-  INTERVAL = 2
 
-  def initialize
+  def initialize(opt = {open_timeout: 3})
     @agent, @agent_with_proxy = Mechanize.new, Mechanize.new
     [@agent,@agent_with_proxy].each{|agent|
       agent.follow_meta_refresh = true
-      agent.open_timeout = OPEN_TIMEOUT
+      agent.open_timeout = opt[:open_timeout]
     }
     @agent_with_proxy.set_proxy(HTTP_PROXY[:ip], HTTP_PROXY[:port])
 
     @private = YAML.load(File::open(File::expand_path('config/private.yml',BASE_DIR),'r'))
   end
 
-  def auth
+  def auth(sample_uri = SAMPLE_URI.call)
     return false if not network_available?
     return true if is_connected?
 
-    auth_page = @agent.get(SAMPLE_URI)
+    auth_page = @agent.get(sample_uri)
     return false if auth_page.uri.hostname != 'wlanauth.noc.titech.ac.jp'
 
-    form = auth_page.form
-    form.buttonClicked = 4
-    form.redirect_url = SAMPLE_URI
-    form.username = @private['username']
-    form.password = @private['password']
-    form.submit
-
+    auth_page.form do |form|
+      form.buttonClicked = 4
+      form.redirect_url = sample_uri
+      form.username = @private['username']
+      form.password = @private['password']
+    end.submit
+    
     return is_connected?
   end
 
-  def is_connected?
-    return @agent_with_proxy.get(SAMPLE_URI).uri.hostname == SAMPLE_URI.hostname
+  def is_connected?(sample_uri = SAMPLE_URI.call)
+    return @agent_with_proxy.get(sample_uri).uri.hostname == sample_uri.hostname
   rescue # retry without the proxy
-    return @agent.get(SAMPLE_URI) == SAMPLE_URI.hostname
+    return @agent.get(sample_uri).uri.hostname == sample_uri.hostname
   end
-
+  
   def network_available?
     @agent.get('http://portal.titech.ac.jp')
     return true

data/lib/titech_pubnet_auth.rb.back

@@ -0,0 +1,59 @@
+# -*- coding: utf-8 -*-
+
+require 'mechanize'
+require 'uri'
+require 'yaml'
+
+$:.unshift File.dirname(__FILE__)
+require 'titech_pubnet_auth/extension'
+
+
+class TitechPubnetAuth
+  BASE_DIR = File.expand_path('..',File.dirname(__FILE__))
+
+  SAMPLE_URI = ->{%w[www.titech.ac.jp github.com twitter.com].map{|uri| URI.parse("http://#{uri}")}[rand(3)]}
+  
+  HTTP_PROXY = {ip: '131.112.125.238', port: 3128}
+
+  def initialize(opt = {open_timeout: 3})
+    @agent, @agent_with_proxy = Mechanize.new, Mechanize.new
+    [@agent,@agent_with_proxy].each{|agent|
+      agent.follow_meta_refresh = true
+      agent.open_timeout = opt[:open_timeout]
+    }
+    @agent_with_proxy.set_proxy(HTTP_PROXY[:ip], HTTP_PROXY[:port])
+
+    @private = YAML.load(File::open(File::expand_path('config/private.yml',BASE_DIR),'r'))
+  end
+
+  def auth(sample_uri = SAMPLE_URI.call)
+    return false if not network_available?
+    return true if is_connected?
+
+    auth_page = @agent.get(sample_uri)
+    return false if auth_page.uri.hostname != 'wlanauth.noc.titech.ac.jp'
+
+    auth_page.form do |form|
+      form.buttonClicked = 4
+      form.redirect_url = sample_uri
+      form.username = @private['username']
+      form.password = @private['password']
+    end.submit
+    
+    return is_connected?
+  end
+
+  def is_connected?(sample_uri = SAMPLE_URI.call)
+    return @agent_with_proxy.get(sample_uri).uri.hostname == sample_uri.hostname
+  rescue # retry without the proxy
+    return @agent.get(sample_uri).uri.hostname == sample_uri.hostname
+  end
+  
+  def network_available?
+    @agent.get('http://portal.titech.ac.jp')
+    return true
+  rescue => e
+    return false
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: titech-pubnet-auth
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-13 00:00:00.000000000 Z
+date: 2012-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -71,6 +71,7 @@ files:
 - lib/titech_pubnet_auth/extension.rb
 - lib/titech_pubnet_auth/version.rb
 - lib/titech_pubnet_auth.rb
+- lib/titech_pubnet_auth.rb.back
 - bin/titech-pubnet-auth
 - bin/titech-pubnet-auth-daemon
 - config/private.yml