lewt 0.5.16 → 0.5.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c17788a1c74669a806a0a63c128a64b7494fb133
-  data.tar.gz: d27f84a60f91bbe38ee03ee4bf02648c190be86a
+  metadata.gz: 414eb66e71d62400f6ea97b42eb78184e37eade6
+  data.tar.gz: f2c44dbc75b0b44bec33526536fd75f40d2cc891
 SHA512:
-  metadata.gz: 0fb033c461635d67a52242416a0aa00466d3a56c29c3d936170206b340725534da3960418dfd12c9787102fab5b5384a775866a187d7493db50e08bfadf239ef
-  data.tar.gz: cd7c1279b1db457d6fae2e346d9ad1dc78d8f1bc68123c92b8a32a7f5b8493e9b3eccb7d2ed9523dfe74aa6963ae946fccc177533e393d674ba054e6a208b50d
+  metadata.gz: 151f9ee0271f1f42185379d0b06cbbcc25ed3a3d6e755747067ed104110bd38be38af7e8da182b80b670845924fc00cb2a2266f609a1638a8a60f1ca8f211b18
+  data.tar.gz: ffc3f276180e435e06800d77b27b7f1786218e93629c6a66e737a7f823b06033c1934911bb633b88a9860ee2baa604c634f7fb7d560e2d3740c9bc59286660f8

data/README.md

@@ -1,4 +1,4 @@
-# LEWT v0.5.15
+# LEWT v0.5.17
 
 LEWT is a command line program & library written in Ruby that can help you invoice customers, manage expenses, generate reports and much more. It is designed to encourage lazy accounting, to get more out of it, and to be extended with minimal friction. 
 
@@ -188,7 +188,7 @@ lewt_invoice = LEWT::Lewt.new( options ).run
 
 LEWT by itself is basically just an extension system, all the EPR operations are performed by extensions making LEWT very customisable. Being a beta version of this software, I have shipped LEWT with some basic extension which I find useful in my day to day contracting operations but I'm hoping others will replace them with better versions in time :) these *core extensions* as I will call them for now are:
 
-1. Calendar Timekeeping: Extract Time sheet data from iCal, OSX Calendar, and Google Calender sources and transform it for further processing.
+1. Calendar Timekeeping: Extract Time sheet data from iCal, and OSX Calendar sources and transform it for further processing.
 2. Simple Invoices: Process extract data as an invoice.
 3. Simple Reports: Process extract data as a report.
 4. Liquid Renderer: Liquid template rendering with support for text, html, and PDF tempting.

data/lib/extensions/calendar-timekeeping/apple_extractor.rb

@@ -44,8 +44,8 @@ module CalendarExtractors
           if  self.isTargetDate?(dstart) == true &&  target != false
             timeDiff = (dend - dstart) /60/60
             row = LEWT::LEWTLedger.new({
-                                         :date_start => e.dtstart, 
-                                         :date_end => e.dtend, 
+                                         :date_start => e.dtstart.to_time, 
+                                         :date_end => e.dtend.to_time, 
                                          :category => @category, 
                                          :entity => target["name"], 
                                          :description => e.description.to_s,

data/lib/extensions/calendar-timekeeping/calendar-timekeeping.rb

@@ -1,5 +1,4 @@
 load File.expand_path('../extractor.rb', __FILE__)
-load File.expand_path('../gcal_extractor.rb', __FILE__)
 load File.expand_path('../ical_extractor.rb', __FILE__)
 load File.expand_path('../apple_extractor.rb', __FILE__)
 
@@ -31,7 +30,7 @@ module LEWT
       options = {
         :calendar => {
           :default => "ical",
-          :definition => "The calender extraction method to use, supports 'gcal', 'ical', 'osx' calender extraction. Defaults to ical.",
+          :definition => "The calender extraction method to use, supports 'ical', 'osx' calender extraction. Defaults to ical.",
           :type => String,
         },
         :suppress => {
@@ -52,8 +51,6 @@ module LEWT
       suppressTargets = options[:suppress] == nil ? nil : self.get_matched_customers(options[:suppress])
       if options[:calendar] == "ical"
         extract = CalendarExtractors::ICalExtractor.new( dStart, dEnd, targetCustomers, lewt_settings, suppressTargets )
-      elsif options[:calendar] == "gcal"
-        extract = CalendarExtractors::GCalExtractor.new(dStart, dEnd, targetCustomers, lewt_settings, suppressTargets )
       elsif options[:calendar] == "osx"
         extract = CalendarExtractors::AppleExtractor.new(dStart, dEnd, targetCustomers, lewt_settings, suppressTargets )
       end

data/lib/extensions/liquid-renderer.rb

@@ -34,10 +34,8 @@ module LEWT
           :type => String
         }
       }
-
       super({:cmd => "liquid_render", :options => options })
     end
-
     
     # Loads the plaint-text, html, & (optionally) pdf template files of the given template name and parses it with the Liquid class
     # template [String]:: The name of the template to load.

data/lib/extensions/simple-invoices.rb

@@ -1,5 +1,5 @@
 require "yaml"
-require "securerandom"
+require 'digest/sha1'
 
 # Author::    Jason Wijegooneratne  (mailto:code@jwije.com)
 # Copyright:: Copyright (c) 2014 Jason Wijegooneratne
@@ -35,13 +35,15 @@ module LEWT
     protected 
     
     # Generates a UID for this invoice based of the customer it is being sent to
-    def generate_id
+    def generate_id(client)
       if !lewt_settings.has_key?("invoice_id_counter")
         self.write_settings("settings.yml", "invoice_id_counter", 0)
       end
       id = lewt_settings["invoice_id_counter"].to_i + 1
+      seed = "--#{rand(10000)}--#{Time.now}--"
+      uid = Digest::SHA1.hexdigest(seed)[0,4]
       self.write_settings("settings.yml", "invoice_id_counter", id)
-      return "#{id.to_s}-" + SecureRandom.hex(4)
+      return "#{id.to_s}#{uid}"
     end
 
     # Generates a bill for the given client.
@@ -51,7 +53,7 @@ module LEWT
     def generateBill(client, data)
       bill = {
         "date_created" => DateTime.now.strftime("%d/%m/%y"),
-        "id" => generate_id,
+        "id" => generate_id(client),
         # "date_begin"=> @events.dateBegin.strftime("%d/%m/%y"),
         # "date_end"=> @events.dateEnd.strftime("%d/%m/%y"),
         "billed_to" => client,

data/lib/lewt.rb

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 require 'rubygems'
+require 'bundler/setup'
 require 'date'
 require 'yaml'
 require 'optparse'
@@ -16,7 +17,7 @@ require_relative 'lewt_ledger.rb'
 # This module acts as a container for the LEWT namespace
 module LEWT
   
-  VERSION = "0.5.16"
+  VERSION = "0.5.17"
 
   # The Lewt class contains the major functionality of this program.
   # It handles loading all extensions, gathering the results and passing options ariound the place.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lewt
 version: !ruby/object:Gem::Version
-  version: 0.5.16
+  version: 0.5.17
 platform: ruby
 authors:
 - Jason Wijegooneratne
@@ -9,77 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 date: 2014-09-17 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: safe_yaml
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-- !ruby/object:Gem::Dependency
-  name: icalendar
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.0.0
-- !ruby/object:Gem::Dependency
-  name: google_calendar
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.1
-- !ruby/object:Gem::Dependency
-  name: liquid
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.5.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.5.0
-- !ruby/object:Gem::Dependency
-  name: pdfkit
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.6.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.6.2
+dependencies: []
 description: A simple command line tool and library for enterprise management. It
   can currently handle invoicing, expenses, reporting, and is very extensible.
 email: code@jwije.com
@@ -107,7 +37,6 @@ files:
 - lib/extensions/calendar-timekeeping/apple_extractor.rb
 - lib/extensions/calendar-timekeeping/calendar-timekeeping.rb
 - lib/extensions/calendar-timekeeping/extractor.rb
-- lib/extensions/calendar-timekeeping/gcal_extractor.rb
 - lib/extensions/calendar-timekeeping/ical_extractor.rb
 - lib/extensions/liquid-renderer.rb
 - lib/extensions/metastat/metamath.rb
@@ -126,7 +55,6 @@ files:
 - tests/milestones.csv
 - tests/run_tests.rb
 - tests/tc_Billing.rb
-- tests/tc_CalExt.rb
 - tests/tc_Lewt.rb
 - tests/tc_LewtExtension.rb
 - tests/tc_LewtLedger.rb

data/lib/extensions/calendar-timekeeping/gcal_extractor.rb

@@ -1,61 +0,0 @@
-require 'google_calendar'
-
-# Author::    Jason Wijegooneratne  (mailto:code@jwije.com)
-# Copyright:: Copyright (c) 2014 Jason Wijegooneratne
-# License::   MIT. See LICENSE.md distributed with the source code for more information.
-
-
-module CalendarExtractors
-
-  # Extracts data from a Google Calender source.
-  #
-  # === Setup
-  # It is required that you have a Google App setup with your account to allow for API access to your data. Then 
-  # add the following keys to your settings file.
-  #
-  # gmail_username:: The username for your google application.
-  # gmail_password:: The password associated with this username.
-  # gmail_app_name:: The name of the application you created.
-  # 
-  class GCalExtractor < CalExtractor
-
-    # Sets up this extension
-    def initialize ( dStart, dEnd, targetCustomers, lewt_settings, suppressTargets )
-      uname = lewt_settings["gmail_username"]
-      pass = lewt_settings["gmail_password"]
-      app = lewt_settings["google_app_name"]
-      @googleCalender = Google::Calendar.new(
-                                             :username => uname,
-                                             :password => pass,
-                                             :app_name => app
-                                             )
-      super( dStart, dEnd, targetCustomers )
-    end
-    
-    # This method does the actual google calender extract, comparing events to the requested paramters.
-    # It manipulates the @data property of this object which is used by LEWT to gather the extracted data.
-    def extractCalendarData
-      gConf = { :max_results => 2500, :order_by => 'starttime', :single_events => true }
-      @googleCalender.find_events_in_range(@dateStart, @dateEnd + 1, gConf).each do |e|
-        eStart = Time.parse( e.start_time )
-        eEnd = Time.parse( e.end_time )
-        timeDiff = (eEnd - eStart)/60/60
-        target = self.isTargetCustomer?(e.title)
-        if  self.isTargetDate?( eStart ) == true && target != false
-          row = LEWT::LEWTLedger.new({
-                                       :date_start => eStart, 
-                                       :date_end => eEnd, 
-                                       :category => @category, 
-                                       :entity => target["name"], 
-                                       :description => e.content, 
-                                       :quantity => timeDiff, 
-                                       :unit_cost => target["rate"]
-                                     })
-          @data.push(row)
-        end
-      end
-    end
-
-  end
-
-end

data/tests/tc_CalExt.rb

@@ -1,44 +0,0 @@
-#!/usr/bin/env ruby
-
-# Test Cases for the Billing core extension.
-# ./lib/extension.rb
-#
-# Written by: jdw <4 July 2014>
-#
-# ********************************************
-
-require "test/unit"
-
-require_relative "../lib/extension.rb"
-require_relative "../lib/extensions/calendar-timekeeping/calendar-timekeeping.rb"
- 
-class TestCalendarTimekeeping < Test::Unit::TestCase
-
-  def  test_initialize
-    caltime = LEWT::CalendarTimekeeping.new
-    assert_instance_of( LEWT::CalendarTimekeeping, caltime, "Extension CalandarTimekeeping not initialising properly." )
-    calext = CalendarExtractors::CalExtractor.new( (DateTime.now - 8).to_s, DateTime.now.to_s, "ACME" )
-    assert_instance_of( CalendarExtractors::CalExtractor, calext, "Extension CalandarTimekeeping sub-module CalExtractor not initialising properly." )
-  end
-
-  def test_filtering_methods
-    calext = CalendarExtractors::CalExtractor.new( (DateTime.now - 8)::to_s, DateTime.now::to_s, LEWT::Extension.new::get_matched_customers("ACME") )
-    assert_instance_of(Hash, calext.isTargetCustomer?("ACME"), "#{calext.class.name} not matching customer names properly.")
-    assert_instance_of(Hash, calext.isTargetCustomer?("ACME doing some stuff"), "#{calext.class.name} not matching customer names properly.")
-    assert_instance_of(Hash, calext.isTargetCustomer?("making thing! ACME"), "#{calext.class.name} not matching customer names properly.")
-    assert_instance_of(Hash, calext.isTargetCustomer?("AC"), "#{calext.class.name} not matching customer alias' properly.")
-    assert_instance_of(Hash, calext.isTargetCustomer?("AC: building stuff"), "#{calext.class.name} not matching customer alias' properly.")
-    assert_instance_of(Hash, calext.isTargetCustomer?("creating features AC"), "#{calext.class.name} not matching customer alias' properly.")
-    assert_equal(true, calext.isTargetDate?( DateTime.now - 2 ), "#{calext.class.name} not matching targeted dates properly.")
-    assert_equal(false, calext.isTargetDate?( DateTime.now - 50 ), "#{calext.class.name} not ignoring un-targeted dates properly.")
-  end
-
-  
-
-end
-
-
-
-
-
-