task_report 0.5.3 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 44c0dac375e7e16141977b24a08fcea97b4f8fb4
-  data.tar.gz: 1f5f2d07631828b73e3eac41aba1aab01acbae53
+  metadata.gz: 1c892838becbaf46a4fd36fad5567a8da474a936
+  data.tar.gz: 4d7756be9e805d934214c3d484e6436d9bc1c0d7
 SHA512:
-  metadata.gz: 1da1947ec2f57d33474fb109db1b44ee9fadc8b494a1e7441cf70b5a1418fcb4aa3083967107a64bcad18c15183d0efacee26092d5364bcb5b88eb9baf9e48c2
-  data.tar.gz: f2c949e04705e5452b53ca0932d4d1c5878dcce94de6e1f8fe6dd5ac058983db32fcbc4bf45cc9c2ea632e9162863b962f7390fe870fdb2624a119824f4a67e3
+  metadata.gz: d6881843d91884e65f38bfcdf23d40319ade48de0d69a37064284275aa24bc26124379182150a55ad78ea617e340b0057e172a3a16370f2b3058ebc24c3ce2c4
+  data.tar.gz: 1f1dc6f2313e311f2e022b3c844c851dc7d6d2643b949d542924a8c4e87a33bae8fa53a1a3a3bf56b893706164be8722e87e8203085bb0cb9aa7bc648ba55231

data/README.md

@@ -40,10 +40,11 @@ Use `task` as follows:
   `task list`
     - Lists all of today's tasks
 
-  `task summary [--gist, -g]`
+  `task summary [--gist, -g] [{--from, -f} YYYY-MM-DD {--until, -u} YYYY-MM-DD]`
     - prints a task summary to the command line
     - if the `--gist` or `-g` options are used, creates a markdown gist summary
       and prints the link to stdout
+    - if `--from` and `--until` options are passed, then a gist will be made including any tracked time between the two dates
 
   `task delete {TASK-ID, TASK-DESCRIPTION, today, gist}`
     - deletes the provided task if it exists

data/VERSION

@@ -1 +1 @@
-0.5.3
+0.6.3

data/bin/task

@@ -2,7 +2,12 @@
 
 require 'task_report'
 
-def show_usage_message(exit_status = 0)
+def show_usage_message(additional_message = nil, exit_status = 0)
+  if additional_message
+    puts additional_message
+    puts ''
+  end
+
   puts \
 "Use `task` as follows:
 
@@ -22,10 +27,11 @@ def show_usage_message(exit_status = 0)
   `task list`
     - Lists all of today's tasks
 
-  `task summary [--gist, -g]`
+  `task summary [--gist, -g] [{--from, -f} YYYY-MM-DD {--until, -u} YYYY-MM-DD]`
     - prints a task summary to the command line
     - if the `--gist` or `-g` options are used, creates a markdown gist summary
       and prints the link to stdout
+    - if `--from` and `--until` options are passed, then a gist will be made including any tracked time between the two dates
 
   `task delete {TASK-ID, TASK-DESCRIPTION, today, gist}`
     - deletes the provided task if it exists
@@ -45,6 +51,31 @@ def show_usage_message(exit_status = 0)
   exit exit_status
 end
 
+def parse_summary_args
+  gist = from = to = nil
+
+  ARGV.each_with_index do |arg, i|
+    case arg
+    when '--gist', '-g'
+      gist = true
+    when '--from', '-f'
+      if ARGV[i+1] =~ /\d{4}-\d{2}-\d{2}/ # must be a date
+        from = ARGV[i+1]
+      else
+        show_usage_message('summary date arguments must have the format: YYYY-MM-DD')
+      end
+    when '--until', '-u'
+      if ARGV[i+1] =~ /\d{4}-\d{2}-\d{2}/ # must be a date
+        to = ARGV[i+1]
+      else
+        show_usage_message('summary date arguments must have the format: YYYY-MM-DD')
+      end
+    end
+  end
+
+  [gist, from, to]
+end
+
 TaskReport.read_config
 
 case ARGV[0]
@@ -61,7 +92,7 @@ when 'delete'
 when 'current'
   TaskReport.current
 when 'summary'
-  TaskReport.summary(ARGV[1])
+  TaskReport.summary(*parse_summary_args)
 when 'note'
   TaskReport.note(ARGV[1], ARGV[2])
 when 'total'

data/lib/task_report/gist.rb

@@ -6,16 +6,26 @@ module TaskReport
   module Gist
     class << self
       def find_gist_from_today_by_description(description)
-        Gist.get_recent_gists_for_user.find do |gist|
+        get_gists_for_user.find do |gist|
           gist['description'] == description
         end
       end
 
-      def get_recent_gists_for_user
-        now = Time.now
+      def find_gists_by_descriptions(descriptions, from = Time.now)
+        get_gists_for_user(from).select do |gist|
+          descriptions.include? gist['description']
+        end
+      end
+
+      def find_gists_by_description(description, from = Time.now)
+        get_gists_for_user(from).find do |gist|
+          description == gist['description']
+        end
+      end
 
+      def get_gists_for_user(from = Time.now)
         # kind of like Time.now.midnight in UTC
