ascii_invoicer 2.5.15 → 2.5.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 323c8259870f7d7523277ae5879c95d89ff79f05
-  data.tar.gz: 2d2efe808b97b0be6ab729226803dd25c2b58135
+  metadata.gz: eb682f58e7ae42b47e5d84e88de21f953df524ec
+  data.tar.gz: d6240cbc5f434f6ab8efef3ee8915cf63a5aefa0
 SHA512:
-  metadata.gz: e22a536968bd6074270dac96e6e754e14125aec22cbb2b2b90e60cfacb49a232b5dbd707ec199cfd1162c0a736969f5e2a5d5900095887b5d5df45050d085986
-  data.tar.gz: 45d36ca573aaacb0b0e2930a91b02bce846ad4f65a0750fa108b3b467e39bcdeac7939f08c5c370e8bdb1b2b16135427a755c22c2e50317245585dacbeb304b4
+  metadata.gz: d173a22fa136e4d20de1921c993a8ff7d33a4abb56978d8ed23fd3571ef0f9976adc458ecf87a52ca1b4afc4c6225098b1ba294295ce2c12e78683441247c249
+  data.tar.gz: 47796e28941946ab71ddeb4244a59632f43f4f6537670fa3859e331bd1483cf730677f1fe2ec27dc4a519099bd488cfb3bdc5ecc0d9345bc066bf44ee6ee6330

data/bin/ascii

@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
+# warn_indent: true
+# frozen_string_literal: true
 
 require 'pp'
 require 'csv'
@@ -187,30 +189,30 @@ class Commander < Thor
         projects = open_projects names, options
         paths= projects.map{ |project| project.path }
 
-      if options[:archive]
-        map = $PLUMBER.map_project_files_archive(options[:archive])
-      else
-        map = $PLUMBER.map_project_files_working()
-      end
-      map.each{|k,v|
-        names.each{|name|
-          if k.downcase.include? name.downcase
-            paths += [v]
-          end
+        if options[:archive]
+          map = $PLUMBER.map_project_files_archive(options[:archive])
+        else
+          map = $PLUMBER.map_project_files_working()
+        end
+        map.each{|k,v|
+          names.each{|name|
+            if k.downcase.include? name.downcase
+              paths += [v]
+            end
+          }
         }
-      }
-      paths.uniq!
+        paths.uniq!
 
-      #pp paths
-      $logger.info "opening #{paths}", :stdo
-    end
+        #pp paths
+        $logger.info "opening #{paths}", :stdo
+      end
 
-    if paths.size > 0
-      edit_files paths, options[:editor]
-    else
-      puts "nothing found (#{names})"
+      if paths.size > 0
+        edit_files paths, options[:editor]
+      else
+        puts "nothing found (#{names})"
+      end
     end
-  end
 
 
   desc "open NAMES", "Open created documents"

data/lib/ascii_invoicer.rb

@@ -1,7 +1,7 @@
-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"
+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"

data/lib/ascii_invoicer/InvoiceProject.rb

@@ -1,3 +1,4 @@
+# warn_indent: true
 require 'yaml'
 require 'csv'
 require 'date'
@@ -115,7 +116,13 @@ class InvoiceProject < LuigiProject
     end
 
     #load format and transform or not
-    @data[:format] = @raw_data['format'] ? @raw_data['format'] : "1.0.0"
+    @data[:format] = if @raw_data['format']
+                       @raw_data['format']
+                     elsif @raw_data['meta']['format']
+                       @raw_data['meta']['format']
+                     else
+                       "1.0.0"
+                     end
     if @data[:format] < "2.4.0"
       begin
         @raw_data = import_100 @raw_data
@@ -199,7 +206,11 @@ class InvoiceProject < LuigiProject
     new_hash.set_path("event/dates/0/time/begin", new_hash.get_path("time"))     if date[1].nil?
     new_hash.set_path("event/dates/0/time/end",   new_hash.get_path("time_end")) if date[1].nil?
 
-    new_hash['manager']= new_hash['manager'].lines.to_a[1] if new_hash['manager'].lines.to_a.length > 1
+    pp new_hash
+    manager_lines = new_hash['manager'].lines.to_a()
+    if manager_lines.length > 1
+      new_hash['manager'] = new_hash['manager'].lines[1]
+    end
 
     if new_hash.get_path("client/fullname").words.class == Array
       new_hash.set_path("client/title",     new_hash.get_path("client/fullname").lines.to_a[0].strip)

data/lib/ascii_invoicer/ascii_logger.rb

@@ -1,3 +1,4 @@
+# warn_indent: true
 #http://stackoverflow.com/questions/6407141/how-can-i-have-ruby-logger-log-output-to-stdout-as-well-as-file
 require 'logger'
 require 'fileutils'

data/lib/ascii_invoicer/filters.rb

@@ -1,3 +1,5 @@
+# warn_indent: true
+# frozen_string_literal: true
 require 'date'
 #require File.join __dir__ + '/rfc5322_regex.rb'
 

data/lib/ascii_invoicer/generators.rb

@@ -1,3 +1,5 @@
+# warn_indent: true
+# frozen_string_literal: true
 module Generators
   def generate_hours_total full_data
     hours = full_data[:hours]

data/lib/ascii_invoicer/hash_transformer.rb

@@ -1,3 +1,4 @@
+# warn_indent: true
 require 'hash-graft'
 
 class HashTransformer

data/lib/ascii_invoicer/mixins.rb

@@ -1,3 +1,5 @@
+# warn_indent: true
+# frozen_string_literal: true
 require 'icalendar'
 require 'fileutils'
 require 'money'

data/lib/ascii_invoicer/projectFileReader.rb

@@ -1,3 +1,5 @@
+# warn_indent: true
+# frozen_string_literal: true
 require 'paint'
 
 require File.join __dir__, 'tweaks.rb'
@@ -87,13 +89,13 @@ module ProjectFileReader
         @logger.info Paint[path, :yellow] if @settings.DEBUG
         return parser.call(value)
       end
-    end
     rescue => error
       fail_at path
       puts Array.new($@).keep_if{|line| line.include? "filter_"}.map {|line| Paint[line, :red, :bold]}
       puts Array.new($@).keep_if{|line| line.include? "generate_"}.map {|line| Paint[line, :blue, :bold]}
       puts Paint["      #{error} (#{@project_path})", :yellow]
     end
+  end
 
   def fail_at(*criteria)
     @data[:valid] = false

data/lib/ascii_invoicer/rfc5322_regex.rb

@@ -1,3 +1,4 @@
+# warn_indent: true
 # RFC 5322 Email Validation Regex in Ruby
 
 $RFC5322 = /

data/lib/ascii_invoicer/settings_manager.rb

@@ -1,3 +1,4 @@
+# warn_indent: true
 require 'fileutils'
 
 require 'hash-graft'

data/lib/ascii_invoicer/texwriter.rb

@@ -1,3 +1,4 @@
+# warn_indent: true
 require 'logger'
 
 module TexWriter
@@ -93,11 +94,18 @@ module TexWriter
       templates[File.basename(file.split(?.)[0]).to_sym] = file
     }
     path = templates[type]
-    if File.exists?(path)
-      return File.open(path).read
-    else
+
+    if path.nil?
+      @logger.error "No template found!\n  Check #{$PLUMBER.dirs[:templates]} !"
+      return false
+
+    elsif not File.exists?(path)
       @logger.error "Template (#{path}) File not found!"
       return false
+
+    else
+      return File.open(path).read
+
     end
   end
 

data/lib/ascii_invoicer/tweaks.rb

@@ -1,3 +1,5 @@
+# warn_indent: true
+# frozen_string_literal: true
 $FB = "foobar"
 class TrueClass
   def print(symbol=?✓)

data/lib/ascii_invoicer/version.rb

@@ -1,3 +1,4 @@
+# warn_indent: true
 module AsciiInvoicer
-  VERSION = '2.5.15'
+  VERSION = '2.5.17'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ascii_invoicer
 version: !ruby/object:Gem::Version
-  version: 2.5.15
+  version: 2.5.17
 platform: ruby
 authors:
 - Hendrik Sollich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-22 00:00:00.000000000 Z
+date: 2016-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec