jeny 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 80c63bb3ba6b2c4dbb710eb1b465427e207663c56d6f03872871ceb999fd01b8
-  data.tar.gz: 99188a6695c03b3520c0a8b03b499125ac8ba8ff9989114b8520b29e372b0652
+  metadata.gz: 6db35c1fd878f2bc7af87ba0215aa8129c5e8110e19466a3499a6cdcdcef70e8
+  data.tar.gz: 66fc2826d8cf09bf5fed06c3632e530048a640c5f6df0d679cc0409b8e96ebd0
 SHA512:
-  metadata.gz: dd518b08c9d0e212dbd185552c8acc3e328c727e4a774198c15b9dfdafef2fa8a80103bac09c3c5432b387560450f01ded4b472667b525953cfffce7afc8694f
-  data.tar.gz: 68caadbe294ce2da79a680ee008cbda7d18b0bd2bb2adce536e04c887a96be04dc3be9b6ef685605196077b379c67d252f160079c3172bbc9a360a715426bdab
+  metadata.gz: 91302c64a85dbe34f87dc1a1c75e2c743a6a7962f25a64732547502bc17bdd946882b29ad0ccd8757171c8897690cc079d8c5fb0569b03e65e8e4480281ecd0b
+  data.tar.gz: 87817c9880ef4cba5665a0b41fbbbce70955a3c05c2666d1b860f12906836c3b58a8ccea1b218c69f8df9d34bff9fac5147f553120a070a530a4f46a3c5b9ce8

data/README.md

@@ -1,6 +1,6 @@
 # Jeny
 