-        time_string = Time.new(now.year, now.month, now.day).getgm.strftime('%Y-%m-%dT%H:%M:%SZ')
+        time_string = Time.new(from.year, from.month, from.day).getgm.strftime('%Y-%m-%dT%H:%M:%SZ')
 
         params = {
           access_token: User.api_token,
@@ -76,6 +86,18 @@ module TaskReport
         response = http.request(request)
         JSON.parse(response.body)
       end
+
+      def create_or_update(params, from)
+        description = params[:description]
+        found = find_gists_by_description(from)
+
+        if found
+          edit(found['id'], params)
+          return found
+        end
+
+        create(params)
+      end
     end
   end
 end

data/lib/task_report/report.rb

@@ -8,12 +8,12 @@ module TaskReport
     attr_reader :gist_id
 
     class << self
-      def gist_description
-        "#{User.name}_report_#{Time.now.strftime('%Y-%m-%d')}"
+      def gist_description(time = Time.now)
+        "#{User.name}_report_#{time.strftime('%Y-%m-%d')}"
       end
 
-      def json_file_name
-        "#{gist_description}.json"
+      def json_file_name(description = nil)
+        "#{description || gist_description}.json"
       end
 
       def create(new_task_description:)
@@ -24,10 +24,11 @@ module TaskReport
       end
 
       def create_from_gist(gist)
-        raw_url = gist['files'][json_file_name]['raw_url']
+        description = gist['description'] || gist_description
+        raw_url = gist['files'][json_file_name(description)]['raw_url']
 
         Report.new(
-          description: gist_description,
+          description: description,
           json_file_name: json_file_name,
           gist_id: gist['id'],
           gist_html_url: gist['html_url'],
@@ -117,8 +118,10 @@ module TaskReport
           puts "  - #{note}"
         end
 
-        puts "\nTotal time tracked: #{total_duration.to_s}"
+        puts "\n"
       end
+
+      puts "Total time tracked: #{total_duration.to_s}\n\n"
     end
 
     def gist_summary
@@ -161,6 +164,24 @@ module TaskReport
       puts total_duration.to_s
     end
 
+    def gist_summary_content
+      lines = ["## #{User.name} Task Report #{@date.strftime('%Y-%m-%d')}", '']
+
+      @tasks.each do |task|
+        lines << "- '#{task.description}'"
+        lines << "  - #{task.duration.to_s}"
+
+        task.notes.each do |note|
+          lines << "  - #{note}"
+        end
+      end
+
+      lines << ''
+      lines << "#### Total time tracked: #{total_duration.to_s}"
+
+      lines.join("\n")
+    end
+
     private
       def initialize(description:, json_file_name:, gist_id: nil, gist_html_url: nil, existing_json_content: {})
         @description = description
@@ -239,24 +260,6 @@ module TaskReport
         raise MultipleOngoingTasks if @tasks.count(&:ongoing?) > 1
       end
 
-      def gist_summary_content
-        lines = ["## #{User.name} Task Report #{@date.strftime('%Y-%m-%d')}", '']
-
-        @tasks.each do |task|
-          lines << "- '#{task.description}'"
-          lines << "  - #{task.duration.to_s}"
-
-          task.notes.each do |note|
-            lines << "  - #{note}"
-          end
-        end
-
-        lines << ''
-        lines << "#### Total time tracked: #{total_duration.to_s}"
-
-        lines.join("\n")
-      end
-
       def total_duration
         total_time_in_seconds =
           @tasks.inject(0) do |sum, task|

data/lib/task_report.rb

@@ -98,23 +98,43 @@ module TaskReport
       puts 'Something went wrong. There are multiple ongoing tasks.'
     end
 
-    def summary(options)
+    def summary(gist, from, to)
+      if from
+        return range_summary(gist, from, to || Time.now.strftime('%Y-%m-%d'))
+      end
+
       return if no_gist?
 
       @report ||= Report.create_from_gist(report_gist)
 
-      if ['--gist', '-g'].include? options
+      if gist
         @report.gist_summary
       else
-        unless options.nil?
-          puts "The #{options} option is not recorgnized.\n"\
-               "Printing the summary to the stdout.\n\n"
-        end
-
         @report.print_summary
       end
     end
 
+    def print_range_summary_to_gist(reports, from, to)
+      content = reports.map { |r| r.gist_summary_content }.compact.join("\n\n")
+      file_name = "task_report_#{from}_-_#{to}.md"
+
+      gist =
+        Gist.create_or_update(
+          {
+            public: false,
+            description: "Task Report: #{from} - #{to}",
+            files: {
+              file_name => {
+                content: content
+              }
+            }
+          },
+          Time.parse(from)
+        )
+
+      puts gist['html_url']
+    end
+
     def note(task_id, note)
       return if no_gist?
 
@@ -150,5 +170,38 @@ module TaskReport
 
         false
       end
+
+      def find_reports(from, to)
+        from_time = Time.parse(from)
+        from_epoch = from_time.to_i
+
+        to_epoch =
+          if to
+            Time.parse(to).to_i
+          else
+            now = Time.now
+            Time.new(now.year, now.month, now.day).to_i
+          end
+
+        seconds_in_a_day = 86400
+        descriptions = []
+
+        (from_epoch..to_epoch).step(seconds_in_a_day) do |epoch|
+          descriptions << Report.gist_description(Time.at(epoch))
+        end
+
+        gists = Gist.find_gists_by_descriptions(descriptions, from_time)
+        gists.map { |gist| Report.create_from_gist(gist) }
+      end
+
+      def range_summary(gist, from, to)
+        reports = find_reports(from, to).reverse
+
+        if gist
+          print_range_summary_to_gist(reports, from, to)
+        else
+          reports.map(&:print_summary)
+        end
+      end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: task_report
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.6.3
 platform: ruby
 authors:
 - Mat Pataki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-25 00:00:00.000000000 Z
+date: 2016-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler