runfile 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 93b12b23dbe13c9268f51757ae21b59fc59abec7
-  data.tar.gz: 9ccca34c560d656bbb98ceddbf4059a97540a370
+  metadata.gz: c3a9ac4d26448820b0d60e8cc43d02256de42d82
+  data.tar.gz: 5363a4b2a3f513693178f1f2d21b8a93f4946ca2
 SHA512:
-  metadata.gz: a8e21b6ef2cdab994ab2e368d5fa1f492f7397868d79faa6825823730fa1ea80aa219c858e09843e8d96f524c000e1ef649abd24de9d4ac6b7e57ae5e4903c10
-  data.tar.gz: fe4e88c465ab572016bc331b81b388c743564be4092f16cbe3d5df27de0bf0018b14175b918598dd48dc1b2db13e825b702440854f527c8cdb1984404cfe34e8
+  metadata.gz: 1a6cc42619f4b37c8e73df76af4dd81164e1718a37f93d3049cf4ba420aa828946bc139a5a3544e090659e48afe3cda804c1ff701555aa3ff03d3b698e6f7581
+  data.tar.gz: eced22d6cb4bc351e0f9cf121db680a7c30b7ed90f23e12502cd71e4bfeca247641fc0425de979409b61cf2568de72eab3d4969daf0948a04547ffb1af6fa4df

data/README.md

@@ -1,5 +1,5 @@
 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)
@@ -25,21 +25,22 @@ You create a `Runfile`, and execute commands with
 
 ---
 
-## Install ##
+Install
+--------------------------------------------------
 
 	$ gem install runfile
 
 
-
-## Quick Start ##
+Quick Start
+--------------------------------------------------
 
 	$ run make       # create a new Runfile
 	$ run --help     # show the usage patterns
 	$ vi Runfile     # edit the Runfile
 
 
-
-## Example ##
+Example
+--------------------------------------------------
 
 The most minimal `Runfile` looks like this:
 
@@ -85,8 +86,8 @@ Options:
 ```
 
 
-
-## Runfile per project or global Runfiles ##
+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 
@@ -105,8 +106,8 @@ for global (named) runfiles.
 Read more in the [Runfile Location and Filename wiki page](https://github.com/DannyBen/runfile/wiki/Runfile-Location-and-Filename)
 
 
-
-## Documentation ##
+Documentation
+--------------------------------------------------
 
 - [Learn by Example](https://github.com/DannyBen/runfile/tree/master/examples)
 - [Runfile Command Reference](https://github.com/DannyBen/runfile/wiki/Runfile-Command-Reference)

data/lib/runfile.rb

@@ -5,5 +5,6 @@ require 'runfile/action'
 require 'runfile/runner'
 require 'runfile/dsl'
 require 'runfile/util'
+require 'runfile/settings'
 
 require 'runfile/extensions/exec'

data/lib/runfile/runfile_helper.rb

@@ -31,11 +31,16 @@ module Runfile
         runfile and return runfile
       end
 
-      # if we are here, offer some help and advice
-      show_make_help runfiles
+      # if we are here, offer some help and advice and show a list
+      # of possible runfiles to run.
+      show_make_help runfiles, settings.folder
       return false
     end
 
+    def purge_settings
+      @settings = OpenStruct.new
+    end
+
     private
 
     # Create a new runfile in the current directory. We can either
@@ -53,7 +58,7 @@ module Runfile
       end
     end
 
-    # Find all *.runfile files in in our search difrectories
+    # Find all *.runfile files in our search difrectories
     def find_runfiles
       result = []
       dirs = runfile_folders
@@ -65,14 +70,16 @@ module Runfile
     end
 
     # Show some helpful tips, and a list of available runfiles
-    def show_make_help(runfiles)
-      say "!txtpur!Runfile engine v#{Runfile::VERSION}"
-      runfiles.size < 3 and say "\nTip: Type '!txtblu!run make!txtrst!' or '!txtblu!run make name!txtrst!' to create a runfile.\nFor global access, place !txtblu!named.runfiles!txtrst! in ~/runfile/ or in /etc/runfile/."
+    def show_make_help(runfiles, compact=false)
+      say "!txtpur!Runfile engine v#{Runfile::VERSION}" unless compact
+      if runfiles.size < 3 and !compact
+        say "\nTip: Type '!txtblu!run make!txtrst!' or '!txtblu!run make name!txtrst!' to create a runfile.\nFor global access, place !txtblu!named.runfiles!txtrst! in ~/runfile/ or in /etc/runfile/."
+      end
       if runfiles.empty? 
         say "\n!txtred!Runfile not found."
       else
         say ""
-        say_runfile_list runfiles
+        say_runfile_list runfiles, compact
       end
     end
 
@@ -81,7 +88,14 @@ module Runfile
       # This trick allows searching in subfolders recursively, including
       # one level of symlinked folder
       subdirs = '**{,/*/**}'
-      [Dir.pwd, "#{Dir.home}/runfile/#{subdirs}", "/etc/runfile/#{subdirs}"]
+      
+      # If there is a '.runfile' settings file with a folder definition
+      # in it, use it. Otherwise, search globally.
+      if settings.folder
+        ["#{settings.folder}/#{subdirs}"]
+      else
+        [Dir.pwd, "#{Dir.home}/runfile/#{subdirs}", "/etc/runfile/#{subdirs}"]
+      end
     end
     
     # [UNUSED] Same as runfile_folders, but including PATH
@@ -92,19 +106,27 @@ module Runfile
     end
 
     # Output the list of available runfiles
-    def say_runfile_list(runfiles)
+    def say_runfile_list(runfiles, compact=false)
       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}"
-        spacer_size = width - max - command.size - 6
-        spacer_size = [1, spacer_size].max
-        spacer = '.' * spacer_size
-        say "  !txtgrn!#{command}!txtrst! #{spacer} #{File.dirname f}"
+        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
       end
     end
 
+    def settings
+      @settings ||= Settings.new.as_struct
+    end
+
   end
 end

data/lib/runfile/runner.rb

@@ -30,12 +30,12 @@ module Runfile
 
     # Return a singleton Runner instance.
     def self.instance
-      @@instance = self.new if @@instance.nil?
-      @@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 filename
@@ -141,6 +141,7 @@ module Runfile
     # on our part, or the name of a runfile to execute.
     def handle_no_runfile(argv)
       maker = RunfileHelper.new
+      maker.purge_settings if @ignore_settings
       runfile = maker.handle argv
       if runfile
         @superspace = argv[0]

data/lib/runfile/settings.rb

@@ -0,0 +1,27 @@
+require 'ostruct'
+require 'yaml'
+
+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
+
+    private
+
+    def settings
+      @settings ||= settings!
+    end
+
+    def settings!
+      File.file?('.runfile') ? YAML.load_file('.runfile') : {}
+    end
+  end
+
+end

data/lib/runfile/version.rb

@@ -1,3 +1,3 @@
 module Runfile
-  VERSION = "0.6.0"
+  VERSION = "0.6.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: runfile
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Danny Ben Shitrit
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-12 00:00:00.000000000 Z
+date: 2016-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colsole
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: docopt
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.2'
+- !ruby/object:Gem::Dependency
+  name: similar_text
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.4
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.4
 description: Build command line applications per project with ease. Rake-inspired,
   Docopt inside.
 email: db@dannyben.com
@@ -113,6 +127,7 @@ files:
 - lib/runfile/extensions/exec.rb
 - lib/runfile/runfile_helper.rb
 - lib/runfile/runner.rb
+- lib/runfile/settings.rb
 - lib/runfile/templates/Runfile
 - lib/runfile/util.rb
 - lib/runfile/version.rb