lucasalary 0.1.16 → 0.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f49cf6d52b646b39f7016d61c0647689ea43508072064dcc8dd76c424eae7afa
-  data.tar.gz: 03d2e15f7245f9297c5176e7488be53daf1fd5f07ab84577cd10721910e803d5
+  metadata.gz: e1eaada7633a6968784a6421f92f6393aebb762d67725f7df7237a429e4dd0f5
+  data.tar.gz: 7168896dd1c49cd1a4f44e35ab5dc232426c304964fb878bff67d899db9f8753
 SHA512:
-  metadata.gz: f103a5237210acd3d5baa555799ee6acefaccbbd75278d9d9ab45ff176a706cb05be12aa02913cbdfec940f42084643f5cb052453ef3f2f2f83cc607c974cd4f
-  data.tar.gz: 914e93f2dda3788ddfc2913046bb7ffc8f6c74b59468ae47c21253df97189408dd4eb24c6ed8d06999e5a39fe1c95bda0fd8cd95564d10e579fd2089fa550099
+  metadata.gz: b959970ee8cec2debca73f672c2f16d6365d3bd29b5c53fc4814369ecf08e9312f137c824371c799e3a2bf4cda2f27f3b200a3d7a46e5c66a599a78702fb3175
+  data.tar.gz: fa89846e020e818a8e9367312292a9256757ebed278bc1d7afbbe785a525d28929a7f04d4801490164e749dcbdee65da051108546cbae7a364fc32bd8cfc392c

data/CHANGELOG.md

@@ -0,0 +1,4 @@
+## LucaSalary 0.1.17
+
+* Breaking change: restructure CLI in sub-sub command format.
+* Add 'x-editor' on export to LucaBook

data/exe/luca-salary

@@ -5,60 +5,76 @@ require 'optparse'
 require 'luca_salary'
 require 'luca_salary/monthly'
 
-def export(args = nil, _params = nil)
-  if args
-    args << 28 if args.length == 2 # specify safe last day
-    LucaSalary::Monthly.new(args.join('-')).export_json
-  else
-    LucaSalary::Monthly.new.export_json
+module LucaCmd
+  class Profile
+    def self.create(args = nil, _params = nil)
+      LucaSalary::Profile.gen_profile!(args.first)
+    end
   end
-end
 
-def payment(args = nil, _params = nil)
-  if args
-    args << 28 if args.length == 2 # specify safe last day
-    LucaSalary::Base.new(args.join('-')).calc
-  else
-    LucaSalary::Base.new.calc
-  end
-end
+  class Payment
+    def self.create(args = nil, _params = nil)
+      if args
+        args << 28 if args.length == 2 # specify safe last day
+        LucaSalary::Base.new(args.join('-')).calc
+      else
+        LucaSalary::Base.new.calc
+      end
+    end
 
-def report(args = nil, params = nil)
-  if args
-    args << 28 if args.length == 2 # specify safe last day
-    LucaSalary::Monthly.new(args.join('-')).report(params.dig('mode'))
-  else
-    LucaSalary::Monthly.new.report(params.dig('mode'))
-  end
-end
+    def self.export(args = nil, _params = nil)
+      if args
+        args << 28 if args.length == 2 # specify safe last day
+        LucaSalary::Payment.new(args.join('-')).export_json
+      else
+        LucaSalary::Payment.new.export_json
+      end
+    end
 
-def add_person(args = nil, _params = nil)
-  LucaSalary::Profile.gen_profile!(args.first)
+    def self.list(args = nil, params = nil)
+      if args
+        args << 28 if args.length == 2 # specify safe last day
+        LucaSalary::Monthly.new(args.join('-')).report(params.dig('mode'))
+      else
+        LucaSalary::Monthly.new.report(params.dig('mode'))
+      end
+    end
+  end
 end
 
 LucaRecord::Base.valid_project?
 cmd = ARGV.shift
+params = {}
 
 case cmd
