ascii_invoicer 2.5.5 → 2.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 186d774a2d826b6b83265d7597ebb7009a321d4f
-  data.tar.gz: f94639520acbbcee90c511f7539442dd7f7602f6
+  metadata.gz: f84258bb06f6de068f343d5ec1ba51150799e703
+  data.tar.gz: 4395599f3222f8febe2ce683e108f591901a9859
 SHA512:
-  metadata.gz: 4e3d3887e9432fde377decb43b2a2e44383ee73ea04cbe0b75069cb5623a2f095ab95388f6633a676bba7e057f2c64bc63ca1c92f9dd4b3674bbe5aa6d7f49b3
-  data.tar.gz: 9865ad5aea22a6e4b8e6f42ffa73f571ae0410014da6c3286646409d55e415aeb8f3b8b81dca227fa9dc67287d8627c6e7e13a510a51d316739664b3316a0818
+  metadata.gz: dd09954c365791aa28dac616ade11804076ee01b63836d9379b43f78307ff2ecea34b8eea751e9c7819f65520f79f6e395e285937822b56a5b7f2ce80bd38f10
+  data.tar.gz: a8eeb5fa5553c2264b6298aa1b4467e4ea1024afe128262e43dc86d78f592cc0f324d1615b1e07ff64e61819df14e288007abe19ff2b5ffbf119d8f5cc88d66d

data/bin/ascii

@@ -212,6 +212,30 @@ class Commander < Thor
   end
 
 
+  desc "open NAMES", "Open created documents"
+    method_option :archive,
+      :type=>:numeric, :aliases => "-a", :default => nil,
+      :lazy_default=> Date.today.year, :required => false, :desc => "Open File from archive YEAR"
+    method_option :offer, :type=>:boolean, :aliases => "-o",
+      :default=> false, :lazy_default=> true, :required => false,
+      :desc => "Open the offer, otherwise defaults to invoice"
+
+  def open *names
+    choice = :invoice
+    choice = :offer if options[:offer]
+
+    projects = open_projects names, options
+    projects.each{|p|
+      path = p.output_files[choice]
+      unless File.exists? path
+        $logger.error "File does not exist: #{path}."
+        return false
+      else
+        open_file path
+      end
+    }
+  end
+
 
   desc "list", "List current Projects"
     method_option :archive,
@@ -411,8 +435,8 @@ class Commander < Thor
     end
   end
 
-  desc "reopen YEAR NAME", "reopen an archived project"
-  def reopen(year, name)
+  desc "unarchive YEAR NAME", "reopen an archived project"
+  def unarchive(year, name)
     projects = $PLUMBER.open_projects_archive year
     project = projects.lookup_by_name name
     if project.count > 1

data/lib/ascii_invoicer/InvoiceProject.rb

@@ -98,11 +98,13 @@ class InvoiceProject < LuigiProject
       @raw_data        = YAML::load(File.open(project_path))
     rescue SyntaxError => error
       @logger.warn "SyntaxError in #{project_path}, use \"edit\" to correct it.", :both
+      @logger.info "Check #{@settings.log_file} for details.", :stdo
       @logger.error error, :file
       @status = :unparsable
       return false
     rescue Psych::SyntaxError => error
       @logger.warn "SyntaxError in #{project_path}, use \"edit\" to correct it.", :both
+      @logger.info "Check #{@settings.log_file} for details.", :stdo
       @logger.error error, :file
       @status = :unparsable
       return false
@@ -272,6 +274,28 @@ class InvoiceProject < LuigiProject
       return false
     end
   end
+
+  def output_files
+    output_path = File.expand_path File.join @settings.output_path
+    {
+      :offer => File.join(output_path, export_filename(:offer, 'pdf')),
+      :invoice => File.join(output_path, export_filename(:invoice, 'pdf'))
+    }
+  end
+
+  def state_sign choice
+    if validate(choice)
+      if File.exists? output_files[choice]
+        return Paint[?✓,:green, :bright]
+      else
+        return Paint[?✓,:green]
+      end
+    else
+      return Paint[?✗,:red]
+    end
+  end
+
+
 end
 
 class InvoiceProduct

data/lib/ascii_invoicer/mixins.rb

@@ -85,8 +85,8 @@ module AsciiMixins
       project.data[:manager],
       project.data[:invoice][:number],
       project.date.strftime("%d.%m.%Y"),
-      project.validate(:offer).print,
-      project.validate(:invoice).print,
+      project.state_sign(:offer),
+      project.state_sign(:invoice),
       project.validate(:payed).print($SETTINGS.currency_symbol),
       # try these: ☑☒✉☕☀☻
     ]
@@ -98,8 +98,8 @@ module AsciiMixins
     projects.each_index do |i|
       p  = projects[i]
       table.add_row [
-        (i+1).to_s+".", 
-        p.name.ljust(35), 
+        (i+1).to_s+".",
+        p.name.ljust(35),
         p.data[:project_path]
       ]
     end
@@ -132,7 +132,7 @@ module AsciiMixins
       puts "...\n\n"
     end
   end
-  
+
   def caterers_string project, join = ", "
       data = project.data
       data[:hours][:caterers].map{|name, hours| "#{name} (#{hours})" if hours > 0 }.join join if data[:hours][:caterers]
@@ -249,6 +249,18 @@ module AsciiMixins
     end
   end
 
+  ## hand path to default programm
+  def open_file path
+    unless path.class == String and File.exists? path
+      $logger.error "Cannot open #{path}", :both 
+      return false
+    end
+    opener = $SETTINGS.opener
+    $logger.info "Opening #{path} in #{opener}"
+    pid = spawn "#{opener} \"#{path}\""
+    Process.wait pid
+  end
+
   ## hand path to editor
   def edit_files(paths, editor = $SETTINGS.editor)
     paths = [paths] if paths.class == String

data/lib/ascii_invoicer/version.rb

@@ -1,3 +1,3 @@
 module AsciiInvoicer
-  VERSION = '2.5.5'
+  VERSION = '2.5.6'
 end

data/settings/default-settings.yml

@@ -2,6 +2,7 @@
 manager_name: "The Unnamed Manager"
 verbose:  false
 editor:   "vim -O"
+opener:   "xdg-open"
 colors:   false
 list_sort: index
 

data/settings/settings_template.yml

@@ -1,9 +1,10 @@
 ---
-#manager_name: "The Unnamed Manager"
+manager_name: "The Unnamed Manager"
 #verbose:  false
 #editor:   "vim -O"
+#opener:   "xdg-open"
 #colors:   false
-#list_sort: date # index, name
+#list_sort: index # index, date, name
 
 #path: "~" #/where/you/want/to/put/the/dirs
 #output_path: "."

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ascii_invoicer
 version: !ruby/object:Gem::Version
-  version: 2.5.5
+  version: 2.5.6
 platform: ruby
 authors:
 - Hendrik Sollich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-24 00:00:00.000000000 Z
+date: 2015-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec