ballista 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e28f5b4cd7a280a48db419b0cd1627b15f58f378
-  data.tar.gz: ff2653e81dd62e11b13445200a245b71d7ce2fa2
+  metadata.gz: df187f2848829cd2041ff61c0608e9ef6565cd4d
+  data.tar.gz: dfe92f7df442936a4663f23a7f0d86948675756d
 SHA512:
-  metadata.gz: 1b772d292612ace47dadc918b8249865a315a0a4ad5f364a9db1b03ae55fa9a67935e83d73fc72a54009e8574c8a53effed372aa0f7534e98bf35b77eb2b7bcb
-  data.tar.gz: 63401db844403490ae269c271691fa9db8b6405c295546b9518277ebf820d356e6e51bba9d938e7b591536e47aff7e32d97b86cdb71f2f74beb6f0957e7abefc
+  metadata.gz: 45e390ce041a275e89491de8455016b4b34804a6682e7f24d75d9f29c6227c32af84246af9a610ee392e5af6746ee28c82a4a8f1989486316f0d8e42b054f538
+  data.tar.gz: c6f2d58b24dcbb3cb8a988f8d89f0b4c9d27e924a01d23bbac3b60fb44996cad8d86a4fb2fa8786108e17de1f67d01072058b215c81a1d153a7c3e2437d2e790

data/bin/ballista

@@ -4,11 +4,32 @@ require 'ballista'
 require 'yaml'
 require 'mercenary'
 require 'cymbal'
+require 'date'
 
 def parse_config(file)
   Cymbal.symbolize(YAML.load(File.read(file)))
 end
 
+def count_months(months)
+  return unless months
+  start_dt = Date.today + 1
+  end_dt = start_dt >> months.to_i
+  [start_dt, end_dt]
+end
+
+def parse_start_end(start_dt, end_dt)
+  return unless start_dt || end_dt
+  raise('Must specify start and end together') unless start_dt && end_dt
+  [Date.parse(start_dt), Date.parse(end_dt)]
+end
+
+def parse_range(months, start_dt, end_dt)
+  if months && (start_dt || end_dt)
+    raise('Cannot specify months *and* start/end')
+  end
+  count_months(months) || parse_start_end(start_dt, end_dt) || count_months(12)
+end
+
 Mercenary.program(:ballista) do |p|
   p.version Ballista::VERSION
   p.description 'Tool for projecting future activity with Ledger'
@@ -16,13 +37,17 @@ Mercenary.program(:ballista) do |p|
 
   p.option :output, '-o FILE', '--output FILE', 'Output file for ledger'
   p.option :months, '-m INT', '--months INT', 'How far ahead to project'
+  p.option :start, '-s DATE', '--start DATE', 'When to start the projection'
+  p.option :end, '-e DATE', '--end DATE', 'When to end the projection'
 
   p.action do |_, options|
     config_file = ARGV.shift
     puts p unless config_file
     config = parse_config(config_file)
-    months = options[:months].to_i || 12
-    projection = Ballista.new(entries: config).project(months)
+
+    start_dt, end_dt = parse_range(*options.values_at(:months, :start, :end))
+
+    projection = Ballista.new(entries: config).project(start_dt, end_dt)
     if options[:output]
       File.open(options[:output], 'w') { |fh| fh << projection.to_s }
     else

data/lib/ballista/projection.rb

@@ -9,10 +9,8 @@ module Ballista
       @entries = params[:entries]
     end
 
-    def project(months)
-      start = Date.today + 1
-      finish = start >> months
-      entries = start.upto(finish).map { |date| parse_day(date) }
+    def project(start_dt, end_dt)
+      entries = start_dt.upto(end_dt).map { |date| parse_day(date) }
       Ledger.new(entries: entries.flatten)
     end
 

data/lib/ballista/version.rb

@@ -1,5 +1,5 @@
 ##
 # Set the version (needed for Mercenary -v)
 module Ballista
-  VERSION = '0.0.2'.freeze
+  VERSION = '0.0.3'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ballista
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Les Aker