work_guide 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3601b0cf778beaeb88809a78d26dd3e338550816
-  data.tar.gz: 6febc2436d8db93a8d50e15fc24194941fedcc3f
+  metadata.gz: 67c88f7640b63487a85b8204722c633f3efb7074
+  data.tar.gz: 81c40b86796dd1b01da1d554a53171a643adf427
 SHA512:
-  metadata.gz: e52c8c74631eed4eb219c3cbaf9b7cf57e1018b30eddc68d6b03d1a60256c2fb6f9287fed127e7a707d556c1ff05b538fa0c21a0705beb99de42a4b6836a9493
-  data.tar.gz: 1939f4abf82766b61bcb5203af79e1c9517fce46f6b08a5263dda29bc11c008219cccbaed9010c8a95eef40cf6ca5f34997d20d88f2aa63500154770e015a530
+  metadata.gz: b397fed96ac1776230a170fd2e9182f2fc2d8cedd59c6471d2e85ec1e74df01e9866ba53809edc8c51b3af7c24420bbc61db57b8c8a8658f68f477713e47dc5e
+  data.tar.gz: f21ecee0754f824dbd6772c9f854d399edd7a7205897c5cb0bae9e3cde8f7a41500c280708d81c0a66dd36789d5f4706bb51a03c9cc33c74238cb7b074a7cd93

data/lib/work_guide/cli.rb

@@ -6,11 +6,13 @@ module WorkGuide
     desc "add [guide description]", "Add a new guide"
     option :cycle, default: 'daily', banner: '[hourly|daily|weekly|monthly]', aliases: :c
     option :priority, default: 'medium', banner: '[high|medium|low]'
+    option :week_start, default: 'monday', banner: '[sunday|monday|...]'
     def add(description)
       guide = Guide.create(
         description: description,
         priority: options[:priority],
-        cycle: options[:cycle]
+        cycle: options[:cycle],
+        week_start: options[:week_start]
       )
       puts "Created [#{Guide.all.size - 1}]#{guide}"
     end
@@ -87,11 +89,11 @@ module WorkGuide
       }.sort_by { |index, guide|
         guide.priority_rate
       }.map { |index, guide|
-        [index, guide.cycle, guide.priority, guide.description, guide.done_at]
+        [index, guide.cycle, guide.priority, guide.description, guide.done_at, guide.week_start_if_weekly]
       }
 
       table = Kosi::Table.new(
-        header: %w(index cycle priorify description done_at)
+        header: %w(index cycle priorify description done_at week_start)
       )
       table.render(rows)
     end

data/lib/work_guide/guide.rb

@@ -3,7 +3,7 @@ require 'active_support/core_ext'
 
 module WorkGuide
   class Guide
-    attr_accessor :description, :cycle, :done_at, :priority
+    attr_accessor :description, :cycle, :done_at, :priority, :week_start
 
     class << self
       def create(args)
@@ -32,7 +32,8 @@ module WorkGuide
           description: ,
           cycle: 'daily',
           done_at: nil,
-          priority: 'medium'
+          priority: 'medium',
+          week_start: 'monday'
         )
       @description = description
       @cycle = cycle
@@ -40,6 +41,10 @@ module WorkGuide
         @done_at = Time.parse(done_at)
       end
       @priority = priority
+
+      if week_start
+        @week_start = week_start.to_sym
+      end
     end
 
     def should_do?
@@ -50,7 +55,7 @@ module WorkGuide
         when 'daily'
           1.day.since(done_at).beginning_of_day.past?
         when 'weekly'
-          1.week.since(done_at).beginning_of_day.past?
+          Time.now.beginning_of_week(week_start) >= done_at
         when 'monthly'
           1.month.since(done_at).beginning_of_month.past?
         else
@@ -61,6 +66,10 @@ module WorkGuide
       end
     end
 
+    def week_start_if_weekly
+      cycle == 'weekly' ? week_start : nil
+    end
+
     def priority_rate
       case priority
       when 'high'  ; 1
@@ -76,6 +85,7 @@ module WorkGuide
         cycle: cycle,
         done_at: done_at,
         priority: priority,
+        week_start: week_start,
       }
     end
 

data/lib/work_guide/version.rb

@@ -1,3 +1,3 @@
 module WorkGuide
-  VERSION = "1.2.0"
+  VERSION = "1.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: work_guide
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - adorechic
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-11-13 00:00:00.000000000 Z
+date: 2015-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor