toys 0.2.1 → 0.2.2

data/lib/toys/version.rb

@@ -1,3 +1,36 @@
+# Copyright 2018 Daniel Azuma
+#
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# * Redistributions of source code must retain the above copyright notice,
+#   this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above copyright notice,
+#   this list of conditions and the following disclaimer in the documentation
+#   and/or other materials provided with the distribution.
+# * Neither the name of the copyright holder, nor the names of any other
+#   contributors to this software, may be used to endorse or promote products
+#   derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+;
+
 module Toys
-  VERSION = "0.2.1".freeze
+  ##
+  # Current version of Toys
+  # @return [String]
+  #
+  VERSION = "0.2.2".freeze
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: toys
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Daniel Azuma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-07 00:00:00.000000000 Z
+date: 2018-03-13 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.16'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.16'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -67,33 +53,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '5.2'
 - !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '12.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '12.0'
-- !ruby/object:Gem::Dependency
-  name: rdoc
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: 0.53.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: 0.53.0
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -116,8 +88,11 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- LICENSE.md
+- README.md
 - bin/toys
 - lib/toys.rb
+- lib/toys/builder.rb
 - lib/toys/builtins/system.rb
 - lib/toys/cli.rb
 - lib/toys/context.rb
@@ -125,10 +100,12 @@ files:
 - lib/toys/helpers/exec.rb
 - lib/toys/helpers/file_utils.rb
 - lib/toys/lookup.rb
-- lib/toys/parser.rb
 - lib/toys/template.rb
+- lib/toys/templates/clean.rb
 - lib/toys/templates/gem_build.rb
 - lib/toys/templates/minitest.rb
+- lib/toys/templates/rubocop.rb
+- lib/toys/templates/yardoc.rb
 - lib/toys/tool.rb
 - lib/toys/version.rb
 homepage: https://github.com/dazuma/toys
@@ -143,7 +120,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -151,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Command line tool framework

data/lib/toys/parser.rb

@@ -1,138 +0,0 @@
-module Toys
-  class Parser
-    def initialize(path, tool, remaining_words, priority, lookup)
-      @path = path
-      @tool = tool
-      @remaining_words = remaining_words
-      @priority = priority
-      @lookup = lookup
-    end
-
-    def name(word, alias_of: nil, &block)
-      word = word.to_s
-      subtool = @lookup.get_tool(@tool.full_name + [word], @priority)
-      return self if subtool.nil?
-      if alias_of
-        if block
-          raise Toys::ToysDefinitionError, "Cannot take a block with alias_of"
-        end
-        target = @tool.full_name + [alias_of.to_s]
-        target_tool = @lookup.lookup(target)
-        unless target_tool.full_name == target
-          raise Toys::ToysDefinitionError, "Alias target #{target.inspect} not found"
-        end
-        subtool.set_alias_target(target)
-        return self
-      end
-      next_remaining = @remaining_words
-      if next_remaining && !next_remaining.empty?
-        if next_remaining.first == word
-          next_remaining = next_remaining.slice(1..-1)
-        else
-          next_remaining = nil
-        end
-      end
-      Parser.parse(@path, subtool, next_remaining, @priority, @lookup, block)
-      self
-    end
-
-    def alias_as(word)
-      unless @tool.root?
-        alias_tool = @lookup.get_tool(@tool.full_name.slice(0..-2) + [word], @priority)
-        alias_tool.set_alias_target(@tool) if alias_tool
-      end
-      self
-    end
-
-    def alias_of(target)
-      target_tool = @lookup.lookup(target)
-      unless target_tool.full_name == target
-        raise Toys::ToysDefinitionError, "Alias target #{target.inspect} not found"
-      end
-      @tool.set_alias_target(target_tool)
-      self
-    end
-
-    def include(path)
-      @tool.yield_definition do
-        @lookup.include_path(path, @tool.full_name, @remaining_words, @priority)
-      end
-      self
-    end
-
-    def expand(template, opts={})
-      if template.is_a?(Symbol)
-        template = template.to_s
-        file_name = template.gsub(/([a-zA-Z])([A-Z])/){ |m| "#{$1}_#{$2.downcase}" }.downcase
-        require "toys/templates/#{file_name}"
-        const_name = template.gsub(/(^|_)([a-zA-Z0-9])/){ |m| $2.upcase }
-        template = Toys::Templates.const_get(const_name)
-      end
-      opts = template.opts_initializer.call(opts)
-      yield opts if block_given?
-      instance_exec(opts, &template.expander)
-      self
-    end
-
-    def long_desc(desc)
-      @tool.long_desc = desc
-      self
-    end
-
-    def short_desc(desc)
-      @tool.short_desc = desc
-      self
-    end
-
-    def switch(key, *switches, accept: nil, default: nil, doc: nil)
-      @tool.add_switch(key, *switches, accept: accept, default: default, doc: doc)
-      self
-    end
-
-    def required_arg(key, accept: nil, doc: nil)
-      @tool.add_required_arg(key, accept: accept, doc: doc)
-      self
-    end
-
-    def optional_arg(key, accept: nil, default: nil, doc: nil)
-      @tool.add_optional_arg(key, accept: accept, default: default, doc: doc)
-      self
-    end
-
-    def remaining_args(key, accept: nil, default: [], doc: nil)
-      @tool.set_remaining_args(key, accept: accept, default: default, doc: doc)
-      self
-    end
-
-    def execute(&block)
-      @tool.executor = block
-      self
-    end
-
-    def helper(name, &block)
-      @tool.add_helper(name, &block)
-      self
-    end
-
-    def use(mod)
-      @tool.use_helper_module(mod)
-      self
-    end
-
-    def _binding
-      binding
-    end
-
-    def self.parse(path, tool, remaining_words, priority, lookup, source)
-      parser = new(path, tool, remaining_words, priority, lookup)
-      tool.defining_from(path) do
-        if String === source
-          eval(source, parser._binding, path, 1)
-        elsif Proc === source
-          parser.instance_eval(&source)
-        end
-      end
-      tool
-    end
-  end
-end