-![](https://travis-ci.com/enspirit/jeny.svg?branch=master)
+[![Tests](https://github.com/enspirit/jeny/actions/workflows/integration.yml/badge.svg)](https://github.com/enspirit/jeny/actions/workflows/integration.yml)
 
 Jeny is a simple yet powerful commandline tool for scaffolding new
 projects and generating code snippets in existing ones.

data/lib/jeny/code_block.rb

@@ -17,7 +17,7 @@ module Jeny
       case d = data[asset]
       when NilClass
       when Hash
-        Dialect.render(source, d)
+        Dialect.render(source, d) rescue source
       when Array
         d.map{|item| instantiate(asset => item) }.join("\n")  
       else

data/lib/jeny/command/generate.rb

@@ -30,6 +30,15 @@ module Jeny
         edit_changed_files(changed)
       end
 
+    private
+
+      def target_for(source, data = self.data)
+        relative = source.relative_to(from)
+        relative.each_filename.map{|f|
+          Dialect.render(f.gsub(/.jeny$/, ""), data)
+        }.inject(to){|t,part| t/part }
+      end
+
     end # class Generate
   end # class Command
 end # module Jeny

data/lib/jeny/command/snippets.rb

@@ -11,19 +11,16 @@ module Jeny
       end
       attr_reader :config, :data, :asset, :from
 
-      alias :to :from
-
       def call
         puts
         sm, state = config.state_manager, OpenStruct.new
         sm.stash(state) if config.sm_stash?
 
         changed = []
-        from.glob("**/*").each do |source|
-          next if source.directory?
-          next if config.ignore_file?(source)
-          pair = snippet_it(source)
-          changed << pair if pair
+        from.each do |source|
+          parent = source
+          parent = source.parent until parent.directory?
+          _call(source, parent, changed)
         end
 
         sm.commit(changed.map(&:first), state) if config.sm_commit?
@@ -36,7 +33,25 @@ module Jeny
         sm.unstash(state) if config.sm_stash?
       end
 
-      def snippet_it(source)
+      def _call(source, parent, changed)
+        raise ArgumentError, parent unless parent.directory?
+
+        if source.file?
+          return if config.ignore_file?(source)
+          pair = snippet_it(source, parent)
+          changed << pair if pair
+        elsif source.directory?
+          source.glob("**/*").each do |sub|
+            next if sub.directory?
+            _call(sub, parent, changed)
+          end
+        else
+          raise ArgumentError, "Not a file, nor or directly: #{source}"
+        end
+      end
+      private :_call
+
+      def snippet_it(source, parent)
         target, target_content = nil
         if source.ext =~ /\.?jeny/
           file = File::Full.new(source, config)
@@ -62,7 +77,13 @@ module Jeny
         target ? [target, target_content] : nil
       rescue => ex
         msg = "Error in `#{simplify_path(source)}`: #{ex.message}"
-        raise Error, msg
+        raise Error, msg, ex.backtrace
+      end
+
+    private
+
+      def target_for(source, data = self.data)
+        Path(Dialect.render(source.to_s.gsub(/\.jeny/, ""), data))
       end
 
     end # class Snippets

data/lib/jeny/command/support.rb

@@ -2,13 +2,6 @@ module Jeny
   class Command
     module Support
 
-      def target_for(source, data = self.data)
-        relative = source.relative_to(from)
-        relative.each_filename.map{|f|
-          Dialect.render(f.gsub(/.jeny$/, ""), data)
-        }.inject(to){|t,part| t/part }
-      end
-
       def simplify_path(path)
         if path.to_s.start_with?(Path.pwd.to_s)
           path.relative_to(Path.pwd)

data/lib/jeny/command.rb

@@ -26,10 +26,11 @@ module Jeny
         to.mkdir_p
         Generate.new(@config, jeny_data, from, to).call
       when "s", "snippets"
-        _, asset, source = args
+        _, asset, *source = args
         raise Error, "Asset must be specified" if asset.nil? or Path(asset).exist?
-        source ||= Path.pwd
-        Snippets.new(@config, jeny_data, asset, Path(source)).call
+        source = [Path.pwd] if source.empty?
+        from = source.map{|t| Path(t) }
+        Snippets.new(@config, jeny_data, asset, from).call
       else
         raise Error, "Unknown command `#{command}`"
       end

data/lib/jeny/configuration.rb

@@ -6,8 +6,8 @@ module Jeny
     }
 
     def initialize
-      @jeny_block_delimiter = "#jeny"
-      @ignore_pattern = /^(vendor|\.bundle)/
+      @jeny_block_delimiter = "(#|\/\/)jeny"
+      @ignore_pattern = /^(vendor|\.bundle|.min.js|.min.css)/
       @editor_command = default_editor_command
       @edit_changed_files = DEFAULT_EDIT_PROC
       @state_manager = default_state_manager
@@ -54,7 +54,7 @@ module Jeny
     # either true of false.
     #
     # Both are true by default.
-    attr_reader :state_manager_options
+    attr_accessor :state_manager_options
 
     # :nodoc:
     def sm_stash?

data/lib/jeny/file/full.rb

@@ -3,7 +3,7 @@ module Jeny
     class Full < File
 
       def context_rgx
-        /^#{config.jeny_block_delimiter}\(([a-z]+)\)\s*$/
+        /^#{config.jeny_block_delimiter}\((?<asset>[a-z]+)\)\s*$/
       end
 
       def has_jeny_context?
@@ -11,8 +11,8 @@ module Jeny
       end
 
       def instantiate_context(data)
-        if path.readlines.first =~ context_rgx
-          data[$1]
+        if match = path.readlines.first.match(context_rgx)
+          data[match[:asset]]
         else
           data
         end
@@ -21,7 +21,7 @@ module Jeny
       def instantiate(data)
         path.readlines.map{|l|
           next if l =~ context_rgx
-          Dialect.render(l, data)
+          Dialect.render(l, data) rescue l
         }.compact.join("")
       end
 

data/lib/jeny/file/with_blocks.rb

@@ -4,31 +4,34 @@ module Jeny
 
       def has_jeny_blocks?
         !jeny_blocks.empty?
+      rescue Exception => ex
+        puts "WARN: #{path} skipped: #{ex.message}"
+        false
       end
-  
+
       def jeny_blocks
         @jeny_blocks ||= _parse_jeny_blocks(path.readlines, 0, [])
       end
-  
+
       def instantiate(data)
         return path.read unless has_jeny_blocks?
         _instantiate(data, path.readlines, 0, jeny_blocks, []).join("")
       end
-  
+
     private
-  
+
       def _parse_jeny_blocks(lines, index, blocks)
         if index >= lines.size
           blocks
-        elsif lines[index] =~ jeny_block_regex
+        elsif match = (lines[index].match(jeny_block_regex))
           source, new_index = _parse_jeny_block(lines, index)
-          blocks << CodeBlock.new(source, path, index+1, $1)
+          blocks << CodeBlock.new(source, path, index+1, match[:asset])
           _parse_jeny_blocks(lines, new_index+1, blocks)
         else
           _parse_jeny_blocks(lines, index+1, blocks)
         end
       end
-  
+
       def _parse_jeny_block(lines, index, str = "")
         if lines[index] =~ jeny_block_regex
           _parse_jeny_block(lines, index+1, str + lines[index])
@@ -40,7 +43,7 @@ module Jeny
           [source, index]
         end
       end
-  
+
       def _instantiate(data, lines, index, blocks, acc)
         block = blocks.first
         if block.nil?
@@ -57,11 +60,11 @@ module Jeny
           _instantiate(data, lines, block.line_index, blocks, acc)
         end
       end
-  
+
       def jeny_block_regex
-        @jeny_block_regex ||= %r{^\s*#{config.jeny_block_delimiter}\(([a-z]+)\)}m
+        @jeny_block_regex ||= %r{^\s*#{config.jeny_block_delimiter}\((?<asset>[a-z]+)\)}m
       end
-  
+
       def jeny_block_gsub
         @jeny_block_gsub ||= %r{#{config.jeny_block_delimiter}(\([a-z]+\))[ ]?}
       end

data/lib/jeny/version.rb

@@ -1,7 +1,7 @@
 module Jeny
   module Version
     MAJOR = 1
-    MINOR = 0
+    MINOR = 1
     TINY  = 0
   end
   VERSION = "#{Version::MAJOR}.#{Version::MINOR}.#{Version::TINY}"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jeny
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Bernard Lambeau
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-30 00:00:00.000000000 Z
+date: 2022-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: path
@@ -99,7 +99,7 @@ homepage: http://github.com/enspirit/jeny
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -115,7 +115,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.4
-signing_key:
+signing_key: 
 specification_version: 4
 summary: Simple scaffolding and code generation
 test_files: []