rbinvoice 0.2.4 → 0.4.0

data/.gitignore

@@ -0,0 +1,54 @@
+# rcov generated
+coverage
+
+# rdoc generated
+rdoc
+
+# yard generated
+doc
+.yardoc
+
+# bundler
+.bundle
+
+# jeweler generated
+pkg
+
+# Have editor/IDE/OS specific files you need to ignore? Consider using a global gitignore: 
+#
+# * Create a file at ~/.gitignore
+# * Include files you want ignored
+# * Run: git config --global core.excludesfile ~/.gitignore
+#
+# After doing this, these files will be ignored in all your git projects,
+# saving you from having to 'pollute' every project you touch with them
+#
+# Not sure what to needs to be ignored for particular editors/OSes? Here's some ideas to get you started. (Remember, remove the leading # of the line)
+#
+# For MacOS:
+#
+.DS_Store
+
+# For TextMate
+#*.tmproj
+#tmtags
+
+# For emacs:
+*~
+\#*
+.\#*
+
+# For vim:
+.*.swp
+.*.swo
+
+# For redcar:
+#.redcar
+
+# For rubinius:
+#*.rbc
+
+tmp
+README.html
+
+rbinvoice*.gem

data/Rakefile

@@ -9,24 +9,6 @@ rescue Bundler::BundlerError => e
   $stderr.puts "Run `bundle install` to install missing gems"
   exit e.status_code
 end
-require 'rake'
-
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
-  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
-  gem.name = "rbinvoice"
-  gem.homepage = "http://github.com/pjungwir/rbinvoice"
-  gem.license = "MIT"
-  gem.summary = 'Used to invoice my clients'
-  gem.description = <<-EOT
-      Reads hours from a Google Spreadsheet and generates a PDF invoice.
-  EOT
-  gem.email = "pj@illuminatedcomputing.com"
-  gem.authors = ["Paul A. Jungwirth"]
-  gem.executables << 'rbinvoice'
-  # dependencies defined in Gemfile
-end
-Jeweler::RubygemsDotOrgTasks.new
 
 require 'rspec/core'
 require 'rspec/core/rake_task'
@@ -34,24 +16,10 @@ RSpec::Core::RakeTask.new(:spec) do |spec|
   spec.pattern = FileList['spec/**/*_spec.rb']
 end
 
-=begin
-RSpec::Core::RakeTask.new(:rcov) do |spec|
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
-end
-=end
-
 task :default => :spec
 
-require 'rdoc/task'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
 
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "rbinvoice #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
+Bundler::GemHelper.install_tasks
 
 task :run, [] => [] do |t, args|
   require 'rbinvoice'

data/VERSION

@@ -1 +1 @@
-0.2.4
+0.4.0

data/lib/rbinvoice.rb

@@ -48,6 +48,8 @@ module RbInvoice
                      parse_date(earliest_task_date(hours))
                    end
       start_date, end_date = RbInvoice::Options::find_invoice_bounds(earliest_date, freq)
+      opts[:start_date] = start_date
+      opts[:end_date] = end_date
       tasks = hourly_breakdown(client, start_date, end_date, opts)
       while tasks.size > 0
         filename = RbInvoice::Options::default_out_filename(opts)
@@ -100,6 +102,7 @@ module RbInvoice
         total_duration: decimal_to_interval(items.inject(0) {|t, item| t + item['duration_decimal']}),
         total_price: "%0.02f" % items.inject(0) {|t, item| t + item['price_decimal']},
         dba: escape_for_latex(opts[:dba]),
+        payment_due: opts[:payment_due],
         client_full_name: escape_for_latex(full_name),
         client_address: escape_for_latex(address),
         client_description: escape_for_latex(description),

data/lib/rbinvoice/options.rb

@@ -1,6 +1,7 @@
 require 'yaml'
 require 'trollop'
 require 'rbinvoice/util'
+require 'rbinvoice/version'
 
 module RbInvoice
   module Options
@@ -199,6 +200,10 @@ module RbInvoice
       key_for_client(data, client, :dba) || opts[:dba] || 'Illuminated Computing Inc.'
     end
 
+    def self.payment_due_for_client(data, opts, client)
+      key_for_client(data, client, :payment_due) || opts[:payment_due] || 'upon receipt'
+    end
+
     def self.full_name_for_client(data, opts, client)
       key_for_client(data, client, :full_name)
     end
@@ -208,12 +213,13 @@ module RbInvoice
     end
 
     def self.description_for_client(data, opts, client)
-      key_for_client(data, client, :description)
+      desc = key_for_client(data, client, :description)
+      "#{desc} from #{opts[:start_date].strftime("%B %-d")} to #{opts[:end_date].strftime("%B %-d, %Y")}."
     end
 
     def self.parse_command_line(argv)
       opts = Trollop::options(argv) do
-        version "rbinvoice 0.1.0 (c) 2012 Paul A. Jungwirth"
+        version "rbinvoice #{::RbInvoice::VERSION} (c) 2012 Paul A. Jungwirth"
         banner <<-EOH
           USAGE: rbinvoice [options] <client> [filename]
         EOH
@@ -260,6 +266,7 @@ module RbInvoice
       opts[:end_date]   = Date.strptime(opts[:end_date], "%Y-%m-%d")    if opts[:end_date]
 
       opts[:dba] = dba_for_client(opts[:data], opts, opts[:client])
+      opts[:payment_due] = payment_due_for_client(opts[:data], opts, opts[:client])
       # Read the list of past invoices.
       # If there are none, assume there is only one invoice to do.
 

data/lib/rbinvoice/version.rb

@@ -0,0 +1,3 @@
+module RbInvoice
+  VERSION = '0.4.0'
+end

data/rbinvoice.gemspec

@@ -1,78 +1,33 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
+$:.push File.dirname(__FILE__) + "/lib"
+require 'rbinvoice/version'
 
 Gem::Specification.new do |s|
   s.name = "rbinvoice"
-  s.version = "0.2.4"
+  s.version = RbInvoice::VERSION
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Paul A. Jungwirth"]
-  s.date = "2013-03-15"
+  s.summary = "Used to invoice my clients"
   s.description = "      Reads hours from a Google Spreadsheet and generates a PDF invoice.\n"
-  s.email = "pj@illuminatedcomputing.com"
-  s.executables = ["rbinvoice", "rbinvoice"]
-  s.extra_rdoc_files = [
-    "LICENSE.txt",
-    "README.html",
-    "README.md",
-    "TODO"
-  ]
-  s.files = [
-    "Gemfile",
-    "Gemfile.lock",
-    "LICENSE.txt",
-    "NOTES",
-    "README.md",
-    "Rakefile",
-    "TODO",
-    "VERSION",
-    "bin/rbinvoice",
-    "lib/rbinvoice.rb",
-    "lib/rbinvoice/options.rb",
-    "lib/rbinvoice/util.rb",
-    "rbinvoice.gemspec",
-    "spec/options_spec.rb",
-    "templates/invoice.tex.liquid"
-  ]
   s.homepage = "http://github.com/pjungwir/rbinvoice"
+  s.date = "2013-03-15"
+  s.authors = ["Paul A. Jungwirth"]
+  s.email = "pj@illuminatedcomputing.com"
+
   s.licenses = ["MIT"]
+
   s.require_paths = ["lib"]
+  s.executables = ["rbinvoice", "rbinvoice"]
   s.rubygems_version = "1.8.24"
-  s.summary = "Used to invoice my clients"
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
+  s.files = `git ls-files`.split("\n")
+  s.test_files = `git ls-files -- {test,spec,fixtures}/*`.split("\n")
+
+  s.add_runtime_dependency 'trollop', '>= 0'
+  s.add_runtime_dependency 'roo', '>= 0'
+  s.add_runtime_dependency 'prawn', '>= 0'
+  s.add_runtime_dependency 'liquid', '>= 0'
+
+  s.add_development_dependency 'rspec', '~> 2.4.0'
+  s.add_development_dependency 'bundler', '>= 0'
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<trollop>, [">= 0"])
-      s.add_runtime_dependency(%q<roo>, [">= 0"])
-      s.add_runtime_dependency(%q<prawn>, [">= 0"])
-      s.add_runtime_dependency(%q<liquid>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, [">= 0"])
-      s.add_development_dependency(%q<bundler>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, [">= 0"])
-      s.add_development_dependency(%q<simplecov>, [">= 0"])
-    else
-      s.add_dependency(%q<trollop>, [">= 0"])
-      s.add_dependency(%q<roo>, [">= 0"])
-      s.add_dependency(%q<prawn>, [">= 0"])
-      s.add_dependency(%q<liquid>, [">= 0"])
-      s.add_dependency(%q<rspec>, [">= 0"])
-      s.add_dependency(%q<bundler>, [">= 0"])
-      s.add_dependency(%q<jeweler>, [">= 0"])
-      s.add_dependency(%q<simplecov>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<trollop>, [">= 0"])
-    s.add_dependency(%q<roo>, [">= 0"])
-    s.add_dependency(%q<prawn>, [">= 0"])
-    s.add_dependency(%q<liquid>, [">= 0"])
-    s.add_dependency(%q<rspec>, [">= 0"])
-    s.add_dependency(%q<bundler>, [">= 0"])
-    s.add_dependency(%q<jeweler>, [">= 0"])
-    s.add_dependency(%q<simplecov>, [">= 0"])
-  end
 end
 

data/templates/invoice.tex.liquid

@@ -46,7 +46,7 @@ Beaverton, OR 97005 \\
 
 \noindent
 Please make all checks payable to {{ dba }}. \\
-Payment due upon receipt. \\
+Payment due {{ payment_due }}. \\
 
 \begin{center}
 \textbf{Thank you for your business!}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rbinvoice
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -80,17 +80,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -107,38 +107,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: jeweler
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 description: ! '      Reads hours from a Google Spreadsheet and generates a PDF invoice.
 
 '
@@ -146,12 +114,9 @@ email: pj@illuminatedcomputing.com
 executables:
 - rbinvoice
 extensions: []
-extra_rdoc_files:
-- LICENSE.txt
-- README.html
-- README.md
-- TODO
+extra_rdoc_files: []
 files:
+- .gitignore
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -164,10 +129,10 @@ files:
 - lib/rbinvoice.rb
 - lib/rbinvoice/options.rb
 - lib/rbinvoice/util.rb
+- lib/rbinvoice/version.rb
 - rbinvoice.gemspec
 - spec/options_spec.rb
 - templates/invoice.tex.liquid
-- README.html
 homepage: http://github.com/pjungwir/rbinvoice
 licenses:
 - MIT
@@ -183,7 +148,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2995707456041748597
+      hash: 3119729522843240763
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/README.html

@@ -1,43 +0,0 @@
-<h1>rbinvoice</h1>
-
-<p>rbinvoice lets you generate PDF invoices from a Google Spreadsheet.
-It's pretty obscure; you probably haven't heard of it.</p>
-
-<h2>Input</h2>
-
-<p>RbInvoice reads your hours from a Google Spreadsheet, which should be formatted like this:</p>
-
-<table>
-  <tr>
-    <td colspan="7"><b style="font-size:120%">My Time Tracking</b></td>
-  </tr>
-  <tr>
-    <td><b>Weekday</b></td>
-    <td><b>Day</b></td>
-    <td><b>Task</b></td>
-    <td><b>Notes</b></td>
-    <td><b>Start</b></td>
-    <td><b>Stop</b></td>
-    <td><b>Total</b></td>
-  </tr>
-  <tr>
-    <td>T</td>
-    <td>3/20/2012</td>
-    <td>BigCorp</td>
-    <td>API</td>
-    <td>8:00</td>
-    <td>12:15</td>
-    <td>4:15</td>
-  </tr>
-  <tr>
-    <td>T</td>
-    <td>3/20/2012</td>
-    <td>SmallCorp</td>
-    <td>Shopping Cart</td>
-    <td>13:00</td>
-    <td>17:15</td>
-    <td>4:00</td>
-  </tr>
-</table>
-
-<p>Columns B, E, F, and G should have a Date format. </p>