todo_or_die 0.0.3 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 96c320c1ac97e6cffb75fb2a62e882c2f7380aab8e38a562a584ab8c167b05b0
-  data.tar.gz: ac069f4dac6b8282328c521b9f9dc28ea4121d4ddd071ebc838db81a11e946b3
+  metadata.gz: 7cc7971ad1d363af9350c7f9bdc7ae6884104ad1161b1a584de791eb1bccd2f6
+  data.tar.gz: 037644cf228dd8c3fae1f15fe568d11c50aebff47494a040ee6702198305464b
 SHA512:
-  metadata.gz: 4b2336159eb6e740866bbbf452979c3f55970a0dd77017880e3c40213511f47acd139d0be43cca0cae5d2c3fbff2b3671ae4929f43843e3c2cbd84f72717ba70
-  data.tar.gz: 4aed5f65010ef315704714d9acd608c9bb356ed0b07bb187c89a57c692f1efcbc6f14c9761edff0391ac538cf1ca2ded76f81295718ce75581c5baf6901df492
+  metadata.gz: fce9ed473d8727a3596380df75079d51e88c23328dc741bc700eaaafd167fcec00a5b510f84931134860a530bf7692ca6dff9f9e62d93eec3b8ad3b085b4428f
+  data.tar.gz: 70a8d8b3df3da35509932cb01ab3f2861b79e7e030602183e581d0a8ea83018dfeb675254618976788789f20aec052323a84b157f587a4a75e31c669bfbb1f4c

data/.circleci/config.yml

@@ -6,7 +6,9 @@ version: 2
 jobs:
   build:
     docker:
-       - image: circleci/ruby:2.4.1-node-browsers
+       - image: circleci/ruby:2.7-node-browsers
+         environment:
+           RUBYOPT: "-W:no-deprecated -W:no-experimental"
 
     working_directory: ~/repo
 
@@ -16,6 +18,7 @@ jobs:
       - run:
           name: install dependencies
           command: |
+            bundle update --bundler
             bundle install --retry=3
 
       - run:

data/CHANGELOG.md

@@ -0,0 +1,35 @@
+# Changelog
+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)
+
+## [0.0.3] - 2019-11-26
+### Added
+- Boolean-returning conditionals or callables (Proc, Block, Lambda) can be passed to the
+new `if` argument. `if` can be used instead of or in conjunction with the `by` argument
+to die on a specific date OR when a specific condition becomes true.
+
+### Changed
+- Date strings can now be parsed parsed internally without calling `Time` or `Date`
+classes explicitely.
+
+## [0.0.2] - 2019-02-15
+### Changed
+- Exclude this gem's backtrace location from exceptions thrown to make it easier to find
+TODOs.
+
+## [0.0.1] - 2019-01-01
+
+[Unreleased]: https://github.com/olivierlacan/keep-a-changelog/compare/v0.0.3...HEAD
+[0.0.3]: https://github.com/olivierlacan/keep-a-changelog/compare/v0.0.2...v0.0.3
+[0.0.2]: https://github.com/olivierlacan/keep-a-changelog/compare/v0.0.1...v0.0.2
+[0.0.1]: https://github.com/olivierlacan/keep-a-changelog/releases/tag/v0.0.1

data/Gemfile

@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
+git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 
 # Specify your gem's dependencies in todo_or_die.gemspec
 gemspec

data/Gemfile.lock

@@ -1,33 +1,40 @@
 PATH
   remote: .
   specs:
-    todo_or_die (0.0.3)
+    todo_or_die (0.1.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    ast (2.4.0)
-    jaro_winkler (1.5.1)
-    minitest (5.11.3)
-    parallel (1.12.1)
-    parser (2.5.3.0)
-      ast (~> 2.4.0)
-    powerpack (0.1.2)
-    rainbow (3.0.0)
-    rake (12.3.2)
-    rubocop (0.61.1)
-      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.5, != 2.5.1.1)
-      powerpack (~> 0.1)
+      parser (>= 3.1.0.0)
       rainbow (>= 2.2.2, < 4.0)
+      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)
-    ruby-progressbar (1.10.0)
-    standard (0.0.23)
-      rubocop (>= 0.60)
-    timecop (0.9.1)
-    unicode-display_width (1.4.1)
+      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
@@ -41,4 +48,4 @@ DEPENDENCIES
   todo_or_die!
 
 BUNDLED WITH
-   1.17.3
+   2.1.4

data/README.md

@@ -60,20 +60,22 @@ end
 Nothing will happen at all until February 4th, at which point the gem will
 raise an error whenever this class is loaded until someone deals with it.
 
-You may also pass a condition, either as boolean or in proc/lambda form:
+You may also pass a condition, either as a callable (e.g. proc/lambda/method) or
+a boolean test:
 
 ``` ruby
 class User < ApplicationRecord
-  TodoOrDie(
-    "delete after 1 million users",
-    if: User.size > 1000000,
-  )
+  TodoOrDie("delete after someone wins", if: User.count > 1000000)
   def is_one_millionth_user?
     id == 1000000
   end
 end
 ```
 
+You can also pass both `by` and `if` (where both must be met for an error to be
+raised) or, I guess, neither (where an error will be raised as soon as
+`TodoOrDie` is invoked).
+
 ### What kind of error?
 
 It depends on whether you're using [Rails](https://rubyonrails.org) or not.

data/lib/todo_or_die/version.rb

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

data/lib/todo_or_die.rb

@@ -1,3 +1,4 @@
+require "time"
 require "todo_or_die/version"
 require "todo_or_die/overdue_error"
 
@@ -10,7 +11,7 @@ module TodoOrDie
         (" came due on #{due_at.strftime("%Y-%m-%d")}" if due_at),
         (" and" if due_at && condition),
         (" has met the conditions to be acted upon" if condition),
-        ". Do it!",
+        ". Do it!"
       ].compact.join("")
 
       if defined?(Rails) && Rails.env.production?
@@ -19,6 +20,20 @@ module TodoOrDie
         raise TodoOrDie::OverdueTodo, error_message, TodoOrDie.__clean_backtrace(caller)
       end
     },
+
+    warn: lambda { |message, due_at, warn_at, condition|
+      error_message = [
+        "TODO: \"#{message}\"",
+        (" is due on #{due_at.strftime("%Y-%m-%d")}" if due_at),
+        (" and" if warn_at && condition),
+        (" has met the conditions to be acted upon" if condition),
+        ". Don't forget!"
+      ].compact.join("")
+
+      puts error_message
+
+      Rails.logger.warn(error_message) if defined?(Rails)
+    }
   }.freeze
 
   def self.config(options = {})
@@ -37,14 +52,25 @@ module TodoOrDie
 end
 
 # The main event
-def TodoOrDie(message, by: by_omitted = true, if: if_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
-  is_due = by_omitted || Time.now > due_at
+  warn_at = Time.parse(warn_by.to_s) unless warn_by_omitted
   condition = binding.local_variable_get(:if) unless if_omitted
-  condition_met = if_omitted || (condition.respond_to?(:call) ? condition.call : condition)
 
-  if is_due && condition_met
+  is_past_due_date = by_omitted || Time.now > due_at
+  die_condition_met = if_omitted || (condition.respond_to?(:call) ? condition.call : condition)
+  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]
     die.call(*[message, due_at, condition].take(die.arity.abs))
+  elsif should_warn
+    warn = TodoOrDie.config[:warn]
+    warn.call(*[message, due_at, warn_at, condition].take(warn.arity.abs))
   end
 end

data/todo_or_die.gemspec

@@ -3,15 +3,15 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "todo_or_die"
 
 Gem::Specification.new do |spec|
-  spec.name          = "todo_or_die"
-  spec.version       = TodoOrDie::VERSION
-  spec.authors       = ["Justin Searls"]
-  spec.email         = ["searls@gmail.com"]
+  spec.name = "todo_or_die"
+  spec.version = TodoOrDie::VERSION
+  spec.authors = ["Justin Searls"]
+  spec.email = ["searls@gmail.com"]
 
-  spec.summary       = "Write TO​DOs in code that ensure you actually do them"
-  spec.homepage      = "https://github.com/searls/todo_or_die"
+  spec.summary = "Write TO​DOs in code that ensure you actually do them"
+  spec.homepage = "https://github.com/searls/todo_or_die"
 
-  spec.files         = Dir.chdir(File.expand_path("..", __FILE__)) do
+  spec.files = Dir.chdir(File.expand_path("..", __FILE__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
   spec.require_paths = ["lib"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: todo_or_die
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.1
 platform: ruby
 authors:
 - Justin Searls
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-11-26 00:00:00.000000000 Z
+date: 2022-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,7 +80,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email:
 - searls@gmail.com
 executables: []
@@ -89,6 +89,7 @@ extra_rdoc_files: []
 files:
 - ".circleci/config.yml"
 - ".gitignore"
+- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -103,7 +104,7 @@ files:
 homepage: https://github.com/searls/todo_or_die
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -118,8 +119,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.3.6
+signing_key:
 specification_version: 4
 summary: Write TO​DOs in code that ensure you actually do them
 test_files: []