titech-pubnet-auth 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e611fb6cd90163e6460a3f576118d9b3d479bba
-  data.tar.gz: 686255d23b172c56253798ed5ad15cb362ce5591
+  metadata.gz: e6d229c5d3acdffa4e0f96fc54a5a588f79687ba
+  data.tar.gz: 41938bad3750c15dc24772dd7a066058b906699e
 SHA512:
-  metadata.gz: 1e27367ad4f8a43b46e16366812962daadba3f811b01631023fd9d311da27ccc194bd104fa35ae3e0a59a37b41b8d5835dda0e2685ae2506a927f425e4788dab
-  data.tar.gz: 90fc94968d4aa64d993828be20f8c63ab5bfe25eaddf3fd2ad2c178854b26d6b044604cf8618faca4979af06b563771ef171a98027b50ff55571bc6e973a4dac
+  metadata.gz: 35f2a9f211ed53a98c978b78f6872f8f3e0bc0074365875f4a26edc85ef6378216960544ac63aabcb61f453d500ac6ca6277172ee7fd86e6bcac2d3689b89a11
+  data.tar.gz: 2d3aaea8844c635ecdbc174514722eb78a42b3fe64786774f22307f77ee97e549f16ac81094c5749b53ee38a0b1d41f1fa1456576297da0e820f52507065b988

data/README.md

