timr 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f79b6ea230b0bb324476f5cb65f5f8905c8f0eac
-  data.tar.gz: 2f85343c2c7ee84c052067f40d263a76ffffc832
+  metadata.gz: 0a52eda0ed77a6f73e3c0e039bc938fa21248a54
+  data.tar.gz: a17fe3a693f1cf2a7c544b6212f405cb3ba42e1c
 SHA512:
-  metadata.gz: 374a2459ee630217d4cafa343150690d0729c1ef6a93c1221569e85ae79ea4a8be48919e2ccb43810ba95a354446d6a9bde388229bf6e7e53b6dfccd7a9a7cd8
-  data.tar.gz: c1bdc85bc01a15f9f5cc827c3c2dff82ba0fbfe8c3e3d68a2987b8c61a1d0d590037ab0d841dde8a8041f332a7c28ae833de57d7f8afdc7e308823960fbe65f3
+  metadata.gz: 86632a136e85c82349380204a9e02d9ed9bea484ea634b85c44fed7af4ab1707470b85995c3cce4c8325562704826bb9bdf0aa526c283f3f83ed50705ad03458
+  data.tar.gz: e9be4b7834949de95f9cfcdb77a8f279dbf23d448ae83219bd169a5fd96d2ae7d2b1c02b14035e706710ab7b00f9d3ed90b4e7859bf3ab81d69969de3b63505b

data/.gitignore

@@ -2,13 +2,9 @@
 .env
 .setup
 /api/
+build.txt
 CHANGELOG-*.txt
 /coverage/
 Gemfile.lock
 README.html
 /tmp/
-*.log
-*.yml
-*.txt
-*.csv
-*.html

data/.gitlab-ci.yml

@@ -0,0 +1,95 @@
+before_script:
+    - apt-get update -yqq
+    - 'which ssh-agent || ( apt-get install openssh-client -y )'
+    - 'which rsync || ( apt-get install rsync -yqq --force-yes )'
+    - eval $(ssh-agent -s)
+    - ssh-add <(echo "$SSH_PRIVATE_KEY")
+    - mkdir -p ~/.ssh
+    - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config'
+    - ruby -v
+    - gem update --system
+    - gem install bundler -v '~>1.13'
+    - gem install ronn -v '0.7.3'
+    - bundler --version
+    - bundler install
+
+stages:
+    - test
+    - release
+    - deploy
+
+test_feature:
+    image: ruby:2.1
+    stage: test
+    environment: test
+    only:
+        - /^feature/
+    script:
+        - ./bin/test.sh
+
+test_21:
+    image: ruby:2.1
+    stage: test
+    environment: test
+    only:
+        - tags
+    script:
+        - ./bin/test.sh
+
+test_22:
+    image: ruby:2.2
+    stage: test
+    environment: test
+    only:
+        - tags
+    script:
+        - ./bin/test.sh
+
+test_23:
+    image: ruby:2.3
+    stage: test
+    environment: test
+    only:
+        - tags
+    script:
+        - ./bin/test.sh
+
+test_24:
+    image: ruby:2.4.0
+    stage: test
+    environment: test
+    only:
+        - tags
+    script:
+        - ./bin/test.sh
+
+release:
+    image: ruby:2.4.0
+    stage: release
+    environment: gem
+    only:
+        - tags
+    script:
+        - mkdir -p ~/.gem
+        - 'printf "%s\n:rubygems_api_key: %s" "---" "${RUBYGEMSORG_API_KEY}" > ~/.gem/credentials; chmod 0600 ~/.gem/credentials'
+        - ./bin/release.sh
+
+deploy_dev:
+    image: ruby:2.4.0
+    stage: deploy
+    environment: homepage_dev
+    only:
+        - develop
+    script:
+        - ./bin/build.sh
+        - ./bin/publish
+
+deploy_prod:
+    image: ruby:2.4.0
+    stage: deploy
+    environment: homepage_prod
+    only:
+        - tags
+    script:
+        - ./bin/build.sh
+        - ./bin/publish

data/.travis.yml

@@ -0,0 +1,23 @@
+language: ruby
+rvm:
+    - 2.1
+    - 2.2
+    - 2.3
+    - 2.4.0
+    - ruby-head
+sudo: required
+before_install:
+    - gem --version
+    - gem update --system
+    - gem install bundler -v '~>1.13'
+    - bundler --version
+install:
+    - bundler install
+    - 'gem build "${GEMSPEC_FILE}"'
+    - 'gem install "${GEM_NAME}"-*.gem'
+    - 'gem list -l "${GEM_NAME}"'
+script:
+    - ./bin/test.sh
+    - cd
+    - which -a timr
+    - timr --version

data/bin/build_info.sh

@@ -21,7 +21,8 @@ timr: %s
 
 --- build ---
 id: %s
-ref: %s@%s
+branch: %s
+commit: %s
 stage: %s
 server: %s %s
-" "${DATE}" "${RUBY_VERSION}" "${TIMR_VERSION}" "${CI_BUILD_ID}" "${CI_BUILD_REF}" "${CI_BUILD_REF_NAME}" "${CI_BUILD_STAGE}" "${CI_SERVER_NAME}" "${CI_SERVER_VERSION}"
+" "${DATE}" "${RUBY_VERSION}" "${TIMR_VERSION}" "${CI_BUILD_ID}" "${CI_BUILD_REF_NAME}" "${CI_BUILD_REF}" "${CI_BUILD_STAGE}" "${CI_SERVER_NAME}" "${CI_SERVER_VERSION}"

data/bin/install.sh

@@ -37,13 +37,15 @@ echo "install gem file '$gem_file'"
 gem install "$gem_file"
 
 # Create tmp directory.
-if [[ ! -d tmp ]]; then
-	mkdir -p tmp
+if [[ ! -d tmp/releases ]]; then
+	mkdir -p tmp/releases
+	
 	chmod u=rwx,go-rwx tmp
+	chmod u=rwx,go-rwx tmp/releases
 fi
 
 if [[ "$option" = "-f" ]]; then
-	mv -v "$gem_file" tmp
+	mv -v "$gem_file" tmp/releases
 else
-	mv -v -i "$gem_file" tmp
+	mv -v -i "$gem_file" tmp/releases
 fi

data/bin/publish

@@ -27,10 +27,17 @@ fi
 
 which rsync &> /dev/null || { echo 'ERROR: rsync not found in PATH'; exit 1; }
 
-remote_path=$RSYNC_REMOTE_PATH_DEVELOP
-if [[ "$CI_BUILD_REF_NAME" = "master" ]]; then
-	remote_path=$RSYNC_REMOTE_PATH_MASTER
-fi
+echo "CI_BUILD_REF_NAME: '$CI_BUILD_REF_NAME'"
+
+case "$CI_BUILD_REF_NAME" in
+	# For example v0.4.0
+	v*.*)
+		remote_path=$RSYNC_REMOTE_PATH_MASTER
+		;;
+	*)
+		remote_path=$RSYNC_REMOTE_PATH_DEVELOP
+		;;
+esac
 
 echo "rsync to '${RSYNC_USER}@${RSYNC_HOST}:${remote_path}'"
 rsync ${RSYNC_OPTIONS} build.txt coverage api "${RSYNC_USER}@${RSYNC_HOST}:${remote_path}"

data/bin/release.sh

@@ -28,8 +28,10 @@ echo "push gem file '$gem_file'"
 gem push "$gem_file"
 
 # Create tmp directory.
-if [[ ! -d tmp ]]; then
-	mkdir -p tmp
+if [[ ! -d tmp/releases ]]; then
+	mkdir -p tmp/releases
+	
 	chmod u=rwx,go-rwx tmp
+	chmod u=rwx,go-rwx tmp/releases
 fi
-mv -v -i "$gem_file" tmp
+mv -v -i "$gem_file" tmp/releases

data/bin/timr_bash_completion.sh

@@ -103,6 +103,7 @@ function _timr_report_main {
 		--all
 		--tasks
 		--tracks
+		--format
 		--csv
 		--force
 	)

data/lib/timr/command/log_command.rb

@@ -190,7 +190,7 @@ module TheFox
 									begin_datetime_s,
 									end_datetime_s,
 									duration ? duration.to_human : '---',
-									task.short_id,
+									task.id_foreign_or_short,
 									'%s %s' % [track.short_id, track.title(15)],
 								]
 							end
@@ -220,7 +220,7 @@ module TheFox
 								begin_datetime_s,
 								end_datetime_s,
 								duration ? duration.to_human : '---',
-								task.short_id,
+								task.id_foreign_or_short,
 								'%s %s' % [track.short_id, track.title(15)],
 							]
 						end

data/lib/timr/command/report_command.rb

@@ -27,6 +27,7 @@ module TheFox
 					@to_opt = nil
 					# @billed_opt = false
 					# @unbilled_opt = false
+					@format_opt = nil
 					@csv_opt = nil
 					@force_opt = false
 					
@@ -60,6 +61,9 @@ module TheFox
 						# when '--unbilled'
 						# 	@unbilled_opt = true
 						
+						when '--format'
+							@format_opt = argv.shift
+						
 						when '--csv'
 							@csv_opt = argv.shift
 							if !@csv_opt
@@ -129,6 +133,14 @@ module TheFox
 						else
 							export_tasks_csv
 						end
+					elsif @format_opt
+						if @tasks_opt
+							print_formatted_task_list
+						elsif @tracks_opt
+							print_formatted_track_list
+						else
+							print_formatted_task_list
+						end
 					else
 						if @tasks_opt
 							print_task_table
@@ -215,7 +227,7 @@ module TheFox
 							duration.to_human,
 							unbilled_duration.to_human,
 							# tracks_c,
-							'%s %s' % [task.short_id, task.foreign_id ? task.foreign_id : task.name(15)]
+							'%s %s' % [task.id_foreign_or_short, task.name(15)]
 						]
 					end
 					
@@ -243,6 +255,13 @@ module TheFox
 					end
 				end
 				
+				def print_formatted_task_list
+					puts 'print_formatted_task_list'
+					filtered_tasks.each do |task|
+						puts task.formatted(@format_opt)
+					end
+				end
+				
 				def print_track_table
 					puts "From #{@from_opt.strftime('%F %T %z')}"
 					puts "  To #{@to_opt.strftime('%F %T %z')}"
@@ -303,7 +322,7 @@ module TheFox
 							track.begin_datetime_s(@filter_options),
 							track.end_datetime_s(@filter_options),
 							duration.to_human,
-							'%s' % [task.foreign_id ? task.foreign_id : task.short_id],
+							'%s' % [task.id_foreign_or_short],
 							'%s %s' % [track.short_id, track.title(15)],
 						]
 					end
@@ -331,6 +350,13 @@ module TheFox
 					end
 				end
 				
+				def print_formatted_track_list
+					puts 'print_formatted_track_list'
+					@timr.tracks(@filter_options).each do |track_id, track|
+						puts track.formatted(@format_opt)
+					end
+				end
+				
 				def export_tasks_csv
 					if @csv_opt == '-'
 						csv_file_handle = STDOUT
@@ -660,11 +686,13 @@ module TheFox
 				end
 				
 				def help
-					puts 'usage: timr report '
+					puts 'usage: timr report [-d|--day <date>] [-m|--month <[YYYY-]MM>]'
+					puts '                   [-y|--year [<YYYY>]] [-a|--all] [--tasks|--tracks]'
+					puts '                   [--csv <path>] [--force]'
 					puts '   or: timr report [-h|--help]'
 					puts
 					puts 'Options'
-					puts '    -d, --day   <date>          A single day from 00:00 to 23:59.'
+					puts '    -d, --day   [<date>]        A single day from 00:00 to 23:59.'
 					puts '    -m, --month <[YYYY-]MM>     A single month from 01 to 31.'
 					puts '    -y, --year  [<YYYY>]        A single year from 01-01 to 12-31.'
 					puts '    -a, --all                   All.'
@@ -672,6 +700,7 @@ module TheFox
 					puts '    --tracks                    Export Tracks'
 					# puts '    --billed                    Filter only Tasks/Tracks which are billed.'
 					# puts '    --unbilled                  Filter only Tasks/Tracks which are not billed.'
+					puts '    --format                    Format Tasks and Tracks output.'
 					puts "    --csv <path>                Export as CSV file. Use '--csv -' to use STDOUT."
 					puts "    --force                     Force overwrite file."
 					puts
@@ -680,6 +709,27 @@ module TheFox
 					puts
 					HelpCommand.print_datetime_help
 					puts
+					puts 'Task Format'
+					puts '    %id     ID'
+					puts '    %sid    Short ID'
+					puts '    %fid    Foreign ID'
+					puts '    %n      Name'
+					puts '    %d      Description'
+					puts
+					puts 'Track Format'
+					puts '    %id     ID'
+					puts '    %sid    Short ID'
+					puts '    %m      Message'
+					puts '    %bdt    Begin DateTime'
+					puts '    %bd     Begin Date'
+					puts '    %bt     Begin Time'
+					puts '    %edt    End DateTime'
+					puts '    %ed     End Date'
+					puts '    %et     End Time'
+					puts
+					puts "Use '%T' prefix for each Task attribute for Track formatting."
+					puts "For example use '%Tid' to use the Task ID."
+					puts
 				end
 				
 			end # class TrackCommand

data/lib/timr/command/status_command.rb

@@ -115,7 +115,8 @@ module TheFox
 							row << remaining_time_s
 							row << remaining_time_percent_s
 						end
-						row << task.short_id
+						
+						row << task.id_foreign_or_short
 						
 						if @verbose_opt
 							row << '%s %s' % [track.short_id, track.title]

data/lib/timr/command/task_command.rb

@@ -21,6 +21,7 @@ module TheFox
 				
 				def initialize(argv = Array.new)
 					super()
+					# puts "argv #{argv}"
 					
 					@help_opt = false
 					@show_opt = false
@@ -71,6 +72,7 @@ module TheFox
 							@description_opt = argv.shift
 						when '-e', '--est', '--estimation'
 							@estimation_opt = argv.shift
+							# puts "est: #{@estimation_opt}"
 						when '-b', '--billed'
 							@billed_opt = true
 						when '--unbilled'
@@ -99,6 +101,8 @@ module TheFox
 						else
 							@tasks_opt << arg
 						end
+						
+						# puts "argv #{argv}"
 					end
 					
 					if @foreign_id_opt && @unset_foreign_id_opt
@@ -169,14 +173,14 @@ module TheFox
 					end
 					task_id = @tasks_opt.first
 					
-					if @foreign_id_opt.nil? && @unset_foreign_id_opt.nil?
-						@name_opt.nil? && @description_opt.nil? &&
-						@estimation_opt.nil? &&
-						@billed_opt.nil? && @unbilled_opt.nil? &&
-						@hourly_rate_opt.nil? && @unset_hourly_rate_opt.nil? &&
+					if @foreign_id_opt.nil? && @unset_foreign_id_opt.nil? && \
+						@name_opt.nil? && @description_opt.nil? && \
+						@estimation_opt.nil? && \
+						@billed_opt.nil? && @unbilled_opt.nil? && \
+						@hourly_rate_opt.nil? && @unset_hourly_rate_opt.nil? && \
 						@has_flat_rate_opt.nil? && @unset_flat_rate_opt.nil?
 						
-						raise TaskCommandError, "No option given. See 'time task -h'."
+						raise TaskCommandError, "No option given. See 'timr task -h'."
 					end
 					
 					task = @timr.get_task_by_id(task_id)
@@ -256,12 +260,12 @@ module TheFox
 				
 				def run_show_all
 					@timr.tasks.each do |task_id, task|
-						full_id = @verbose_opt ? task.id : task.short_id
+						task_id = @verbose_opt ? task.id : task.short_id
 						
 						if task.foreign_id
-							puts '%s %s %s' % [full_id, task.foreign_id, task.name_s]
+							puts '%s %s %s' % [task_id, task.foreign_id, task.name_s]
 						else
-							puts '%s - %s' % [full_id, task.name_s]
+							puts '%s - %s' % [task_id, task.name_s]
 						end
 					end
 				end

data/lib/timr/command/track_command.rb

@@ -307,7 +307,7 @@ module TheFox
 				end
 				
 				def check_opts_add
-					if @start_date_opt || @start_time_opt ||
+					if @start_date_opt || @start_time_opt || \
 						@end_date_opt || @end_time_opt
 						
 						if @start_date_opt.nil?
@@ -327,9 +327,9 @@ module TheFox
 				end
 				
 				def check_opts_set
-					if @start_date_opt.nil? && @start_time_opt.nil? &&
-						@end_date_opt.nil? && @end_time_opt.nil? &&
-						@message_opt.nil? && @task_id_opt.nil? &&
+					if @start_date_opt.nil? && @start_time_opt.nil? && \
+						@end_date_opt.nil? && @end_time_opt.nil? && \
+						@message_opt.nil? && @task_id_opt.nil? && \
 						@billed_opt.nil? && @unbilled_opt.nil?
 						
 						raise TrackCommandError, "No option given. See 'timr track --help'."

data/lib/timr/model/task.rb

@@ -29,6 +29,11 @@ module TheFox
 					@tracks = Hash.new
 				end
 				
+				# Get Foreign ID or Short ID.
+				def id_foreign_or_short
+					@foreign_id ? @foreign_id : short_id
+				end
+				
 				def foreign_id=(foreign_id)
 					@foreign_id = foreign_id
 					
@@ -214,9 +219,12 @@ module TheFox
 							bdt = track.begin_datetime
 							edt = track.end_datetime || Time.now
 							
-							bdt && (
-								bdt <  from_opt && edt >  from_opt || # Track A, B
-								bdt >= from_opt && edt >= from_opt    # Track C, D, F
+							bdt && ( \
+								# Track A, B
+								bdt <  from_opt && edt >  from_opt || \
+								
+								# Track C, D, F
+								bdt >= from_opt && edt >= from_opt
 							)
 						}
 					elsif from_opt.nil? && !to_opt.nil?
@@ -225,9 +233,12 @@ module TheFox
 							bdt = track.begin_datetime
 							edt = track.end_datetime || Time.now
 							
-							bdt && (
-								bdt <  to_opt && edt <= to_opt || # Track B, D, E
-								bdt <  to_opt && edt >  to_opt    # Track A, C
+							bdt && ( \
+								# Track B, D, E
+								bdt <  to_opt && edt <= to_opt || \
+								
+								# Track A, C
+								bdt <  to_opt && edt >  to_opt
 							)
 						}
 					elsif !from_opt.nil? && !to_opt.nil?
@@ -236,11 +247,18 @@ module TheFox
 							bdt = track.begin_datetime
 							edt = track.end_datetime || Time.now
 							
-							bdt && (
-								bdt >= from_opt && edt <= to_opt ||               # Track D
-								bdt <  from_opt && edt >  to_opt ||               # Track A
-								bdt <  from_opt && edt <= to_opt && edt > from_opt || # Track B
-								bdt >= from_opt && edt >  to_opt && bdt < to_opt      # Track C
+							bdt && ( \
+								# Track D
+								bdt >= from_opt && edt <= to_opt || \
+								
+								# Track A
+								bdt <  from_opt && edt >  to_opt || \
+								
+								# Track B
+								bdt <  from_opt && edt <= to_opt && edt > from_opt || \
+								
+								# Track C
+								bdt >= from_opt && edt >  to_opt && bdt < to_opt
 							)
 						}
 					else
@@ -759,13 +777,9 @@ module TheFox
 				def to_track_array(options = Hash.new)
 					full_id_opt = options.fetch(:full_id, false) # @TODO full_id unit test
 					
-					full_id = full_id_opt ? self.id : self.short_id
+					full_id = full_id_opt ? self.id : ( self.foreign_id ? self.foreign_id : self.short_id )
 					
-					name_a = ["Task: #{full_id}"]
-					
-					if self.foreign_id
-						name_a << self.foreign_id
-					end
+					name_a = ['Task:', full_id]
 					if self.name
 						name_a << self.name
 					end
