victor-cli 0.2.0 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9acf122e53e375434a1cad7cf0a5c1e93c7b804304f02e0907d0b95776739d4e
-  data.tar.gz: 93bbaa1caa3ccc7747f291f60de666fefd90696ed69c48f055f6ef0136c11bce
+  metadata.gz: 82fc02c3ba2a1713203ac34aa76bd025ae9fb4cf04139c74b7e9dadb055d8005
+  data.tar.gz: 9204eb4ce2e142b989266e7079942f70d13f0051bdeee1618715ef8608eec8c0
 SHA512:
-  metadata.gz: f8f6f15561beecff52a10e4ab4c02837a10ac2037a65ea62467bc1a27d78140917b0f6a0f59d597b41f746b42835e30a3613e45b395d891eaa1113efe241c45f
-  data.tar.gz: de421ce4109502beaffc76f8a3df3b9d27e4f4a5117c411b1f9d417ecc85f01de61030c3623ee76d32e666f04401f94cf803eacd224e2cd80d64d8d0a073e9a9
+  metadata.gz: 5c01a4894fa0830e67d55ef0d90d4a67163765896993d52637d31a26f16eb15215c0ac40797be6bd65958f8a52a1019a343c95551f38a7d2abbf01a222b35963
+  data.tar.gz: 4430b1433977028919dcc33c67225746cf23f08f8ec5520af821dc7997adcaf3f3a793e19ec79fa289ff39b06457015207fde16f2fabe21cec8aec3bf83df991

data/README.md

@@ -16,35 +16,15 @@ Command line interface for [Victor][victor], the SVG Library.
 
 ## Usage
 
-### Convert SVG to Ruby
+### `init`: Create a sample Ruby file
 
-Given this SVG file:
-
-```xml
-<!-- example.svg -->
-<svg width="140" height="100">
-  <circle cx="50" cy="50" r="30" fill="yellow"/>
-</svg>
-```
-
-Run this command:
+Run this command to create an initial sample file:
 
 ```shell
-$ victor to-ruby example.svg
-```
-
-To generate this Ruby code:
-
-```ruby
-setup width: "140", height: "100"
-
-build do
-  circle cx: "50", cy: "50", r: "30", fill: "yellow"
-end
-
+$ victor init example
 ```
 
-### Convert Ruby to SVG
+### `render`: Render Ruby to SVG
 
 Given this Ruby code:
 
@@ -59,7 +39,7 @@ end
 
 Run this command:
 ```shell
-$ victor to-svg example.rb --template minimal
+$ victor render example.rb --template minimal
 ```
 
 To generate this code:
@@ -70,6 +50,33 @@ To generate this code:
 </svg>
 ```
 
+### `convert`: Convert SVG to Ruby
+
+Given this SVG file:
+
+```xml
+<!-- example.svg -->
+<svg width="140" height="100">
+  <circle cx="50" cy="50" r="30" fill="yellow"/>
+</svg>
+```
+
+Run this command:
+
+```shell
+$ victor convert example.svg
+```
+
+To generate this Ruby code:
+
+```ruby
+setup width: 140, height: 100
+
+build do
+  circle cx: 50, cy: 50, r: 30, fill: "yellow"
+end
+
+```
 ---
 
 [victor]: https://github.com/DannyBen/victor

data/bin/victor

@@ -4,6 +4,7 @@ require 'pretty_trace/enable-trim'
 
 include Colsole
 PrettyTrace.filter [/gem/, /lib/, /bin\/victor/]
+PrettyTrace.debug_tip
 
 router = Victor::CLI::CommandLine.router
 exit router.run ARGV

data/lib/victor/cli/command_line.rb

@@ -1,7 +1,5 @@
 require 'mister_bin'
-require_relative 'commands/base'
-require_relative 'commands/generate_ruby'
-require_relative 'commands/generate_svg'
+requires 'commands/base', 'commands'
 
 module Victor
   module CLI
@@ -10,8 +8,9 @@ module Victor
         router = MisterBin::Runner.new version: VERSION,
           header: "Victor SVG Utilities"
 
-        router.route 'to-ruby', to: Commands::GenerateRuby
-        router.route 'to-svg',  to: Commands::GenerateSVG
+        router.route 'init',    to: Commands::Init
+        router.route 'convert', to: Commands::Convert
+        router.route 'render',  to: Commands::Render
 
         router
       end

data/lib/victor/cli/commands/{generate_ruby.rb → convert.rb}

@@ -1,11 +1,11 @@
 module Victor
   module CLI
     module Commands
-      class GenerateRuby < Base
+      class Convert < Base
         summary "Convert SVG to Ruby code"
 
-        usage "victor to-ruby SVG_FILE [RUBY_FILE --template NAME]"
-        usage "victor to-ruby (-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" +
@@ -15,14 +15,16 @@ module Victor
         param "SVG_FILE", "Input SVG file"
         param "RUBY_FILE", "Output Ruby file. Leave empty to write to stdout"
 
-        example "victor to-ruby example.svg example.rb"
+        example "victor convert example.svg example.rb"
 
         def run
-          svg_file = File.read(args["SVG_FILE"])
-          svg_tree = Parser.new(svg_file).parse
-          generator = CodeGenerator.new svg_tree, template: args['--template']
+          svg_file = args["SVG_FILE"]
+          template = args['--template']
+          svg_node = SVGNode.load_file svg_file, layout: template
 
-          code = generator.generate
+          validate_template template if template
+
+          code = svg_node.render
           ruby_file = args["RUBY_FILE"]
 
           if ruby_file
@@ -32,6 +34,13 @@ module Victor
             puts code
           end
         end
+
+        def validate_template(template)
+          allowed = %w[cli dsl standalone]
+          unless allowed.include? template
+            raise "Template not found #{template}\nAvailable templates: #{allowed.join ', '}"
+          end
+        end
       end
     end
   end

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

@@ -0,0 +1,71 @@
+module Victor
+  module CLI
+    module Commands
+      class Init < Base
+        summary "Create a sample Victor Ruby script"
+
+        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)"
+
+        param "RUBY_FILE", "Output Ruby file"
+
+        example "victor init ghost.rb"
+        example "victor init ghost.rb --template standalone"
+
+        def run
+          raise "File already exists #{filename}" if File.exist? filename
+
+          basename = File.basename filename, '.rb'
+          vars = { filename: filename, basename: basename }
+          content = template_content(template) % vars
+
+          File.write filename, content
+          say "Saved #{filename}"
+          
+          if template == 'cli'
+            say %Q[Run !txtblu!victor render "#{filename}"!txtrst! to render]
+          else
+            say %Q[Run !txtblu!ruby "#{filename}"!txtrst! to render]
+          end
+        end
+
+      private
+
+        def filename
+          @filename ||= if args["RUBY_FILE"].end_with? '.rb'
+            args["RUBY_FILE"]
+          else
+            args['RUBY_FILE'] + ".rb"
+          end
+        end
+
+        def template
+          @template ||= args['--template'] || 'cli'
+        end
+
+        def template_content(name)
+          filename = File.join templates_path, "#{name}.rb"
+
+          unless available_templates.include? name
+            raise "Invalid template #{name}\nAvailable templates: #{available_templates.join ', '}"
+          end
+
+          File.read filename
+        end
+
+        def templates_path
+          @templates_path ||= File.expand_path "../templates/init", __dir__
+        end
+
+        def available_templates
+          ['cli', 'dsl', 'standalone']
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,73 @@
+require 'filewatcher'
+
+module Victor
+  module CLI
+    module Commands
+      class Render < Base
+        summary "Render Ruby code to SVG"
+
+        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 '-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"
+
+        example "victor render input.rb output.svg"
+        example "victor render input.rb --template minimal"
+
+        def run
+          if args['--watch']
+            watch { generate }
+          else
+            generate
+          end
+        end
+
+      private
+
+        def generate
+          code = File.read ruby_file
+
+          ruby_source = RubySource.new code, ruby_file
+          ruby_source.evaluate
+          ruby_source.template template if template
+
+          if svg_file
+            ruby_source.svg.save svg_file
+            say "Saved #{svg_file}"
+          else
+            puts ruby_source.svg.render
+          end
+        end
+
+        def watch
+          say "Watching #{ruby_file} for changes"
+          file_watcher.watch do |file, event|
+            yield unless event == :deleted
+          end
+        end
+
+        def file_watcher
+          @file_watcher ||= Filewatcher.new(ruby_file, immediate: true)
+        end
+
+        def ruby_file
+          args["RUBY_FILE"]
+        end
+
+        def svg_file
+          args["SVG_FILE"]
+        end
+
+        def template
+          args['--template']
+        end
+      end
+    end
+  end
+end

data/lib/victor/cli/css_data.rb

@@ -0,0 +1,27 @@
+require "css_parser"
+
+module Victor
+  module CLI
+    class CSSData
+      attr_reader :css_string
+
+      def initialize(css_string)
+        @css_string = css_string
+      end
+
+      def to_h
+        parser.load_string! css_string
+        parser.to_h['all']
+      end
+
+    private
+
+      def parser
+        @parser ||= CssParser::Parser.new
+      end
+
+    end
+  end
+end
+
+

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

@@ -0,0 +1,46 @@
+module Victor
+  module CLI
+    module Rendering
+      refine Hash do
+        def render
+          # TODO: Reduce cognitive complexity
+          map do |key, value|
+            key = key.to_key if key.is_a? String
+
+            if key == "style"
+              value = "{ #{value.style_to_hash.render} }"
+            elsif value.is_a? String
+              value = value.to_value
+            end
+
+            "#{key}: #{value}"
+          end.join ", "
+        end
+
+      end
+
+      refine String do
+        def to_key
+          gsub('-', '_').to_sym.inspect[1..-1]
+        end
+
+        def to_value
+          if to_f.to_s == self or to_i.to_s == self
+            self
+          else
+            %Q["#{self}"]
+          end
+        end
+
+        # Transforms the valus of a style attribute to a hash
+        # Example: "color: black; top: 10" => { color: black, top: 10 }
+        def style_to_hash
+          parser = CssParser::Parser.new
+          parser.load_string! "victor { #{self} }"
+          parser.to_h["all"]["victor"]
+        end
+
+      end
+    end
+  end
+end

data/lib/victor/cli/{ruby_code.rb → ruby_source.rb}

@@ -1,15 +1,20 @@
 module Victor
   module CLI
-    class RubyCode
+    class RubySource
       include Victor::DSL
-      attr_reader :code
+      attr_reader :code, :filename
 
-      def initialize(code)
+      def initialize(code, filename = nil)
         @code = code
+        @filename = filename
       end
 
       def evaluate
-        instance_eval code
+        if filename
+          instance_eval code, filename
+        else
+          instance_eval code
+        end
       end
 
       def template(template)

data/lib/victor/cli/svg_node.rb

@@ -0,0 +1,141 @@
+require 'nokogiri'
+require 'erb'
+require 'rufo'
+
+module Victor
+  module CLI
+    class SVGNode
+      using Rendering
+      attr_reader :node, :layout
+
+      # Returns a new instance from an SVG file
+      def self.load_file(path, layout: nil)
+        load File.read(path), layout: layout
+      end
+
+      # Returns a new instance from raw SVG string
+      def self.load(svg_string, layout: nil)
+        doc = Nokogiri::XML svg_string
+        root = doc.children.last
+        new root, layout: layout
+      end
+
+      # Initializes with a Nokogiri XML node
+      def initialize(node, layout: nil)
+        @node = node
+        @layout = layout || :cli
+      end
+
+      # Returns formatted Ruby code
+      def render
+        Rufo::Formatter.format ruby_code
+      rescue Rufo::SyntaxError => e
+        raise ruby_code
+      end
+
+      def inspect
+        "#<#{self.class} name=#{name}, type=#{type}>"
+      end
+
+      # Returns the tag name
+      def name
+        node.name
+      end
+
+      # Returns one of our internal types (symbol)
+      def type
+        @type ||= type!
+      end
+
+      # Returns a hash of attributes
+      def attributes
+        @attributes ||= attributes!
+      end
+
+      # Returns the content (body) of the lement
+      def content
+        @content ||= content!
+      end
+
+      # Returns an array of children elements (SVGNode)
+      def children
+        @children ||= children!
+      end
+
+      # Returns the ruby code, unformatted
+      def ruby_code
+        erb erb_template
+      end
+
+    private
+
+      # Returns true if the element should be ignored
+      def rejected?
+        (node.text? and node.text.strip.empty?) or type == :junk
+      end
+
+      # Renders ERB code
+      def erb(code)
+        ERB.new(code, trim_mode: '%-').result(binding)
+      end
+
+      # Returns the content of the appropriate ERB tempalte, based on type
+      def erb_template
+        @erb_template ||= File.read(erb_template_file)
+      end
+
+      # 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__
+      end
+
+      # Returns the internal element type
+      def type!
+        if node.text?
+          :text
+        elsif node.comment?
+          :junk
+        elsif node.name == 'style'
+          :css
+        elsif node.name == 'svg'
+          :root
+        else
+          :element
+        end
+      end
+
+      # Returns a filtered list of SVGNode children
+      def children!
+        node.children.map do |child|
+          SVGNode.new child
+        end.reject(&:rejected?)
+      end
+
+      # Returns a hash of attributes
+      def attributes!
+        node.attribute_nodes.map do |attr|
+          name = attr.name
+          value = attr.value
+          key = attr.respond_to?(:prefix) ? "#{attr.prefix}:#{name}" : name
+          
+          [key, value]
+        end.to_h
+      end
+
+      def content!
+        if type == :css
+          CSSData.new(node.content).to_h
+        elsif node.content.is_a? String
+          node.content.strip
+        else
+          # TODO: do we need this?
+          # :nocov:
+          node.content
+          # :nocov:
+        end
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,15 @@
+# Render this by running:
+# victor render "%{filename}"
+
+setup viewBox: "0 0 100 100"
+
+build do
+  circle cx: 50, cy: 50, r: 40, fill: 'yellow'
+  rect x: 10, y: 50, width: 80, height: 50, fill: 'yellow'
+
+  [25, 50].each do |x|
+    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'
+end

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

@@ -0,0 +1,19 @@
+# Render this by running
+# ruby "%{filename}"
+require 'victor/script'
+
+setup viewBox: "0 0 100 100"
+
+build do
+  circle cx: 50, cy: 50, r: 40, fill: 'yellow'
+  rect x: 10, y: 50, width: 80, height: 50, fill: 'yellow'
+
+  [25, 50].each do |x|
+    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'
+end
+
+puts render
+save "%{basename}"

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

@@ -0,0 +1,19 @@
+# Render this by running
+# ruby "%{filename}"
+require 'victor'
+
+svg = Victor::SVG.new viewBox: "0 0 100 100"
+
+svg.build do
+  circle cx: 50, cy: 50, r: 40, fill: 'yellow'
+  rect x: 10, y: 50, width: 80, height: 50, fill: 'yellow'
+
+  [25, 50].each do |x|
+    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'
+end
+
+puts svg.render
+svg.save "%{basename}"

data/lib/victor/cli/templates/nodes/css.erb

@@ -0,0 +1,7 @@
+<%= "# :css" if ENV['DEBUG'] -%>
+<%- content.each do |selector, declarations| %>
+css[<%= selector.inspect %>] = {
+  <%- declarations.each do |key, value| -%>
+  <%= key.to_key %>: <%= value.to_value %>,
+  <%- end -%>}
+<%- end -%>

data/lib/victor/cli/templates/nodes/element.erb

@@ -0,0 +1,18 @@
+<%= "# :element" if ENV['DEBUG'] -%>
+<%- if children.any? -%>
+  <%- if children.count == 1 and children.first.node.text? -%>
+    <%- if attributes.any? -%>
+<%= name %> "<%= content %>", <%= attributes.render %>
+    <%- else -%>
+<%= name %> "<%= content %>"
+    <%- end -%>
+  <%- else -%>
+<%= name %> <%= attributes.render %> do
+    <%- children.each do |child| -%>
+<%= child.render %>
+    <%- end -%>
+end
+  <%- end -%>
+<%- else -%>
+<%= name %> <%= attributes.render %>
+<%- end -%>

data/lib/victor/cli/templates/nodes/root_cli.erb

@@ -0,0 +1,12 @@
+<%= "# :root" if ENV['DEBUG'] -%>
+# Render this template by running 'victor render FILE'
+
+<%- if attributes.any? -%>
+setup <%= attributes.render %>
+<%- end -%>
+
+build do
+<%- children.each do |child| -%>
+<%= child.render %>
+<%- end -%>
+end

data/lib/victor/cli/templates/nodes/root_dsl.erb

@@ -0,0 +1,17 @@
+<%= "# :root" if ENV['DEBUG'] -%>
+# Render this template by running 'ruby FILE' or 'victor render FILE'
+
+require 'victor/script'
+
+<%- if attributes.any? -%>
+setup <%= attributes.render %>
+<%- end -%>
+
+build do
+<%- children.each do |child| -%>
+<%= child.render %>
+<%- end -%>
+end
+
+puts render
+save 'output'

data/lib/victor/cli/templates/nodes/root_standalone.erb

@@ -0,0 +1,14 @@
+<%= "# :root" if ENV['DEBUG'] -%>
+# Render this template by running 'ruby FILE' or 'victor render FILE'
+
+require "victor"
+
+svg = Victor::SVG.new <%= attributes.render %>
+
+svg.build do
+<%- children.each do |child| -%>
+<%= child.render %>
+<%- end -%>
+end
+
+svg.save "result"

data/lib/victor/cli/templates/nodes/text.erb

@@ -0,0 +1,2 @@
+<%= "# :text" if ENV['DEBUG'] -%>
+_ "<%= content %>"

data/lib/victor/cli/version.rb

@@ -1,5 +1,5 @@
 module Victor
   module CLI
-    VERSION = "0.2.0"
+    VERSION = "0.3.2"
   end
 end

data/lib/victor/cli.rb

@@ -1,7 +1,12 @@
 require 'victor'
-require_relative 'cli/parser'
-require_relative 'cli/code_generator'
-require_relative 'cli/ruby_code'
+require 'requires'
+requires 'cli/refinements'
+require_relative 'cli/ruby_source'
+require_relative 'cli/css_data'
 require_relative 'cli/command_line'
+require_relative 'cli/svg_node'
 
-require 'byebug' if ENV['BYEBUG']
+if ENV['BYEBUG']
+  require 'byebug'
+  require 'lp'
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: victor-cli
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.2
 platform: ruby
 authors:
 - Danny Ben Shitrit
@@ -9,64 +9,64 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-29 00:00:00.000000000 Z
+date: 2022-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: mister_bin
+  name: filewatcher
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: colsole
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '1.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '1.10'
 - !ruby/object:Gem::Dependency
-  name: victor
+  name: pretty_trace
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 0.2.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 0.2.5
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: requires
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: rufo
   requirement: !ruby/object:Gem::Requirement
@@ -82,19 +82,61 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.12'
 - !ruby/object:Gem::Dependency
-  name: pretty_trace
+  name: colsole
   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: css_parser
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
+- !ruby/object:Gem::Dependency
+  name: mister_bin
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
+- !ruby/object:Gem::Dependency
+  name: victor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
 description: CLI for Victor, the SVG Library
 email: db@dannyben.com
 executables:
@@ -105,16 +147,24 @@ files:
 - README.md
 - bin/victor
 - lib/victor/cli.rb
-- lib/victor/cli/code_generator.rb
 - lib/victor/cli/command_line.rb
 - lib/victor/cli/commands/base.rb
-- lib/victor/cli/commands/generate_ruby.rb
-- lib/victor/cli/commands/generate_svg.rb
-- lib/victor/cli/parser.rb
-- lib/victor/cli/ruby_code.rb
-- lib/victor/cli/templates/cli.rb
-- lib/victor/cli/templates/dsl.rb
-- lib/victor/cli/templates/standalone.rb
+- lib/victor/cli/commands/convert.rb
+- lib/victor/cli/commands/init.rb
+- lib/victor/cli/commands/render.rb
+- lib/victor/cli/css_data.rb
+- lib/victor/cli/refinements/rendering.rb
+- lib/victor/cli/ruby_source.rb
+- lib/victor/cli/svg_node.rb
+- lib/victor/cli/templates/init/cli.rb
+- lib/victor/cli/templates/init/dsl.rb
+- lib/victor/cli/templates/init/standalone.rb
+- lib/victor/cli/templates/nodes/css.erb
+- lib/victor/cli/templates/nodes/element.erb
+- lib/victor/cli/templates/nodes/root_cli.erb
+- lib/victor/cli/templates/nodes/root_dsl.erb
+- lib/victor/cli/templates/nodes/root_standalone.erb
+- lib/victor/cli/templates/nodes/text.erb
 - lib/victor/cli/version.rb
 homepage: https://github.com/dannyben/victor-cli
 licenses:
@@ -128,14 +178,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.3.14
 signing_key: 
 specification_version: 4
 summary: CLI for Victor, the SVG Library

data/lib/victor/cli/code_generator.rb

@@ -1,81 +0,0 @@
-require "rufo"
-
-module Victor
-  module CLI
-    class CodeGenerator
-      attr_reader :svg_tree, :template
-
-      def initialize(svg_tree, template: nil)
-        @svg_tree = svg_tree
-        @template = template || :cli
-      end
-
-      def generate
-        Rufo::Formatter.format(code_for_node(svg_tree))
-      end
-
-    private
-
-      def code_for_node(node)
-        case node.first
-        when "svg"
-          root_to_ruby node
-        else
-          node_to_ruby node
-        end
-      end
-
-      def node_to_ruby(node)
-        name, attrs, children = node
-        code = "#{name} #{attrs_to_ruby(attrs)} "
-        unless children.empty?
-          code << " do\n"
-          code << nodes_to_ruby(children)
-          code << "\nend\n"
-        end
-        code
-      end
-
-      def nodes_to_ruby(nodes)
-        nodes.map(&method(:code_for_node)).join("\n")
-      end
-
-      def attrs_to_ruby(attrs)
-        attrs.reduce([]) do |acc, (k, v)|
-          acc << "#{k.to_sym.inspect[1..-1]}: #{v.inspect}"
-          acc
-        end.join(",")
-      end
-
-      def root_to_ruby(node)
-        _, attrs, children = node
-        values = {
-          attributes: attrs_to_ruby(attrs),
-          nodes: nodes_to_ruby(children)
-        }
-
-        template_content(template) % values
-      end
-
-      def template_content(name)
-        filename = File.join templates_path, "#{name}.rb"
-
-        unless File.exist? filename
-          raise "Template not found #{name}\nAvailable templates: #{available_templates.join ', '}"
-        end
-
-        File.read filename
-      end
-
-      def templates_path
-        @templates_path ||= File.expand_path "templates", __dir__
-      end
-
-      def available_templates
-        @available_templates ||= Dir["#{templates_path}/*.rb"].map do |path|
-          File.basename path, '.rb'
-        end
-      end
-    end
-  end
-end

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

@@ -1,39 +0,0 @@
-module Victor
-  module CLI
-    module Commands
-      class GenerateSVG < Base
-        summary "Convert Ruby code to SVG"
-
-        usage "victor to-svg RUBY_FILE [SVG_FILE --template TEMPLATE]"
-        usage "victor to-svg (-h|--help)"
-
-        option '-t, --template TEMPLATE', "Set SVG template\n"+
-          "Can be: default, html, minimal, or a file path"
-
-        param "RUBY_FILE", "Input Ruby file"
-        param "SVG_FILE", "Output SVG file. Leave empty to write to stdout"
-
-        example "victor to-svg input.rb output.svg"
-        example "victor to-svg input.rb --template minimal"
-
-        def run
-          ruby_file = args["RUBY_FILE"]
-          svg_file = args["SVG_FILE"]
-          template = args['--template']
-          code = File.read ruby_file
-
-          ruby_code = RubyCode.new code
-          ruby_code.evaluate
-          ruby_code.template template if template
-          
-          if svg_file
-            ruby_code.svg.save svg_file
-            say "Saved #{svg_file}"
-          else
-            puts ruby_code.svg.render
-          end
-        end
-      end
-    end
-  end
-end

data/lib/victor/cli/parser.rb

@@ -1,64 +0,0 @@
-require "nokogiri"
-
-module Victor
-  module CLI
-    class Parser
-      attr_reader :raw_svg
-
-      def initialize(raw_svg)
-        @raw_svg = raw_svg
-      end
-
-      def parse
-        parse_node svg_root
-      end
-
-    private
-
-
-      def parse_node(node)
-        case node
-        when Nokogiri::XML::Comment
-          nil
-        when Nokogiri::XML::Text
-          parse_text node
-        else
-          parse_normal_node node
-        end
-      end
-
-      def parse_text(node)
-        inner_text = node.text
-        cleaned_text = inner_text.strip
-        return nil unless cleaned_text.length > 0
-        return ["_", {}, cleaned_text]
-      end
-
-      def parse_normal_node(node)
-        [
-          node.name,
-          node_attrs(node),
-          node.children.map(&method(:parse_node)).compact,
-        ]
-      end
-
-      def node_attrs(node)
-        node.attributes.values.reduce({}) do |acc, attr|
-          name = attr.name
-          value = attr.value
-          key = attr.respond_to?(:prefix) ? "#{attr.prefix}:#{name}" : name
-          acc[key] = value
-          acc
-        end
-      end
-
-      def xml_doc
-        Nokogiri::XML raw_svg
-      end
-
-      def svg_root
-        xml_doc.children.last
-      end
-    end
-  end
-end

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

@@ -1,8 +0,0 @@
-# Render this template by running 'victor to-svg FILE'
-
-setup %{attributes}
-
-build do
-  %{nodes}
-end
-

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

@@ -1,12 +0,0 @@
-# Render this template by running 'ruby FILE' or 'victor to-svg FILE'
-
-require 'victor/script'
-
-setup %{attributes}
-
-build do
-  %{nodes}
-end
-
-puts render
-save 'output'

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

@@ -1,10 +0,0 @@
-# Render this template by running 'ruby FILE' or 'victor to-svg FILE'
-
-require "victor"
-
-svg = Victor::SVG.new %{attributes}
-svg.build do
-  %{nodes}
-end
-
-svg.save "generated"