lucadeal 0.2.18 → 0.2.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d8159099446dcdae1b4c928d4eac5861cd35fe13f8d37155cdf28dafb30fc21e
-  data.tar.gz: 3c086a2ea6c4c9ec6bc9014fa9500ab9fde0a07c1778a5817fbb64e7409b5670
+  metadata.gz: 36ce9f92d92079f0049ec346da2921116e7cde669314bccca3653c28dca33b51
+  data.tar.gz: b2f591e9bfb9710fa45cdb1d3582f19997d392e84e639531e4b15e77d6b284c7
 SHA512:
-  metadata.gz: 0a26cec96f1a0805044470f8710b36b60aacf344bad53527c2a9fd4ff64557a06836e4eefec21f083e0b51bc48a9854dbe2fdd6fed4d4754aba9fe51fa5890ce
-  data.tar.gz: 8a611e016833673fb1e7fcab747a24d4bfdb4152a60086791a1377d8576feb181255c8b2a0dfeca2f6807a4d11d4d2f579be6353ca62a7996a5f960d8b4f1311
+  metadata.gz: 8e2ca7f2a7063d44d29013cdd7448f807c58dbabca341cdeb1a8a118e24ca826ca94ac608f1c4a56eb16cb41cb039a0b39d2b07cb011fdd4a57e4b04c24a7d92
+  data.tar.gz: 692b888b1209de7fa6329ffbc7edd1ef7ad84be530b2dad7fcaad64b5c621d0da424e3ac90f21e9db7113057599497c91b61d70f479cf48bdea6bee2c49e1f0e

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## LucaDeal 0.2.19
+
+* CLI id completion on Customer delete, Contract create/delete
+* add `describe` to Customer / Contract
+
 ## LucaDeal 0.2.18
 
 * Breaking change: restructure CLI in sub-sub command format.

data/exe/luca-deal

@@ -18,12 +18,41 @@ module LucaCmd
       end
     end
 
-    def self.delete(args = nil, params = {})
-      if args
-        id = LucaDeal::Customer.delete(args[0])
+    def self.describe(args = nil, params = {})
+      if args.empty?
+        list = LucaDeal::Customer.id_completion('')
+        puts 'requires customer\'s id. exit'
+        list.each { |item| puts "  #{item[:id]}  #{item[:label]}" }
+        exit 1
       else
+        list = LucaDeal::Customer.id_completion(args[0])
+        case list.length
+        when 1
+          id = LucaDeal::Customer.new.describe(list.first)
+        else
+          puts 'found multiple contract id. exit'
+          list.each { |item| puts "  #{item[:id]}  #{item[:label]}" }
+          exit 1
+        end
+      end
+    end
+
+    def self.delete(args = nil, params = {})
+      if args.empty?
+        list = LucaDeal::Customer.id_completion('')
         puts 'requires customer\'s id. exit'
+        list.each { |item| puts "  #{item[:id]}  #{item[:label]}" }
         exit 1
+      else
+        list = LucaDeal::Customer.id_completion(args[0])
+        case list.length
+        when 1
+          id = LucaDeal::Customer.delete(list.first)
+        else
+          puts 'found multiple customer\'s id. exit'
+          list.each { |item| puts "  #{item[:id]}  #{item[:label]}" }
+          exit 1
+        end
       end
     end
 
@@ -34,22 +63,61 @@ module LucaCmd
 
   class Contract
     def self.create(args = nil, params = {})
-      if args
-        id = LucaDeal::Contract.new.generate!(args[0], params['category'])
-        puts "Successfully generated Contract  #{id}" if id
-        puts 'Conditions are tentative. Edit contract detail.' if id
-      else
+      if args.empty?
+        list = LucaDeal::Customer.id_completion('')
         puts 'requires customer\'s id. exit'
+        list.each { |item| puts "  #{item[:id]}  #{item[:label]}" }
         exit 1
+      else
+        list = LucaDeal::Customer.id_completion(args[0])
+        case list.length
+        when 1
+          id = LucaDeal::Contract.new.generate!(list.first, params['category'])
+          puts "Successfully generated Contract  #{id}" if id
+          puts 'Conditions are tentative. Edit contract detail.' if id
+        else
+          puts 'found multiple customer\'s id. exit'
+          list.each { |item| puts "  #{item[:id]}  #{item[:label]}" }
+          exit 1
+        end
       end
     end
 
-    def self.delete(args = nil, params = {})
-      if args
-        id = LucaDeal::Contract.delete(args[0])
+    def self.describe(args = nil, params = {})
+      if args.empty?
+        list = LucaDeal::Contract.id_completion('', label: 'customer_name')
+        puts 'requires contract id. exit'
+        list.each { |item| puts "  #{item[:id]}  #{item[:label]}" }
+        exit 1
       else
+        list = LucaDeal::Contract.id_completion(args[0])
+        case list.length
+        when 1
+          id = LucaDeal::Contract.new.describe(list.first)
+        else
+          puts 'found multiple contract id. exit'
+          list.each { |item| puts "  #{item[:id]}  #{item[:label]}" }
+          exit 1
+        end
+      end
+    end
+
+    def self.delete(args = nil, params = {})
+      if args.empty?
+        list = LucaDeal::Contract.id_completion('', label: 'customer_name')
         puts 'requires contract id. exit'
+        list.each { |item| puts "  #{item[:id]}  #{item[:label]}" }
         exit 1
+      else
+        list = LucaDeal::Contract.id_completion(args[0])
+        case list.length
+        when 1
+          id = LucaDeal::Contract.delete(list.first)
+        else
+          puts 'found multiple contract id. exit'
+          list.each { |item| puts "  #{item[:id]}  #{item[:label]}" }
+          exit 1
+        end
       end
     end
   end
@@ -128,10 +196,19 @@ when /customers?/
       args = opt.parse(ARGV)
       LucaCmd::Customer.create(args, params)
     end
+  when 'describe'
+    LucaCmd::Customer.describe(ARGV)
   when 'delete'
     LucaCmd::Customer.delete(ARGV)
   else
-    puts 'Usage: luca-deal customers sub-commands'
+    puts 'Proper subcommand needed.'
+    puts
+    puts 'Usage: luca-deal customer[s] subcommands [--help|options]'
+    puts '  create'
+    puts '  list'
+    puts '  describe: show customer with contracts info'
+    puts '  delete'
+    exit 1
   end
 when /contracts?/
   subcmd = ARGV.shift
@@ -145,10 +222,18 @@ when /contracts?/
       args = opt.parse(ARGV)
       LucaCmd::Contract.create(args, params)
     end
+  when 'describe'
+    LucaCmd::Contract.describe(ARGV)
   when 'delete'
     LucaCmd::Contract.delete(ARGV)
   else
-    puts 'Usage: luca-deal contracts Subcommand'
+    puts 'Proper subcommand needed.'
+    puts
+    puts 'Usage: luca-deal contract[s] subcommand [--help|options]'
+    puts '  create'
+    puts '  describe: show contract with puroducts or items info'
+    puts '  delete'
+    exit 1
   end
 when 'export'
   LucaCmd::Invoice.export(ARGV)
@@ -158,7 +243,7 @@ when /invoices?/, 'i'
   when 'create'
     OptionParser.new do |opt|
       opt.banner = 'Usage: luca-deal invoices create [options] year month [date]'
-      opt.on('--monthly', 'generate monthly data') { |v| params['mode'] = 'monthly' }
+      opt.on('--monthly', 'generate monthly data') { |_v| params['mode'] = 'monthly' }
       args = opt.parse(ARGV)
       LucaCmd::Invoice.create(args, params)
     end
@@ -173,23 +258,35 @@ when /invoices?/, 'i'
   when 'mail'
     OptionParser.new do |opt|
       opt.banner = 'Usage: luca-deal invoices mail [options] year month [date]'
-      opt.on('--preview', 'send to preview user') { |v| params['mode'] = 'preview' }
+      opt.on('--preview', 'send to preview user') { |_v| params['mode'] = 'preview' }
       args = opt.parse(ARGV)
       LucaCmd::Invoice.mail(args, params)
     end
   else
-    puts 'Usage: luca-deal invoices SubCommand'
+    puts 'Proper subcommand needed.'
+    puts
+    puts 'Usage: luca-deal invoices subcommand [--help|options]'
+    puts '  create'
+    puts '  delete'
+    puts '  list'
+    puts '  mail: send mail with invoice'
+    exit 1
   end
 when 'new'
   params = {}
   OptionParser.new do |opt|
+    opt.banner = 'Usage: luca-deal new DIR'
     args = opt.parse(ARGV)
     new_pj(args, params)
   end
 else
-  puts 'Usage: luca-deal sub-command [--help|options]'
+  puts 'Proper subcommand needed.'
+  puts
+  puts 'Usage: luca-deal subcommand [options]'
   puts '        customers'
   puts '        contracts'
   puts '        invoices'
-  puts '        export'
+  puts '        new: initialize project dir'
+  puts '        export: puts invoice data for LucaBook import'
+  exit 1
 end

data/lib/luca_deal/contract.rb

@@ -43,6 +43,16 @@ module LucaDeal
       end
     end
 
+    def describe(id)
+      contract = parse_current(self.class.find(id))
+      if contract['products']
+        contract['products'] = contract['products'].map do |product|
+          LucaDeal::Product.find(product['id'])
+        end
+      end
+      YAML.dump(readable(contract)).tap{ |d| puts d }
+    end
+
     def generate!(customer_id, mode = 'subscription')
       LucaDeal::Customer.find(customer_id) do |customer|
         current_customer = parse_current(customer)

data/lib/luca_deal/customer.rb

@@ -18,10 +18,25 @@ module LucaDeal
     end
 
     def list_name
-      list = self.class.all.map { |dat| parse_current(dat) }
+      list = self.class.all.map { |dat| parse_current(dat).sort.to_h }
       YAML.dump(list).tap { |l| puts l }
     end
 
+    def describe(id)
+      customer = parse_current(self.class.find(id))
+      contracts = LucaDeal::Contract.all.select { |contract| contract['customer_id'] == customer['id'] }
+      if !contracts.empty?
+        customer['contracts'] = contracts.map do |c|
+          {
+            'id' => c['id'],
+            'effective' => c['terms']['effective'],
+            'defunct' => c['terms']['defunct']
+          }
+        end
+      end
+      YAML.dump(readable(customer)).tap{ |d| puts d }
+    end
+
     def self.create(obj)
       raise ':name is required' if obj[:name].nil?
 

data/lib/luca_deal/invoice.rb

@@ -88,7 +88,8 @@ module LucaDeal
                 'customer' => invoice.dig('customer', 'name'),
                 'subtotal' => amount,
                 'tax' => tax,
-                'due' => invoice.dig('due_date')
+                'due' => invoice.dig('due_date'),
+                'mail' => invoice.dig('status')&.select { |a| a.keys.include?('mail_delivered') }&.first
               }
             end
             stat['issue_date'] = scan_date.to_s

data/lib/luca_deal/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module LucaDeal
-  VERSION = '0.2.18'
+  VERSION = '0.2.19'
 end

metadata

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