standup_md 2.0.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d5b3c3f8fe55eadcdc0ae76de9cb745bfe0c557c2c715884fd1056403fba31f1
-  data.tar.gz: d7191750ade93198d7a432762eb3327425a0dcb632389dc90ba6216735b941f2
+  metadata.gz: d76ddd28cf3a01f84583cb1a9a03ac2b4731b0e5f977e400e88bfa382f456582
+  data.tar.gz: a227c637b17cbc82a32b3d98cb0dc2de93c23861c41635049681e489515a87f3
 SHA512:
-  metadata.gz: 1cc3f477255e687f122e018ce1e4d31e6ca0ca7d9c16a003c463324230e68e528a97fc08a52194fa98965ae9ca82bfd963d0343f3b38f12526b5f8bb276b832b
-  data.tar.gz: c0291b6fabd240ac6b292b4e97c2e5c97ed74afd8675b0274295129625326b94ae2a866ff1dabf89a5e91678537b09b572ab677cc6c87bdbb80d8a2e6e36d401
+  metadata.gz: ebc8045842abc5356997c8fa38f5cff05350946cb854528f68ec88714e15b7853cfbcf1a5c6663dae138de0c26b14ec007fca0c62a11279217b35dcda1ae8af3
+  data.tar.gz: 2eefdcfae08a7e983a0b9d232795ab501b19ada60c159ad7c5c6fbda9956f1b51d4c521f20bf6ab669be1871199376362b5d05303a303b5bcf2802b08193d6cc

data/.ruby-version

@@ -0,0 +1 @@
+4.0.4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    standup_md (2.0.1)
+    standup_md (2.1.0)
 
 GEM
   remote: https://rubygems.org/
@@ -49,6 +49,7 @@ GEM
       rubocop (>= 1.75.0, < 2.0)
       rubocop-ast (>= 1.47.1, < 2.0)
     ruby-progressbar (1.13.0)
+    semverve (0.1.0)
     simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
@@ -82,6 +83,7 @@ PLATFORMS
 DEPENDENCIES
   rake (~> 13.0, >= 13.0.1)
   rdoc
+  semverve
   simplecov
   standard (~> 1.54.0)
   standup_md!
@@ -109,13 +111,14 @@ CHECKSUMS
   rubocop-ast (1.49.1) sha256=4412f3ee70f6fe4546cc489548e0f6fcf76cafcfa80fa03af67098ffed755035
   rubocop-performance (1.26.1) sha256=cd19b936ff196df85829d264b522fd4f98b6c89ad271fa52744a8c11b8f71834
   ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33
+  semverve (0.1.0) sha256=cda51f2cc148af0a163ac5b25616ff3c3d20fc5aa9f036a7f2910e20ee3058b6
   simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5
   simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246
   simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428
   standard (1.54.0) sha256=7a4b08f83d9893083c8f03bc486f0feeb6a84d48233b40829c03ef4767ea0100
   standard-custom (1.0.2) sha256=424adc84179a074f1a2a309bb9cf7cd6bfdb2b6541f20c6bf9436c0ba22a652b
   standard-performance (1.9.0) sha256=49483d31be448292951d80e5e67cdcb576c2502103c7b40aec6f1b6e9c88e3f2
-  standup_md (2.0.1)
+  standup_md (2.1.0)
   stringio (3.2.0) sha256=c37cb2e58b4ffbd33fe5cd948c05934af997b36e0b6ca6fdf43afa234cf222e1
   test-unit (3.7.8) sha256=689d1ca53f4d46f678b4e5d68d8e4294f87fc5e8b9238cc4de7c5727e8d65943
   tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f

data/README.md

@@ -1,8 +1,8 @@
 # The Standup Doctor
 <!-- vi: set ts=4 sw=4 : -->
 [![Build Status](https://img.shields.io/endpoint.svg?url=https%3A%2F%2Factions-badge.atrox.dev%2Fevanthegrayt%2Fstandup_md%2Fbadge%3Fref%3Dmaster&style=flat)](https://actions-badge.atrox.dev/evanthegrayt/standup_md/goto?ref=master)
+[![Language: Ruby](https://img.shields.io/static/v1?label=language&message=Ruby&color=CC342D&style=flat&logo=ruby&logoColor=CC342D)](https://www.ruby-lang.org/)
 [![Gem Version](https://img.shields.io/gem/v/standup_md.svg)](https://rubygems.org/gems/standup_md)
-![Language: Ruby](https://img.shields.io/static/v1?label=language&message=Ruby&color=CC342D&style=flat&logo=ruby&logoColor=CC342D)
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
 
 > The cure for all your standup woes.
@@ -126,6 +126,13 @@ file:
 - None
 ```
 
+Impediments are not carried forward by default. To copy the previous entry's
+impediments into a new entry, pass `-i` or `--carry-forward-impediments`.
+
+```sh
+standup -i
+```
+
 #### Copy the entry for today to clipboard
 There are also flags that will print entries to the command line. There's a full
 list of features below, but as a quick example, you can copy today's entry to
@@ -220,6 +227,7 @@ StandupMD.configure do |c|
   c.cli.post_adapter       = nil
   c.cli.post_channel       = nil
   c.cli.auto_fill_previous = true
+  c.cli.carry_forward_impediments = false
   c.cli.preference_file    = ::File.expand_path(::File.join(ENV["HOME"], ".standuprc"))
 
   # Defaults for posting standups to chat clients.
@@ -252,6 +260,8 @@ follows.
 -d, --directory DIRECTORY      The directory where standup files are located
 -w, --[no-]write               Write current entry if it doesn't exist. Default is true
 -a, --[no-]auto-fill-previous  Auto-generate 'previous' tasks for new entries
+-i, --[no-]carry-forward-impediments
+                               Carry impediments forward for new entries
 -e, --[no-]edit                Open the file in the editor. Default is true
 -v, --[no-]verbose             Verbose output. Default is false.
     --zsh-completion           Print zsh completion setup instructions
@@ -430,11 +440,11 @@ markdown = parser.render(entries, start_date: entries.first.date, end_date: entr
 runtime = StandupMD.config.copy
 runtime.file.directory = "/tmp/request-standups"
 runtime.entry.current = ["Work scoped to this request"]
+runtime.cli.carry_forward_impediments = true
 
-file = StandupMD::File.find_by_date(Date.today, config: runtime.file).load
-entry = StandupMD::Entry.create(config: runtime.entry)
-file.entries << entry
-file.write
+cli = StandupMD::Cli.new(["--no-edit"], config: runtime)
+entry = cli.entry
+cli.write_file
 ```
 
 ### API Examples

data/Rakefile

@@ -2,13 +2,18 @@
 
 $LOAD_PATH.unshift(File.expand_path("lib", __dir__))
 
-require "standup_md"
 require "bundler/gem_tasks"
 require "rdoc/task"
 require "rake/testtask"
+require "semverve/task"
+require "standup_md"
 
 STANDARD_FILES = ["lib", "test"].freeze
 
+Semverve::Task.new do |t|
+  t.bundle_lock = true
+end
+
 Rake::TestTask.new do |t|
   t.libs = ["lib"]
   t.warning = true
@@ -22,6 +27,8 @@ RDoc::Task.new do |rdoc|
   rdoc.rdoc_files.include("README.md", "lib/**/*.rb")
 end
 
+task default: :test
+
 desc "Lint with the Standard Ruby style guide"
 task :standard do
   require "standard"
@@ -37,50 +44,3 @@ task :"standard:fix" do
   exit_code = Standard::Cli.new(STANDARD_FILES + ["--fix"]).run
   fail unless exit_code.zero?
 end
-
-task default: :test
-
-namespace :version do
-  desc "Print the current version from the version.rb file"
-  task :current do
-    puts StandupMD::VERSION
-  end
-
-  namespace :increment do
-    desc "Increment the version's PATCH level"
-    task :patch do
-      File.join(__dir__, "lib", "standup_md", "version.rb").then do |version_file|
-        File.write(
-          version_file,
-          File.read(version_file).sub(/(PATCH\s=\s)(\d+)/) { "#{$1}#{$2.next}" }
-        )
-      end
-      system("bundle lock")
-    end
-    desc "Increment the version's MINOR level"
-    task :minor do
-      File.join(__dir__, "lib", "standup_md", "version.rb").then do |version_file|
-        File.write(
-          version_file,
-          File.read(version_file)
-            .sub(/(PATCH\s=\s)(\d+)/) { "#{$1}0" }
-            .sub(/(MINOR\s=\s)(\d+)/) { "#{$1}#{$2.next}" }
-        )
-      end
-      system("bundle lock")
-    end
-    desc "Increment the version's MAJOR level"
-    task :major do
-      File.join(__dir__, "lib", "standup_md", "version.rb").then do |version_file|
-        File.write(
-          version_file,
-          File.read(version_file)
-            .sub(/(PATCH\s=\s)(\d+)/) { "#{$1}0" }
-            .sub(/(MINOR\s=\s)(\d+)/) { "#{$1}0" }
-            .sub(/(MAJOR\s=\s)(\d+)/) { "#{$1}#{$2.next}" }
-        )
-      end
-      system("bundle lock")
-    end
-  end
-end

data/completion/zsh/_standup

@@ -66,6 +66,8 @@ _arguments -s -S \
   '(-w --write --no-write)--no-write[do not write current entry if it does not exist]' \
   '(-a --auto-fill-previous --no-auto-fill-previous)'{-a,--auto-fill-previous}'[auto-generate previous tasks for new entries]' \
   '(-a --auto-fill-previous --no-auto-fill-previous)--no-auto-fill-previous[do not auto-generate previous tasks for new entries]' \
+  '(-i --carry-forward-impediments --no-carry-forward-impediments)'{-i,--carry-forward-impediments}'[carry impediments forward for new entries]' \
+  '(-i --carry-forward-impediments --no-carry-forward-impediments)--no-carry-forward-impediments[do not carry impediments forward for new entries]' \
   '(-e --edit --no-edit)'{-e,--edit}'[open the file in the editor]' \
   '(-e --edit --no-edit)--no-edit[do not open the file in the editor]' \
   '(-v --verbose --no-verbose)'{-v,--verbose}'[use verbose output]' \

data/lib/standup_md/cli/helpers.rb

@@ -101,6 +101,11 @@ module StandupMD
             "Auto-generate 'previous' tasks for new entries. Default is true"
           ) { |v| config.cli.auto_fill_previous = v }
 
+          opts.on(
+            "-i", "--[no-]carry-forward-impediments",
+            "Carry impediments forward for new entries. Default is false"
+          ) { |v| config.cli.carry_forward_impediments = v }
+
           opts.on(
             "-e", "--[no-]edit",
             "Open the file in the editor. Default is true"
@@ -170,7 +175,7 @@ module StandupMD
           config.cli.date,
           config.entry.current,
           previous_entry(file),
-          config.entry.impediments,
+          impediments_entry(file),
           config.entry.notes
         ).tap { |e| file.entries << e }
       end
@@ -181,12 +186,20 @@ module StandupMD
       # @return [Array]
       def previous_entry(file)
         return config.entry.previous unless config.cli.auto_fill_previous
-        if file.new?
-          previous_file = prev_file_exists?
-          return prev_entry_tasks(previous_file.load.entries) if previous_file
-        end
 
-        prev_entry_tasks(file.entries)
+        carry_forward_tasks(file, fallback: []) { |entry| entry.current_tasks }
+      end
+
+      ##
+      # The "impediments" tasks.
+      #
+      # @return [Array]
+      def impediments_entry(file)
+        return config.entry.impediments unless config.cli.carry_forward_impediments
+
+        carry_forward_tasks(file, fallback: config.entry.impediments) do |entry|
+          entry.impediments_tasks
+        end
       end
 
       def append_current_entry(entry)
@@ -217,14 +230,19 @@ module StandupMD
         raise OptionParser::InvalidArgument, value
       end
 
-      ##
-      # The previous entry's current tasks.
-      #
-      # @param [StandupMD::EntryList] entries
-      #
-      # @return [Array<StandupMD::Task>]
-      def prev_entry_tasks(entries)
-        entries.empty? ? [] : entries.last.current_tasks
+      def carry_forward_tasks(file, fallback:)
+        entry = carry_forward_entry(file)
+        entry.nil? ? fallback : yield(entry)
+      end
+
+      def carry_forward_entry(file)
+        carry_forward_entries(file).last
+      end
+
+      def carry_forward_entries(file)
+        return file.entries unless file.new?
+
+        find_previous_month_file&.load&.entries || file.entries
       end
 
       ##
@@ -233,14 +251,27 @@ module StandupMD
       # @param [StandupMD::Config::File] config
       #
       # @return [StandupMD::File]
-      def prev_file(config: self.config.file)
+      def previous_month_file(config: self.config.file)
         StandupMD::File.find_by_date(Date.today.prev_month, config: config)
       end
 
-      def prev_file_exists?
-        without_file_creation { |file_config| prev_file(config: file_config) }
-      rescue StandupMD::File::NotFoundError
-        nil
+      def previous_month_file?
+        ::File.file?(previous_month_file_path)
+      end
+
+      def find_previous_month_file
+        return nil unless previous_month_file?
+
+        without_file_creation do |file_config|
+          previous_month_file(config: file_config)
+        end
+      end
+
+      def previous_month_file_path
+        ::File.join(
+          config.file.directory,
+          Date.today.prev_month.strftime(config.file.name_format)
+        )
       end
 
       ##

data/lib/standup_md/cli.rb

@@ -127,7 +127,11 @@ module StandupMD
     # Constructor. Sets defaults.
     #
     # @param [Array] options
-    def initialize(options = [], load_config: true)
+    #
+    # @param [Boolean] load_config
+    #
+    # @param [StandupMD::Config, nil] config
+    def initialize(options = [], load_config: true, config: nil)
       @config = nil
       @preference_file_loaded = false
       @file_date_argument = false
@@ -136,8 +140,8 @@ module StandupMD
       @options = options
       return if load_zsh_completion_request(options)
 
-      load_preferences if load_config
-      @config = StandupMD.config.copy
+      load_preferences if load_config && config.nil?
+      @config = config.nil? ? StandupMD.config.copy : config.copy
       load_runtime_preferences(options)
       return if zsh_completion_requested?
 

data/lib/standup_md/config/cli.rb

@@ -22,6 +22,7 @@ module StandupMD
         post_adapter: nil,
         post_channel: nil,
         auto_fill_previous: true,
+        carry_forward_impediments: false,
         preference_file: ::File.expand_path(
           ::File.join(ENV["HOME"], ".standuprc")
         )
@@ -123,6 +124,15 @@ module StandupMD
       # @return [Boolean]
       attr_accessor :auto_fill_previous
 
+      ##
+      # When writing a new entry, should impediments be pulled from the last
+      # entry?
+      #
+      # @param [Boolean] carry_forward_impediments
+      #
+      # @return [Boolean]
+      attr_accessor :carry_forward_impediments
+
       ##
       # Initializes the config with default values.
       def initialize

data/lib/standup_md/version.rb

@@ -15,13 +15,13 @@ module StandupMD
     # Minor version.
     #
     # @return [Integer]
-    MINOR = 0
+    MINOR = 1
 
     ##
     # Patch version.
     #
     # @return [Integer]
-    PATCH = 1
+    PATCH = 0
 
     ##
     # Version as +[MAJOR, MINOR, PATCH]+

data/standup_md.gemspec

@@ -32,6 +32,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.add_development_dependency "rake", "~> 13.0", ">= 13.0.1"
   spec.add_development_dependency "rdoc"
+  spec.add_development_dependency "semverve"
   spec.add_development_dependency "simplecov"
   spec.add_development_dependency "standard", "~> 1.54.0"
   spec.add_development_dependency "test-unit", "~> 3.3", ">= 3.3.5"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: standup_md
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
 platform: ruby
 authors:
 - Evan Gray
@@ -43,6 +43,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: semverve
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -100,6 +114,7 @@ extra_rdoc_files: []
 files:
 - ".github/workflows/ruby.yml"
 - ".gitignore"
+- ".ruby-version"
 - Gemfile
 - Gemfile.lock
 - LICENSE