runfile 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fcd488881171918b71a9b0ed134e2b9dbedf4055
-  data.tar.gz: 5b71cceb782e4a4a6ccd6215d5642a937bfe7da1
+  metadata.gz: 07eb84f262b49c776d311056be64345f415c94da
+  data.tar.gz: fc740fc871111c1bac8a30df994b4ce4778c1ecf
 SHA512:
-  metadata.gz: 27247b748385fd0ae5f76d4a3eccea430ea0eb003ecd825c41c47310147a129a4c37d5d5ecfd03d5404e4dfb4fe2ebcf241766b5ee3dc4b1083ef7a187b7d205
-  data.tar.gz: 4478310d2e8866423f508a8ba4ac58bf32b91150237d01b718f485556e092b709a77ebd954b9adeb3bd1c4cc4cef8d4b79375247ab14a5dfc5bde3406666d258
+  metadata.gz: 57b71aaad3c8bde5c96064abe7ab2662509903f327cbed5f8fb43caa6ffc104f5c0f437ae10f8c51ba71018c23fd5c3eb4b75dd5f05bd8c1a3f658f5fe7e4b44
+  data.tar.gz: f04af615efa538afc2f6fefe69aa65815ab87069e4281a446694d99e57d5dc966b7cf9da094c69699bdce77f28b504216d81ad0cd2dcaa4c290fa99f37802d42

data/README.md

@@ -1,11 +1,11 @@
 Runfile - If Rake and Docopt had a baby
 ==================================================
 
-[![Gem Version](https://badge.fury.io/rb/runfile.svg)](http://badge.fury.io/rb/runfile)
-[![Build Status](https://travis-ci.org/DannyBen/runfile.svg?branch=master)](https://travis-ci.org/DannyBen/runfile)
-[![Code Climate](https://codeclimate.com/github/DannyBen/runfile/badges/gpa.svg)](https://codeclimate.com/github/DannyBen/runfile)
-[![Dependency Status](https://gemnasium.com/DannyBen/runfile.svg)](https://gemnasium.com/DannyBen/runfile)
-<!-- [![Gem](https://img.shields.io/gem/dt/runfile.svg)](https://rubygems.org/gems/runfile) -->
+[![Gem](https://img.shields.io/gem/v/runfile.svg?style=flat-square)](https://rubygems.org/gems/runfile)
+[![Travis](https://img.shields.io/travis/DannyBen/runfile.svg?style=flat-square)](https://travis-ci.org/DannyBen/runfile)
+[![Code Climate](https://img.shields.io/codeclimate/github/DannyBen/runfile.svg?style=flat-square)](https://codeclimate.com/github/DannyBen/runfile)
+[![Gemnasium](https://img.shields.io/gemnasium/DannyBen/runfile.svg?style=flat-square)](https://gemnasium.com/DannyBen/runfile)
+[![Gem](https://img.shields.io/gem/dt/runfile.svg?style=flat-square)](https://rubygems.org/gems/runfile)
 
 ---
 

data/lib/runfile.rb

@@ -1,10 +1,10 @@
 require 'runfile/version'
+require 'runfile/settings'
 require 'runfile/docopt_helper'
 require 'runfile/runfile_helper'
 require 'runfile/action'
 require 'runfile/runner'
 require 'runfile/dsl'
 require 'runfile/util'
-require 'runfile/settings'
 
 require 'runfile/extensions/exec'

data/lib/runfile/docopt_helper.rb

@@ -29,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, height = detect_terminal_size
+      width = detect_terminal_size[0]
       doc = []
       doc << (@version ? "#{@name} #{@version}" : "#{@name}")
       doc << "#{@summary}" if @summary

data/lib/runfile/runfile_helper.rb

@@ -8,6 +8,7 @@ module Runfile
   # 2. Creating new runfiles (`run make`)
   # 3. Showing a list of found system runfiles in a colorful help
   class RunfileHelper
+    include SettingsMixin
     
     # Handle the case when `run` is called without a Runfile 
     # present. We will let the user know they can type `run make`
@@ -79,7 +80,7 @@ module Runfile
         say "\n!txtred!Runfile not found."
       else
         say ""
-        say_runfile_list runfiles, compact
+        compact ? say_runfile_usage(runfiles) : say_runfile_list(runfiles)
       end
     end
 
@@ -106,26 +107,30 @@ module Runfile
     end
 
     # Output the list of available runfiles
-    def say_runfile_list(runfiles, compact=false)
+    def say_runfile_list(runfiles)
       runfile_paths = runfiles.map { |f| File.dirname f }
       max = runfile_paths.max_by(&:length).size
       width, height = detect_terminal_size
       runfiles.each do |f|
         f[/([^\/]+).runfile$/]
         command  = "run #{$1}"
-        if compact
-          say "  !txtgrn!#{command}!txtrst!"
-        else
-          spacer_size = width - max - command.size - 6
-          spacer_size = [1, spacer_size].max
-          spacer = '.' * spacer_size
-          say "  !txtgrn!#{command}!txtrst! #{spacer} #{File.dirname f}"
-        end
+        spacer_size = width - max - command.size - 6
+        spacer_size = [1, spacer_size].max
+        spacer = '.' * spacer_size
+        say "  !txtgrn!#{command}!txtrst! #{spacer} #{File.dirname f}"
       end
     end
 
-    def settings
-      @settings ||= Settings.new.as_struct
+    # Output the list of available runfiles without filename
+    def say_runfile_usage(runfiles)
+      namelist = runfiles.map {|f| /([^\/]+).runfile$/.match(f)[1] }
+      width = detect_terminal_size[0]
+      max = namelist.max_by(&:length).length
+      message = "  " + namelist.map {|f| f.ljust max+1 }.join(' ')
+      
+      say "#{settings.intro}\n" if settings.intro
+      say "Usage: run <file>"
+      say word_wrap(message, width)
     end
 
   end

data/lib/runfile/runner.rb

@@ -1,5 +1,5 @@
+require 'singleton'
 require 'docopt'
-require 'pp'
 
 module Runfile
 
@@ -9,11 +9,12 @@ module Runfile
   # 1. DocoptHelper - for deeper docopt related actions
   # 2. RunfileHelper - for Runfile creation and system wide search
   class Runner
+    include Singleton
+    include SettingsMixin
+
     attr_accessor :last_usage, :last_help, :name, :version, 
       :summary, :namespace, :superspace
 
-    @@instance = nil
-
     # Initialize all variables to sensible defaults.
     def initialize
       @superspace = nil     # used when filename != Runfile
@@ -28,21 +29,17 @@ module Runfile
       @summary  = false     # dsl: summary
     end
 
-    # Return a singleton Runner instance.
-    def self.instance
-      @@instance ||= self.new
-    end
-
     # Load and execute a Runfile call.
     def execute(argv, filename='Runfile')
       @ignore_settings = !filename
       filename and File.file?(filename) or handle_no_runfile argv
       begin
+        load settings.helper if settings.helper
         load filename
       rescue => ex
         abort "Runfile error:\n#{ex.message}\n#{ex.backtrace[0]}"
       end
-      @@instance.run *argv
+      run *argv
     end
 
     # Add an action to the @actions array, and use the last known

data/lib/runfile/settings.rb

@@ -6,9 +6,6 @@ module Runfile
   # The Settings class handles '.runfile' YAML config files.
   # If found in the current directory, we will use their content.
   class Settings
-    def initialize
-    end
-
     def as_struct
       OpenStruct.new settings
     end
@@ -24,4 +21,10 @@ module Runfile
     end
   end
 
+  module SettingsMixin
+    def settings
+      @settings ||= Settings.new.as_struct
+    end
+  end
+
 end

data/lib/runfile/version.rb

@@ -1,3 +1,3 @@
 module Runfile
-  VERSION = "0.6.2"
+  VERSION = "0.6.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: runfile
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - Danny Ben Shitrit
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-07 00:00:00.000000000 Z
+date: 2016-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colsole