howzit 2.0.12 → 2.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 700c444e11477c62c6de0f06b81b3029b21f3363f507c5a6cab927f2365d2be5
-  data.tar.gz: be862c2c31427abae2428a024009aea0f73885a5dc9652c5d2b5f308c181ca3b
+  metadata.gz: e269532605e044c35e2a0ebe322fe51ba5199d690a57385a358a3bad4fc2921f
+  data.tar.gz: 4ca045a0c3c2d1627b04a47363beb8e2de6718f5c708e1f4bf96285af96e09d4
 SHA512:
-  metadata.gz: d07c309680eef72f5edb3b41d40354aa9cefa1b6efebd1c0dfbaa59f7cbfc95c6211433f081b6f21afa069cd5ae30f79dc42f1a4a08c96680b533b16519ca25b
-  data.tar.gz: '08ca9d51ec3793c1750d70f500bde1e68c1f327cd41d0b92839c317d6a421f96cbb8ef2f03204ab6cfe1ddb1d83a497084aa9590233d6ceb860921fdb473267e'
+  metadata.gz: 803b06d4a85632357eb1e61a898f88c39971df388107a62f67479e34788346f1824f78a3b3473cf5ee45dc445a494e7a144590d5df33ffd1b73d2114ba19049d
+  data.tar.gz: 51c6ec7213c4b7c531e53c32140dc485d897f40ee79d242ee8ec446804ad0edac8a9bac61d3b68189bf60884a3dbee28fe6d5f5f3040dae23ec8cb7ddb24903c

data/.rubocop.yml

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

data/.travis.yml

@@ -4,10 +4,10 @@ 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*'"

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+### 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

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/version.rb

@@ -3,5 +3,5 @@
 # Primary module for this gem.
 module Howzit
   # Current Howzit version.
-  VERSION = '2.0.12'
+  VERSION = '2.0.13'
 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.12
+  version: 2.0.13
 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