synvert 0.19.3 → 0.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b2cb7297283566f1929523ec1bd27886170ce2c8dc8b4ddf6e07a13d9139ba0
-  data.tar.gz: 64d388db47dd58a7d40e4a97d7ad954c474b795fd52cfcc39c850e9271b1ad01
+  metadata.gz: 0fb489331d776e367ae6be1c1ab39330b59419b07b9db40e1c6ea215fd612338
+  data.tar.gz: fbbb3fc50e1c05bc67aef081b4490e49f1c839dc24eb76941e2487f2cb240cd3
 SHA512:
-  metadata.gz: 8c005363c25b19c5253732c9f262643fab4ea4c928aaf10bcc11aa5672cf55464864cc7518b1f74d81ae7fb1876f075a699beb9d0444b3de05aaee98d5a15725
-  data.tar.gz: c6d1bb9f75b6f8a06dfd37e7bf94df5bb9750911bc00c4b9059616dddeb4629e30619b7f1fe38daf6de7f7a806b4f8cc3effd90f740addf9a2f9babb39a04e63
+  metadata.gz: dad0c74122ab91f6a05907af7bca9fb3badbb3a137a6914227508814de3682f6578975bd9a2aa51a577881ccb6c22e837b43b2b36c01769eb703f63b2eb1e9a2
+  data.tar.gz: ff5309c3d2ca47e01be1a02aeb5ab9e3f1f6d0ef1c8ea8dc5fe3e8bcf03afeda5035aebf0c4fc26acf62e44097999294fab431936a665e3726ba9a6314522641

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # CHANGELOG
 
+## 0.20.0 (2022-08-20)
+
+* Rename `load_rewriters` to `read_rewriters`
+* Run a snippet from remote url or local file path
+
 ## 0.19.3 (2022-07-18)
 
 * Require json

data/README.md

@@ -40,7 +40,6 @@ $ synvert-ruby -r factory_bot/use_short_syntax
 ```
 $ synvert-ruby -h
 Usage: synvert-ruby [project_path]
-    -d, --load SNIPPET_PATHS         load custom snippets, snippet paths can be local file path or remote http url
     -l, --list                       list all available snippets
     -q, --query QUERY                query specified snippets
     -s, --show SNIPPET_NAME          show specified snippet description, SNIPPET_NAME is combined by group and name, e.g. ruby/new_hash_syntax
@@ -48,7 +47,7 @@ Usage: synvert-ruby [project_path]
     -g, --generate NEW_SNIPPET_NAME  generate a new snippet
         --sync                       sync snippets
         --execute                    execute snippet
-    -r, --run SNIPPET_NAME           run specified snippet, e.g. ruby/new_hash_syntax
+    -r, --run SNIPPET_NAME           run specified snippet, e.g. ruby/new_hash_syntax, or remote url, or local file path
         --show-run-process           show processing files when running a snippet
         --skip FILE_PATTERNS         skip specified files or directories, separated by comma, e.g. app/models/post.rb,vendor/plugins/**/*.rb
     -f, --format FORMAT              output format
@@ -99,10 +98,16 @@ Run a snippet, analyze and then rewrite code.
 $ synvert-ruby -r factory_bot/use_short_syntax ~/Sites/xinminlabs/synvert-core-ruby
 ```
 
-Load custom snippet
+run a snippet from remote url
 
 ```
-$ synvert-ruby --load ~/.custom-snippets/my-own-snippet.rb -r my-own-snippet ~/Sites/xinminlabs/synvert-core-ruby
+$ synvert-ruby -r https://raw.githubusercontent.com/xinminlabs/synvert-snippets-ruby/master/lib/factory_bot/use_short_syntax.rb ~/sites/xinminlabs/synvert-core-ruby
+```
+
+run a snippet from local path
+
+```
+$ synvert-ruby -r ~/.synvert-ruby/lib/factory_bot/use_short_syntax.rb ~/sites/xinminlabs/synvert-core-ruby
 ```
 
 Show processing files when running a snippet.

data/lib/synvert/cli.rb

@@ -2,6 +2,8 @@
 
 require 'optparse'
 require 'json'
+require 'uri'
+require 'open-uri'
 
 module Synvert
   # Synvert command line interface.
@@ -16,7 +18,7 @@ module Synvert
 
     # Initialize a CLI.
     def initialize
-      @options = { command: 'run', custom_snippet_paths: [], format: 'plain' }
+      @options = { command: 'run', format: 'plain' }
     end
 
     # Run the CLI.
@@ -27,12 +29,12 @@ module Synvert
 
       case @options[:command]
       when 'list'
-        load_rewriters
+        read_rewriters
         list_available_rewriters
       when 'open'
         open_rewriter
       when 'query'
-        load_rewriters
+        read_rewriters
         query_available_rewriters
       when 'show'
         show_rewriter
@@ -43,9 +45,19 @@ module Synvert
       when 'execute'
         execute_snippet
       else
-        # run
-        load_rewriters
-        run_snippet
+        if /^http/.match?(@options[:snippet_name])
+          uri = URI.parse(@options[:snippet_name])
+          eval(uri.open.read)
+          snippet_name = get_last_snippet_name
+          run_snippet(snippet_name)
+        elsif File.exists?(@options[:snippet_name])
+          require(@options[:snippet_name])
+          snippet_name = get_last_snippet_name
+          run_snippet(snippet_name)
+        else
+          read_rewriters
+          run_snippet(@options[:snippet_name])
+        end
       end
       true
     rescue SystemExit
@@ -67,11 +79,6 @@ module Synvert
       optparse =
         OptionParser.new do |opts|
           opts.banner = 'Usage: synvert-ruby [project_path]'
-          opts.on '-d',
-                  '--load SNIPPET_PATHS',
-                  'load custom snippets, snippet paths can be local file path or remote http url' do |snippet_paths|
-            @options[:custom_snippet_paths] = snippet_paths.split(',').map(&:strip)
-          end
           opts.on '-l', '--list', 'list all available snippets' do
             @options[:command] = 'list'
           end
@@ -99,7 +106,7 @@ module Synvert
           opts.on '--execute', 'execute snippet' do
             @options[:command] = 'execute'
           end
-          opts.on '-r', '--run SNIPPET_NAME', 'run specified snippet, e.g. ruby/new_hash_syntax' do |snippet_name|
+          opts.on '-r', '--run SNIPPET_NAME', 'run specified snippet, e.g. ruby/new_hash_syntax, or remote url, or local file path' do |snippet_name|
             @options[:snippet_name] = snippet_name
           end
           opts.on '--show-run-process', 'show processing files when running a snippet' do
@@ -129,21 +136,9 @@ module Synvert
       end
     end
 
-    # Load all rewriters.
-    def load_rewriters
+    # read all rewriters.
+    def read_rewriters
       Dir.glob(File.join(default_snippets_home, 'lib/**/*.rb')).each { |file| require file }
-
-      @options[:custom_snippet_paths].each do |snippet_path|
-        if /^http/.match?(snippet_path)
-          uri = URI.parse snippet_path
-          eval(uri.read)
-        else
-          require snippet_path
-        end
-      end
-    rescue StandardError
-      FileUtils.rm_rf default_snippets_home
-      retry
     end
 
     # List and print all available rewriters.
@@ -234,8 +229,7 @@ module Synvert
     end
 
     # run snippets
-    def run_snippet
-      snippet_name = @options[:snippet_name]
+    def run_snippet(snippet_name)
       if plain_output?
         puts "===== #{snippet_name} started ====="
         group, name = snippet_name.split('/')
@@ -338,5 +332,12 @@ module Synvert
     def json_output?
       @options[:format] == 'json'
     end
+
+    # get the last registered snippet name
+    def get_last_snippet_name
+      group = Rewriter.availables.keys.last
+      name = Rewriter.availables[group].keys.last
+      return [group, name].join("/")
+    end
   end
 end

data/lib/synvert/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Synvert
-  VERSION = '0.19.3'
+  VERSION = '0.20.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: synvert
 version: !ruby/object:Gem::Version
-  version: 0.19.3
+  version: 0.20.0
 platform: ruby
 authors:
 - Richard Huang
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-18 00:00:00.000000000 Z
+date: 2022-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: synvert-core