@@ -1,10 +1,10 @@
+[![Build Status](https://travis-ci.org/Altech/titech-pubnet-auth.svg?branch=master)](https://travis-ci.org/Altech/titech-pubnet-auth)
+
 # Titech-Pubnet-Auth
 ## これはなに？
 
 titech-pubnet の認証を自動で行なうための gem です。
 
-Mac OS X Mountain Lion, Ruby1.9.3 で動作確認済みです。たぶん Ruby1.9 じゃないと動きません。
-
 titech-pubnet の認証の仕様に依存しているため、仕様が変われば動かなくなるかもしれません。主に以下のようなものの内容に依存していると思います。
 
 - 認証ページのドメイン
@@ -18,15 +18,13 @@ titech-pubnet に接続すると自動で認証が行われる（デスクトッ
 
 ## 使い方
 
-参考：Ruby1.9 のインストール（Mac OS Xの場合）。
+参考：Ruby のインストール（Mac OS Xの場合）。
 
-	$ sudo port install ruby19 # MacPortsを使うなら
-	$ brew install ruby # Homebrewを使うなら
+	$ brew install ruby # Homebrewを使う場合
 
-gem のインストール [^1]
+gem のインストール
 
-	$ gem install titech-pubnet-auth
-	$ gem install titech-pubnet-auth -r -p http://131.112.125.238:3128 # titech-pubnetでインストールするなら
+	$ gem install titech-pubnet-auth # titech-pubnet 経由でインストールするなら引数として " -r -p http://131.112.125.238:3128" を追加
 
 最初に、ユーザー名、パスワードを設定
 
@@ -45,9 +43,7 @@ gem のインストール [^1]
 
 ### ログイン時に起動する方法（Mac OS X の場合）
 
-色々あるけど以下だとほぼGUIで完結する。
+色々あるけど以下だとほぼGUIで完結する。CUIなら launchd など。
 
 1. 「システム環境設定」→「ユーザとグループ」→「ログイン項目」に起動スクリプト`titech-pubnet-auth-daemon`を追加（`$ which titech-pubnet-auth-daemon`とかで場所を調べて、Finder上で⌘gでパス指定して移動できる）。
 2. （デフォルトだとプロセス終了時にターミナル.appが閉じない。これが煩わしい場合、）ターミナルを起動して、「環境設定」→「設定タブ」→「シェル」で、「シェルの終了時」の動作を「ウィンドウを閉じる」にする。
-
-[^1]: 依存している gem の一つである nokogiri（XMLパーサー）が native extension を使っていて必要なものが無いと install で失敗するかも。http://nokogiri.org/tutorials/installing_nokogiri.html を参照。

data/Rakefile

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 require 'rdoc/task'
 require "bundler/gem_tasks"
+require 'rspec/core/rake_task'
 
 BASE_DIR = File.dirname(__FILE__)
 
@@ -9,3 +10,5 @@ require 'yard/rake/yardoc_task'
 YARD::Rake::YardocTask.new do |t|
   t.files   = ['README.md','lib/**/*.rb']
 end
+
+RSpec::Core::RakeTask.new(:spec)

data/bin/titech-pubnet-auth

@@ -11,7 +11,7 @@ interval = 3
 opt.on('-i','--interval=SECONDS',"Specify the polling interval.[#{interval}]"){|v|
   interval = v.to_i
 }
-        
+
 daemon = false
 opt.on('-d','--daemon','Execute as a daemon.'){
   daemon = true

data/lib/titech_pubnet_auth.rb

@@ -4,7 +4,7 @@ require 'mechanize'
 require 'uri'
 require 'yaml'
 
-$:.unshift(__dir__ || File.dirname(__FILE__))
+$:.unshift(File.dirname(__FILE__))
 require 'titech_pubnet_auth/bin_routines'
 require 'titech_pubnet_auth/extensions'
 
@@ -13,7 +13,8 @@ class TitechPubnetAuth
   SAMPLE_URI = URI "http://example.org"
   HTTP_PROXY = {ip: '131.112.125.238', port: 3128}
 
-  def initialize(opt = {open_timeout: 5})
+  def initialize(opt)
+    opt = {open_timeout: 5}.merge(opt)
     @agent, @agent_with_proxy = Mechanize.new, Mechanize.new
     [@agent, @agent_with_proxy].each{|agent|
       agent.follow_meta_refresh = true
@@ -21,7 +22,7 @@ class TitechPubnetAuth
     }
     @agent_with_proxy.set_proxy(HTTP_PROXY[:ip], HTTP_PROXY[:port])
 
-    @private = YAML.load_file((__dir__ || File.dirname(__FILE__)) + '/../config/private.yml')
+    @private = opt[:private] || YAML.load_file(File.dirname(__FILE__) + '/../config/private.yml')
   end
 
   #
@@ -40,7 +41,7 @@ class TitechPubnetAuth
 
     return is_connected?
   end
-  
+
   #
   # called if network_available?
   #

data/lib/titech_pubnet_auth/version.rb

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

data/titech_pubnet_auth.gemspec

@@ -20,5 +20,9 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'colorize'
   gem.add_dependency 'mechanize', '~> 2.7'
   gem.add_dependency 'terminal-notifier', '~> 1.4'
-  
+
+  gem.add_development_dependency 'rake'
+  gem.add_development_dependency 'rspec'
+  gem.add_development_dependency 'yard'
+  gem.add_development_dependency 'webmock'
 end

metadata

@@ -1,57 +1,113 @@
 --- !ruby/object:Gem::Specification
 name: titech-pubnet-auth
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Sohei Takeno
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-28 00:00:00.000000000 Z
+date: 2014-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mechanize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.7'
 - !ruby/object:Gem::Dependency
   name: terminal-notifier
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: This gem provides automatic authentication for titech-pubnet.
 email:
 - takeno.sh@gmail.com
@@ -61,16 +117,16 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- Gemfile
+- README.md
+- Rakefile
+- bin/titech-pubnet-auth
+- bin/titech-pubnet-auth-daemon
+- config/private.yml.example
 - lib/titech_pubnet_auth.rb
 - lib/titech_pubnet_auth/bin_routines.rb
 - lib/titech_pubnet_auth/extensions.rb
 - lib/titech_pubnet_auth/version.rb
-- bin/titech-pubnet-auth
-- bin/titech-pubnet-auth-daemon
-- config/private.yml.example
-- Rakefile
-- Gemfile
-- README.md
 - titech_pubnet_auth.gemspec
 homepage: http://for-titech.herokuapp.com
 licenses: []
@@ -81,17 +137,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: This gem provides automatic authentication for titech-pubnet.