@@ -782,12 +796,10 @@ module TheFox
 				
 				# Used to print informations to STDOUT.
 				def to_compact_array
+					full_id = self.foreign_id ? self.foreign_id : self.short_id
+					
 					to_ax = Array.new
-					if self.foreign_id
-						to_ax << 'Task: %s %s %s' % [self.short_id, self.foreign_id, self.name]
-					else
-						to_ax << 'Task: %s %s' % [self.short_id, self.name]
-					end
+					to_ax << 'Task: %s %s' % [full_id, self.name]
 					if self.description
 						to_ax << 'Description: %s' % [self.description]
 					end
@@ -810,13 +822,11 @@ module TheFox
 				def to_detailed_array(options = Hash.new)
 					full_id_opt = options.fetch(:full_id, false)
 					
+					full_id = full_id_opt ? self.id : self.short_id
+					
 					to_ax = Array.new
 					
-					if full_id_opt
-						to_ax << 'Task: %s' % [self.id]
-					else
-						to_ax << 'Task: %s' % [self.short_id]
-					end
+					to_ax << 'Task: %s' % [full_id]
 					
 					if self.foreign_id
 						to_ax << 'Foreign ID: %s' % [self.foreign_id]
@@ -925,6 +935,22 @@ module TheFox
 					to_ax
 				end
 				
+				# Return formatted String.
+				# 
+				# - `%id` - ID
+				# - `%sid` - Short ID
+				# - `%fid` - Foreign ID
+				# - `%n` - Name
+				# - `%d` - Description
+				def formatted(format, prefix = '%')
+					format
+						.gsub("#{prefix}id", self.id)
+						.gsub("#{prefix}sid", self.short_id ? self.short_id : '')
+						.gsub("#{prefix}fid", self.foreign_id ? self.foreign_id : '')
+						.gsub("#{prefix}n", self.name ? self.name : '')
+						.gsub("#{prefix}d", self.description ? self.description : '')
+				end
+				
 				def inspect
 					"#<Task_#{short_id} tracks=#{@tracks.count}>"
 				end
@@ -984,6 +1010,8 @@ module TheFox
 					
 					if @estimation
 						@meta['estimation'] = @estimation.to_i
+					else
+						@meta['estimation'] = nil
 					end
 					if @hourly_rate
 						@meta['hourly_rate'] = @hourly_rate.to_f

data/lib/timr/model/track.rb

@@ -509,6 +509,43 @@ module TheFox
 					self.id == track.id
 				end
 				
+				# Return formatted String.
+				# 
+				# - `%id` - ID
+				# - `%sid` - Short ID
+				# - `%t` - Title generated from message.
+				# - `%m` - Message
+				# - `%bdt` - Begin DateTime
+				# - `%bd` - Begin Date
+				# - `%bt` - Begin Time
+				# - `%edt` - End DateTime
+				# - `%ed` - End Date
+				# - `%et` - End Time
+				def formatted(format)
+					formatted_s = format
+						.gsub('%id', self.id)
+						.gsub('%sid', self.short_id)
+						.gsub('%t', self.title ? self.title : '')
+						.gsub('%m', self.message ? self.message : '')
+						.gsub('%bdt', self.begin_datetime ? self.begin_datetime.strftime('%F %H:%M') : '')
+						.gsub('%bd', self.begin_datetime ? self.begin_datetime.strftime('%F') : '')
+						.gsub('%bt', self.begin_datetime ? self.begin_datetime.strftime('%H:%M') : '')
+						.gsub('%edt', self.end_datetime ? self.end_datetime.strftime('%F %H:%M') : '')
+						.gsub('%ed', self.end_datetime ? self.end_datetime.strftime('%F') : '')
+						.gsub('%et', self.end_datetime ? self.end_datetime.strftime('%H:%M') : '')
+					
+					if @task
+						formatted_s = @task.formatted(formatted_s, '%T')
+					else
+						tmp_task = Task.new
+						tmp_task.id = ''
+						
+						formatted_s = tmp_task.formatted(formatted_s, '%T')
+					end
+					
+					formatted_s
+				end
+				
 				def inspect
 					"#<Track #{short_id}>"
 				end

data/lib/timr/timr.rb

@@ -39,7 +39,6 @@ module TheFox
 				if @config.file_path.exist?
 					@config.load_from_file
 				else
-					#@config.save_to_file
 					@config.save_to_file(nil, true)
 				end
 				

data/lib/timr/version.rb

@@ -2,8 +2,8 @@
 module TheFox
 	module Timr
 		NAME = 'Timr'
-		VERSION = '0.4.0'
-		DATE = '2017-04-13'
+		VERSION = '0.5.0'
+		DATE = '2017-04-16'
 		HOMEPAGE = 'https://github.com/TheFox/timr'
 		
 		MODEL_DATETIME_FORMAT = '%FT%T%z'

data/man/index.txt

@@ -0,0 +1,15 @@
+
+timr(1) timr.1.ronn
+timr-continue(1) timr-continue.1.ronn
+timr-log(1) timr-log.1.ronn
+timr-pause(1) timr-pause.1.ronn
+timr-pop(1) timr-pop.1.ronn
+timr-push(1) timr-push.1.ronn
+timr-report(1) timr-report.1.ronn
+timr-start(1) timr-start.1.ronn
+timr-status(1) timr-status.1.ronn
+timr-stop(1) timr-stop.1.ronn
+timr-task(1) timr-task.1.ronn
+timr-track(1) timr-track.1.ronn
+
+timr-ftime(7) timr-ftime.7.ronn

data/man/timr-report.1

@@ -14,41 +14,37 @@ This command is designed to print a list of Tasks or Tracks to STDOUT and to exp
 .
 .SH "OPTIONS"
 .
-.TP
-\-d, \-\-day \fIdate\fR
-A single day from 00:00 to 23:59\. See timr\-ftime(7)\.
+.IP "\(bu" 4
+\-d, \-\-day \fIdate\fR: A single day from 00:00 to 23:59\. See timr\-ftime(7)\.
 .
-.TP
-\-m, \-\-month \fI[YYYY\-]MM\fR
-A single month from 01 to 31\.
+.IP "\(bu" 4
+\-m, \-\-month \fI[YYYY\-]MM\fR: A single month from 01 to 31\.
 .
-.TP
-\-y, \-\-year [\fIYYYY\fR]
-A single year from 01\-01 to 12\-31\.
+.IP "\(bu" 4
+\-y, \-\-year [\fIYYYY\fR]: A single year from 01\-01 to 12\-31\.
 .
-.TP
-\-a, \-\-all
-Export all\.
+.IP "\(bu" 4
+\-a, \-\-all: Export all\.
 .
-.TP
-\-\-tasks
-Export Tasks (default)
+.IP "\(bu" 4
+\-\-tasks : Export Tasks (default)
 .
-.TP
-\-\-tracks
-Export Tracks
+.IP "\(bu" 4
+\-\-tracks: Export Tracks
 .
-.TP
-\-\-csv \fIpath\fR
-Export as CSV file\. Use \fB\-\-csv \-\fR to use STDOUT\.
+.IP "\(bu" 4
+\-\-format See TASK FORMAT and TRACK FORMAT section\.
 .
-.TP
-\-\-force
-Force overwrite file\.
+.IP "\(bu" 4
+\-\-csv \fIpath\fR: Export as CSV file\. Use \fB\-\-csv \-\fR to use STDOUT\.
 .
-.TP
-\-h, \-\-help
-Displays the help page\.
+.IP "\(bu" 4
+\-\-force : Force overwrite file\.
+.
+.IP "\(bu" 4
+\-h, \-\-help: Displays the help page\.
+.
+.IP "" 0
 .
 .SH "EXAMPLES"
 .
@@ -61,6 +57,8 @@ timr report \-\-day 2017\-01\-02 \-\-csv timr_report_20170102\.csv \-\-tracks
 timr report \-\-month 2017\-01 \-\-csv timr_report_201701\.csv
 timr report \-\-year 2017 \-\-csv timr_report_2017\.csv
 timr report \-\-all \-\-csv timr_report_all\.csv
+timr report \-\-format \'\- %id\'
+timr report \-\-tracks \-\-format \'\- %Tsid %sid %t\'
 .
 .fi
 .
@@ -218,6 +216,73 @@ TRACK_IS_BILLED
 .P
 The last row in CSV files is always the total sum\.
 .
+.SH "TASK FORMAT"
+.
+.TP
+%id
+ID
+.
+.TP
+%sid
+Short ID
+.
+.TP
+%fid
+Foreign ID
+.
+.TP
+%n
+Name
+.
+.TP
+%d
+Description
+.
+.SH "TRACK FORMAT"
+.
+.TP
+%id
+ID
+.
+.TP
+%sid
+Short ID
+.
+.TP
+%t
+Title generated from message\.
+.
+.TP
+%m
+Message
+.
+.TP
+%bdt
+Begin DateTime
+.
+.TP
+%bd
+Begin Date
+.
+.TP
+%bt
+Begin Time
+.
+.TP
+%edt
+End DateTime
+.
+.TP
+%ed
+End Date
+.
+.TP
+%et
+End Time
+.
+.P
+Use \fB%T\fR prefix for each Task attribute for Track formatting\. For example use \fB%Tid\fR to use the Task ID\.
+.
 .SH "API REFERENCE"
 \fIhttps://timr\.fox21\.at/api/TheFox/Timr/Command/ReportCommand\.html\fR
 .

data/man/timr-report.1.ronn

@@ -29,6 +29,9 @@ This command is designed to print a list of Tasks or Tracks to STDOUT and to exp
 * --tracks:
 	Export Tracks
 
+* --format
+	See TASK FORMAT and TRACK FORMAT section.
+
 * --csv <path>:
 	Export as CSV file. Use `--csv -` to use STDOUT.
 
@@ -48,6 +51,8 @@ timr report --day 2017-01-02 --csv timr_report_20170102.csv --tracks
 timr report --month 2017-01 --csv timr_report_201701.csv
 timr report --year 2017 --csv timr_report_2017.csv
 timr report --all --csv timr_report_all.csv
+timr report --format '- %id'
+timr report --tracks --format '- %Tsid %sid %t'
 ```
 
 ## TASK TABLE COLUMNS
@@ -184,6 +189,57 @@ timr report --all --csv timr_report_all.csv
 
 The last row in CSV files is always the total sum.
 
+## TASK FORMAT
+
+* %id:
+	ID
+
+* %sid:
+	Short ID
+
+* %fid:
+	Foreign ID
+
+* %n:
+	Name
+
+* %d:
+	Description
+
+## TRACK FORMAT
+
+* %id:
+	ID
+
+* %sid:
+	Short ID
+
+* %t:
+	Title generated from message.
+
+* %m:
+	Message
+
+* %bdt:
+	Begin DateTime
+
+* %bd:
+	Begin Date
+
+* %bt:
+	Begin Time
+
+* %edt:
+	End DateTime
+
+* %ed:
+	End Date
+
+* %et:
+	End Time
+
+Use `%T` prefix for each Task attribute for Track formatting. For example use `%Tid` to use the Task ID.
+
 ## API REFERENCE
 
 <https://timr.fox21.at/api/TheFox/Timr/Command/ReportCommand.html>

data/timr.sublime-project

@@ -24,6 +24,13 @@
 			"working_dir": "${project_path:${folder}}",
 			"path": "$HOME/.rbenv/shims:/usr/local/bin:$PATH",
 			"shell": true
+		},
+		{
+			"name": "Install",
+			"cmd": [ "./bin/install.sh -f" ],
+			"working_dir": "${project_path:${folder}}",
+			"path": "$HOME/.rbenv/shims:/usr/local/bin:$PATH",
+			"shell": true
 		}
 	]
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: timr
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Christian Mayer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-13 00:00:00.000000000 Z
+date: 2017-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -191,6 +191,7 @@ files:
 - lib/timr/version.rb
 - man/.gitignore
 - man/_footer
+- man/index.txt
 - man/timr-continue.1
 - man/timr-continue.1.ronn
 - man/timr-ftime.7