titech-pubnet-auth 0.2.2 → 0.3.0

data/bin/titech-pubnet-auth

@@ -1,12 +1,9 @@
 #!/usr/bin/env ruby
 # -*- coding: utf-8 -*-
 
-OS_X = RbConfig::CONFIG["target_os"].downcase =~ /^darwin/
-
 $:.unshift File.expand_path('../lib', File.dirname(__FILE__))
 require 'titech_pubnet_auth'
 require 'optparse'
-require 'terminal-notifier' if OS_X
 
 opt = OptionParser.new
 
@@ -61,8 +58,7 @@ if daemon
 end
 
 
-notifier = ->{TerminalNotifier.notify(nil,:title => 'Titech Punet Auth', :subtitle => 'Connected!') if OS_X}
-error_notifier = ->(e){TerminalNotifier.notify(e.inspect,:title => 'Titech Punet Auth',:subtitle => 'Caught an unexpected error!') if OS_X}
+include TitechPubnetAuth::BinRoutines
 
 pubnet_auth = TitechPubnetAuth.new
 retry_count = 0
@@ -71,7 +67,7 @@ loop do |t|
     if mputs 'network_available?', pubnet_auth.network_available?
       if not mputs 'is_connected?', pubnet_auth.is_connected?
         if mputs 'auth', pubnet_auth.auth
-          notifier.call
+          notifier
           retry_count = 0
           pubnet_auth = TitechPubnetAuth.new(open_timeout: 3)
         end
@@ -83,7 +79,7 @@ loop do |t|
     puts "  #{e.message}"
     puts "  == Stack Trace =="
     puts e.backtrace.map{|l| "  #{l}"}.join("\n")
-    error_notifier.call(e) if debug
+    error_notifier(e) if debug
 
     pubnet_auth = TitechPubnetAuth.new(open_timeout: 10)
     retry_count += 1

data/lib/titech_pubnet_auth.rb

@@ -5,7 +5,7 @@ require 'uri'
 require 'yaml'
 
 $:.unshift File.dirname(__FILE__)
-require 'titech_pubnet_auth/extension'
+require 'titech_pubnet_auth/bin_routines'
 
 
 class TitechPubnetAuth
@@ -55,11 +55,11 @@ class TitechPubnetAuth
   #
   # note: titech-pubnet allows to access portal.titech.ac.jp without authentication.
   #
-  def network_available?
+  def network_available?(sample_uri = SAMPLE_URI.call)
     @agent.get('http://portal.titech.ac.jp')
     return true
-  rescue => e
-    return false
+  rescue # check another website just to make sure
+    return @agent.get(sample_uri).uri.hostname == sample_uri.hostname
   end
 
 end

data/lib/titech_pubnet_auth/bin_routines.rb

@@ -0,0 +1,32 @@
+# -*- coding: utf-8 -*-
+
+class TitechPubnetAuth
+  module BinRoutines
+    module_function
+    
+    if RbConfig::CONFIG["target_os"].downcase =~ /^darwin/
+      require 'terminal-notifier'
+      
+      def notifier
+        TerminalNotifier.notify(nil,:title => 'Titech Punet Auth', :subtitle => 'Connected!') 
+      end
+
+      def error_notifier(e)
+        TerminalNotifier.notify(e.inspect,:title => 'Titech Punet Auth',:subtitle => 'Caught an unexpected error!')
+      end
+
+    else
+      def notifier; end
+      def error_notifier; end
+    end
+
+    require 'colorize'
+
+    def mputs(tag,msg)
+      s = Time.now.strftime("%Y-%m-%d %H:%M:%S").green + "\t" + caller.first[/([^:]*):/,1].split('/').last.blue + "\t" + tag + "：" + msg.to_s
+      puts(s)
+      return msg
+    end
+
+  end
+end

data/lib/titech_pubnet_auth/version.rb

@@ -1,3 +1,3 @@
 class TitechPubnetAuth
-  VERSION = '0.2.2'
+  VERSION = '0.3.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: titech-pubnet-auth
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-21 00:00:00.000000000 Z
+date: 2012-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -68,7 +68,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/titech_pubnet_auth/extension.rb
+- lib/titech_pubnet_auth/bin_routines.rb
 - lib/titech_pubnet_auth/version.rb
 - lib/titech_pubnet_auth.rb
 - bin/titech-pubnet-auth

data/lib/titech_pubnet_auth/extension.rb

@@ -1,14 +0,0 @@
-# -*- coding: utf-8 -*-
-
-require 'colorize'
-
-module Kernel
-  #
-  # バッチ処理の経過報告用メソッド。ファイル名と時刻を付けて出力してくれる。
-  #
-  def mputs(tag,msg)
-    s = Time.now.strftime("%Y-%m-%d %H:%M:%S").green + "\t" + caller.first[/([^:]*):/,1].split('/').last.blue + "\t" + tag + "：" + msg.to_s
-    puts(s)
-    return msg
-  end
-end