howzit 1.2.5 → 1.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f2fa88b6f75dba8846894028f457fa1515d104bb41c77307bd0b22835afeed8
-  data.tar.gz: 64a7169ae4968d94f0193d784924a6a36bf36d3389cefdd8dc15a1d916292548
+  metadata.gz: ca091b1137f05559c0e53738d8cf283e3e301bbd434b3241a54592ded4aac39a
+  data.tar.gz: 99f0a601a6d2655954da642621df18573f15bcefe44ccb458b3ef61f397ec92b
 SHA512:
-  metadata.gz: 52e107f32837a775c115a9f2051a8347458e9194972f36fd1af42888e70d567ddc48bc51411335ad037d497c0d86abe38171f7b1064945c7b77671cb4a7a3afb
-  data.tar.gz: 9c67de8ad8748e365753194d59f4cbc1a73a590f0291289ab20e1558077114d531fe3b6b957d38204dfaace53e7d5e84a2c4743ee3ae33d4fa160828d97478fb
+  metadata.gz: 24215ee9b271df785dedee31da6f2bf3ecbc4be69231635ee0d77a6e9a76b5fa1507e4125ee9b896cc15559842d7546302f25a789b726a87a7a4a3531a6a49bf
+  data.tar.gz: a1754b95775992055ba92a294215bc9680e296f932cf2d2664a0e00e9d5442742469ac2f51e8acd741f788b49a9b39053083c4cd0d271d7aa2db167394fb343e

data/README.md

@@ -2,10 +2,6 @@
 
 [![Gem](https://img.shields.io/gem/v/howzit.svg)](https://rubygems.org/gems/howzit)
 [![GitHub license](https://img.shields.io/github/license/ttscoff/howzit.svg)](./LICENSE.txt)
-[![Gemnasium](https://img.shields.io/gemnasium/ttscoff/howzit.svg)](https://gemnasium.com/ttscoff/howzit)
-[![Travis](https://img.shields.io/travis/ttscoff/howzit.svg)](https://travis-ci.org/ttscoff/howzit)
-[![Codecov](https://img.shields.io/codecov/c/github/ttscoff/howzit.svg)](https://codecov.io/github/ttscoff/howzit)
-[![Code Climate](https://img.shields.io/codeclimate/github/ttscoff/howzit.svg)](https://codeclimate.com/github/ttscoff/howzit)
 
 A command-line reference tool for tracking project build systems
 

data/howzit.gemspec

@@ -39,4 +39,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'github-markup', '~> 1.3'
 
   spec.add_runtime_dependency 'mdless', '~> 1.0', '>= 1.0.28'
+  spec.add_runtime_dependency 'tty-screen', '~> 0.8'
 end

data/lib/howzit/buildnotes.rb

@@ -1,6 +1,8 @@
 module Howzit
   # Primary Class for this module
   class BuildNotes
+    include Prompt
+
     attr_accessor :arguments, :metadata
 
     def topics
@@ -108,7 +110,6 @@ module Howzit
       options = {
         color: true,
         highlight: false,
-        paginate: false,
         wrap: 0
       }
 
@@ -124,14 +125,17 @@ module Howzit
 
       output = `echo #{Shellwords.escape(string.strip)}#{pipes}`
 
-      if options[:paginate]
+      if @options[:paginate]
         page(output)
       else
-        output.gsub!(/^╌/, '\e]1337;SetMark\a╌') if ENV['TERM_PROGRAM'] =~ /^iTerm/ && !options[:run]
         puts output
       end
     end
 
+    def iterm_marker
+      "\e]1337;SetMark\a\n" if ENV['TERM_PROGRAM'] =~ /^iTerm/ && !@options[:run] && !@options[:paginate]
+    end
+
     def color_single_options(choices = %w[y n])
       out = []
       choices.each do |choice|
@@ -153,16 +157,9 @@ module Howzit
       end
       # First make sure there isn't already a buildnotes file
       if note_file
-        system 'stty cbreak'
         fname = "\e[1;33m#{note_file}\e[1;37m"
-        yn = color_single_options(%w[y N])
-        $stdout.syswrite "#{fname} exists and appears to be a build note, continue anyway #{yn}\e[1;37m? \e[0m"
-        res = $stdin.sysread 1
-        res.chomp!
-        puts
-        system 'stty cooked'
-
-        unless res =~ /y/i
+        res = yn("#{fname} exists and appears to be a build note, continue anyway?", false)
+        unless res
           puts 'Canceled'
           Process.exit 0
         end
@@ -209,16 +206,10 @@ module Howzit
       EOBUILDNOTES
 
       if File.exist?(filename)
-        system 'stty cbreak'
-        yn = color_single_options(%w[y N])
         file = "\e[1;33m#{filename}"
-        $stdout.syswrite "\e[1;37mAre you absolutely sure you want to overwrite #{file} #{yn}\e[1;37m? \e[0m"
-        res = $stdin.sysread 1
-        res.chomp!
-        puts
-        system 'stty cooked'
+        res = yn("Are you absolutely sure you want to overwrite #{file}", false)
 
-        unless res =~ /y/i
+        unless res
           puts 'Canceled'
           Process.exit 0
         end
@@ -240,11 +231,11 @@ module Howzit
 
       options.merge!(opts)
 
-      cols = `tput cols`.strip.to_i
+      cols = TTY::Screen.columns
       cols = @options[:wrap] if (@options[:wrap]).positive? && cols > @options[:wrap]
       title = "\e[#{options[:border]}m#{options[:hr]}#{options[:hr]}( \e[#{options[:color]}m#{title}\e[#{options[:border]}m )"
       tail = options[:hr] * (cols - title.uncolor.length)
-      "#{title}#{tail}\e[0m"
+      options[:hr] =~ /╌/ ? "#{iterm_marker}#{title}#{tail}\e[0m" : "#{title}#{tail}\e[0m"
     end
 
     def os_open(command)
@@ -283,6 +274,15 @@ module Howzit
       output = []
       tasks = 0
       if topics[key] =~ /(@(include|run|copy|open|url)\((.*?)\)|`{3,}run)/i
+        prereqs = topics[key].scan(/(?<=@before\n).*?(?=\n@end)/im).map(&:strip)
+        postreqs = topics[key].scan(/(?<=@after\n).*?(?=\n@end)/im).map(&:strip)
+
+        unless prereqs.empty?
+          puts prereqs.join("\n\n")
+          res = yn('This task has prerequisites, have they been met?', true)
+          Process.exit 1 unless res
+
+        end
         directives = topics[key].scan(/(?:@(include|run|copy|open|url)\((.*?)\)|(`{3,})run(?: +([^\n]+))?(.*?)\3)/mi)
 
         tasks += directives.length
@@ -333,6 +333,8 @@ module Howzit
         warn "\e[0;31m--run: No \e[1;31m@directive\e[0;31;40m found in \e[1;37m#{key}\e[0m"
       end
       output.push("Ran #{tasks} #{tasks == 1 ? 'task' : 'tasks'}") if @options[:log_level] < 2
+
+      puts postreqs.join("\n\n")
     end
 
     # Output a topic with fancy title and bright white text.
@@ -349,6 +351,8 @@ module Howzit
       topic.gsub!(/(?mi)^(`{3,})run *([^\n]*)[\s\S]*?\n\1\s*$/, '@@@run \2') unless @options[:show_all_code]
       topic.split(/\n/).each do |l|
         case l
+        when /@(before|after|prereq|end)/
+          next
         when /@include\((.*?)\)/
 
           m = Regexp.last_match
@@ -837,14 +841,9 @@ module Howzit
       raise 'No EDITOR variable defined in environment' if ENV['EDITOR'].nil?
 
       if note_file.nil?
-        system 'stty cbreak'
-        yn = color_single_options(%w[Y n])
-        $stdout.syswrite "No build notes file found, create one #{yn}? "
-        res = $stdin.sysread 1
-        puts
-        system 'stty cooked'
-
-        create_note if res.chomp =~ /^y?$/i
+        res = yn("No build notes file found, create one?", true)
+
+        create_note if res
         edit_note
       else
         `#{ENV['EDITOR']} "#{note_file}"`
@@ -1064,14 +1063,8 @@ module Howzit
         ARGV.length.times do
           ARGV.shift
         end
-        system 'stty cbreak'
-        yn = color_single_options(%w[Y n])
-        $stdout.syswrite "No build notes file found, create one #{yn}? "
-        res = $stdin.sysread 1
-        puts
-        system 'stty cooked'
-
-        create_note if res.chomp =~ /^y?$/i
+        res = yn("No build notes file found, create one?", true)
+        create_note if res
         Process.exit 1
       end
 

data/lib/howzit/prompt.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Howzit
+  module Prompt
+  	def yn(prompt, default = true)
+    	system 'stty cbreak'
+    	yn = color_single_options(default ? %w[Y n] : %w[y N])
+    	$stdout.syswrite "\e[1;37m#{prompt} #{yn}\e[1;37m? \e[0m"
+    	res = $stdin.sysread 1
+    	res.chomp!
+    	puts
+    	system 'stty cooked'
+    	res =~ /y/i
+    end
+  end
+end

data/lib/howzit/stringutils.rb

@@ -5,7 +5,7 @@ module Howzit
   module StringUtils
     # Just strip out color codes when requested
     def uncolor
-      gsub(/\e\[[\d;]+m/, '')
+      gsub(/\e\[[\d;]+m/, '').gsub(/\e]1337;SetMark/,'')
     end
 
     # Adapted from https://github.com/pazdera/word_wrap/,

data/lib/howzit/version.rb

@@ -2,5 +2,5 @@
 # Primary module for this gem.
 module Howzit
   # Current Howzit version.
-  VERSION = '1.2.5'.freeze
+  VERSION = '1.2.6'.freeze
 end

data/lib/howzit.rb

@@ -1,4 +1,5 @@
 require 'howzit/version'
+require 'howzit/prompt'
 require 'howzit/buildnotes'
 require 'howzit/stringutils'
 require 'optparse'
@@ -8,6 +9,8 @@ require 'readline'
 require 'tempfile'
 require 'yaml'
 
+require 'tty/screen'
+
 CONFIG_DIR = '~/.config/howzit'
 CONFIG_FILE = 'howzit.yaml'
 IGNORE_FILE = 'ignore.yaml'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: howzit
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.2.6
 platform: ruby
 authors:
 - Brett Terpstra
@@ -240,6 +240,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.28
+- !ruby/object:Gem::Dependency
+  name: tty-screen
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
 description: Command line project documentation and task runner
 email:
 - me@brettterpstra.com
@@ -269,6 +283,7 @@ files:
 - lib/.rubocop.yml
 - lib/howzit.rb
 - lib/howzit/buildnotes.rb
+- lib/howzit/prompt.rb
 - lib/howzit/stringutils.rb
 - lib/howzit/version.rb
 - spec/.rubocop.yml