titech-pubnet-auth 1.1.1 → 1.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 8e611fb6cd90163e6460a3f576118d9b3d479bba
+  data.tar.gz: 686255d23b172c56253798ed5ad15cb362ce5591
+SHA512:
+  metadata.gz: 1e27367ad4f8a43b46e16366812962daadba3f811b01631023fd9d311da27ccc194bd104fa35ae3e0a59a37b41b8d5835dda0e2685ae2506a927f425e4788dab
+  data.tar.gz: 90fc94968d4aa64d993828be20f8c63ab5bfe25eaddf3fd2ad2c178854b26d6b044604cf8618faca4979af06b563771ef171a98027b50ff55571bc6e973a4dac

data/README.md

@@ -26,6 +26,7 @@ titech-pubnet に接続すると自動で認証が行われる（デスクトッ
 gem のインストール [^1]
 
 	$ gem install titech-pubnet-auth
+	$ gem install titech-pubnet-auth -r -p http://131.112.125.238:3128 # titech-pubnetでインストールするなら
 
 最初に、ユーザー名、パスワードを設定
 

data/bin/titech-pubnet-auth

@@ -7,7 +7,7 @@ require 'optparse'
 
 opt = OptionParser.new
 
-interval = 2
+interval = 3
 opt.on('-i','--interval=SECONDS',"Specify the polling interval.[#{interval}]"){|v|
   interval = v.to_i
 }
@@ -45,7 +45,7 @@ if configure
       'username' => username,
       'password' => password
   }
-  f = File::open(File.expand_path('../config/private.yml', File.dirname(__FILE__)),'w'){|f|
+  File::open(File.expand_path('../config/private.yml', File.dirname(__FILE__)),'w'){|f|
     f << conf.to_yaml
   }
   puts 'configured!'
@@ -61,15 +61,13 @@ end
 include TitechPubnetAuth::BinRoutines
 
 pubnet_auth = TitechPubnetAuth.new
-retry_count = 0
 loop do |t|
   begin
     if mputs 'network_available?', pubnet_auth.network_available?
       if not mputs 'is_connected?', pubnet_auth.is_connected?
         if mputs 'auth', pubnet_auth.auth
           notifier
-          retry_count = 0
-          pubnet_auth = TitechPubnetAuth.new(open_timeout: 3)
+          pubnet_auth = TitechPubnetAuth.new(open_timeout: 5)
         end
       end
     end
@@ -82,11 +80,9 @@ loop do |t|
     error_notifier(e) if debug
 
     pubnet_auth = TitechPubnetAuth.new(open_timeout: 10)
-    retry_count += 1
   ensure
-    print "\n"
-    $stdout.flush
-    sleep interval unless retry_count == 1
+    print "\n"; $stdout.flush
+    sleep interval
   end
   break if single
 end

data/lib/titech_pubnet_auth.rb

@@ -4,33 +4,30 @@ require 'mechanize'
 require 'uri'
 require 'yaml'
 
-$:.unshift File.dirname(__FILE__)
+$:.unshift(__dir__ || File.dirname(__FILE__))
 require 'titech_pubnet_auth/bin_routines'
 require 'titech_pubnet_auth/extensions'
 
 
 class TitechPubnetAuth
-  BASE_DIR = File.expand_path('..',File.dirname(__FILE__))
-
-  SAMPLE_URI = ->{%w[www.google.com twitter.com www.facebook.com mixi.jp www.amazon.co.jp www.wikipedia.org www.fc2.com www.yahoo.co.jp www.kakaku.com].map{|uri| URI.parse("http://#{uri}")}[rand(3)]}
-  
+  SAMPLE_URI = URI "http://example.org"
   HTTP_PROXY = {ip: '131.112.125.238', port: 3128}
 
-  def initialize(opt = {open_timeout: 3})
+  def initialize(opt = {open_timeout: 5})
     @agent, @agent_with_proxy = Mechanize.new, Mechanize.new
-    [@agent,@agent_with_proxy].each{|agent|
+    [@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'))
+    @private = YAML.load_file((__dir__ || File.dirname(__FILE__)) + '/../config/private.yml')
   end
 
   #
   # called if network_available? and not is_connected?
   #
-  def auth(sample_uri = SAMPLE_URI.call)
+  def auth(sample_uri = SAMPLE_URI)
     auth_page = @agent.get(sample_uri)
     return false if auth_page.uri.hostname != 'wlanauth.noc.titech.ac.jp'
 
@@ -43,23 +40,29 @@ class TitechPubnetAuth
 
     return is_connected?
   end
-
+  
   #
   # called if network_available?
   #
-  def is_connected?(sample_uri = SAMPLE_URI.call)
-    @agent_with_proxy.get(sample_uri).uri.hostname == sample_uri.hostname
+  def is_connected?(sample_uri = SAMPLE_URI)
+    compare_uri_by_first_part sample_uri, @agent_with_proxy.get(sample_uri).uri
   rescue # retry without the proxy
-    @agent.get(sample_uri).uri.hostname == sample_uri.hostname
+    compare_uri_by_first_part sample_uri, @agent.get(sample_uri).uri
   end
 
   #
   # note: titech-pubnet allows to access portal.titech.ac.jp without authentication.
   #
-  def network_available?(sample_uri = SAMPLE_URI.call)
+  def network_available?(sample_uri = SAMPLE_URI)
     @agent.get('http://portal.titech.ac.jp').to_b
   rescue # check another website just to make sure
     @agent.get(sample_uri).to_b rescue return false
   end
 
+  private
+
+  def compare_uri_by_first_part uri1, uri2
+    uri1.hostname.split(".").first == uri2.hostname.split(".").first
+  end
+
 end

data/lib/titech_pubnet_auth/bin_routines.rb

@@ -8,11 +8,11 @@ class TitechPubnetAuth
       require 'terminal-notifier'
       
       def notifier
-        TerminalNotifier.notify(nil,:title => 'Titech Punet Auth', :subtitle => 'Connected!') 
+        TerminalNotifier.notify(nil,:title => 'Titech Pubnet Auth', :subtitle => 'Connected!') 
       end
 
       def error_notifier(e)
-        TerminalNotifier.notify(e.inspect,:title => 'Titech Punet Auth',:subtitle => 'Caught an unexpected error!')
+        TerminalNotifier.notify(e.inspect,:title => 'Titech Pubnet Auth',:subtitle => 'Caught an unexpected error!')
       end
 
     else

data/lib/titech_pubnet_auth/version.rb

@@ -1,3 +1,3 @@
 class TitechPubnetAuth
-  VERSION = '1.1.1'
+  VERSION = '1.2.0'
 end

data/titech_pubnet_auth.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |gem|
   gem.version       = TitechPubnetAuth::VERSION
 
   gem.add_dependency 'colorize'
-  gem.add_dependency 'mechanize', '~> 2.5'
+  gem.add_dependency 'mechanize', '~> 2.7'
   gem.add_dependency 'terminal-notifier', '~> 1.4'
   
 end

metadata

@@ -1,52 +1,46 @@
 --- !ruby/object:Gem::Specification
 name: titech-pubnet-auth
 version: !ruby/object:Gem::Version
-  version: 1.1.1
-  prerelease: 
+  version: 1.2.0
 platform: ruby
 authors:
 - Sohei Takeno
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-24 00:00:00.000000000 Z
+date: 2013-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mechanize
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '2.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '2.7'
 - !ruby/object:Gem::Dependency
   name: terminal-notifier
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -68,10 +61,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/titech_pubnet_auth.rb
 - lib/titech_pubnet_auth/bin_routines.rb
 - lib/titech_pubnet_auth/extensions.rb
 - lib/titech_pubnet_auth/version.rb
-- lib/titech_pubnet_auth.rb
 - bin/titech-pubnet-auth
 - bin/titech-pubnet-auth-daemon
 - config/private.yml.example
@@ -81,27 +74,26 @@ files:
 - titech_pubnet_auth.gemspec
 homepage: http://for-titech.herokuapp.com
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: This gem provides automatic authentication for titech-pubnet.
 test_files: []
 has_rdoc: