akashiyaki 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3516ea38703505100c73a82cd3262c704ec333b9
-  data.tar.gz: 649780f3325523cb58182e656c726c06df5e206a
+  metadata.gz: 652a4b0a3b87f208ed5b4e3bf586aafdb943421f
+  data.tar.gz: 5c4ee1c02c2a749ca78bdf9b04e76b841d8e64b0
 SHA512:
-  metadata.gz: bb0914d7efb2e55d789ebaecead204ec5caf60548c67027335c78c12d26afc3ed5f25df11bbda4e2aa8f04a29fca10bb0b0629b90f7187bcf670721031b2d6bb
-  data.tar.gz: 38a6cec60f5d6b6d9567407c4bcea47f94d9872a54b172e44b2b2b721ad7f0401410af314c91d4632b67242a8346bcc790c92fb12fc0e5b7cb94230662561f38
+  metadata.gz: b415ece85b90835994b649f888bac5378c22e81ed3041971a43616afbcf599f2f1ae71ee692890c55a09d71c4db73c8f790a802765ffa8f56ae91609ed47f9df
+  data.tar.gz: cecd482c7b2f9f1ce8f3ad25cdb48ad5592fcb2e85b21d1010d3599debb88b6eb752da82c503fc80373e8410e46d68ea52e31f6f6acea6dd668828608e2ea3f6

data/README.md

@@ -18,7 +18,7 @@ Or install it yourself as:
 
     $ gem install akashiyaki
 
-## Usage
+## Library
 
 ```rb
 require "akashiyaki"
@@ -30,10 +30,67 @@ client.start_break
 client.finish_break
 ```
 
+## CLI
+
+Akashiyaki includes `ak4` command that is a CLI tool to access AKASHI.
+
+Basic usage:
+
+```bash
+# To start work
+ak4 work start
+
+# To finish work
+ak4 work finish
+
+# To start break
+ak4 break start
+
+# To finish break
+ak4 break finish
+```
+
+When `ak4` is executed without account information, `ak4` asks you about your account:
+
+```bash
+$ ak4 work finish
+Company ID: mycompany
+Login ID: myid
+Password: %
+```
+
+If you think it's too much bother to enter account information everytime,  you can save your account as configuration file `~/.config/ak4/account.yaml` (or `~/.config/ak4/account.json`):
+
+```yaml
+company: mycompany
+id: myid
+password: mypassword
+```
+
+`ak4` reads account information from `$XDG_CONFIG_HOME` directory.
+
+If you don't want to save your password, you can save only company ID and login ID:
+
+```yaml
+company: mycompany
+id: myid
+```
+
+So `ak4` asks you about only password.
+
+You can also use command options:
+
+```bash
+Options:
+      [--config=CONFIG]
+  -c, [--company=COMPANY]
+  -i, [--id=ID]
+  -p, [--password=PASSWORD]
+```
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake test` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
-
 To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
 ## Contributing

data/akashiyaki.gemspec

@@ -25,4 +25,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "minitest", "~> 5.0"
 
   spec.add_runtime_dependency "mechanize", "~> 2.7.5"
+  spec.add_runtime_dependency "thor", "~> 0.19.4"
 end

data/exe/ak4

@@ -0,0 +1,8 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+$LOAD_PATH.unshift File.expand_path("../../lib", __FILE__)
+
+require "akashiyaki/cli"
+
+Akashiyaki::Cli.start(ARGV)

data/lib/akashiyaki/account.rb

@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+Account = Struct.new("Account", :company, :id, :password)

data/lib/akashiyaki/account_parser.rb

@@ -0,0 +1,84 @@
+# frozen_string_literal: true
+
+require "io/console"
+require "json"
+require "yaml"
+
+require "akashiyaki/account"
+
+module Akashiyaki
+  class AccountParser
+    def initialize(options)
+      @options = options
+    end
+
+    def parse
+      Account.new(company, id, password)
+    end
+
+    private
+
+    def company
+      return @options[:company] if @options[:company]
+      return config["company"] if config["company"]
+
+      print "Company ID: "
+      STDIN.gets.chomp
+    end
+
+    def config
+      @config ||= load_config_file
+    end
+
+    def id
+      return @options[:id] if @options[:id]
+      return config["id"] if config["id"]
+
+      print "Login ID: "
+      STDIN.gets.chomp
+    end
+
+    def password
+      return @options[:password] if @options[:password]
+      return config[:password] if config[:password]
+
+      print "Password: "
+      STDIN.noecho(&:gets).chomp
+    end
+
+    def search_config
+      if @options[:config]
+        path = File.expand_path(@options[:config])
+        return path if File.exist?(path)
+      end
+
+      %w(json yaml yml).each do |ext|
+        path = File.join(config_dir, "account.#{ext}")
+        return path if File.exist?(path)
+      end
+
+      nil
+    end
+
+    def config_dir
+      @config_dir ||=
+        File.join(
+          ENV["XDG_CONFIG_HOME"] || File.expand_path("~/.config"),
+          "ak4"
+        )
+    end
+
+    def load_config_file
+      config_file = search_config
+
+      return {} unless config_file
+
+      case config_file
+      when /\.json$/
+        JSON.parse(File.read(config_file))
+      when /\.ya?ml$/
+        YAML.load_file(config_file)
+      end
+    end
+  end
+end

data/lib/akashiyaki/cli.rb

@@ -0,0 +1,50 @@
+# coding: utf-8
+# frozen_string_literal: true
+
+require "thor"
+
+require "akashiyaki/account_parser"
+require "akashiyaki/command"
+
+module Akashiyaki
+  class Cli < Thor
+    class << self
+      def mode(mode, start, finish)
+        desc "#{mode} ACTION [options]", "#{start}/#{finish}"
+        subcommand mode, command_class(mode, start, finish)
+      end
+
+      private
+
+      def command_class(mode, start, finish)
+        Class.new(Thor).tap do |c|
+          c.desc "start [options]", start
+          c.send(:define_method, :start) do
+            Command.new(
+              mode,
+              :start,
+              AccountParser.new(options).parse
+            ).run
+          end
+
+          c.desc "finish [options]", finish
+          c.send(:define_method, :finish) do
+            Command.new(
+              mode,
+              :finish,
+              AccountParser.new(options).parse
+            ).run
+          end
+        end
+      end
+    end
+
+    class_option :config, type: :string
+    class_option :company, aliases: "-c", type: :string
+    class_option :id, aliases: "-i", type: :string
+    class_option :password, aliases: "-p", type: :string
+
+    mode("work", "出勤", "退勤")
+    mode("break", "休憩開始", "休憩終了")
+  end
+end

data/lib/akashiyaki/command.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+require "akashiyaki/client"
+
+module Akashiyaki
+  class Command
+    attr_reader :mode, :action, :account
+
+    def initialize(mode, action, account)
+      @mode = mode
+      @action = action
+      @account = account
+    end
+
+    def run
+      client.send(:"#{action}_#{mode}")
+    end
+
+    private
+
+    def client
+      @client ||=
+        Client.new(
+          account.company,
+          account.id,
+          account.password
+        )
+    end
+  end
+end

data/lib/akashiyaki/version.rb

@@ -1,3 +1,3 @@
 module Akashiyaki
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: akashiyaki
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - nownabe
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-02 00:00:00.000000000 Z
+date: 2017-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,10 +66,25 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.7.5
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.19.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.19.4
 description: 
 email:
 - nownabe@gmail.com
-executables: []
+executables:
+- ak4
 extensions: []
 extra_rdoc_files: []
 files:
@@ -82,8 +97,13 @@ files:
 - akashiyaki.gemspec
 - bin/console
 - bin/setup
+- exe/ak4
 - lib/akashiyaki.rb
+- lib/akashiyaki/account.rb
+- lib/akashiyaki/account_parser.rb
+- lib/akashiyaki/cli.rb
 - lib/akashiyaki/client.rb
+- lib/akashiyaki/command.rb
 - lib/akashiyaki/version.rb
 homepage: https://github.com/nownabe/akashiyaki
 licenses: