victor-cli 0.3.4 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5310277ac8adfa21b11145be6a0ca34b198a9407e8186eb1a54ac5af7da4b685
-  data.tar.gz: fff3d483dbf41ef774a4a3a5f30d6abc72c55919d6516c03dec8d1dfdb0f4c19
+  metadata.gz: afafb8c88c6da7d1af79069ad31bb509ff5888c69e659a753e0eb753004defcd
+  data.tar.gz: 849b54edb118a6e4a2b3c5c91c0dbb21c4067fa712aef3984e46928d3ca63696
 SHA512:
-  metadata.gz: 1001b0a3ccd0d48944f3abf93956acf8e524c71e2dd81a9b39dd0ee415197f8ebcf9b29f2f2cada4bef4cba7e910b2865e671ffa7ff2c8cb1b1f28ab3fb65a1e
-  data.tar.gz: 0d3e77e6cd44a095f5d7d45d7130ea2fd685bda224e1d31d1739eb60580216a90ab6be253ca8ae4cbad9ec70f8e57a9e9fdcbdbf50ca6d2c8045982c146fc014
+  metadata.gz: 1dc516300e9686ad0b9418f653ecdc4a78853f8f7a93334beb8d834fffdb741649b369e001c5b2f13f763f270239654d75d28c50ddadf6a9d0f3ace1aec80544
+  data.tar.gz: 13d73e7b3017f22ddbf4394ae263f5d9adfd50eb95f6060b4b8e7ee0aad40096fc47456e2440b6754f11342d46dd573feb155c093a28886896d8ac9dcadcfb58

data/bin/victor

@@ -3,7 +3,7 @@ require 'victor/cli'
 require 'pretty_trace/enable-trim'
 
 include Colsole
-PrettyTrace.filter [/gem/, /lib/, /bin\/victor/]
+PrettyTrace.filter [/gem/, /lib/, %r{bin/victor}]
 PrettyTrace.debug_tip
 
 router = Victor::CLI::CommandLine.router

data/lib/victor/cli/command_line.rb

@@ -1,12 +1,13 @@
 require 'mister_bin'
-requires 'commands/base', 'commands'
+requires 'commands/base'
+requires 'commands'
 
 module Victor
   module CLI
     class CommandLine
       def self.router
         router = MisterBin::Runner.new version: VERSION,
-          header: "Victor SVG Utilities"
+          header: 'Victor SVG Utilities'
 
         router.route 'init',    to: Commands::Init
         router.route 'convert', to: Commands::Convert
@@ -15,6 +16,5 @@ module Victor
         router
       end
     end
-
   end
-end
+end

data/lib/victor/cli/commands/base.rb

@@ -9,4 +9,4 @@ module Victor
       end
     end
   end
-end
+end

data/lib/victor/cli/commands/convert.rb

@@ -2,30 +2,32 @@ module Victor
   module CLI
     module Commands
       class Convert < Base
-        summary "Convert SVG to Ruby code"
+        summary 'Convert SVG to Ruby code'
 
-        usage "victor convert SVG_FILE [RUBY_FILE --template NAME]"
-        usage "victor convert (-h|--help)"
+        usage 'victor convert SVG_FILE [RUBY_FILE --template NAME]'
+        usage 'victor convert (-h|--help)'
 
-        option "-t, --template NAME", "Name of the Ruby template to use. Can be:\n" +
-          "  standalone   a full standalone Ruby script\n" +
-          "  dsl          a Victor DSL script\n" +
-          "  cli          a Victor CLI compatible DSL script (default)"
+        option '-t, --template NAME', <<~USAGE
+          Name of the Ruby template to use. Can be:
+            standalone   a full standalone Ruby script
+            dsl          a Victor DSL script
+            cli          a Victor CLI compatible DSL script (default)
+        USAGE
 
-        param "SVG_FILE", "Input SVG file"
-        param "RUBY_FILE", "Output Ruby file. Leave empty to write to stdout"
+        param 'SVG_FILE', 'Input SVG file'
+        param 'RUBY_FILE', 'Output Ruby file. Leave empty to write to stdout'
 
-        example "victor convert example.svg example.rb"
+        example 'victor convert example.svg example.rb'
 
         def run
-          svg_file = args["SVG_FILE"]
+          svg_file = args['SVG_FILE']
           template = args['--template']
           svg_node = SVGNode.load_file svg_file, layout: template
 
           validate_template template if template
 
           code = svg_node.render
-          ruby_file = args["RUBY_FILE"]
+          ruby_file = args['RUBY_FILE']
 
           if ruby_file
             File.write ruby_file, code
@@ -37,9 +39,9 @@ module Victor
 
         def validate_template(template)
           allowed = %w[cli dsl standalone]
-          unless allowed.include? template
-            raise "Template not found #{template}\nAvailable templates: #{allowed.join ', '}"
-          end
+          return if allowed.include? template
+
+          raise "Template not found #{template}\nAvailable templates: #{allowed.join ', '}"
         end
       end
     end

data/lib/victor/cli/commands/init.rb

@@ -2,20 +2,22 @@ module Victor
   module CLI
     module Commands
       class Init < Base
-        summary "Create a sample Victor Ruby script"
+        summary 'Create a sample Victor Ruby script'
 
-        usage "victor init RUBY_FILE [--template TEMPLATE]"
-        usage "victor init (-h|--help)"
+        usage 'victor init RUBY_FILE [--template TEMPLATE]'
+        usage 'victor init (-h|--help)'
 
-        option "-t, --template NAME", "Name of the Ruby template to use. Can be:\n" +
-          "  standalone   a full standalone Ruby script\n" +
-          "  dsl          a Victor DSL script\n" +
-          "  cli          a Victor CLI compatible DSL script (default)"
+        option '-t, --template NAME', <<~USAGE
+          Name of the Ruby template to use. Can be:
+            standalone   a full standalone Ruby script
+            dsl          a Victor DSL script
+            cli          a Victor CLI compatible DSL script (default)
+        USAGE
 
-        param "RUBY_FILE", "Output Ruby file"
+        param 'RUBY_FILE', 'Output Ruby file'
 
-        example "victor init ghost.rb"
-        example "victor init ghost.rb --template standalone"
+        example 'victor init ghost.rb'
+        example 'victor init ghost.rb --template standalone'
 
         def run
           raise "File already exists #{filename}" if File.exist? filename
@@ -26,21 +28,21 @@ module Victor
 
           File.write filename, content
           say "Saved #{filename}"
-          
+
           if template == 'cli'
-            say %Q[Run !txtblu!victor render "#{filename}"!txtrst! to render]
+            say %[Run !txtblu!victor render "#{filename}"!txtrst! to render]
           else
-            say %Q[Run !txtblu!ruby "#{filename}"!txtrst! to render]
+            say %[Run !txtblu!ruby "#{filename}"!txtrst! to render]
           end
         end
 
       private
 
         def filename
-          @filename ||= if args["RUBY_FILE"].end_with? '.rb'
-            args["RUBY_FILE"]
+          @filename ||= if args['RUBY_FILE'].end_with? '.rb'
+            args['RUBY_FILE']
           else
-            args['RUBY_FILE'] + ".rb"
+            "#{args['RUBY_FILE']}.rb"
           end
         end
 
@@ -59,11 +61,11 @@ module Victor
         end
 
         def templates_path
-          @templates_path ||= File.expand_path "../templates/init", __dir__
+          @templates_path ||= File.expand_path '../templates/init', __dir__
         end
 
         def available_templates
-          ['cli', 'dsl', 'standalone']
+          %w[cli dsl standalone]
         end
       end
     end

data/lib/victor/cli/commands/render.rb

@@ -4,22 +4,24 @@ module Victor
   module CLI
     module Commands
       class Render < Base
-        summary "Render Ruby code to SVG"
+        summary 'Render Ruby code to SVG'
 
-        usage "victor render RUBY_FILE [SVG_FILE] [options]"
-        usage "victor render (-h|--help)"
+        usage 'victor render RUBY_FILE [SVG_FILE] [options]'
+        usage 'victor render (-h|--help)'
 
-        option '-t, --template TEMPLATE', "Set SVG template\n"+
-          "Can be: default, html, minimal, or a file path"
+        option '-t, --template TEMPLATE', <<~USAGE
+          Set SVG template
+          Can be: default, html, minimal, or a file path
+        USAGE
 
         option '-w, --watch', 'Watch the source file and regenerate on change'
 
-        param "RUBY_FILE", "Input Ruby file"
-        param "SVG_FILE", "Output SVG file. Leave empty to write to stdout"
+        param 'RUBY_FILE', 'Input Ruby file'
+        param 'SVG_FILE', 'Output SVG file. Leave empty to write to stdout'
 
-        example "victor render input.rb output.svg"
-        example "victor render input.rb output.svg --watch"
-        example "victor render input.rb --template minimal"
+        example 'victor render input.rb output.svg'
+        example 'victor render input.rb output.svg --watch'
+        example 'victor render input.rb --template minimal'
 
         def run
           if args['--watch']
@@ -49,7 +51,7 @@ module Victor
         def watch
           say "Watching #{ruby_file} for changes"
           file_watcher.watch do |changes|
-            changes.each do |path, event|
+            changes.each do |_path, event|
               yield unless event == :deleted
             end
           end
@@ -58,7 +60,7 @@ module Victor
         def watch_and_generate
           watch do
             generate
-          rescue Exception => e
+          rescue => e
             say! "!undred!#{e.class}!txtrst!\n#{e.message}"
           end
         end
@@ -68,11 +70,11 @@ module Victor
         end
 
         def ruby_file
-          args["RUBY_FILE"]
+          args['RUBY_FILE']
         end
 
         def svg_file
-          args["SVG_FILE"]
+          args['SVG_FILE']
         end
 
         def template

data/lib/victor/cli/css_data.rb

@@ -1,4 +1,4 @@
-require "css_parser"
+require 'css_parser'
 
 module Victor
   module CLI
@@ -19,9 +19,6 @@ module Victor
       def parser
         @parser ||= CssParser::Parser.new
       end
-
     end
   end
 end
-
-

data/lib/victor/cli/refinements/rendering.rb

@@ -7,28 +7,27 @@ module Victor
           map do |key, value|
             key = key.to_key if key.is_a? String
 
-            if key == "style"
+            if key == 'style'
               value = "{ #{value.style_to_hash.render} }"
             elsif value.is_a? String
               value = value.to_value
             end
 
             "#{key}: #{value}"
-          end.join ", "
+          end.join ', '
         end
-
       end
 
       refine String do
         def to_key
-          gsub('-', '_').to_sym.inspect[1..-1]
+          tr('-', '_').to_sym.inspect[1..]
         end
 
         def to_value
-          if to_f.to_s == self or to_i.to_s == self
+          if (to_f.to_s == self) || (to_i.to_s == self)
             self
           else
-            %Q["#{self}"]
+            %["#{self}"]
           end
         end
 
@@ -37,10 +36,9 @@ module Victor
         def style_to_hash
           parser = CssParser::Parser.new
           parser.load_string! "victor { #{self} }"
-          parser.to_h["all"]["victor"]
+          parser.to_h['all']['victor']
         end
-
       end
     end
   end
-end
+end

data/lib/victor/cli/ruby_source.rb

@@ -32,7 +32,6 @@ module Victor
       def built_in_templates
         %w[default minimal html]
       end
-
     end
   end
 end

data/lib/victor/cli/svg_node.rb

@@ -29,7 +29,7 @@ module Victor
       # Returns formatted Ruby code
       def render
         Rufo::Formatter.format ruby_code
-      rescue Rufo::SyntaxError => e
+      rescue Rufo::SyntaxError
         raise ruby_code
       end
 
@@ -87,7 +87,7 @@ module Victor
       # Returns the path to the appropriate ERB template, based on type
       def erb_template_file
         file = type == :root ? "root_#{layout}" : type
-        path = File.expand_path "templates/nodes/#{file}.erb", __dir__
+        File.expand_path "templates/nodes/#{file}.erb", __dir__
       end
 
       # Returns the internal element type
@@ -114,13 +114,13 @@ module Victor
 
       # Returns a hash of attributes
       def attributes!
-        node.attribute_nodes.map do |attr|
+        node.attribute_nodes.to_h do |attr|
           name = attr.name
           value = attr.value
           key = attr.respond_to?(:prefix) ? "#{attr.prefix}:#{name}" : name
-          
+
           [key, value]
-        end.to_h
+        end
       end
 
       def content!
@@ -135,7 +135,6 @@ module Victor
           # :nocov:
         end
       end
-
     end
   end
 end

data/lib/victor/cli/templates/init/cli.rb

@@ -1,7 +1,7 @@
 # Render this by running:
 # victor render "%{filename}"
 
-setup viewBox: "0 0 100 100"
+setup viewBox: '0 0 100 100'
 
 build do
   circle cx: 50, cy: 50, r: 40, fill: 'yellow'
@@ -11,5 +11,5 @@ build do
     circle cx: x, cy: 40, r: 8, fill: 'white'
   end
 
-  path d: "M11 100 l13 -15 l13 15 l13 -15 l13 15 l13 -15 l13 15 Z", fill: 'white'
+  path d: 'M11 100 l13 -15 l13 15 l13 -15 l13 15 l13 -15 l13 15 Z', fill: 'white'
 end

data/lib/victor/cli/templates/init/dsl.rb

@@ -2,7 +2,7 @@
 # ruby "%{filename}"
 require 'victor/script'
 
-setup viewBox: "0 0 100 100"
+setup viewBox: '0 0 100 100'
 
 build do
   circle cx: 50, cy: 50, r: 40, fill: 'yellow'
@@ -12,8 +12,8 @@ build do
     circle cx: x, cy: 40, r: 8, fill: 'white'
   end
 
-  path d: "M11 100 l13 -15 l13 15 l13 -15 l13 15 l13 -15 l13 15 Z", fill: 'white'
+  path d: 'M11 100 l13 -15 l13 15 l13 -15 l13 15 l13 -15 l13 15 Z', fill: 'white'
 end
 
 puts render
-save "%{basename}"
+save '%{basename}'

data/lib/victor/cli/templates/init/standalone.rb

@@ -2,7 +2,7 @@
 # ruby "%{filename}"
 require 'victor'
 
-svg = Victor::SVG.new viewBox: "0 0 100 100"
+svg = Victor::SVG.new viewBox: '0 0 100 100'
 
 svg.build do
   circle cx: 50, cy: 50, r: 40, fill: 'yellow'
@@ -12,8 +12,8 @@ svg.build do
     circle cx: x, cy: 40, r: 8, fill: 'white'
   end
 
-  path d: "M11 100 l13 -15 l13 15 l13 -15 l13 15 l13 -15 l13 15 Z", fill: 'white'
+  path d: 'M11 100 l13 -15 l13 15 l13 -15 l13 15 l13 -15 l13 15 Z', fill: 'white'
 end
 
 puts svg.render
-svg.save "%{basename}"
+svg.save '%{basename}'

data/lib/victor/cli/version.rb

@@ -1,5 +1,5 @@
 module Victor
   module CLI
-    VERSION = "0.3.4"
+    VERSION = '0.3.6'
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: victor-cli
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.6
 platform: ruby
 authors:
 - Danny Ben Shitrit
@@ -9,120 +9,126 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-23 00:00:00.000000000 Z
+date: 2023-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: filewatcher
+  name: colsole
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0.8'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0.8'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.8.1
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: css_parser
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
-  name: pretty_trace
+  name: filewatcher
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.5
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.5
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: requires
+  name: mister_bin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.7'
 - !ruby/object:Gem::Dependency
-  name: rufo
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: '1.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: '1.10'
 - !ruby/object:Gem::Dependency
-  name: colsole
+  name: pretty_trace
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.2'
 - !ruby/object:Gem::Dependency
-  name: css_parser
+  name: requires
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: mister_bin
+  name: rufo
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.12'
 - !ruby/object:Gem::Dependency
   name: victor
   requirement: !ruby/object:Gem::Requirement
@@ -169,7 +175,8 @@ files:
 homepage: https://github.com/dannyben/victor-cli
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -185,7 +192,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.14
+rubygems_version: 3.4.3
 signing_key: 
 specification_version: 4
 summary: CLI for Victor, the SVG Library