-when 'add'
-  add_person(ARGV)
-when 'export'
-  export(ARGV)
-when 'report'
-  params = {}
-  OptionParser.new do |opt|
-    opt.banner = 'Usage: luca-salary report [--mail] year month [date]'
-    opt.on('--mail', 'send to managers') { |_v| params['mode'] = 'mail' }
-    args = opt.parse(ARGV)
-    report(args, params)
+when /profiles?/
+  subcmd = ARGV.shift
+  case subcmd
+  when 'create'
+    OptionParser.new do |opt|
+      opt.banner = 'Usage: luca-salary profiles create Name'
+      args = opt.parse(ARGV)
+      LucaCmd::Profile.create(args)
+    end
   end
-when 'payment'
-  params = {}
-  OptionParser.new do |opt|
-    opt.banner = 'Usage: luca-salary payment [--mail] year month [date]'
-    opt.on('--mail', 'send to managers') { |_v| params['mode'] = 'mail' }
-    args = opt.parse(ARGV)
-    payment(args)
+when 'export'
+  LucaCmd::Payment.export(ARGV)
+when /payments?/
+  subcmd = ARGV.shift
+  case subcmd
+  when 'create'
+    OptionParser.new do |opt|
+      opt.banner = 'Usage: luca-salary payments create year month [date]'
+      args = opt.parse(ARGV)
+      LucaCmd::Payment.create(args)
+    end
+  when 'list'
+    OptionParser.new do |opt|
+      opt.banner = 'Usage: luca-salary payments list [--mail] year month [date]'
+      opt.on('--mail', 'send to managers') { |_v| params['mode'] = 'mail' }
+      args = opt.parse(ARGV)
+      LucaCmd::Payment.list(args, params)
+    end
   end
 else
   puts 'Invalid subcommand'

data/lib/luca_salary/monthly.rb

@@ -20,15 +20,16 @@ module LucaSalary
     # output payslips via mail or console
     #
     def report(mode = nil)
+      data = LucaSalary::Payment.new(@date.to_s).payslip
       if mode == 'mail'
         mail = Mail.new do
           subject '[luca salary] Monthly Payment'
         end
         mail.to = @config.dig('mail', 'report_mail')
-        mail.text_part = YAML.dump(LucaSalary::Payment.new(@date.to_s).payslip)
+        mail.text_part = YAML.dump(LucaSupport::Code.readable(data))
         LucaSupport::Mail.new(mail, @pjdir).deliver
       else
-        puts YAML.dump(LucaSalary::Payment.new(@date.to_s).payslip)
+        puts YAML.dump(LucaSupport::Code.readable(data))
       end
     end
 

data/lib/luca_salary/payment.rb

@@ -58,11 +58,15 @@ module LucaSalary
         acct_label = @dict[k][:acct_label]
         h[pos][acct_label] = h[pos].key?(acct_label) ? h[pos][acct_label] + v : v
       end
-      res = {}
-      res['date'] = "#{@date.year}-#{@date.month}-#{@date.day}"
-      res['debit'] = h[:debit].map { |k, v| { 'label' => k, 'value' => v } }
-      res['credit'] = h[:credit].map { |k, v| { 'label' => k, 'value' => v } }
-      puts JSON.dump(res)
+      [].tap do |res|
+        item = {}
+        item['date'] = "#{@date.year}-#{@date.month}-#{@date.day}"
+        item['debit'] = h[:debit].map { |k, v| { 'label' => k, 'value' => v } }
+        item['credit'] = h[:credit].map { |k, v| { 'label' => k, 'value' => v } }
+        item['x-editor'] = 'LucaSalary'
+        res << item
+        puts JSON.dump(LucaSupport::Code.readable(res))
+      end
     end
 
     private

data/lib/luca_salary/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module LucaSalary
-  VERSION = '0.1.16'
+  VERSION = '0.1.17'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lucasalary
 version: !ruby/object:Gem::Version
-  version: 0.1.16
+  version: 0.1.17
 platform: ruby
 authors:
 - Chuma Takahiro
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-11-08 00:00:00.000000000 Z
+date: 2020-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lucarecord