titech-pubnet-auth 1.3.1 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1105b394137f8c02a980326256be37c1a8d0f30c
-  data.tar.gz: 9f7883e331fcaddd0ff8b996a4fa3f0bb022ef06
+  metadata.gz: 05593e5dec9d131a04ac5be42ca7de6e5a7994c2
+  data.tar.gz: bbd03b2b41e239b5d0a246929617396bc0d490c8
 SHA512:
-  metadata.gz: 90ed09e86ac16b4d26c280cba335ded1e5f3177927d7a6117418c6fc9a6fc2d51e481c21e7a7ce35355088211fc39cbd297e1d0dbabb88494899db2f82593978
-  data.tar.gz: b921e1c0a594442b776410a63de369e7503b89924f0b291e32052b40a7cecd988f2be37ac08163c09b062168a67518a51be91b5386158426c1355a289edc3cae
+  metadata.gz: 1461fb93108722600e466de33e403d829c02d88d55d93fc7101d8f1cf3f6026bf58f20a8979daed2f49259d9e5b9fa7554474c9fd5fe2b7ce1d5dd8398a0a22a
+  data.tar.gz: fed6471199fc471dd692906a2b68bbb86c425fb1e1c2990bedb8d2ee6fa8c762ea330088af3dcc1db20ee83dc73780763302f7a5260752a8faa2d414e2cc89b9

data/bin/titech-pubnet-auth

@@ -22,9 +22,9 @@ opt.on('-s','--single','No loop. Use as single command.'){
   single = true
 }
 
-configure = !File::exists?(File.expand_path('../config/private.yml', File.dirname(__FILE__)))
+reconfig = false
 opt.on('-c','--config','Set your username and password.'){
-  configure = true
+  reconfig = true
 }
 
 debug = false
@@ -35,19 +35,14 @@ opt.on('--debug','Debug-mode.'){
 opt.parse!(ARGV)
 
 
-if configure
+if !TitechPubnetAuth::Config.get || reconfig
+  config = TitechPubnetAuth::Config.new
   puts 'Please type your username:'
-  username = gets.strip
+  config.username = gets.strip
   system "stty -echo"
   puts 'Please type your password (typing will be hidden):'
-  password = gets.strip
-  conf = {
-      'username' => username,
-      'password' => password
-  }
-  File::open(File.expand_path('../config/private.yml', File.dirname(__FILE__)),'w'){|f|
-    f << conf.to_yaml
-  }
+  config.password = gets.strip
+  config.save!
   puts 'configured!'
   exit!
 end

data/lib/titech_pubnet_auth.rb

@@ -7,7 +7,7 @@ require 'yaml'
 $:.unshift(File.dirname(__FILE__))
 require 'titech_pubnet_auth/bin_routines'
 require 'titech_pubnet_auth/extensions'
-
+require 'titech_pubnet_auth/config'
 
 class TitechPubnetAuth
   SAMPLE_URI = URI "http://example.org"
@@ -22,7 +22,8 @@ class TitechPubnetAuth
     }
     @agent_with_proxy.set_proxy(HTTP_PROXY[:ip], HTTP_PROXY[:port])
 
-    @private = opt[:private] || YAML.load_file(File.dirname(__FILE__) + '/../config/private.yml')
+    @config = opt[:config] || TitechPubnetAuth::Config.get
+    fail "config not found" unless @config
   end
 
   #
@@ -35,8 +36,8 @@ class TitechPubnetAuth
     auth_page.form do |form|
       form.buttonClicked = 4
       form.redirect_url = sample_uri
-      form.username = @private['username']
-      form.password = @private['password']
+      form.username = @config.username
+      form.password = @config.password
     end.submit
 
     return is_connected?

data/lib/titech_pubnet_auth/config.rb

@@ -0,0 +1,50 @@
+require 'pathname'
+require 'virtus'
+
+class TitechPubnetAuth
+  class Config
+    include Virtus::Model
+    attribute :username, String
+    attribute :password, String
+
+    if RbConfig::CONFIG["target_os"].downcase =~ /^darwin/
+      require 'keychain'
+      SERVICE_NAME = 'titech-pubnet-auth'
+
+      def self.get
+        key = keychain_item
+        key && new(username: key.account, password: key.password)
+      end
+
+      def self.keychain_item
+        Keychain.generic_passwords.where(service: SERVICE_NAME).first
+      end
+
+      def save!
+        key = self.class.keychain_item
+        if key
+          key.account = username
+          key.password = password
+          key.save!
+        else
+          Keychain.generic_passwords.create(service: SERVICE_NAME, account: username, password: password)
+        end
+        self
+      end
+    else
+      require 'yaml'
+      CONFIG_PATH = Pathname(__FILE__) + '../../../config/private.yml'
+
+      def self.get
+        new(YAML.load_file(CONFIG_PATH)) rescue nil
+      end
+
+      def save!
+        CONFIG_PATH.open('w') do |f|
+          f << attributes.to_yaml
+        end
+        self
+      end
+    end
+  end
+end

data/lib/titech_pubnet_auth/version.rb

@@ -1,3 +1,3 @@
 class TitechPubnetAuth
-  VERSION = '1.3.1'
+  VERSION = '1.4.0'
 end

data/titech_pubnet_auth.gemspec

@@ -20,6 +20,8 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'colorize'
   gem.add_dependency 'mechanize', '~> 2.7'
   gem.add_dependency 'terminal-notifier', '~> 1.4'
+  gem.add_dependency 'ruby-keychain'
+  gem.add_dependency 'virtus', '~> 1.0'
 
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'rspec'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: titech-pubnet-auth
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.0
 platform: ruby
 authors:
 - Sohei Takeno
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-15 00:00:00.000000000 Z
+date: 2014-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -52,6 +52,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
+- !ruby/object:Gem::Dependency
+  name: ruby-keychain
+  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: virtus
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -125,6 +153,7 @@ files:
 - config/private.yml.example
 - lib/titech_pubnet_auth.rb
 - lib/titech_pubnet_auth/bin_routines.rb
+- lib/titech_pubnet_auth/config.rb
 - lib/titech_pubnet_auth/extensions.rb
 - lib/titech_pubnet_auth/version.rb
 - titech_pubnet_auth.gemspec