toys 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 562abaf505246d6b3a84c800908b19cfe9acbc6a57d5432bceccac31eaa107ef
-  data.tar.gz: 39efb6120be94eeb4479e8ae4fe782d796a49e5dcfd4e837735dd69986e3cfb4
+  metadata.gz: 4a2d413fba0285f718e4d586832a78010060e68e52ad2f0ef7df54e4295a71b6
+  data.tar.gz: 431cbcb0425cf2bcde91c145a574238293d83c47b81668abf9c67de6cc16d6cc
 SHA512:
-  metadata.gz: fe6196e43402bce7c7e916dcc75906e5b420ce1882ed0ca6104b6f0a54c6263feba8bf2284c1e8b8d2ca783ed1dacb291078622912f84483628b9f003397ca9e
-  data.tar.gz: bd24a58dcdc1fd2f34c50b97d57129e031f17aaa77044af1c6b62a86d67a1ba32506d3234156cb66576f282de82953e95cf52460fc409f86a82ff5d6c64e42de
+  metadata.gz: 2f7988dd0108eb50afc3a44dabf5b2d3a04f272af2c6d58135a525250d50c42d5e7902e1f1c07768cabb80fb88cfca0e8a2513fe2a5274a7c1a1d1ac90c02650
+  data.tar.gz: b5199ca795795821bc7ba6605ec276995e9a29b73c597c5700424de0a0f01ba5d9a39392d24528c981e9d05956dbbd2691aeb513a22413ff84610ce122d29ee1

data/lib/toys/builtins/system.rb

@@ -17,7 +17,7 @@ name "update" do
 
   short_desc "Update toys if a newer version is available"
 
-  helper_module :exec
+  use :exec
 
   execute do
     version_info = capture("gem query -q -r -e toys")

data/lib/toys/cli.rb

@@ -4,19 +4,21 @@ module Toys
     DEFAULT_DIR_NAME = ".toys"
     DEFAULT_FILE_NAME = ".toys.rb"
     DEFAULT_BINARY_NAME = "toys"
-    ETC_PATH = "/etc"
+    DEFAULT_PRELOAD_NAME = ".preload.rb"
 
     def initialize(
       binary_name: nil,
       logger: nil,
       config_dir_name: nil,
       config_file_name: nil,
-      index_file_name: nil
+      index_file_name: nil,
+      preload_file_name: nil
     )
       @lookup = Toys::Lookup.new(
         config_dir_name: config_dir_name,
         config_file_name: config_file_name,
-        index_file_name: index_file_name)
+        index_file_name: index_file_name,
+        preload_file_name: preload_file_name)
       @context = Context.new(
         @lookup,
         logger: logger || self.class.default_logger,
@@ -47,6 +49,15 @@ module Toys
       self
     end
 
+    def add_standard_config_paths
+      toys_path = ENV["TOYS_PATH"].to_s.split(File::PATH_SEPARATOR)
+      if toys_path.size == 0
+        toys_path << ENV["HOME"] if ENV["HOME"]
+        toys_path << "/etc" if File.directory?("/etc") && File.readable?("/etc")
+      end
+      @lookup.add_config_paths(toys_path)
+    end
+
     def run(*args)
       @context.run(*args)
     end
@@ -57,12 +68,11 @@ module Toys
           binary_name: DEFAULT_BINARY_NAME,
           config_dir_name: DEFAULT_DIR_NAME,
           config_file_name: DEFAULT_FILE_NAME,
-          index_file_name: DEFAULT_FILE_NAME
+          index_file_name: DEFAULT_FILE_NAME,
+          preload_file_name: DEFAULT_PRELOAD_NAME
         )
         cli.add_config_path_hierarchy
-        if !File.directory?(ETC_PATH) || !File.readable?(ETC_PATH)
-          cli.add_config_paths(ETC_PATH)
-        end
+        cli.add_standard_config_paths
         cli.add_paths(BUILTINS_PATH)
         cli
       end

data/lib/toys/lookup.rb

@@ -1,6 +1,7 @@
 module Toys
   class Lookup
-    def initialize(config_dir_name: nil, config_file_name: nil, index_file_name: nil)
+    def initialize(config_dir_name: nil, config_file_name: nil,
+                   index_file_name: nil, preload_file_name: nil)
       @config_dir_name = config_dir_name
       if @config_dir_name && File.extname(@config_dir_name) == ".rb"
         raise LookupError, "Illegal config dir name #{@config_dir_name.inspect}"
@@ -13,6 +14,10 @@ module Toys
       if @index_file_name && File.extname(@index_file_name) != ".rb"
         raise LookupError, "Illegal index file name #{@index_file_name.inspect}"
       end
+      @preload_file_name = preload_file_name
+      if @preload_file_name && File.extname(@preload_file_name) != ".rb"
+        raise LookupError, "Illegal preload file name #{@preload_file_name.inspect}"
+      end
       @load_worklist = []
       @tools = {[] => [Tool.new(nil, nil), nil]}
       @max_priority = @min_priority = 0
@@ -33,9 +38,7 @@ module Toys
       paths = Array(paths)
       paths = paths.reverse if high_priority
       paths.each do |path|
-        if !File.directory?(path) || !File.readable?(path)
-          raise LookupError, "Cannot read config directory #{path}"
-        end
+        path = check_path(path, type: :dir)
         priority = high_priority ? (@max_priority += 1) : (@min_priority -= 1)
         if @config_file_name
           p = File.join(path, @config_file_name)
@@ -135,13 +138,23 @@ module Toys
           Parser.parse(path, tool, remaining_words, priority, self, IO.read(path))
         end
       else
-        children = Dir.entries(path) - [".", ".."]
-        children.each do |child|
-          child_path = File.join(path, child)
-          if child == @index_file_name
-            load_path(check_path(child_path), words, remaining_words, priority)
-          else
-            next unless check_path(child_path, strict: false)
+        if @preload_file_name
+          preload_path = File.join(path, @preload_file_name)
+          if File.exist?(preload_path)
+            preload_path = check_path(preload_path, type: :file)
+            require preload_path
+          end
+        end
+        if @index_file_name
+          index_path = File.join(path, @index_file_name)
+          if File.exist?(index_path)
+            index_path = check_path(index_path, type: :file)
+            load_path(index_path, words, remaining_words, priority)
+          end
+        end
+        Dir.entries(path).each do |child|
+          if !child.start_with?(".") && child != @preload_file_name && child != @index_file_name
+            child_path = check_path(File.join(path, child))
             child_word = File.basename(child, ".rb")
             next_words = words + [child_word]
             next_remaining_words =
@@ -158,19 +171,22 @@ module Toys
       end
     end
 
-    def check_path(path, strict: true)
-      if File.extname(path) == ".rb"
+    def check_path(path, lenient: false, type: nil)
+      path = File.expand_path(path)
+      type ||= File.extname(path) == ".rb" ? :file : :dir
+      case type
+      when :file
         if File.directory?(path) || !File.readable?(path)
+          return nil if lenient
           raise LookupError, "Cannot read file #{path}"
         end
-      else
+      when :dir
         if !File.directory?(path) || !File.readable?(path)
-          if strict
-            raise LookupError, "Cannot read directory #{path}"
-          else
-            return nil
-          end
+          return nil if lenient
+          raise LookupError, "Cannot read directory #{path}"
         end
+      else
+        raise ArgumentError, "Illegal type #{type}"
       end
       path
     end

data/lib/toys/parser.rb

@@ -114,12 +114,8 @@ module Toys
       self
     end
 
-    def helper_module(mod, &block)
-      if block
-        @tool.define_helper_module(mod, &block)
-      else
-        @tool.use_helper_module(mod)
-      end
+    def use(mod)
+      @tool.use_helper_module(mod)
       self
     end
 

data/lib/toys/templates/gem_build.rb

@@ -32,8 +32,8 @@ module Toys
       name toy_name do
         short_desc "#{push_gem ? 'Release' : 'Build'} the gem: #{gem_name}"
 
-        helper_module :file_utils
-        helper_module :exec
+        use :file_utils
+        use :exec
 
         execute do
           gemspec = Gem::Specification.load "#{gem_name}.gemspec"

data/lib/toys/templates/minitest.rb

@@ -30,7 +30,7 @@ module Toys
       name toy_name do
         short_desc "Run minitest"
 
-        helper_module :exec
+        use :exec
 
         execute do
           sh(cmd, report_subprocess_errors: true)

data/lib/toys/tool.rb

@@ -26,8 +26,6 @@ module Toys
       @helpers = {}
       @modules = []
       @executor = nil
-
-      @defined_modules = {}
     end
 
     attr_reader :simple_name
@@ -105,29 +103,6 @@ module Toys
       @alias_target = target_tool
     end
 
-    def define_helper_module(name, &block)
-      if @alias_target
-        raise ToolDefinitionError, "Tool #{display_name.inspect} is an alias"
-      end
-      unless name.is_a?(String)
-        raise ToolDefinitionError,
-          "Helper module name #{name.inspect} is not a string"
-      end
-      if @defined_modules.key?(name)
-        raise ToolDefinitionError,
-          "Helper module #{name.inspect} is already defined"
-      end
-      mod = Module.new(&block)
-      mod.instance_methods.each do |meth|
-        name_str = meth.to_s
-        unless name_str =~ /^[a-z]\w+$/
-          raise ToolDefinitionError,
-            "Illegal helper method name: #{name_str.inspect}"
-        end
-      end
-      @defined_modules[name] = mod
-    end
-
     def short_desc=(str)
       check_definition_state
       @short_desc = str
@@ -158,8 +133,6 @@ module Toys
         require "toys/helpers/#{file_name}"
         const_name = mod.gsub(/(^|_)([a-zA-Z0-9])/){ |m| $2.upcase }
         @modules << Toys::Helpers.const_get(const_name)
-      when String
-        @modules << mod
       else
         raise ToolDefinitionError, "Illegal helper module name: #{mod.inspect}"
       end
@@ -220,12 +193,6 @@ module Toys
 
     protected
 
-    def find_module_named(name)
-      return @defined_modules[name] if @defined_modules.key?(name)
-      return @parent.find_module_named(name) if @parent
-      nil
-    end
-
     def ensure_collection_only(source_name)
       if has_definition?
         raise ToolDefinitionError, "Cannot create tool #{source_name.inspect}" \
@@ -393,11 +360,6 @@ module Toys
         full_name, args, execution_data[:options])
       context.logger.level += execution_data[:delta_severity]
       @modules.each do |mod|
-        unless Module === mod
-          found = find_module_named(mod)
-          raise StandardError, "Unable to find module #{mod}" unless found
-          mod = found
-        end
         context.extend(mod)
       end
       @helpers.each do |name, block|

data/lib/toys/version.rb

@@ -1,3 +1,3 @@
 module Toys
-  VERSION = "0.2.0".freeze
+  VERSION = "0.2.1".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: toys
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Daniel Azuma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-01 00:00:00.000000000 Z
+date: 2018-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler