doing 2.1.10 → 2.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2c60c7dbce3b8c11e37f56b4072c1685a87df9f8c77e937cc17dbb3672001939
-  data.tar.gz: 66a9906024cc16f65159207d608c741a83300c95dd99a3fae6ac3c50d0848aa9
+  metadata.gz: d1b58e7951de262f97661e6d4d5c451e87a27b513e1cb1eed5fd83ce9d2d28cf
+  data.tar.gz: 64021965e62aa9229f033f76d94a11bbb04ae409bbec7bb280df168448f0f33b
 SHA512:
-  metadata.gz: 389ec0da4647c43291f2611111e0ccafd4e50855d3e9772ea67a3c564b858d509aece9d302b194789a27f400991e9eb91829dae26ad628b4acbb22def1578c8b
-  data.tar.gz: cfb58baff7b8485dfaee0d68e81566e6ab72871275edb597d49cab9645b08ff8bcfd1bd028fcbc9911ceaec6ef4e92b0e50532499e5ecd3fb30a389f49da4e13
+  metadata.gz: 933fb7fdc3c4cc71c2c4f149d28a530cfe77c2f6aa985919b6a37747ee87a5f86ea09622e4e38eec71d8031bb9e5086e4d4276ac399a4ffb637ac55321397e02
+  data.tar.gz: 838122157c1763e4c46b3121355e30d3ad2b580926e741b8bd47a6219e284a0f9ec0caa67c813b7c22be549ed14bf057db6c2ebc7607a013c3415a24b3784eed

data/CHANGELOG.md

@@ -1,3 +1,23 @@
+### 2.1.11
+
+#### NEW
+
+- Tag_dir command creates/updates .doingrc files in the current directory with default_tags values. Then all entries created within that directory (or subdirs) get tagged with that value.
+- Synonym triggers allow `*` and `?` wildcards
+- Add `--delete` flag for `doing last` to delete last entry
+- --delete and --editor flags for `doing search`, batch edit and delete
+- Example hook to add new entries containing a certain tag to Day One
+- New hooks: pre_entry_add, post_entry_added, post_entry_updated, post_entry_removed, pre_export
+
+#### IMPROVED
+
+- If you need to use a colon in an autotag transform pattern, you can split with double colon, e.g. pattern::replacement
+- Arrays defined in local configurations merge with main config instead of overwriting
+
+#### FIXED
+
+- `doing tags --interactive` wasn't showing menu
+
 ### 2.1.10
 
 #### NEW

data/Dockerfile

@@ -0,0 +1,9 @@
+FROM ruby:3.0.1
+RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
+RUN mkdir /doing
+WORKDIR /doing
+COPY ./ /doing/
+RUN gem install bundler:2.2.17
+# RUN bundle update --bundler
+RUN bundle install
+CMD ["rake", "parallel:test"]

data/Dockerfile-2.6

@@ -0,0 +1,9 @@
+FROM ruby:2.6
+RUN mkdir /doing
+WORKDIR /doing
+COPY ./ /doing/
+RUN gem install bundler:2.2.17
+# RUN bundle update --bundler
+RUN bundle install
+# ENTRYPOINT rake parallel:test
+CMD ["rake", "parallel:test"]

data/Dockerfile-2.7

@@ -0,0 +1,8 @@
+FROM ruby:2.7
+RUN mkdir /doing
+WORKDIR /doing
+COPY ./ /doing/
+RUN gem install bundler:2.2.17
+# RUN bundle update --bundler
+RUN bundle install
+CMD ["rake", "parallel:test"]

data/Dockerfile-3.0

@@ -0,0 +1,8 @@
+FROM ruby:3.0.0
+RUN mkdir /doing
+WORKDIR /doing
+COPY ./ /doing/
+RUN gem install bundler:2.2.17
+# RUN bundle update --bundler
+RUN bundle install
+CMD ["rake", "parallel:test"]

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    doing (2.1.10)
+    doing (2.1.11)
       chronic (~> 0.10, >= 0.10.2)
       deep_merge (~> 1.2, >= 1.2.1)
       gli (~> 2.19, >= 2.19.2)

data/README.md

@@ -6,7 +6,7 @@ _If you're one of the rare people like me who find this useful, feel free to [bu
 
 <!--README-->
 
-The current version of `doing` is <!--VER-->2.1.9<!--END VER-->.
+The current version of `doing` is <!--VER-->2.1.10<!--END VER-->.
 
 Find all of the documentation in the [doing wiki](https://github.com/ttscoff/doing/wiki).
 

data/Rakefile

@@ -8,6 +8,7 @@ require 'open3'
 require 'yard'
 require 'parallel_tests'
 require 'parallel_tests/tasks'
+require 'tty-spinner'
 
 YARD::Rake::YardocTask.new do |t|
  t.files = ['lib/doing/*.rb']
@@ -38,21 +39,54 @@ end
 namespace :test do
 
   FileList['test/*_test.rb'].each do |rakefile|
-    test_name = File.basename(rakefile, '.rb').sub(%r{^.*?_(.*?)_.*?$}, '\1')
+    test_name = File.basename(rakefile, '.rb').sub(/^.*?_(.*?)_.*?$/, '\1')
 
     Rake::TestTask.new(:"#{test_name}") do |t|
       t.libs << ['test', 'test/helpers']
       t.pattern = rakefile
       t.verbose = ENV['VERBOSE'] =~ /(true|1)/i ? true : false
     end
-    #Define default task for :test
-    task :default => test_name
+    # Define default task for :test
+    task default: test_name
   end
+end
+
+desc 'Run tests in Docker'
+task :dockertest, :version, :login do |_, args|
+  args.with_defaults(version: '2.7', login: false)
+  case args[:version]
+  when /^3/
+    img = 'doingtest3'
+    file = 'Dockerfile-3.0'
+  when /6$/
+    img = 'doingtest26'
+    file = 'Dockerfile-2.6'
+  when /(^2|7$)/
+    img = 'doingtest27'
+    file = 'Dockerfile-2.7'
+  else
+    img = 'doingtest'
+    file = 'Dockerfile'
+  end
+
+  exec "docker run -it #{img} /bin/bash -l" if args[:login]
+
+  puts `docker build . --file #{file} -t #{img}`
+
+  spinner = TTY::Spinner.new('[:spinner] Running tests ...', hide_cursor: true)
+
+  spinner.auto_spin
+  res = `docker run --rm -it #{img}`
+  # commit = puts `bash -c "docker commit $(docker ps -a|grep #{img}|awk '{print $1}'|head -n 1) #{img}"`.strip
+  spinner.success
+  spinner.stop
 
+  puts res
+  # puts commit&.empty? ? "Error commiting Docker tag #{img}" : "Committed Docker tag #{img}"
 end
 
-desc "Run all tests"
-task :test => 'test:default'
+desc 'Run all tests'
+task test: 'test:default'
 
 desc 'Run one test verbosely'
 task :test_one, :test do |_, args|