ascii_invoicer 2.5.9 → 2.5.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2aaed93c7c093414e9043b3dd86e9fb3ca77ce25
-  data.tar.gz: 7a60774dd51efc5faca5c52b40f5b58589c3f06b
+  metadata.gz: 695e518f05626d7d49ff52e39a29005057357ab2
+  data.tar.gz: 8a17c19f7331d0b5ae76babf591ec2d2d975ef50
 SHA512:
-  metadata.gz: 829c6984136235fab3c3133a2fbe43c5964722d4b51329d8d0807b887a47699d0fdb9f2307e31fa0ac8ecd8aea962e763a63182c4095aa3a19beb53e5990bc8c
-  data.tar.gz: b558a4aa82889ab85c838a6cb2512bb41c777feb5acb1c5ab891ee2c06c5a2ab1334fe4a63154115239e5584fabf19903049345d424e28dd141aa732fe000ce1
+  metadata.gz: 6f6a9bf9d506f143fa8d1fa50844575cbda4c1122f608b02c7d6567ce8eabe5db376eae9c5b8fa46cea4890da48595b7913b82877c03d555d1f8d4a8881d0117
+  data.tar.gz: aaf28dd551e743f293538c9cf450e74b8c792b01a93e543d1ebae784b43a4f0a5b27288c2203812d40a889f54a19244ee8562bfc7441034a4f923344c0d04838

data/bin/ascii

@@ -4,10 +4,10 @@ require 'pp'
 require 'csv'
 require 'yaml'
 require 'thor'
-require 'euro'
 require 'paint'
 require 'luigi'
 require 'logger'
+require 'bundler/setup'
 require 'textboxes'
 require 'hash-graft'
 
@@ -39,6 +39,8 @@ $SETTINGS.version = $VERSION = AsciiInvoicer::VERSION
 ## path to the project File, here we expand the "~"
 $SETTINGS.path = File.expand_path $SETTINGS.path
 
+## money
+$SETTINGS.currency_symbol = Money::Currency.new($SETTINGS.currency).symbol
 
 ## "security"
 #error "settings:editor is an elaborate string: \"#{$SETTINGS.editor}\"!\nDANGEROUS!" if $SETTINGS.editor.include? " "
@@ -264,6 +266,9 @@ class Commander < Thor
     method_option :caterers, :type=>:boolean,
       :lazy_default=> true, :required => false, :desc => "list caterers"
 
+    method_option :wages, :type=>:boolean,
+      :lazy_default=> true, :required => false, :desc => "list wages"
+
     method_option :blockers, :type=>:boolean, :aliases => '-b',
       :lazy_default=> true, :required => false, :desc => "list blockers"
 
@@ -292,10 +297,8 @@ class Commander < Thor
     hash            = {}
     hash[:verbose]  = (options[:verbose] and !options[:simple])
     hash[:colors]   = (options[:colors] and !options[:no_colors])
-    hash[:errors]   = options[:errors]
-    hash[:blockers] = options[:blockers]
-    hash[:caterers] = options[:caterers]
-    hash[:details]  = options[:details]
+    [ :errors, :blockers,
+      :caterers, :wages, :details ].each {|name| hash[name] = options[name]}
 
     if options[:paths]
       map = $PLUMBER.map_project_files_working()
@@ -317,7 +320,6 @@ class Commander < Thor
     if options[:final]
       hash[:details] = [] if hash[:details].nil?
       hash[:details] << "invoice/final"
-      puts hash
     end
 
     if options[:all]

data/lib/ascii_invoicer.rb

@@ -1,17 +1,7 @@
-begin
-  require "ascii_invoicer/version"
-  require "ascii_invoicer/settings_manager"
-  require "ascii_invoicer/InvoiceProject"
-  require "ascii_invoicer/hash_transformer"
-  require "ascii_invoicer/tweaks"
-  require "ascii_invoicer/mixins"
-  require "ascii_invoicer/ascii_logger"
-rescue LoadError
-  require "./lib/ascii_invoicer/version"
-  require "./lib/ascii_invoicer/settings_manager"
-  require "./lib/ascii_invoicer/InvoiceProject"
-  require "./lib/ascii_invoicer/hash_transformer"
-  require "./lib/ascii_invoicer/tweaks"
-  require "./lib/ascii_invoicer/mixins"
-  require "./lib/ascii_invoicer/ascii_logger"
-end
+require "ascii_invoicer/version"
+require "ascii_invoicer/settings_manager"
+require "ascii_invoicer/InvoiceProject"
+require "ascii_invoicer/hash_transformer"
+require "ascii_invoicer/tweaks"
+require "ascii_invoicer/mixins"
+require "ascii_invoicer/ascii_logger"

data/lib/ascii_invoicer/InvoiceProject.rb

@@ -1,7 +1,7 @@
 require 'yaml'
 require 'csv'
 require 'date'
-require 'euro'
+require 'money'
 
 require File.join __dir__, 'hash_transformer.rb'
 require File.join __dir__, 'projectFileReader.rb'

data/lib/ascii_invoicer/mixins.rb

@@ -1,5 +1,47 @@
 require 'icalendar'
 require 'fileutils'
+require 'money'
+
+module EuroConversion
+
+  def euro
+    self.to_euro
+  end
+
+  def €
+    self.to_euro
+  end
+
+  def to_euro
+    Money.new self*100, $SETTINGS.currency
+  end
+
+end
+
+class Money
+  def to_s
+    value = self.amount
+    a,b = sprintf("%0.2f", value.to_s).split('.')
+    a.gsub!(/(\d)(?=(\d{3})+(?!\d))/, '\\1.')
+    "#{a}#{self.currency.separator}#{b}#{self.currency.symbol}"
+  end
+
+  def to_euro
+    self
+  end
+end
+
+class Fixnum
+  include EuroConversion
+end
+
+class Rational
+  include EuroConversion
+end
+
+class Float
+  include EuroConversion
+end
 
 module AsciiMixins
 
@@ -48,6 +90,7 @@ module AsciiMixins
       end
 
       row << caterers_string(project) if hash[:caterers] and project.data[:hours][:caterers]
+      row << wages_string(project) if hash[:wages] and project.data[:hours][:caterers]
 
       row << project.blockers(:archive)      if hash[:blockers]
       if hash[:details]
@@ -65,7 +108,7 @@ module AsciiMixins
     puts table
   end
 
-  def print_row_simple(project,hash) 
+  def print_row_simple(project,hash)
     row = [
       project.pretty_name,
       project.data[:manager],
@@ -140,6 +183,12 @@ module AsciiMixins
       data[:hours][:caterers].map{|name, hours| "#{name} (#{hours})" if hours > 0 }.join join if data[:hours][:caterers]
   end
 
+  def wages_string project, join = ", "
+      data = project.data
+      salary = data[:hours][:salary]
+      data[:hours][:caterers].map{|name, hours| "#{name} (#{salary* hours})" if hours > 0 }.join join if data[:hours][:caterers]
+  end
+
   #takes an array of invoices (@plumber.working_projects)
   def print_project_list_csv(projects)
     header = [
@@ -254,7 +303,7 @@ module AsciiMixins
   ## hand path to default programm
   def open_file path
     unless path.class == String and File.exists? path
-      $logger.error "Cannot open #{path}", :both 
+      $logger.error "Cannot open #{path}", :both
       return false
     end
     opener = $SETTINGS.opener

data/lib/ascii_invoicer/version.rb

@@ -1,3 +1,3 @@
 module AsciiInvoicer
-  VERSION = '2.5.9'
+  VERSION = '2.5.10'
 end

data/settings/default-settings.yml

@@ -59,7 +59,7 @@ defaults:
         - "Wir bitten um eine Begleichung des Betrags innerhalb von 14 Tagen nach Erhalt der Rechnung."
       signature: Mit freundlichen Grüßen
 
-currency_symbol: €
+currency: "eur" # see gem "money"
 
 gender_matches:
   herr: male

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ascii_invoicer
 version: !ruby/object:Gem::Version
-  version: 2.5.9
+  version: 2.5.10
 platform: ruby
 authors:
 - Hendrik Sollich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-01 00:00:00.000000000 Z
+date: 2015-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -127,19 +127,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.0.1
 - !ruby/object:Gem::Dependency
-  name: euro
+  name: money
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 6.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 6.5.1
 - !ruby/object:Gem::Dependency
   name: hash-graft
   requirement: !ruby/object:Gem::Requirement
@@ -186,20 +186,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.7
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.7
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: hashr
   requirement: !ruby/object:Gem::Requirement