clinvoice 1.1.0 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b15d22bdc4eac1154f8ff91961d2ad3675f3046b17792a418310b02242478a5
-  data.tar.gz: 0ec6a774d8e43916edf4d408aef4ac883195dd232262016f7fbe939721c2c70a
+  metadata.gz: 0613efe19493bd8ab74fd529496463b68d52cc8feff37fa279d21044dc271f16
+  data.tar.gz: 949fbc2f22382af6c0fb52844ebd0a0ebbff29e625d7f86ed395aff94bb834df
 SHA512:
-  metadata.gz: 9828213ba2f5e4fa094bdbcb538811f8bd592a0f3f014a67142889630e591b2da66be54d9b4d1567a053635fa0d494255ff9e98d520f1faea1ae2bc235c6e969
-  data.tar.gz: 9048ed41925013e8ee3326dd77daa039c79e2fd8c4155e98fb0b31c7330e23170039fe1717cf89bf65db0c72984ad5690b054e43f4e047f4d4921481ab2d1504
+  metadata.gz: 6a8b43a3e3a229804442b895715d8712876937e9c50ff18680ce49fb2200b5960565c1dac29224b2374578a035b86b09a45fb4a2fe8090fc84081d1163194475
+  data.tar.gz: ceaa6f32db5fc09e4e16477493f07f4bb44fc03416710af7a5801b9c41c6bd517c8d8247c01354d189345a839b4d09928409e7b5942cacdc9c7da4e0090f5952

data/.tool-versions

@@ -0,0 +1 @@
+ruby 2.5.5

data/Gemfile.lock

@@ -1,29 +1,29 @@
 PATH
   remote: .
   specs:
-    clinvoice (1.0.0)
+    clinvoice (2.1.1)
       prawn (~> 2.2)
       prawn-table (~> 0.2.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    pdf-core (0.7.0)
-    prawn (2.2.2)
-      pdf-core (~> 0.7.0)
-      ttfunk (~> 1.5)
+    pdf-core (0.9.0)
+    prawn (2.4.0)
+      pdf-core (~> 0.9.0)
+      ttfunk (~> 1.7)
     prawn-table (0.2.2)
       prawn (>= 1.3.0, < 3.0.0)
     rake (10.5.0)
-    ttfunk (1.5.1)
+    ttfunk (1.7.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.16)
+  bundler (~> 2.2.10)
   clinvoice!
   rake (~> 10.0)
 
 BUNDLED WITH
-   1.16.4
+   2.2.25

data/clinvoice.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler', '~> 1.16'
+  spec.add_development_dependency 'bundler', '~> 2.2.10'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_dependency 'prawn', '~> 2.2'
   spec.add_dependency 'prawn-table', '~> 0.2.2'

data/generate-gem

@@ -0,0 +1,4 @@
+
+rm *.gem
+gem build clinvoice.gemspec
+gem push *.gem

data/lib/clinvoice/data.rb

@@ -5,6 +5,8 @@ require 'yaml'
 module Clinvoice
   class Data
     attr_reader :invoice_id,
+                :issue_date,
+                :due_date,
                 :currency,
                 :contractor,
                 :client,
@@ -14,13 +16,17 @@ module Clinvoice
                 :file
 
     def initialize(file)
-      data = YAML.load_file("#{file}.yml")['data']
+      filename = file.end_with?('.yml') ? file : "#{file}.yml"
+
+      data = YAML.load_file(filename)['data']
 
       @file = file
       @invoice_id = data['id']
       @currency = data['currency']
       @issue_date = data['issue_date']
       @contractor = data['contractor']
+      @issue_date = data['issue_date']
+      @due_date = data['due_date']
       @client = data['client']
       @items = data['items'].map do |item|
         [
@@ -34,5 +40,9 @@ module Clinvoice
       @notes = data['notes']
       @total = @items.map(&:last).sum
     end
+
+    def pdf_file
+      "#{file.gsub('.yml', '')}.pdf"
+    end
   end
 end

data/lib/clinvoice/generate_pdf.rb

@@ -16,7 +16,7 @@ module Clinvoice
     def self.call(file)
       data = Clinvoice::Data.new(file)
 
-      Prawn::Document.generate("#{data.file}.pdf") do |pdf|
+      Prawn::Document.generate(data.pdf_file) do |pdf|
         Prawn::Font::AFM.hide_m17n_warning = true
 
         pdf.font 'Helvetica'

data/lib/clinvoice/render_basic_info.rb

@@ -12,6 +12,20 @@ module Clinvoice
       Clinvoice::Helper.new_line(pdf, data.currency)
 
       pdf.move_down 10
+
+      if data.issue_date
+        Clinvoice::Helper.new_bold_line(pdf, "Issue Date")
+        Clinvoice::Helper.new_line(pdf, data.issue_date)
+
+        pdf.move_down 10
+      end
+
+      if data.issue_date
+        Clinvoice::Helper.new_bold_line(pdf, "Due Date")
+        Clinvoice::Helper.new_line(pdf, data.due_date)
+
+        pdf.move_down 10
+      end
     end
   end
 end

data/lib/clinvoice/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Clinvoice
-  VERSION = '1.1.0'
+  VERSION = '2.2.2'
 end

data/lib/clinvoice.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'clinvoice/initialize_template'
-require 'clinvoice/generate_next_template'
 require 'clinvoice/generate_pdf'
 require 'clinvoice/version'
 
@@ -17,8 +16,6 @@ module Clinvoice
       Clinvoice::InitializeTemplate.call(file)
     when 'new'
       Clinvoice::GeneratePDF.call(file)
-    when 'next'
-      Clinvoice::GenerateNextTemplate.call(file)
     else
       show_usage_and_exit!
     end
@@ -30,7 +27,6 @@ module Clinvoice
 
         clinvoice init <datafile> # starts a new template with id 1 and empty entries.
         clinvoice new <filename> # generates a pdf invoice based on a data file `yml`.
-        clinvoice next <datafile> # generates the next data file `yml`.
 
       Args:
 
@@ -55,12 +51,6 @@ module Clinvoice
 
           This will create a `doge-client-1.pdf` file based on the data file `doge-client-1.yml`.
 
-        4 - Generate a next datafile
-
-          `$ clinvoice next doge-client`
-
-          This will create a `doge-client-2.yml` data file, based on the last data file id + 1.
-
     USAGE
 
     exit

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: clinvoice
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 2.2.2
 platform: ruby
 authors:
 - Andrew S Aguiar
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-02-20 00:00:00.000000000 Z
+date: 2021-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: 2.2.10
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: 2.2.10
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -77,6 +77,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".tool-versions"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -87,9 +88,9 @@ files:
 - bin/clinvoice
 - bin/setup
 - clinvoice.gemspec
+- generate-gem
 - lib/clinvoice.rb
 - lib/clinvoice/data.rb
-- lib/clinvoice/generate_next_template.rb
 - lib/clinvoice/generate_pdf.rb
 - lib/clinvoice/helper.rb
 - lib/clinvoice/initialize_template.rb
@@ -104,7 +105,7 @@ homepage: https://github.com/andrewaguiar/clinvoice
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -119,9 +120,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.7.6.2
+signing_key:
 specification_version: 4
 summary: Generates invoices using command line
 test_files: []

data/lib/clinvoice/generate_next_template.rb

@@ -1,16 +0,0 @@
-# frozen_string_literal: true
-
-module Clinvoice
-  module GenerateNextTemplate
-    def self.call(file)
-      last_data_file = Dir["#{file}-*.yml"].max
-      template_content = File.read(last_data_file)
-
-      next_id = template_content.scan(/id: (\d*)/).first.first.to_i + 1
-
-      next_template_content = template_content.sub(/id: (\d*)/, "id: #{next_id}")
-
-      File.write("#{file}-#{next_id}.yml", next_template_content)
-    end
-  end
-end