misoni 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 075a6c5fe791cd08818db2ed6e0e7c8c411223b4
-  data.tar.gz: d7b33e7ee1bf3e793f0ca59bc26f0e1d0523efd3
+  metadata.gz: c34f0960bf1598a02b537e9a52ea5b6b6ef10dba
+  data.tar.gz: 9e260266a1c621efb36b625125d2a2b6868f78e6
 SHA512:
-  metadata.gz: 444de2bf3a3f91205a67416fc0e70ac19b1dc04687b2eb048130f92d3c87ef84757d90cb20e430fde1740fb392bc7c1dd77592b128d2696a0736f42100709591
-  data.tar.gz: b59bc78814ddb8a77fe5c3c1fc4da496f257d2d8a6d206304efd5b1678c45ce761dd613798613aae4cca0551e982711156d978dfb65c1cd5c21ab80dd5f9892d
+  metadata.gz: 4170fd2d5eafa90b6c92bd2dfd9e483afb2b47b459449a1aa0c3ff4c93e74a3d82660e6b9e6094fa868ea40d651311b90c3ea3d072fdb92fe777ff4d6311731d
+  data.tar.gz: 3e44b17254c8ae1362ac4fd453ef47eaa4140ade6d5597c09ee11e21980b55c02af14650b2af614e52260725fc1482042276f9996778398e955e1359d27adda9

data/README.md

@@ -1,5 +1,7 @@
 # Misoni
 
+[![Gem Version](https://badge.fury.io/rb/misoni.svg)](http://badge.fury.io/rb/misoni)
+
 Magical login to the Zokei Network.
 
 「ZOKEIネットワーク接続のための認証が必要です」を二度と見ないことを目的としたプロジェクトです。鯖の味噌煮。
@@ -8,23 +10,26 @@ Magical login to the Zokei Network.
 ## Installation
 
 ```
-$ git clone https://github.com/noir-neo/misoni
-$ cd misoni
-$ bundle install --path vendor/bundle
+$ gem install misoni
 ```
 
-あとでちゃんと`gem install`でできるようにします。
-
 
 ## Configuration
 
 ```
-$ bundle exec bin/misoni config
+$ misoni config
 ```
 
-をするとエディタが開くので
+もしくは pit コマンドを直接
 
 ```
+$ pit set "http://auth.zokei.ac.jp:16978"
+```
+
+するとエディタが開くので
+
+```
+---
 id: a学籍番号
 password: パスワード(デフォルトだと生年月日のやつ)
 ```
@@ -32,13 +37,15 @@ password: パスワード(デフォルトだと生年月日のやつ)
 のように編集してください。
 
 
+
 ## Usage
 
 ```
-$ bundle exec bin/misoni auth
+$ misoni auth
 ```
 
-とかするといい感じです。  
+すると設定したアカウントで認証します。
+
 `install`コマンドとかで、無線LANへの接続を検知してlaunchdで叩く設定まで勝手にやってくれるようにそのうちします。
 
 
@@ -51,3 +58,8 @@ http://www.amazon.co.jp/registry/wishlist/23CDAA2HM4C5B
 The MIT License (MIT)
 
 Copyright (c) 2015 neo
+
+Portions are:  
+Copyright (c) 2012 MATSUOKA Kohei  
+MIT License  
+https://github.com/machu/wifi_login

data/lib/misoni/cli.rb

@@ -5,11 +5,43 @@ require 'thor'
 
 module Misoni
   class CLI < Thor
+    include Thor::Actions
     package_name "Misoni"
     
+    # https://github.com/machu/wifi_login/blob/master/lib/wifi_login/cli.rb#L9-L39
+    LAUNCH_AGENT_DIR = "#{ENV['HOME']}/Library/LaunchAgents"
+    LAUNCH_AGENT_FILE = "#{LAUNCH_AGENT_DIR}/com.neoneobeam.misoni.plist"
+    LOG_DIR = "#{ENV['HOME']}/Library/Logs/com.neoneobeam.misoni"
+
+    def self.source_root
+      File.dirname(__FILE__)
+    end
+
+    desc "install", "Install trigger. (Only for Mac OS X)"
+    def install
+      empty_directory LOG_DIR
+      if Misoni.in_rbenv?
+        template "templates/com.neoneobeam.misoni.plist.rbenv.tt", "#{LAUNCH_AGENT_FILE}"
+      else
+        template "templates/com.neoneobeam.misoni.plist.tt", "#{LAUNCH_AGENT_FILE}"
+      end
+      run "sudo chmod 600 #{LAUNCH_AGENT_FILE}"
+      run "sudo chown root #{LAUNCH_AGENT_FILE}"
+      run "launchctl load #{LAUNCH_AGENT_FILE}"
+      say
+      say 'Completed install. Please run `misoni config` or `pit set "http://auth.zokei.ac.jp:16978"` to set your ID/Password.', Thor::Shell::Color::GREEN
+    end
+
+    desc "uninstall", "Uninstall trigger."
+    def uninstall
+      run "launchctl unload #{LAUNCH_AGENT_FILE}"
+      return unless File.exist?(LAUNCH_AGENT_FILE)
+      remove_file LAUNCH_AGENT_FILE
+    end
+    
     desc "config", "setting config"
     def config
-      Misoni.getConfig
+      Misoni.config
     end
     
     desc "auth", "authorize zokei network"

data/lib/misoni/templates/com.neoneobeam.misoni.plist.rbenv.tt

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN"
+          "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+  <dict>
+    <key>Label</key>
+    <string>com.neoneobeam.misoni</string>
+    <key>ProgramArguments</key>
+    <array>
+		<string>/bin/bash</string>
+		<string>-c</string>
+		<string>export PATH="$HOME/.rbenv/bin:$PATH"; eval "$(rbenv init -)"; misoni auth</string>
+    </array>
+    <key>RunAtLoad</key>
+    <true/>
+    <key>StandardErrorPath</key>
+    <string><%= ENV['HOME'] %>/Library/Logs/com.neoneobeam.misoni/stderr</string>
+    <key>StandardOutPath</key>
+    <string><%= ENV['HOME'] %>/Library/Logs/com.neoneobeam.misoni/stdout</string>
+    <key>WatchPaths</key>
+    <array>
+      <string>/Library/Preferences/SystemConfiguration/com.apple.airport.preferences.plist</string>
+    </array>
+  </dict>
+</plist>

data/lib/misoni/templates/com.neoneobeam.misoni.plist.tt

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN"
+          "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+  <dict>
+    <key>Label</key>
+    <string>com.neoneobeam.misoni</string>
+    <key>ProgramArguments</key>
+    <array>
+		<string>misoni auth</string>
+    </array>
+    <key>RunAtLoad</key>
+    <true/>
+    <key>StandardErrorPath</key>
+    <string><%= ENV['HOME'] %>/Library/Logs/com.neoneobeam.misoni/stderr</string>
+    <key>StandardOutPath</key>
+    <string><%= ENV['HOME'] %>/Library/Logs/com.neoneobeam.misoni/stdout</string>
+    <key>WatchPaths</key>
+    <array>
+      <string>/Library/Preferences/SystemConfiguration/com.apple.airport.preferences.plist</string>
+    </array>
+  </dict>
+</plist>

data/lib/misoni/version.rb

@@ -1,3 +1,3 @@
 module Misoni
-  VERSION = "0.1.3"
+  VERSION = "0.2.0"
 end

data/lib/misoni.rb

@@ -8,11 +8,11 @@ require 'pit'
 module Misoni
   class Error < StandardError; end
   
-  def self.getConfig
+  def self.config
     Pit.get("http://auth.zokei.ac.jp:16978", :require => { "id"=> "YOUR_UserID", "password"=> "YOUR_PASSWORD" })
   end
   
-  def self.isSuccess(page)
+  def self.success?(page)
     body = Nokogiri::HTML(page.body)
     body.css('table tr:nth-child(2) td').each do |child|
       unless child.text.include?("成功")
@@ -29,15 +29,19 @@ module Misoni
     begin
       agent.get('http://auth.zokei.ac.jp:16978/') do |page|
         login_result = page.form_with(:action => '/cgi-bin/adeflogin.cgi') do |form|
-          config = getConfig
-          form.field_with(:name => 'name').value = config["id"]
-          form.field_with(:name => 'pass').value = config["password"]
+          _config = config
+          form.field_with(:name => 'name').value = _config["id"]
+          form.field_with(:name => 'pass').value = _config["password"]
         end.submit
-        isSuccess(login_result)
+        success?(login_result)
       end
     rescue SocketError => e
       puts e.message
     end
   end
   
+  def self.in_rbenv?
+    ENV.has_key?('RBENV_ROOT')
+  end
+  
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: misoni
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - neo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-07-21 00:00:00.000000000 Z
+date: 2015-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -97,6 +97,8 @@ files:
 - exe/misoni
 - lib/misoni.rb
 - lib/misoni/cli.rb
+- lib/misoni/templates/com.neoneobeam.misoni.plist.rbenv.tt
+- lib/misoni/templates/com.neoneobeam.misoni.plist.tt
 - lib/misoni/version.rb
 - misoni.gemspec
 homepage: https://github.com/noir-neo/misoni