synvert 1.0.1 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 72408c5d30fc643921f1bbcd25720f787c0a9e45abe437200ba96d79016065c1
-  data.tar.gz: 986ad580a7d7c91a3309061571db7a52141533e4c6c276176a3348d76e0f8440
+  metadata.gz: fca31952aad5373170fb41622c3dc07c11aa605ae8d13fb8770229062f9543b8
+  data.tar.gz: b57362eedac41f759e397dd10cfb0641690844161ae36e26c5cfd4fbd926d70a
 SHA512:
-  metadata.gz: 7d586039e691d1398bd1c9826ce51a6ea70d849c16ac4e578d591001b241a81eb306a5e2c22fda45ba03ca5d64b8e93e5b427f2fd047ee28192a41af8d855af6
-  data.tar.gz: 70d8f01ed5d84977a9ad7d825ec90f1bd30612624852bd8c92922c26e68519996f302983777be333a110b914304d8ceffd094e9226553846c8deb3030132f3e4
+  metadata.gz: c7e6e5fe021673fd412a984595258134633d2b5d4612e6e9633568865b3e676d662b597024ab3d7cfcc2d285a8586736a0ca76db33d61c401fe62d7677c48b7c
+  data.tar.gz: 60f4d25764698275cb360ef222e07e3794e4bf33f0cde79fb73c87982f43df8516330b3552a3e6d331d77d773e3777ff62854c6c376054557ac2356717391b78

data/.github/workflows/main.yml

@@ -1,17 +1,10 @@
-# This workflow uses actions that are not certified by GitHub.
-# They are provided by a third-party and are governed by
-# separate terms of service, privacy policy, and support
-# documentation.
-# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
-# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
-
-name: CI
+name: Test & deploy documentation
 
 on:
   push:
-    branches: [ master ]
+    branches: [ main ]
   pull_request:
-    branches: [ master ]
+    branches: [ main ]
 
 jobs:
   test:
@@ -30,3 +23,24 @@ jobs:
         bundler-cache: true
     - name: Run tests
       run: bundle exec rake
+
+  deploy:
+    runs-on: ubuntu-latest
+    needs: test
+    name: Update gh-pages to docs
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v2
+        with:
+          node-version: 18
+      - name: Install required npm dependencies
+        run: npm install -g markdown-to-html
+      - name: Create docs
+        run: mkdir docs
+      - name: Generate docs
+        run: github-markdown README.md -s https://cdn.simplecss.org/simple-v1.css > docs/index.html
+      - name: Deploy
+        uses: peaceiris/actions-gh-pages@v3
+        with:
+          deploy_key: ${{ secrets.ACTIONS_DEPLOY_KEY }}
+          publish_dir: ./docs

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # CHANGELOG
 
+## 1.1.1 (2022-10-05)
+
+* Fix get_last_snippet_name, eval snippet to get rewriter
+
+## 1.1.0 (2022-10-03))
+
+* Fix sub snippet not found
+* Support sub snippets in `test`
+
 ## 1.0.1 (2022-09-23)
 
 * Execute with EXECUTE_COMMAND

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    synvert (1.0.1)
-      synvert-core (>= 1.8.0)
+    synvert (1.1.1)
+      synvert-core (>= 1.9.2)
 
 GEM
   remote: https://rubygems.org/
@@ -33,10 +33,10 @@ GEM
       concurrent-ruby (~> 1.0)
     json (2.5.1)
     minitest (5.16.3)
-    node_mutation (1.4.0)
+    node_mutation (1.4.4)
       activesupport (< 7.0.0)
       erubis
-    node_query (1.6.0)
+    node_query (1.7.0)
       activesupport (< 7.0.0)
     parser (3.1.2.1)
       ast (~> 2.4.1)
@@ -64,7 +64,7 @@ GEM
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
     sync (0.5.0)
-    synvert-core (1.9.0)
+    synvert-core (1.9.2)
       activesupport (< 7.0.0)
       erubis
       node_mutation
@@ -82,7 +82,7 @@ GEM
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    zeitwerk (2.6.0)
+    zeitwerk (2.6.1)
 
 PLATFORMS
   x86_64-darwin-20

data/README.md

@@ -1,4 +1,4 @@
-# Synvert
+# synvert-ruby
 
 <img src="https://synvert.net/img/logo_96.png" alt="logo" width="32" height="32" />
 
@@ -56,7 +56,7 @@ Usage: synvert-ruby [project_path]
     -v, --version                    show this version
 ```
 
-#### Sync snippets
+### Sync snippets
 
 [Official Snippets](https://github.com/xinminlabs/synvert-snippets-ruby) are available on github,
 you can sync them any time you want.
@@ -65,17 +65,17 @@ you can sync them any time you want.
 $ synvert-ruby --sync
 ```
 
-#### List snippets
+### List snippets
 
 List all available snippets
 
 ```
 $ synvert-ruby -l
 
-$ synvert-ruby --list --form json
+$ synvert-ruby --list --format json
 ```
 
-#### Show a snippet
+### Show a snippet
 
 Describe what a snippet does.
 
@@ -83,7 +83,7 @@ Describe what a snippet does.
 $ synvert-ruby -s factory_bot/use_short_syntax
 ```
 
-#### Open a snippet
+### Open a snippet
 
 Open a snippet in your editor, editor is defined in
 `ENV['SNIPPET_EDITOR']` or `ENV['EDITOR']`
@@ -92,7 +92,7 @@ Open a snippet in your editor, editor is defined in
 $ synvert-ruby -o factory_bot/use_short_syntax
 ```
 
-#### Run a snippet
+### Run a snippet
 
 Run a snippet, analyze and then rewrite code.
 
@@ -130,7 +130,7 @@ Show processing files when running a snippet.
 $ synvert-ruby -r factory_bot/use_short_syntax --show-run-process ~/Sites/xinminlabs/synvert-core-ruby
 ```
 
-#### Generate a snippet
+### Generate a snippet
 
 Generate a new snippet
 

data/lib/synvert/cli.rb

@@ -43,13 +43,16 @@ module Synvert
       when 'generate'
         generate_snippet
       when 'execute'
+        read_rewriters
         execute_snippet(@options[:execute_command])
       when 'test'
-        group, name = get_snippet_name(@options[:snippet_name])
-        test_snippet(group, name)
+        read_rewriters
+        rewriter = eval_snippet(@options[:snippet_name])
+        test_snippet(rewriter)
       when 'run'
-        group, name = get_snippet_name(@options[:snippet_name])
-        run_snippet(group, name)
+        read_rewriters
+        rewriter = eval_snippet(@options[:snippet_name])
+        run_snippet(rewriter)
       else
         # nothing to do
       end
@@ -230,41 +233,38 @@ module Synvert
       end
     end
 
-    # get snippet name
-    # it can get from explicit snippet name,
+    # eval snippet by name
+    # it can eval by explicit snippet name,
     # or from local path or http url.
-    def get_snippet_name(snippet_name)
+    def eval_snippet(snippet_name)
       if /^http/.match?(snippet_name)
         uri = URI.parse(snippet_name)
         eval(uri.open.read)
-        get_last_snippet_name
       elsif File.exists?(snippet_name)
-        require(snippet_name)
-        get_last_snippet_name
+        eval(File.read(snippet_name))
       else
         require(File.join(default_snippets_home, 'lib', "#{snippet_name}.rb"))
-        snippet_name.split('/')
+        group, name = snippet_name.split('/')
+        Core::Rewriter.fetch(group, name)
       end
     end
 
-    # get snippet name by user inputs
-    def get_snippet_name_by_input(input)
-      rewriter = eval(input)
-      get_last_snippet_name
+    # eval snippet name by user input
+    def eval_snippet_name_by_input(input)
+      eval(input)
     end
 
     # run a snippet
-    def run_snippet(group, name)
+    def run_snippet(rewriter)
+      rewriter.process
       if plain_output?
-        puts "===== #{group}/#{name} started ====="
-        rewriter = Core::Rewriter.call group, name
+        puts "===== #{rewriter.group}/#{rewriter.name} started ====="
         rewriter.warnings.each do |warning|
           puts '[Warn] ' + warning.message
         end
         puts rewriter.todo if rewriter.todo
-        puts "===== #{group}/#{name} done ====="
+        puts "===== #{rewriter.group}/#{rewriter.name} done ====="
       elsif json_output?
-        rewriter = Core::Rewriter.call group, name
         output = {
           affected_files: rewriter.affected_files.union(rewriter.sub_snippets.sum(Set.new, &:affected_files)).to_a,
           warnings: rewriter.warnings.union(rewriter.sub_snippets.sum([], &:warnings)),
@@ -275,19 +275,21 @@ module Synvert
     end
 
     # test a snippet
-    def test_snippet(group, name)
-      rewriter = Core::Rewriter.fetch(group, name)
+    def test_snippet(rewriter)
       results = rewriter.test
+      rewriter.sub_snippets.each do |sub_snippet|
+        results += sub_snippet.test_results
+      end
       puts JSON.generate(results)
     end
 
     # execute snippet
     def execute_snippet(execute_command)
-      group, name = get_snippet_name_by_input(STDIN.read)
+      rewriter = eval_snippet_name_by_input(STDIN.read)
       if execute_command == 'test'
-        test_snippet(group, name)
+        test_snippet(rewriter)
       else
-        run_snippet(group, name)
+        run_snippet(rewriter)
       end
     end
 
@@ -350,12 +352,5 @@ 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
-    end
   end
 end

data/lib/synvert/version.rb

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

data/synvert-ruby.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
   spec.post_install_message = 'Please run `synvert-ruby --sync` first to sync snippets remotely.'
 
-  spec.add_runtime_dependency 'synvert-core', '>= 1.8.0'
+  spec.add_runtime_dependency 'synvert-core', '>= 1.9.2'
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: synvert
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.1
 platform: ruby
 authors:
 - Richard Huang
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-23 00:00:00.000000000 Z
+date: 2022-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: synvert-core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 1.9.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 1.9.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -126,7 +126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.3.22
 signing_key:
 specification_version: 4
 summary: synvert = syntax + convert.