sakura-cli 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b355454e8178df0c213c7137a6650081b9bbdc6d5a218210a8d3713265e705b
-  data.tar.gz: dc95edb37d7b0aa8c4f77e61a2985a52e5f75a74b1a2a9fb62491b0092763fce
+  metadata.gz: 63e925b0d5771393ece520ba74ef24695fadf188e82980ae0cc59864a6b3abee
+  data.tar.gz: 2c65e42f350a073663eeb9f912b72b07eb9eb2236e839d29a0d910cd481fb483
 SHA512:
-  metadata.gz: 3b333c99ee357eb70318390eae2d8497df12fe60488d2d6e593298a8a6d8d25d1566ad34cc0c3e5e433cc6565c7dd375b945b14df4933019f86fbf0a5f9b5bc6
-  data.tar.gz: 1b2be0dcfb6fe150d2f92fc9f42ca110b5cd007a613f62978d96deff76656c9f8a36b7929ced3d04d43634a69451c240544bc75cffb659c93014850c3f5ea0d0
+  metadata.gz: d3b7c3668f914eefd3735d32370b2cd4031f45aef33a9e009a490a2b2a6569e59580ab66234426cd8e633163d31aec53945dd16d87068ce50b71b7ad6516d1f4
+  data.tar.gz: 259300757340ef237b273025a8438d841f16b65365004fbb60aaa07f6783de2a52daa0af884cf95cfcc33d6983f8695f01007c4877032603a2428e0d9411c35f

data/.gitignore

@@ -7,3 +7,5 @@
 /pkg/
 /spec/reports/
 /tmp/
+
+/.idea/

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2018 Shintaro Kojima
+Copyright (c) 2021 Shintaro Kojima
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -12,18 +12,13 @@ Sakura CLI をインストールします.
 gem install sakura-cli
 ```
 
-Sakura CLI は[PhantomJS](http://phantomjs.org/download.html) に依存しています.
+Sakura CLI は[ChromeDriver](https://chromedriver.chromium.org/downloads) に依存しています.
 お使いのOS に合った方法でインストールしてください.
 
 Mac の場合は
 
 ```zsh
-brew install phantomjs
-
-# Yosemite or newer
-brew cask install phantomjs
-brew install upx
-upx -d /opt/homebrew-cask/Caskroom/phantomjs/2.0.0/phantomjs-2.0.0-macosx/bin/phantomjs
+brew install chromedriver
 ```
 
 でもインストールできます.
@@ -80,12 +75,12 @@ Commands:
 ```zsh
 $ sakura mail list
 # domain: example.com
-address              virus_scan        usage /     quota
+address                     usage /     quota  (  %)
 ---------------------------------------------------------
-dummy                      true     379.13KB /     200MB
-dummy001                   true       1.79MB /       2GB
-dummy002                   true       6.28KB /       2GB
-postmaster                 true           0B /       2GB
+dummy                       893KB /     200MB  ( 0%)
+dummy001                   19.5MB /     200MB  ( 9%)
+dummy002                   11.4MB /     200MB  ( 5%)
+postmaster                 9.75MB /     200MB  ( 4%)
 ```
 
 ### メールアドレス詳細
@@ -94,10 +89,11 @@ postmaster                 true           0B /       2GB
 
 ```zsh
 $ sakura mail show dummy
-usage / quota: 379.13KB / 200MB
+usage / quota: 893KB / 200MB  ( 0%)
 forward_to:    foo@example.com
-keep mail?:    true
-virus_scan?:   false
+keep mail:     true
+virus scan:    false
+spam filter:   disable
 ```
 
 ### メールアドレス作成
@@ -185,4 +181,4 @@ dotenv -f ~/.sakura.env sakura
 
 ## Copyright and License
 
-Copyright (c) 2018 Shintaro Kojima. Code released under the [MIT license](LICENSE).
+Copyright (c) 2021 Shintaro Kojima. Code released under the [MIT license](LICENSE).

data/lib/sakura.rb

@@ -1,5 +1,5 @@
 require 'uri'
 
 module Sakura
-  BASE_URL = URI('https://secure.sakura.ad.jp/rscontrol/')
+  BASE_URL = URI('https://secure.sakura.ad.jp/rs/cp/')
 end

data/lib/sakura/cli/mail.rb

@@ -7,41 +7,51 @@ module Sakura
   module Cli
     class Mail < Thor
       desc 'list', 'List all mail addresses of the domain'
+
       def list
+        preprocess
+
         addrs = MailAddress.all
 
         puts "# domain: #{Client.current_session.domain}"
         puts MailAddress.header
-        addrs.each {|addr| puts addr.to_s }
+        addrs.each { |addr| puts addr.to_s }
       end
 
       desc 'create LOCAL_PART [PASSWORD]', 'Create a mail address'
-      def create(local_part, password=nil)
+
+      def create(local_part, password = nil)
+        preprocess
+
         password ||= ask_password
 
         begin
           MailAddress.create local_part, password
         rescue
+          raise if options[:verbose]
           abort $!
         end
       end
 
       desc 'delete LOCAL_PART', 'Delete a mail address'
+
       def delete(local_part)
-        mail = MailAddress.find(local_part)
-        abort %(No mail address: "#{local_part}") unless mail
+        preprocess
 
         begin
-          mail.delete
+          find(local_part).delete
         rescue
+          raise if options[:verbose]
           abort $!
         end
       end
 
       desc 'quota LOCAL_PART [VALUE]', 'Update or show quota of a mail address'
-      def quota(local_part, value=nil)
-        mail = MailAddress.find(local_part)
-        abort %(No mail address: "#{local_part}") unless mail
+
+      def quota(local_part, value = nil)
+        preprocess
+
+        mail = find(local_part)
 
         begin
           if value
@@ -50,29 +60,35 @@ module Sakura
             puts mail.quota
           end
         rescue
+          raise if options[:verbose]
           abort $!
         end
       end
 
       desc 'password LOCAL_PART [PASSWORD]', 'Update password of a mail address'
-      def password(local_part, password=nil)
+
+      def password(local_part, password = nil)
+        preprocess
+
         password ||= ask_password
-        mail = MailAddress.find(local_part)
-        abort %(No mail address: "#{local_part}") unless mail
+        mail = find(local_part)
 
         begin
           mail.password = password
         rescue
+          raise if options[:verbose]
           abort $!
         end
       end
 
       desc 'scan LOCAL_PART [enable|disable]', 'Switch virus scan configuration of a mail address'
-      def scan(local_part, value=nil)
+
+      def scan(local_part, value = nil)
+        preprocess
+
         self.class.handle_argument_error if value && value !~ /enable|disable/
 
-        mail = MailAddress.find(local_part)
-        abort %(No mail address: "#{local_part}") unless mail
+        mail = find(local_part)
 
         begin
           case value
@@ -84,18 +100,21 @@ module Sakura
             puts mail.virus_scan
           end
         rescue
+          raise if options[:verbose]
           abort $!
         end
       end
 
       desc 'forward LOCAL_PART [{add|remove} EMAIL]', 'Add, remove or show mail address(es) to forward'
-      def forward(local_part, operation=nil, mail_to_forward=nil)
+
+      def forward(local_part, operation = nil, mail_to_forward = nil)
+        preprocess
+
         if (operation && operation !~ /add|remove/) || (!mail_to_forward && operation)
           self.class.handle_argument_error
         end
 
-        mail = MailAddress.find(local_part)
-        abort %(No mail address: "#{local_part}") unless mail
+        mail = find(local_part)
 
         begin
           case operation
@@ -104,19 +123,22 @@ module Sakura
           when 'remove'
             mail.delete_forward_to mail_to_forward
           when nil
-            mail.forward_list.each {|m| puts m }
+            mail.forward_list.each { |m| puts m }
           end
         rescue
+          raise if options[:verbose]
           abort $!
         end
       end
 
       desc 'keep LOCAL_PART [enable|disable]', 'Switch keep or flush configuration of a mail address'
-      def keep(local_part, value=nil)
+
+      def keep(local_part, value = nil)
+        preprocess
+
         self.class.handle_argument_error if value && value !~ /enable|disable/
 
-        mail = MailAddress.find(local_part)
-        abort %(No mail address: "#{local_part}") unless mail
+        mail = find(local_part)
 
         begin
           case value
@@ -128,25 +150,62 @@ module Sakura
             puts mail.keep
           end
         rescue
+          raise if options[:verbose]
+          abort $!
+        end
+      end
+
+      desc 'filter LOCAL_PART [mark|disable|discard|quarantine]', 'Configure spam filter of a mail address'
+
+      def filter(local_part, value = nil)
+        preprocess
+
+        self.class.handle_argument_error if value && value !~ /mark|disable|discard|quarantine/
+
+        mail = find(local_part)
+
+        begin
+          case value
+          when nil
+            puts mail.spam_filter
+          else
+            mail.spam_filter = value.to_sym
+          end
+        rescue
+          raise if options[:verbose]
           abort $!
         end
       end
 
       desc 'show LOCAL_PART', 'Display information about a mail address'
+
       def show(local_part)
-        mail = MailAddress.find(local_part)
-        abort %(No mail address: "#{local_part}") unless mail
+        preprocess
 
-        puts mail.detail
+        puts find(local_part).detail
       end
 
-
       private
 
+      def preprocess
+        Client.verbose = true if options[:verbose]
+      end
+
+      def find(local_part)
+        begin
+          mail = MailAddress.find(local_part)
+        rescue Capybara::ElementNotFound
+          raise if options[:verbose]
+          abort %(No mail address: "#{local_part}")
+        end
+
+        mail
+      end
+
       def ask_password
         password = ask('password?', echo: false)
         puts
-        confirm  = ask('password(confirm)?', echo: false)
+        confirm = ask('password(confirm)?', echo: false)
         puts
         abort "password doesn't match" unless password == confirm
 

data/lib/sakura/cli/root.rb

@@ -4,6 +4,13 @@ require 'sakura/cli/mail'
 module Sakura
   module Cli
     class Root < Thor
+      class_option :verbose, type: :boolean
+
+      # Allow failed exit codes (see https://github.com/erikhuda/thor/issues/244)
+      def self.exit_on_failure?
+        true
+      end
+
       desc 'mail', 'Manage mail addresses'
       subcommand 'mail', Mail
     end

data/lib/sakura/cli/version.rb

@@ -1,5 +1,5 @@
 module Sakura
   module Cli
-    VERSION = "0.1.4"
+    VERSION = "0.2.0"
   end
 end

data/lib/sakura/client.rb

@@ -11,48 +11,67 @@ module Sakura
     include Capybara::DSL
 
     attr_reader :domain
+    @@verbose = false
 
-    def self.current_session
-      @current_session ||= new
-    end
+    class << self
+      def current_session
+        @current_session ||= new
+      end
 
+      def verbose=(bool)
+        @@verbose = !!bool
+      end
+    end
 
     def initialize
       @domain, @passwd = credentials
     end
 
     def login?
-      !@last_login.nil?
+      @logged_in
     end
 
     def login
+      $stderr.puts 'login' if @@verbose
+
       visit BASE_URL
-      fill_in 'domain',   with: @domain
-      fill_in 'password', with: @passwd
-      find('form input[type=image]').click
+      fill_in 'login-username', with: @domain
+      fill_in 'login-password', with: @passwd
+      find('form button[type=submit]').click
 
-      @last_login = Time.now if page.text =~ /ログインドメイン: #{@domain}/
+      wait_for_loading
+
+      if page.text =~ /サーバコントロールパネル ホーム/
+        @logged_in = true
+      end
 
       raise_when_error
       login?
     end
 
-    def get(url)
+    def get(url, expected)
       login unless login?
+
+      $stderr.puts "visit #{url}" if @@verbose
       visit url
+      wait_for_loading
+      unless page.text =~ expected
+        raise Timeout::Error.new('Timed out')
+      end
+
       page
     end
 
-    def process(url, &block)
+    def process(url, expected, &block)
       login unless login?
-      visit url
-      instance_eval &block
+
+      get url, expected
+      yield page
 
       raise_when_error
       page
     end
 
-
     private
 
     def credentials
@@ -67,8 +86,20 @@ module Sakura
     end
 
     def raise_when_error
-      error = page.all('.error-message')
-      raise error.first.text unless error.empty?
+      %w[.error .input-error].each do |cls|
+        error = page.all(cls)
+        raise error.first.text unless error.empty?
+      end
+    end
+
+    def wait_for_loading
+      5.times do
+        if find_all('読み込み中').empty?
+          break
+        else
+          $stderr.puts 'still loading ...' if @@verbose
+        end
+      end
     end
   end
 end

data/lib/sakura/mail_address.rb

@@ -2,100 +2,133 @@ require 'sakura/client'
 
 module Sakura
   class MailAddress
-    MAIL_URL = BASE_URL + 'rs/mail'
+    MAIL_URL = BASE_URL + 'users/list/'
 
-    attr_reader :address, :virus_scan, :usage, :quota, :link, :link_to_delete
+    attr_reader :address, :usage, :quota, :link
 
     class << self
       def create(local_part, password)
-        Client.current_session.process(MAIL_URL) do
-          fill_in 'NewUsername', with: local_part
-          fill_in 'Password1',   with: password
-          fill_in 'Password2',   with: password
-          find('input[name="Submit_useradd"]').click
+        Client.current_session.process(MAIL_URL, /メールアドレス一覧/) do |page|
+          page.first(:xpath, '//a[text() = "新規追加"]').click
+
+          page.find(:xpath, '//label[contains(text(), "ユーザ名")]/..//input')
+              .fill_in with: local_part
+          page.find_all(:xpath, '//label[contains(text(), "パスワード")]/..//input').each do |e|
+            e.fill_in with: password
+          end
+          page.find(:xpath, '//button[text() = "作成する"]').click
         end
 
         true
       end
 
       def all
-        page = Client.current_session.get(MAIL_URL)
+        page = Client.current_session.get(MAIL_URL, /メールアドレス一覧/)
+        page.first('.input-text').select '300件'
 
-        page.all(:xpath, '//a[contains(@href, "mail?Username=")]/../..').map{|element|
+        page.all(:css, '.entity-lists .entity-lists-row').map { |element|
           MailAddress.new_from_element(element)
         }
       end
 
       def find(local_part)
-        page = Client.current_session.get(MAIL_URL)
+        page = Client.current_session.get(MAIL_URL, /メールアドレス一覧/)
+        page.first('.input-text').select '300件'
 
-        element = page.find(:xpath, "//a[@href=\"mail?Username=#{local_part}\"]/../..")
+        element = page.find(:xpath, "//div[contains(@class, \"entity-lists-row\")]//div[@class=\"username\" and contains(text(), \"#{local_part}\")]/../../..")
         MailAddress.new_from_element(element)
       end
 
       def new_from_element(element)
-        arguments = element.all('td').map(&:text)[0..-2] + element.all('a').map{|i| i[:href] }
-        MailAddress.new(*arguments)
+        MailAddress.new(
+          element.find('.username').text.split('@').first,
+          element.find('.capacity').text
+        )
       end
 
       def header
-        str = tabularize('address', 'virus_scan', 'usage', 'quota', '%')
-        "#{str}\n#{'-' * (str.size+1)}"
+        str = tabularize('address', 'usage', 'quota', '%')
+        "#{str}\n#{'-' * (str.size + 1)}"
       end
 
       def tabularize(*args)
         args[0].ljust(20) <<
-          args[1].to_s.rjust(11) <<
-          "#{args[2]} /".to_s.rjust(15) <<
-          args[3].to_s.rjust(10) <<
-          "  (#{args[4].to_s.rjust(3)})"
+          "#{args[1]} /".to_s.rjust(15) <<
+          args[2].to_s.rjust(10) <<
+          "  (#{args[3].to_s.rjust(3)})"
       end
     end
 
-
-    def initialize(address, virus_scan, usage, quota, link, link_to_delete=nil)
-      @address        = address
-      @virus_scan     = virus_scan == '○'
-      @usage          = usage
-      @quota          = quota
-      @link           = link
-      @link_to_delete = link_to_delete
+    def initialize(address, usage)
+      @address = address
+      @usage, @quota = usage.split(/\s*\/\s*/)
     end
 
     def delete
-      link = @link_to_delete
-      Client.current_session.process(MAIL_URL) do
-        find("a[href=\"#{link}\"]").click
+      # FIXME: The URL won't work when mail addresses are more than 300
+      Client.current_session.process(MAIL_URL + "1/edit/#{@address}", /#{@address}の設定/) do |page|
+        page.accept_confirm do
+          page.find('button.dangerous-button').click
+        end
       end
 
       true
     end
 
     def quota=(value)
-      page = Client.current_session.process(MAIL_URL + @link) {
-        fill_in 'MailQuota', with: value
-        find('input[name="Submit_quotaedit"]').click
-      }
+      # FIXME: The URL won't work when mail addresses are more than 300
+      Client.current_session.process(MAIL_URL + "1/edit/#{@address}", /#{@address}の設定/) do |page|
+        case value
+        when /(\d+)\s*GB$/
+          page.find(:xpath, '//label[contains(text(), "メール容量制限")]/..//input').fill_in with: $1
+          page.find(:xpath, '//label[contains(text(), "メール容量制限")]/..//select').select 'GB'
+        when /(\d+)\s*MB$/
+          page.find(:xpath, '//label[contains(text(), "メール容量制限")]/..//input').fill_in with: $1
+          page.find(:xpath, '//label[contains(text(), "メール容量制限")]/..//select').select 'MB'
+        when /(\d+)\s*KB$/
+          page.find(:xpath, '//label[contains(text(), "メール容量制限")]/..//input').fill_in with: $1
+          page.find(:xpath, '//label[contains(text(), "メール容量制限")]/..//select').select 'KB'
+        when /(\d+)\s*B$/
+          page.find(:xpath, '//label[contains(text(), "メール容量制限")]/..//input').fill_in with: $1
+          page.find(:xpath, '//label[contains(text(), "メール容量制限")]/..//select').select 'B'
+        else
+          raise %(Unsupported quota value "#{value}")
+        end
+
+        page.find(:xpath, '//button[text() = "保存する"]').click
+      end
 
-      page.text =~ /利用中のディスク領域: \S+ \/ (\S+)/
-      @quota = $1
+      @quota = value
     end
 
     def password=(value)
-      Client.current_session.process(MAIL_URL + @link) do
-        fill_in 'Password1', with: value
-        fill_in 'Password2', with: value
-        find('input[name="Submit_password"]').click
+      # FIXME: The URL won't work when mail addresses are more than 300
+      Client.current_session.process(MAIL_URL + "1/password/#{@address}", /#{@address}のパスワード設定/) do |page|
+        page.find_all(:xpath, '//label[contains(text(), "パスワード")]/..//input').each do |e|
+          e.fill_in with: value
+        end
+        page.find(:xpath, '//button[text() = "変更する"]').click
+      end
+    end
+
+    def virus_scan(page = nil)
+      if @virus_scan.nil?
+        # FIXME: The URL won't work when mail addresses are more than 300
+        page ||= Client.current_session.get(MAIL_URL + "1/edit/#{@address}", /#{@address}の設定/)
+        @virus_scan = page.find('[name="usesVirusCheck"]:checked').value == '1'
       end
+
+      @virus_scan
     end
 
     def virus_scan=(value)
-      value = value ? 1 : 0
-      Client.current_session.process(MAIL_URL + @link) do
-        find("input[name='VirusScan'][value='#{value}']").click
+      # FIXME: The URL won't work when mail addresses are more than 300
+      Client.current_session.process(MAIL_URL + "1/edit/#{@address}", /#{@address}の設定/) do |page|
+        page.find("[name='usesVirusCheck'][value='#{value ? 1 : 0}']").choose
+        page.find(:xpath, '//button[text() = "保存する"]').click
       end
 
-      @virus_scan = value == 1
+      @virus_scan = value
     end
 
     def enable_virus_scan
@@ -106,22 +139,24 @@ module Sakura
       virus_scan = false
     end
 
-    def keep(page=nil)
+    def keep(page = nil)
       if @keep.nil?
-        page ||= Client.current_session.get(MAIL_URL + @link)
-        @keep = page.find('input[name="Save"]:checked').value == '1'
+        # FIXME: The URL won't work when mail addresses are more than 300
+        page ||= Client.current_session.get(MAIL_URL + "1/edit/#{@address}", /#{@address}の設定/)
+        @keep = page.find('[name="receiveType"]:checked').value == '1'
       end
 
       @keep
     end
 
     def keep=(value)
-      value = value ? 1 : 0
-      Client.current_session.process(MAIL_URL + @link) do
-        find("input[name='Save'][value='#{value}']").click
+      # FIXME: The URL won't work when mail addresses are more than 300
+      Client.current_session.process(MAIL_URL + "1/edit/#{@address}", /#{@address}の設定/) do |page|
+        page.find("[name='receiveType'][value='#{value ? 1 : 2}']").choose
+        page.find(:xpath, '//button[text() = "保存する"]').click
       end
 
-      @keep = value == 1
+      @keep = value
     end
 
     def enable_keep
@@ -132,59 +167,104 @@ module Sakura
       keep = false
     end
 
-    def forward_list(page=nil)
+    def spam_filter(page = nil)
+      if @spam_filter.nil?
+        # FIXME: The URL won't work when mail addresses are more than 300
+        page ||= Client.current_session.get(MAIL_URL + "1/edit/#{@address}", /#{@address}の設定/)
+
+        case page.find(:xpath, '//label[contains(text(), "迷惑メールフィルタ")]/..//select').value
+        when "0"
+          @spam_filter = :disable
+        when "1"
+          @spam_filter = :quarantine
+        when "2"
+          @spam_filter = :discard
+        when "3"
+          @spam_filter = :mark
+        end
+      end
+
+      @spam_filter
+    end
+
+    def spam_filter=(value)
+      # FIXME: The URL won't work when mail addresses are more than 300
+      Client.current_session.process(MAIL_URL + "1/edit/#{@address}", /#{@address}の設定/) do |page|
+        select = page.find(:xpath, '//label[contains(text(), "迷惑メールフィルタ")]/..//select')
+
+        value = value.to_sym
+        case value
+        when :disable
+          select.select '利用しない'
+        when :quarantine
+          select.select '「迷惑メール」フォルダに保存'
+        when :discard
+          select.select 'メールを破棄'
+        when :mark
+          select.select 'フィルタの利用'
+        end
+
+        page.find(:xpath, '//button[text() = "保存する"]').click
+      end
+
+      @spam_filter = value
+    end
+
+    def forward_list(page = nil)
       if @forward_list.nil?
-        page ||= Client.current_session.get(MAIL_URL + @link)
-        @forward_list = page.all('select[name="DeleteAddress[]"] option').map(&:text)
+        # FIXME: The URL won't work when mail addresses are more than 300
+        page ||= Client.current_session.get(MAIL_URL + "1/edit/#{@address}", /#{@address}の設定/)
+        @forward_list = page.find(:xpath, '//label[contains(text(), "転送先アドレス")]/..//textarea').value.split(/[\n,]+/)
       end
 
       @forward_list
     end
 
     def forward_to(mail)
-      Client.current_session.process(MAIL_URL + @link) do
-        execute_script <<-JS
-          var f = document.Transfer;
-          f.Address.value = '#{mail}';
-          f.SubAction.value = 'add';
-          f.submit();
-        JS
+      # FIXME: The URL won't work when mail addresses are more than 300
+      Client.current_session.process(MAIL_URL + "1/edit/#{@address}", /#{@address}の設定/) do |page|
+        @forward_list = page.find(:xpath, '//label[contains(text(), "転送先アドレス")]/..//textarea').value.split(/[\n,]+/)
+        page.find(:xpath, '//label[contains(text(), "転送先アドレス")]/..//textarea')
+            .fill_in with: (@forward_list + [mail]).uniq.join("\n")
+        page.find(:xpath, '//button[text() = "保存する"]').click
       end
 
-      @forward_list ||= []
       @forward_list << mail
     end
 
     def delete_forward_to(mail)
-      Client.current_session.process(MAIL_URL + @link) do
-        find_field('DeleteAddress[]').select(mail)
-        find('a[href="javascript:tr_delete();"]').click
+      # FIXME: The URL won't work when mail addresses are more than 300
+      Client.current_session.process(MAIL_URL + "1/edit/#{@address}", /#{@address}の設定/) do |page|
+        @forward_list = page.find(:xpath, '//label[contains(text(), "転送先アドレス")]/..//textarea').value.split(/[\n,]+/)
+        page.find(:xpath, '//label[contains(text(), "転送先アドレス")]/..//textarea')
+            .fill_in with: (@forward_list - [mail]).uniq.join("\n")
+        page.find(:xpath, '//button[text() = "保存する"]').click
       end
 
-      @forward_list ||= []
       @forward_list.delete mail
     end
 
     def to_s
-      self.class.tabularize(@address, @virus_scan, @usage, @quota, percentage(@usage, @quota))
+      self.class.tabularize(@address, @usage, @quota, percentage(@usage, @quota))
     end
 
     def detail
-      page = Client.current_session.get(MAIL_URL + @link)
+      # FIXME: The URL won't work when mail addresses are more than 300
+      page = Client.current_session.get(MAIL_URL + "1/edit/#{@address}", /#{@address}の設定/)
 
       <<-EOS
 usage / quota: #{usage} / #{quota}  (#{percentage(@usage, @quota)})
 forward_to:    #{forward_list(page).join(' ')}
-keep mail?:    #{keep(page)}
-virus_scan?:   #{virus_scan}
+keep mail:     #{keep(page)}
+virus scan:    #{virus_scan(page)}
+spam filter:   #{spam_filter(page)}
       EOS
     end
 
-
     private
 
     def percentage(usage, quota)
-      usage, quota = [usage, quota].map {|i|
+      usage, quota = [usage, quota].map { |i|
         case i
         when /([\d.]+)TB$/
           $1.to_f * 1000000000000
@@ -199,7 +279,7 @@ virus_scan?:   #{virus_scan}
         end
       }
 
-      "#{(usage*100/quota).to_i}%"
+      "#{(usage * 100 / quota).to_i}%"
     end
   end
 end

data/sakura-cli.gemspec

@@ -21,9 +21,8 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency "capybara"
   spec.add_runtime_dependency "selenium-webdriver"
-  spec.add_runtime_dependency "chromedriver-helper"
   spec.add_runtime_dependency "thor"
-  spec.add_development_dependency "bundler", "~> 1.9"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rake"
   spec.required_ruby_version = '>= 2.0.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sakura-cli
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - Shintaro Kojima
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2018-11-04 00:00:00.000000000 Z
+date: 2021-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: chromedriver-helper
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,47 +53,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.9'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.9'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 description: Command-line tool and client library to control the dashboard of Sakura
   Rental Server.
 email:
@@ -120,7 +106,7 @@ homepage: https://github.com/codeout/sakura-cli
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -135,9 +121,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.2.15
+signing_key:
 specification_version: 4
 summary: Command-line tool for Sakura's Rental Server.
 test_files: []