todo_or_die 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0491e8c47bb1f59f0b38966bb65a8dbd6d31a18aa9044ca9445cce8962c55e62'
-  data.tar.gz: c82c1ce0e56afbfb197ff4d7a66d7187003ef085b58d7096c510696faca4dbc9
+  metadata.gz: 7cc7971ad1d363af9350c7f9bdc7ae6884104ad1161b1a584de791eb1bccd2f6
+  data.tar.gz: 037644cf228dd8c3fae1f15fe568d11c50aebff47494a040ee6702198305464b
 SHA512:
-  metadata.gz: 18751ea8ecfeb4e50ddbdc42229b721957a86bd5d6535655264dec37a46f99f68596fd98be14eb2d585395956cf0b1c01712610750664fae8c8bfa910ac4e0b2
-  data.tar.gz: 6fdf682b441ce3edf280f1322cc4a88bf6af9c84057334eef449e894fcd41ff20a3a2164ccd80a13bbe0214787101c0ff38e24cff1f73ae2353853eaf1563c4c
+  metadata.gz: fce9ed473d8727a3596380df75079d51e88c23328dc741bc700eaaafd167fcec00a5b510f84931134860a530bf7692ca6dff9f9e62d93eec3b8ad3b085b4428f
+  data.tar.gz: 70a8d8b3df3da35509932cb01ab3f2861b79e7e030602183e581d0a8ea83018dfeb675254618976788789f20aec052323a84b157f587a4a75e31c669bfbb1f4c

data/CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.1.1] - 2022-07-01
+
+- Fix `warn_by` [#16](https://github.com/searls/todo_or_die/pull/16)
+
 ## [0.1.0] - 2022-06-27
 
 - Add `warn_by` option [#14](https://github.com/searls/todo_or_die/pull/14)

data/Gemfile.lock

@@ -1,36 +1,40 @@
 PATH
   remote: .
   specs:
-    todo_or_die (0.1.0)
+    todo_or_die (0.1.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    ast (2.4.0)
-    jaro_winkler (1.5.4)
-    minitest (5.11.3)
-    parallel (1.19.1)
-    parser (2.7.1.2)
-      ast (~> 2.4.0)
-    rainbow (3.0.0)
-    rake (13.0.1)
-    rexml (3.2.4)
-    rubocop (0.82.0)
-      jaro_winkler (~> 1.5.1)
+    ast (2.4.2)
+    minitest (5.16.1)
+    parallel (1.22.1)
+    parser (3.1.2.0)
+      ast (~> 2.4.1)
+    rainbow (3.1.1)
+    rake (13.0.6)
+    regexp_parser (2.5.0)
+    rexml (3.2.5)
+    rubocop (1.29.1)
       parallel (~> 1.10)
-      parser (>= 2.7.0.1)
+      parser (>= 3.1.0.0)
       rainbow (>= 2.2.2, < 4.0)
-      rexml
+      regexp_parser (>= 1.8, < 3.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.17.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-performance (1.5.2)
-      rubocop (>= 0.71.0)
-    ruby-progressbar (1.10.1)
-    standard (0.4.1)
-      rubocop (~> 0.82.0)
-      rubocop-performance (~> 1.5.2)
-    timecop (0.9.1)
-    unicode-display_width (1.7.0)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.18.0)
+      parser (>= 3.1.1.0)
+    rubocop-performance (1.13.3)
+      rubocop (>= 1.7.0, < 2.0)
+      rubocop-ast (>= 0.4.0)
+    ruby-progressbar (1.11.0)
+    standard (1.12.1)
+      rubocop (= 1.29.1)
+      rubocop-performance (= 1.13.3)
+    timecop (0.9.5)
+    unicode-display_width (2.2.0)
 
 PLATFORMS
   ruby

data/lib/todo_or_die/version.rb

@@ -1,3 +1,3 @@
 module TodoOrDie
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/todo_or_die.rb

@@ -52,15 +52,19 @@ module TodoOrDie
 end
 
 # The main event
-def TodoOrDie(message, by: by_omitted = true, if: if_omitted = true, warn_by: warn_by_omitted = true) # rubocop:disable Naming/MethodName
+def TodoOrDie(message, by: by_omitted = true, if: if_omitted = true, warn_by: warn_by_omitted = true)
   due_at = Time.parse(by.to_s) unless by_omitted
   warn_at = Time.parse(warn_by.to_s) unless warn_by_omitted
   condition = binding.local_variable_get(:if) unless if_omitted
 
-  should_warn = !warn_by_omitted && Time.now > warn_at
-  is_due = by_omitted || Time.now > due_at
+  is_past_due_date = by_omitted || Time.now > due_at
   die_condition_met = if_omitted || (condition.respond_to?(:call) ? condition.call : condition)
-  should_die = is_due && die_condition_met
+  no_conditions_given = by_omitted && if_omitted && warn_by_omitted
+  only_warn_condition_given = (if_omitted && by_omitted && !warn_by_omitted)
+
+  ready_to_die = is_past_due_date && die_condition_met && !only_warn_condition_given
+  should_die = no_conditions_given || ready_to_die
+  should_warn = !warn_by_omitted && Time.now > warn_at
 
   if should_die
     die = TodoOrDie.config[:die]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: todo_or_die
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Justin Searls
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-27 00:00:00.000000000 Z
+date: 2022-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -119,7 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.3.6
 signing_key:
 specification_version: 4
 summary: Write TO​DOs in code that ensure you actually do them