howzit 2.0.11 → 2.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 700ee2e9d73bdfcfeea142ed992c442119513428c7f4ceca415df2c3c792c844
-  data.tar.gz: c13005486bfac3f5add20bc1076a89f5b9cfad43288c9d5661d059d35271f1d7
+  metadata.gz: a4ce43666235573b6b74c77d0dcb6e1f4c1a45fb8b9cd516747698f56cc3723d
+  data.tar.gz: c13702a3d4b7b2ad707890d3f9d8c2a75e92fba1c732689f1930b511254db742
 SHA512:
-  metadata.gz: dd6f68ba71489fcc87a9cc833ba7ab1c28fa0e680d12f92f09cf59e82bb1e289390a75631a69437c9f1f64e3f0dad470f7c783f5200affdad78e96cec14e35bc
-  data.tar.gz: 9eec9ae3a192de290026b129c81d97ec2a76940e14ea3f958b60e899bbb8a2951923cbf0186a9cecf4a0dae471a46cdc144157aa85df8d764026af70911bbdd2
+  metadata.gz: 586fcb6d9e5bfd901a3e4d33ff9044c57ae50a97cb0a19e8c2d9e5b57dec6771b432e0dc83e28a924824cc04a758ce4397d0f74b7efb2d343181c262f92c636b
+  data.tar.gz: 5f0eac9f6e53ed64ea159630e0f979f9cc8d8734b95186316b924e1e75e752b7a189d02eb1c178c15050676988356b391cfbc19f3da9eacb61d21051b474188e

data/.rubocop.yml

@@ -6,6 +6,7 @@ AllCops:
 
 Metrics/BlockLength:
   Exclude:
+    - Rakefile
     - bin/howzit
     - lib/*.rb
 

data/.travis.yml

@@ -4,10 +4,13 @@ sudo: required
 dist: trusty
 cache: bundler
 rvm:
+  - ruby-2.6.4
   - ruby-2.7.0
   - ruby-3.0.1
 install:
-  - gem uninstall bundler
   - gem install bundler --version '2.2.29'
   - bundle install
 script: "bundle exec rspec spec --exclude-pattern 'cli*'"
+branches:
+  only:
+  - master

data/CHANGELOG.md

@@ -1,3 +1,27 @@
+### 2.0.14
+
+2022-08-05 13:24
+
+#### FIXED
+
+- Travis CI fixes
+
+### 2.0.13
+
+2022-08-05 13:19
+
+#### IMPROVED
+
+- Add tests for more ruby versions via Docker
+
+### 2.0.12
+
+2022-08-05 11:27
+
+#### IMPROVED
+
+- Show how many tasks will be included when requesting confirmation for an include? directive
+
 ### 2.0.11
 
 2022-08-05 11:21

data/Rakefile

@@ -5,6 +5,7 @@ require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 require 'rubocop/rake_task'
 require 'yard'
+require 'tty-spinner'
 
 task default: %i[test yard]
 
@@ -34,3 +35,43 @@ desc 'Changelog version check'
 task :cver do
   puts IO.read(File.join(File.dirname(__FILE__), 'CHANGELOG.md')).match(/^#+ (\d+\.\d+\.\d+(\w+)?)/)[1]
 end
+
+desc 'Run tests in Docker'
+task :dockertest, :version, :login do |_, args|
+  args.with_defaults(version: 'all', login: false)
+  case args[:version]
+  when /^a/
+    %w[6 7 3].each do |v|
+      Rake::Task['dockertest'].reenable
+      Rake::Task['dockertest'].invoke(v, false)
+    end
+    Process.exit 0
+  when /^3/
+    img = 'howzittest3'
+    file = 'docker/Dockerfile-3.0'
+  when /6$/
+    img = 'howzittest26'
+    file = 'docker/Dockerfile-2.6'
+  when /(^2|7$)/
+    img = 'howzittest27'
+    file = 'docker/Dockerfile-2.7'
+  else
+    img = 'howzittest'
+    file = 'docker/Dockerfile'
+  end
+
+  puts `docker build . --file #{file} -t #{img}`
+
+  exec "docker run -v #{File.dirname(__FILE__)}:/howzit -it #{img} /bin/bash -l" if args[:login]
+
+  spinner = TTY::Spinner.new('[:spinner] Running tests ...', hide_cursor: true)
+
+  spinner.auto_spin
+  res = `docker run --rm -v #{File.dirname(__FILE__)}:/howzit -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

data/bin/howzit

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby -W1
+#!/usr/bin/env ruby
 # frozen_string_literal: true
 
 $LOAD_PATH.unshift File.join(__dir__, '..', 'lib')

data/docker/Dockerfile

@@ -0,0 +1,11 @@
+FROM ruby:3.0.1
+# RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
+RUN mkdir /howzit
+WORKDIR /howzit
+# COPY ./ /howzit/
+RUN gem install bundler:2.2.17
+RUN apt-get update -y
+RUN apt-get install -y less vim
+COPY ./docker/inputrc /root/.inputrc
+COPY ./docker/bash_profile /root/.bash_profile
+CMD ["scripts/runtests.sh"]

data/docker/Dockerfile-2.6

@@ -0,0 +1,11 @@
+FROM ruby:2.6
+# RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
+RUN mkdir /howzit
+WORKDIR /howzit
+# COPY ./ /howzit/
+RUN gem install bundler:2.2.17
+RUN apt-get update -y
+RUN apt-get install -y less vim
+COPY ./docker/inputrc /root/.inputrc
+COPY ./docker/bash_profile /root/.bash_profile
+CMD ["scripts/runtests.sh"]

data/docker/Dockerfile-2.7

@@ -0,0 +1,11 @@
+FROM ruby:2.7
+# RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
+RUN mkdir /howzit
+WORKDIR /howzit
+# COPY ./ /howzit/
+RUN gem install bundler:2.2.17
+RUN apt-get update -y
+RUN apt-get install -y less vim
+COPY ./docker/inputrc /root/.inputrc
+COPY ./docker/bash_profile /root/.bash_profile
+CMD ["scripts/runtests.sh"]

data/docker/Dockerfile-3.0

@@ -0,0 +1,11 @@
+FROM ruby:3.0.0
+# RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
+RUN mkdir /howzit
+WORKDIR /howzit
+# COPY ./ /howzit/
+RUN gem install bundler:2.2.17
+RUN apt-get update -y
+RUN apt-get install -y less vim
+COPY ./docker/inputrc /root/.inputrc
+COPY ./docker/bash_profile /root/.bash_profile
+CMD ["scripts/runtests.sh"]

data/docker/bash_profile

@@ -0,0 +1,13 @@
+#!/bin/bash
+export GLI_DEBUG=true
+export EDITOR="/usr/bin/vim"
+alias b="bundle exec bin/howzit"
+
+shopt -s nocaseglob
+shopt -s histappend
+shopt -s histreedit
+shopt -s histverify
+shopt -s cmdhist
+
+cd /howzit
+bundle install

data/docker/inputrc

@@ -0,0 +1,57 @@
+"\e[3~": delete-char
+"\ex": 'cd !$ \015ls\015'
+"\ez": 'cd -\015'
+"\e\C-m": '\C-a "$(\C-e|fzf)"\C-a'
+"\e/": '"$(!!|fzf)"\C-a \C-m\C-m'
+# these allow you to use alt+left/right arrow keys
+# to jump the cursor over words
+"\e[1;5C": forward-word
+"\e[1;5D": backward-word
+# "\e[D": backward-word
+# "\e[C": forward-word
+"\ea": menu-complete
+# TAB: menu-complete
+# "\e[Z": "\e-1\C-i"
+
+"\e\C-l": history-and-alias-expand-line
+
+# these allow you to start typing a command and
+# use the up/down arrow to auto complete from
+# commands in your history
+"\e[B": history-search-forward
+"\e[A": history-search-backward
+"\ew": history-search-backward
+"\es": history-search-forward
+# this lets you hit tab to auto-complete a file or
+# directory name ignoring case
+set completion-ignore-case On
+set mark-symlinked-directories On
+set completion-prefix-display-length 2
+set bell-style none
+# set bell-style visible
+set meta-flag on
+set convert-meta off
+set input-meta on
+set output-meta on
+set show-all-if-ambiguous on
+set show-all-if-unmodified on
+set completion-map-case on
+set visible-stats on
+
+# Do history expansion when space entered?
+$if bash
+	Space: magic-space
+$endif
+
+# Show extra file information when completing, like `ls -F` does
+set visible-stats on
+
+# Be more intelligent when autocompleting by also looking at the text after
+# the cursor. For example, when the current line is "cd ~/src/mozil", and
+# the cursor is on the "z", pressing Tab will not autocomplete it to "cd
+# ~/src/mozillail", but to "cd ~/src/mozilla". (This is supported by the
+# Readline used by Bash 4.)
+set skip-completed-text on
+
+# Use Alt/Meta + Delete to delete the preceding word
+"\e[3;3~": kill-word

data/howzit.gemspec

@@ -38,6 +38,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'yard', '~> 0.9.5'
   spec.add_development_dependency 'redcarpet', '~> 3.2'
   spec.add_development_dependency 'github-markup', '~> 1.3'
+  spec.add_development_dependency 'tty-spinner', '~> 0.9'
 
   spec.add_runtime_dependency 'mdless', '~> 1.0', '>= 1.0.28'
   spec.add_runtime_dependency 'tty-screen', '~> 0.8'

data/lib/howzit/topic.rb

@@ -52,7 +52,13 @@ module Howzit
 
         @tasks.each do |task|
           if task.optional
-            q = %({bg}#{task.type.to_s.capitalize} {xw}"{bw}#{task.title}{xw}"{x}).c
+            note = if task.type == :include
+                     task_count = Howzit.buildnote.find_topic(task.action)[0].tasks.count
+                     " (#{task_count} tasks)"
+                   else
+                     ""
+                   end
+            q = %({bg}#{task.type.to_s.capitalize} {xw}"{bw}#{task.title}{xw}"#{note}{x}).c
             res = Prompt.yn(q, default: task.default)
             next unless res
 
@@ -81,7 +87,7 @@ module Howzit
 
               $stderr.puts "{by}Running tasks from {bw}#{matches[0].title}{x}".c if Howzit.options[:log_level] < 2
               output.push(matches[0].run(nested: true))
-              $stderr.puts "{by}End include: #{matches[0].tasks.count} tasks".c if Howzit.options[:log_level] < 2
+              $stderr.puts "{by}End include: #{matches[0].tasks.count} tasks{x}".c if Howzit.options[:log_level] < 2
               tasks += matches[0].tasks.count
             when :run
               $stderr.puts "{bg}Running {bw}#{title}{x}".c if Howzit.options[:log_level] < 2

data/lib/howzit/version.rb

@@ -3,5 +3,5 @@
 # Primary module for this gem.
 module Howzit
   # Current Howzit version.
-  VERSION = '2.0.11'
+  VERSION = '2.0.14'
 end

data/scripts/runtests.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+bundle install
+rake test

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: howzit
 version: !ruby/object:Gem::Version
-  version: 2.0.11
+  version: 2.0.14
 platform: ruby
 authors:
 - Brett Terpstra
@@ -220,6 +220,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: tty-spinner
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: mdless
   requirement: !ruby/object:Gem::Requirement
@@ -289,6 +303,12 @@ files:
 - README.md
 - Rakefile
 - bin/howzit
+- docker/Dockerfile
+- docker/Dockerfile-2.6
+- docker/Dockerfile-2.7
+- docker/Dockerfile-3.0
+- docker/bash_profile
+- docker/inputrc
 - fish/completions/bld.fish
 - fish/completions/fisher.fish
 - fish/completions/howzit.fish
@@ -307,6 +327,7 @@ files:
 - lib/howzit/topic.rb
 - lib/howzit/util.rb
 - lib/howzit/version.rb
+- scripts/runtests.sh
 - spec/.rubocop.yml
 - spec/buildnote_spec.rb
 - spec/cli_spec.rb