victor-cli 0.3.7 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce744b2b082946dbf4de7f8520c64b21e6d1c36351bcf7713367e953dd392d37
-  data.tar.gz: c76d15b13b96e4d4782b41b0ab74d5423f0024bd2d0a4ae58cfd7ee0e055144a
+  metadata.gz: 68eb51ef26c1d7c3c6caae0e57f92e0781b1291a141843216a9931c986a7364f
+  data.tar.gz: e185c0265b30bdb56f361d874aca8c5751617557896449189ff04d37772b5156
 SHA512:
-  metadata.gz: 90b0c065db9774ff300ea7a0d848bd8b0cdf41355418113c9fbd07d27dcbcb52ff4412967b5cb4476148acf23de71b9a4b44ca11b54356c706aceeb1e8af47cc
-  data.tar.gz: '097a7e56ff5d6f7d09c683d71ab2151a5eb49a10174ed4823e115e60872de5209e5663a79e688c1feb45f863ae141e8cd6125cfb049360eecd21e8b74e0dbba7'
+  metadata.gz: ddf03db760406c47377ce311e6047da11a1e357d8f36277de219aebdc9b35da303da97d27db491528015f11f9229c252d0bc00ca897b2427e36d1bebcd69009a
+  data.tar.gz: b87940516ed8144fc0a2a16da8e9e16ed7968838d3bcdab3497fe2cd75612a772b37c6c4869430591e66a26495dd4371d28865fcd3c6b791181bdb1222000b7b

data/README.md

@@ -1,15 +1,7 @@
 # Victor CLI
 
-[![Gem Version](https://badge.fury.io/rb/victor-cli.svg)](https://badge.fury.io/rb/victor-cli)
-[![Build Status](https://github.com/DannyBen/victor-cli/workflows/Test/badge.svg)](https://github.com/DannyBen/victor-cli/actions?query=workflow%3ATest)
-[![Maintainability](https://api.codeclimate.com/v1/badges/ab7a46b42d268e374ee1/maintainability)](https://codeclimate.com/github/DannyBen/victor-cli/maintainability)
-
----
-
 Command line interface for [Victor][victor], the SVG Library.
 
----
-
 ## Installation
 
     $ gem install victor-cli
@@ -32,21 +24,24 @@ Given this Ruby code:
 # example.rb
 setup width: 140, height: 100
 
+# allow changing parameters from the command line
+color = params[:color] || :yellow
+
 build do
-  circle cx: 50, cy: 50, r: 30, fill: "yellow"
+  circle cx: 50, cy: 50, r: 30, fill: color
 end
 ```
 
 Run this command:
 ```shell
-$ victor render example.rb --template minimal
+$ victor render example.rb --template minimal color=blue
 ```
 
 To generate this code:
 
 ```xml
 <svg width="140" height="100">
-  <circle cx="50" cy="50" r="30" fill="yellow"/>
+  <circle cx="50" cy="50" r="30" fill="blue"/>
 </svg>
 ```
 

data/bin/victor

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

data/lib/victor/cli/command_line.rb

@@ -6,7 +6,7 @@ module Victor
   module CLI
     class CommandLine
       def self.router
-        router = MisterBin::Runner.new version: VERSION,
+        router = MisterBin::Runner.new version: "#{Victor::CLI::VERSION} (victor #{Victor::VERSION})",
           header: 'Victor SVG Utilities'
 
         router.route 'init',    to: Commands::Init

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

@@ -4,7 +4,7 @@ module Victor
       class Convert < Base
         summary 'Convert SVG to Ruby code'
 
-        usage 'victor convert SVG_FILE [RUBY_FILE --template NAME]'
+        usage 'victor convert SVG_FILE [--save RUBY_FILE --template NAME]'
         usage 'victor convert (-h|--help)'
 
         option '-t, --template NAME', <<~USAGE
@@ -14,21 +14,15 @@ module Victor
             cli          a Victor CLI compatible DSL script (default)
         USAGE
 
-        param 'SVG_FILE', 'Input SVG file'
+        option '-o, --save RUBY_FILE', 'Save to RUBY file instead of printing to stdout'
+
         param 'RUBY_FILE', 'Output Ruby file. Leave empty to write to stdout'
 
-        example 'victor convert example.svg example.rb'
+        example 'victor convert example.svg --save example.rb'
 
         def run
-          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']
-
           if ruby_file
             File.write ruby_file, code
             say "Saved #{ruby_file}"
@@ -37,6 +31,17 @@ module Victor
           end
         end
 
+      protected
+
+        def svg_file = args['SVG_FILE']
+        def template = args['--template']
+        def ruby_file = args['--save']
+
+        def svg_node = @svg_node ||= SVGNode.load_file(svg_file, layout: template)
+        def code = @code ||= svg_node.render
+
+      private
+
         def validate_template(template)
           allowed = %w[cli dsl standalone]
           return if allowed.include? template

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

@@ -4,9 +4,11 @@ module Victor
   module CLI
     module Commands
       class Render < Base
+        using PairSplit
+
         summary 'Render Ruby code to SVG'
 
-        usage 'victor render RUBY_FILE [SVG_FILE] [options]'
+        usage 'victor render RUBY_FILE [options] [PARAMS...]'
         usage 'victor render (-h|--help)'
 
         option '-t, --template TEMPLATE', <<~USAGE
@@ -15,28 +17,33 @@ module Victor
         USAGE
 
         option '-w, --watch', 'Watch the source file and regenerate on change'
+        option '-o, --save SVG_FILE', 'Save to SVG file instead of printing to stdout'
 
         param 'RUBY_FILE', 'Input Ruby file'
-        param 'SVG_FILE', 'Output SVG file. Leave empty to write to stdout'
+        param 'PARAMS', 'One or more key=value pairs that will be available in the `params` hash for the Ruby script'
 
-        example 'victor render input.rb output.svg'
-        example 'victor render input.rb output.svg --watch'
+        example 'victor render input.rb -o output.svg'
+        example 'victor render input.rb --save output.svg --watch'
         example 'victor render input.rb --template minimal'
+        example 'victor render input.rb color=black "text=Hello World"'
 
         def run
-          if args['--watch']
-            watch_and_generate
-          else
-            generate
-          end
+          args['--watch'] ? watch_and_generate : generate
         end
 
+      protected
+
+        def ruby_file = args['RUBY_FILE']
+        def svg_file = args['--save']
+        def template = args['--template']
+        def params = @params ||= args['PARAMS'].pair_split
+
       private
 
         def generate
           code = File.read ruby_file
 
-          ruby_source = RubySource.new code, ruby_file
+          ruby_source = RubySource.new code, filename: ruby_file, params: params
           ruby_source.evaluate
           ruby_source.template template if template
 
@@ -51,7 +58,7 @@ module Victor
         def watch
           say "Watching #{ruby_file} for changes"
           file_watcher.watch do |changes|
-            changes.each do |_path, event|
+            changes.each_value do |event|
               yield unless event == :deleted
             end
           end
@@ -68,18 +75,6 @@ module Victor
         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

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

@@ -0,0 +1,13 @@
+module Victor
+  module CLI
+    module PairSplit
+      refine Array do
+        def pair_split(operator = '=')
+          return {} if empty?
+
+          to_h { |pair| pair.split(operator, 2) }.transform_keys(&:to_sym)
+        end
+      end
+    end
+  end
+end

data/lib/victor/cli/ruby_source.rb

@@ -2,14 +2,18 @@ module Victor
   module CLI
     class RubySource
       include Victor::DSL
-      attr_reader :code, :filename
 
-      def initialize(code, filename = nil)
+      attr_reader :code, :filename, :global_params, :params
+
+      def initialize(code, filename: nil, params: nil)
         @code = code
         @filename = filename
+        @global_params = params || {}
+        @params = global_params
       end
 
-      def evaluate
+      def evaluate(local_params = nil)
+        @params = local_params || global_params
         if filename
           instance_eval code, filename
         else

data/lib/victor/cli/version.rb

@@ -1,5 +1,5 @@
 module Victor
   module CLI
-    VERSION = '0.3.7'
+    VERSION = '0.4.0'
   end
 end

data/lib/victor/cli.rb

@@ -5,8 +5,3 @@ require_relative 'cli/ruby_source'
 require_relative 'cli/css_data'
 require_relative 'cli/command_line'
 require_relative 'cli/svg_node'
-
-if ENV['BYEBUG']
-  require 'byebug'
-  require 'lp'
-end

metadata

@@ -1,36 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: victor-cli
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.4.0
 platform: ruby
 authors:
 - Danny Ben Shitrit
 - Max Brosnahan
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-20 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colsole
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.8.1
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.8.1
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: css_parser
   requirement: !ruby/object:Gem::Requirement
@@ -93,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: requires
   requirement: !ruby/object:Gem::Requirement
@@ -135,14 +128,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
+- !ruby/object:Gem::Dependency
+  name: logger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
 description: CLI for Victor, the SVG Library
 email: db@dannyben.com
 executables:
@@ -159,6 +166,7 @@ files:
 - lib/victor/cli/commands/init.rb
 - lib/victor/cli/commands/render.rb
 - lib/victor/cli/css_data.rb
+- lib/victor/cli/refinements/pair_split.rb
 - lib/victor/cli/refinements/rendering.rb
 - lib/victor/cli/ruby_source.rb
 - lib/victor/cli/svg_node.rb
@@ -176,8 +184,10 @@ homepage: https://github.com/dannyben/victor-cli
 licenses:
 - MIT
 metadata:
+  bug_tracker_uri: https://github.com/DannyBen/victor-cli/issues
+  changelog_uri: https://github.com/DannyBen/victor-cli/blob/master/CHANGELOG.md
+  source_code_uri: https://github.com/DannyBen/victor-cli
   rubygems_mfa_required: 'true'
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -185,15 +195,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: '3.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.8
-signing_key: 
+rubygems_version: 3.6.9
 specification_version: 4
 summary: CLI for Victor, the SVG Library
 test_files: []