runfile 0.11.2 → 0.12.0.pre.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f1e4e930d902a8bb8db9d283e1cf7c33fb26c5e1dfdf77b03d5be0a3acc01609
-  data.tar.gz: cf2bf1976c2dee358a8bbd2b9465b871bc6c9630c0ca7f091000b2464615370c
+  metadata.gz: 4ee58eaa893425817219f8fa94a2e96a7789363dc3082f3f8c520130357199e6
+  data.tar.gz: 607dc6702aeb3b9ec09f71c88c32292c98f3a0b7c1c6dfefbfbdb1cec02e5738
 SHA512:
-  metadata.gz: 9eaadbedb085b6a8ef13078327b2260c82fc86baebf2292868eb7d37c166206e8b529a82a67e39fbe3a1087271308d5f750ff07bea8c515e9b065d7e413cdf65
-  data.tar.gz: f837dd093b39741dabc2e67813bcd21f9ff7bdac3b52cb90990fe9b568f90801e5c344e697224ddce095af478fc7e92ace4d5be8867c97827b4627f93dd7535e
+  metadata.gz: be7893890fc0075e964c49bf3aea294b6337bf5440f0ccea2d56a223439fa7eaa5128cad2d9e8bff57798d77ec55b5c686f10acc7726f2d7b9de6f74d55ca4b7
+  data.tar.gz: b0e1b8aa6a11d96433c8bbcf09d92d3838ff6a7e1959b34542b16286d5248a76d0bf6f83fedb8f6520fe880d60450b65c72a052dcc79e79d4e292972de6b5ba4

data/README.md

@@ -1,5 +1,7 @@
-Runfile - If Rake and Docopt had a baby
-==================================================
+<div align='center'>
+<img src='logo.svg' width=280>
+
+# Runfile - command line for your projects
 
 [![Gem Version](https://badge.fury.io/rb/runfile.svg)](https://badge.fury.io/rb/runfile)
 [![Build Status](https://github.com/DannyBen/runfile/workflows/Test/badge.svg)](https://github.com/DannyBen/runfile/actions?query=workflow%3ATest)
@@ -7,11 +9,13 @@ Runfile - If Rake and Docopt had a baby
 
 ---
 
-A beautiful command line application framework.  
-Rake-inspired, Docopt inside.
+A beautiful command line application framework  
+Rake-inspired - Docopt inside
 
 ---
 
+</div>
+
 **Runfile** lets you create command line applications in a way similar 
 to [Rake](https://github.com/ruby/rake), but with the full power of 
 [Docopt](http://docopt.org/) command line options.
@@ -21,26 +25,7 @@ You create a `Runfile`, and execute commands with
 
 ![Runfile Demo](demo.svg "Runfile Demo")
 
-[Learn More in the User Guide](https://runfile.dannyb.co)
-
----
-
-**Upgrade Notice:**  
-If you are upgrading to 0.9.x - the `name` command was replaced 
-with `title`.
-
----
-
-Install
---------------------------------------------------
-
-```shell
-$ gem install runfile
-```
-
-
-Quick Start
---------------------------------------------------
+## Quick Start
 
 ```shell
 $ run new        # create a new Runfile
@@ -49,8 +34,7 @@ $ vi Runfile     # edit the Runfile
 ```
 
 
-Example
---------------------------------------------------
+## Example
 
 The most minimal `Runfile` looks like this:
 
@@ -63,14 +47,14 @@ end
 
 You can then run it by executing this command:
 
-```
+```shell
 $ run greet Luke
 Hello Luke
 ```
 
 Executing `run` without parameters, will show the usage patterns:
 
-```
+```shell
 $ run
 Usage:
   run greet <name>
@@ -79,7 +63,7 @@ Usage:
 
 Executing `run --help` will show the full help document (docopt)
 
-```
+```shell
 $ run --help
 Runfile 0.0.0
 
@@ -95,30 +79,13 @@ Options:
       Show version
 ```
 
+## Documentation
 
-Runfile per project or global Runfiles
---------------------------------------------------
-
-In addition to the per project `Runfile` files, it is also possible to 
-create global runfiles that are accessible to you only or to anybody on 
-the system.
-
-When you execute `run`, we will look for files in this order:
-
-- `Runfile` in the current directory
-- `*.runfile` in the current directory
-- `~/runfile/**/*.runfile`
-- `/etc/runfile/**/*.runfile`
-
-When you execute `run!`, we will ignore any local Runfile and only search 
-for global (named) runfiles.
-
-Read more on [Runfile Location and Filename](https://runfile.dannyb.co/Runfile-Location-and-Filename)
+- [User Guide](https://runfile.dannyb.co/)
+- [Learn by Example](https://github.com/DannyBen/runfile/tree/master/examples#readme)
 
+## Contributing / Support
 
-Documentation
---------------------------------------------------
+If you experience any issue, have a question or a suggestion, or if you wish
+to contribute, feel free to [open an issue](https://github.com/DannyBen/runfile/issues).
 
-- [User Guide](https://runfile.dannyb.co)
-- [Learn by Example](https://github.com/DannyBen/runfile/tree/master/examples)
-- [Rubydoc](http://www.rubydoc.info/gems/runfile)

data/bin/run

@@ -5,7 +5,6 @@ require 'runfile'
 # for dev
 # require File.dirname(__FILE__) + "/../lib/runfile"
 
-include Colsole
 include Runfile::DSL
 
 Runfile::Runner.instance.execute ARGV

data/bin/run!

@@ -11,7 +11,6 @@ require 'runfile'
 # for dev
 # require File.dirname(__FILE__) + "/../lib/runfile"
 
-include Colsole
 include Runfile::DSL
 
 Runfile::Runner.instance.execute ARGV, false

data/lib/runfile/docopt_helper.rb

@@ -1,5 +1,4 @@
 require 'docopt'
-require 'colsole'
 
 module Runfile
   # The DocoptHelper class handles the dynamic generation of the 
@@ -7,7 +6,7 @@ module Runfile
   # to call Docopt so it returns the parsed arguments or halts with
   # usage message).
   class DocoptHelper
-    include Colsole
+    using Refinements
 
     # The constructor expects to an object that responds to all the 
     # textual details needed to generate a docopt document (name, version, 
@@ -30,7 +29,7 @@ module Runfile
     # Generate a document based on all the actions, help messages
     # and options we have collected from the Runfile DSL.
     def docopt
-      width = detect_terminal_size[0]
+      width = Terminal.width
       doc = []
       doc << (@version ? "#{@name} #{@version}" : "#{@name}")
       doc << "#{@summary}" if @summary
@@ -67,7 +66,7 @@ module Runfile
         doc << "Commands:" unless caption_printed
         caption_printed = true
         helpline = "      #{action.help}"
-        wrapped  = word_wrap helpline, width
+        wrapped  = helpline.word_wrap width
         doc << "  #{action.usage}\n#{wrapped}\n" unless action.usage == false
       end
       doc
@@ -99,7 +98,7 @@ module Runfile
       base_command = @superspace ? "run #{@superspace}" : "run"
       @examples.each do |command|
         helpline = "  #{base_command} #{command}"
-        wrapped  = word_wrap helpline, width
+        wrapped  = helpline.word_wrap width
         doc << "#{wrapped}"
       end
       doc
@@ -113,7 +112,7 @@ module Runfile
         doc << "#{scope}:"
         values.each do |label, text|
           helpline = "      #{text}"
-          wrapped  = word_wrap helpline, width
+          wrapped  = helpline.word_wrap width
           doc << "  #{label}\n#{wrapped}\n"
         end
       end

data/lib/runfile/dsl.rb

@@ -83,51 +83,6 @@ module Runfile
       Runner.instance.cross_call command_string
     end
 
-    # Run a command, wait until it is done and continue
-    #   run 'rails server'
-    def run(cmd)
-      ExecHandler.instance.run cmd
-    end
-
-    # Run a command, wait until it is done, then exit
-    #   run! 'rails server'
-    def run!(cmd)
-      ExecHandler.instance.run! cmd
-    end
-
-    # Run a command in the background, optionally log to a log file and save
-    # the process ID in a pid file
-    #   run_bg 'rails server', pid: 'rails', log: 'tmp/log.log'
-    def run_bg(cmd, pid: nil, log: '/dev/null')
-      ExecHandler.instance.run_bg cmd, pid: pid, log: log
-    end
-
-    # Stop a command started with 'run_bg'. Provide the name of he pid file you 
-    # used in 'run_bg'
-    #   stop_bg 'rails'
-    def stop_bg(pid)
-      ExecHandler.instance.stop_bg pid
-    end
-
-    # Set a block to be called before each run. The block should return
-    # the command to run, since this is intended to let the block modify
-    # the command if it needs to.
-    #   before_run do |command|
-    #     puts "BEFORE #{command}"
-    #     command
-    #   end
-    def before_run(&block)
-      ExecHandler.instance.before_run(&block)
-    end
-
-    # Set a block to be called after each run
-    #   before_run do |command|
-    #     puts "AFTER #{command}"
-    #   end
-    def after_run(&block)
-      ExecHandler.instance.after_run(&block)
-    end
-
     # Also allow to use 'endcommand' instead of 'command' to end
     # a command namespace definition
     alias_method :endcommand, :command

data/lib/runfile/refinements.rb

@@ -0,0 +1,22 @@
+module Runfile
+  module Refinements
+    refine String do
+      def word_wrap(length = nil)
+        text = self
+
+        length ||= Terminal.width
+        lead = text[/^\s*/]
+        text.strip!
+        length -= lead.length
+        text.split("\n").collect! do |line|
+          if line.length > length
+            line.gsub!(/([^\s]{#{length}})([^\s$])/, "\\1 \\2")
+            line.gsub(/(.{1,#{length}})(\s+|$)/, "#{lead}\\1\n").rstrip
+          else
+            "#{lead}#{line}"
+          end
+        end * "\n"
+      end
+    end
+  end
+end

data/lib/runfile/runfile_helper.rb

@@ -8,6 +8,7 @@ module Runfile
   # 2. Creating new runfiles (`run new`)
   # 3. Showing a list of found system runfiles in a colorful help
   class RunfileHelper
+    using Refinements
     include SettingsMixin
     
     # Handle the case when `run` is called without a Runfile 
@@ -72,14 +73,14 @@ module Runfile
 
     # Show some helpful tips, and a list of available runfiles
     def show_make_help(runfiles, compact=false)
-      say "!txtpur!Runfile engine v#{Runfile::VERSION}" unless compact
+      puts "Runfile engine v#{Runfile::VERSION}" unless compact
       if runfiles.size < 3 and !compact
-        say "\nTip: Type '!txtblu!run new!txtrst!' or '!txtblu!run new name!txtrst!' to create a runfile.\nFor global access, place !txtblu!named.runfiles!txtrst! in ~/runfile/ or in /etc/runfile/."
+        puts "\nTip: Type 'run new' or 'run new name' to create a runfile.\nFor global access, place named.runfiles in ~/runfile/ or in /etc/runfile/."
       end
       if runfiles.empty? 
-        say "\n!txtred!Runfile not found."
+        puts "\nRunfile not found."
       else
-        say ""
+        puts ""
         compact ? say_runfile_usage(runfiles) : say_runfile_list(runfiles)
       end
     end
@@ -110,14 +111,14 @@ module Runfile
     def say_runfile_list(runfiles)
       runfile_paths = runfiles.map { |f| File.dirname f }
       max = runfile_paths.max_by(&:length).size
-      width = detect_terminal_size[0]
+      width = Terminal.width
       runfiles.each do |f|
         f[/([^\/]+).runfile$/]
         command  = "run #{$1}"
         spacer_size = width - max - command.size - 6
         spacer_size = [1, spacer_size].max
         spacer = '.' * spacer_size
-        say "  !txtgrn!#{command}!txtrst! #{spacer} #{File.dirname f}"
+        puts "  #{command} #{spacer} #{File.dirname f}"
       end
     end
 
@@ -125,19 +126,19 @@ module Runfile
     def say_runfile_usage(runfiles)
       runfiles_as_columns = get_runfiles_as_columns runfiles
       
-      say "#{settings.intro}\n" if settings.intro
-      say "Usage: run <file>"
-      say runfiles_as_columns
+      puts "#{settings.intro}\n" if settings.intro
+      puts "Usage: run <file>"
+      puts runfiles_as_columns
 
       show_shortcuts if settings.shortcuts
     end
 
     # Prints a friendly output of the shortcut list
     def show_shortcuts
-      say "\nShortcuts:"
+      puts "\nShortcuts:"
       max = settings.shortcuts.keys.max_by(&:length).length
       settings.shortcuts.each_pair do |shortcut, command|
-        say "  #{shortcut.rjust max} : #{command}"
+        puts "  #{shortcut.rjust max} : #{command}"
       end
     end
 
@@ -145,10 +146,10 @@ module Runfile
     # current terminal width
     def get_runfiles_as_columns(runfiles)
       namelist = runfile_names runfiles
-      width = detect_terminal_size[0]
+      width = Terminal.width
       max = namelist.max_by(&:length).length
       message = "  " + namelist.map {|f| f.ljust max+1 }.join(' ')
-      word_wrap message, width
+      message.word_wrap width
     end
 
     def runfile_names(runfiles)

data/lib/runfile/runner.rb

@@ -174,7 +174,6 @@ module Runfile
       if settings.shortcuts and settings.shortcuts[possible_candidate]
         shortcut_value = settings.shortcuts[argv[0]]
         expanded = shortcut_value.split ' '
-        say "!txtblu!# #{possible_candidate} > #{shortcut_value}"
         argv.shift
         argv = expanded + argv
       end

data/lib/runfile/templates/Runfile

@@ -2,13 +2,15 @@ title   "Greeter"
 summary "A sample Runfile"
 version "0.1.0"
 
-usage  "hello [<name> --color]"
+usage  "hello [<name> --shout]"
 help   "Say hello"
-option "-c --color", "Greet with color"
+option "-s --shout", "Greet louder"
 action :hello do |args|
-  if args['--color']
-    say "!txtgrn!Hello #{args['<name>']}"
+  message = "Hello #{args['<name>']}"
+  
+  if args['--shout']
+    puts message.upcase
   else
-    say "Hello #{args['<name>']}"
+    puts message
   end
 end

data/lib/runfile/terminal.rb

@@ -0,0 +1,32 @@
+# This file provides some terminal related utilities (extracted from Colsole)
+
+module Runfile
+  class Terminal
+    class << self
+      def size(default = [80,30])
+        if (ENV['COLUMNS'] =~ /^\d+$/) && (ENV['LINES'] =~ /^\d+$/)
+          result = [ENV['COLUMNS'].to_i, ENV['LINES'].to_i]
+        elsif (RUBY_PLATFORM =~ /java/ || (!STDIN.tty? && ENV['TERM'])) && command_exist?('tput')
+          result = [`tput cols 2>&1`.to_i, `tput lines 2>&1`.to_i]
+        elsif STDIN.tty? && command_exist?('stty')
+          result = `stty size 2>&1`.scan(/\d+/).map { |s| s.to_i }.reverse
+        else
+          result = default
+        end
+        result = default unless result[0].is_a? Integer and result[1].is_a? Integer and result[0] > 0 and result[1] > 0
+        result
+      end
+
+      def width
+        size[0]
+      end
+
+      def command_exist?(command)
+        ENV['PATH'].split(File::PATH_SEPARATOR).any? do |dir|
+          File.exist?(File.join dir, command) or File.exist?(File.join dir, "#{command}.exe")
+        end
+      end
+
+    end
+  end
+end

data/lib/runfile/version.rb

@@ -1,3 +1,3 @@
 module Runfile
-  VERSION = "0.11.2"
+  VERSION = "0.12.0-rc1"
 end

data/lib/runfile.rb

@@ -1,4 +1,6 @@
 require 'runfile/version'
+require 'runfile/terminal'
+require 'runfile/refinements'
 require 'runfile/settings'
 require 'runfile/setup'
 require 'runfile/docopt_helper'
@@ -6,6 +8,3 @@ require 'runfile/runfile_helper'
 require 'runfile/action'
 require 'runfile/runner'
 require 'runfile/dsl'
-require 'runfile/exec'
-
-require 'byebug' if ENV['BYEBUG']

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: runfile
 version: !ruby/object:Gem::Version
-  version: 0.11.2
+  version: 0.12.0.pre.rc1
 platform: ruby
 authors:
 - Danny Ben Shitrit
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-06 00:00:00.000000000 Z
+date: 2021-09-28 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: colsole
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.5'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: docopt
   requirement: !ruby/object:Gem::Requirement
@@ -54,12 +40,13 @@ files:
 - lib/runfile/action.rb
 - lib/runfile/docopt_helper.rb
 - lib/runfile/dsl.rb
-- lib/runfile/exec.rb
+- lib/runfile/refinements.rb
 - lib/runfile/runfile_helper.rb
 - lib/runfile/runner.rb
 - lib/runfile/settings.rb
 - lib/runfile/setup.rb
 - lib/runfile/templates/Runfile
+- lib/runfile/terminal.rb
 - lib/runfile/version.rb
 homepage: https://github.com/DannyBen/runfile
 licenses:
@@ -77,14 +64,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.25
 signing_key: 
 specification_version: 4
 summary: If Rake and Docopt had a baby

data/lib/runfile/exec.rb

@@ -1,76 +0,0 @@
-require 'singleton'
-
-module Runfile
-
-  # This class provides methods for easily and politely run shell commands
-  # through a Runfile action.
-  # It is mainly a convenient wrapper around `system` and `exec` and it also
-  # adds functions for running background tasks with ease.
-  class ExecHandler
-    include Singleton
-
-    # Run a command, wait until it is done and continue
-    def run(cmd)
-      cmd = @before_run_block.call(cmd) if @before_run_block
-      return false unless cmd
-      say "!txtgrn!> #{cmd}" unless Runfile.quiet
-      system cmd
-      @after_run_block.call(cmd) if @after_run_block
-    end
-
-    # Run a command, wait until it is done, then exit
-    def run!(cmd)
-      cmd = @before_run_block.call(cmd) if @before_run_block
-      return false unless cmd
-      say "!txtgrn!> #{cmd}" unless Runfile.quiet
-      exec cmd
-    end
-
-    # Run a command in the background, optionally log to a log file and save
-    # the process ID in a pid file
-    def run_bg(cmd, pid: nil, log: '/dev/null')
-      cmd = @before_run_block.call(cmd) if @before_run_block
-      return false unless cmd
-      full_cmd = "exec #{cmd} >#{log} 2>&1"
-      say "!txtgrn!> #{full_cmd}" unless Runfile.quiet
-      process = IO.popen "exec #{cmd} >#{log} 2>&1"
-      File.write pidfile(pid), process.pid if pid
-      @after_run_block.call(cmd) if @after_run_block
-      return process.pid
-    end
-
-    # Stop a command started with 'run_bg'. Provide the name of he pid file you 
-    # used in 'run_bg'
-    def stop_bg(pid)
-      file = pidfile(pid)
-      if File.exist? file
-        pid = File.read file
-        File.delete file
-        run "kill -s TERM #{pid}"
-      else
-        say "!txtred!PID file not found." unless Runfile.quiet
-      end
-    end
-
-    # Set a block to be called before each run
-    def before_run(&block)
-      @before_run_block = block
-    end
-
-    # Set a block to be called after each run
-    def after_run(&block)
-      @after_run_block = block
-    end
-
-    private
-
-    def pid_dir
-      defined?(Runfile.pid_dir) ? Runfile.pid_dir : nil
-    end
-
-    def pidfile(pid)
-      pid_dir ? "#{pid_dir}/#{pid}.pid" : "#{pid}.pid"
-    end
-
-  end
-end