Browse Source

Update to match time range changes in tisk-clock

master
Peter J. Jones 7 years ago
parent
commit
4247f59ef0
4 changed files with 10 additions and 12 deletions
  1. 2
    3
      commands/push.rb
  2. 2
    3
      commands/report.rb
  3. 5
    5
      config/gemspec
  4. 1
    1
      lib/tisk/eva/version.rb

+ 2
- 3
commands/push.rb View File

@@ -10,8 +10,7 @@ class Tisk::Commands::EvaReport < Tisk::Command

##############################################################################
parse_command_line do
options.start_time = Tisk::Clock::Util.today
options.stop_time = nil
options.start_time, options.stop_time = Tisk::Clock::Util.today
options.just_xml = false
options.invoice_id = nil

@@ -20,7 +19,7 @@ class Tisk::Commands::EvaReport < Tisk::Command
end

@parser.on('-t', '--to=DATE', 'Report stop date [today]') do |date|
options.stop_time = Time.parse(date)
options.stop_time = Tisk::Clock::Util.fixup_stop_time(Time.parse(date))
end

@parser.on('-x', '--xml', 'Don\'t push, instead show XML') do |xml|

+ 2
- 3
commands/report.rb View File

@@ -10,10 +10,9 @@ class Tisk::Commands::EvaReport < Tisk::Command

##############################################################################
parse_command_line do
options.start_time, options.stop_time = Tisk::Clock::Util.today
options.format = '%10>short_id %*<subject %7>duration %10>amount'
options.header_format = '%*<date %7>duration %10>amount'
options.start_time = Tisk::Clock::Util.today
options.stop_time = nil
options.date_format = '%A, %B %d, %Y'
options.headers = true
options.total = true
@@ -23,7 +22,7 @@ class Tisk::Commands::EvaReport < Tisk::Command
end

@parser.on('-t', '--to=DATE', 'Report stop date [today]') do |date|
options.stop_time = Time.parse(date)
options.stop_time = Tisk::Clock::Util.fixup_stop_time(Time.parse(date))
end

@parser.on('-c', '--compact', 'Terse output') do |compact|

+ 5
- 5
config/gemspec View File

@@ -15,9 +15,9 @@ Gem::Specification.new do |gem|
gem.files = Dir.glob('{commands,lib}/**/*')
gem.require_path = 'lib'

gem.add_dependency('tisk', '>= 0.1.0')
gem.add_dependency('tisk-clock', '>= 0.1.0')
gem.add_dependency('nokogiri', '>= 1.5.0')
gem.add_dependency('patron', '>= 0.4.16')
gem.add_dependency('money', '>= 4.0.1')
gem.add_dependency('tisk', '~> 0.1.0')
gem.add_dependency('tisk-clock', '~> 0.2.0')
gem.add_dependency('nokogiri', '~> 1.5.0')
gem.add_dependency('patron', '~> 0.4.16')
gem.add_dependency('money', '~> 4.0.1')
end

+ 1
- 1
lib/tisk/eva/version.rb View File

@@ -1,5 +1,5 @@
module Tisk
module Eva
VERSION = '0.1.0'
VERSION = '0.1.1'
end
end

Loading…
Cancel
Save