synvert 0.18.3 → 0.19.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 030b18c7d1eecde7a29eb47590f7104937467693f1ab3475016c0cccbc8ca3b2
-  data.tar.gz: 73839b855d8bbb9ded39cb99dce1645a109516a5e4c0cb229aa26f3076ce9ab5
+  metadata.gz: b4168dd627a46add1e09b6faa57d839ecddcbed0ab39de07f647175513e63aff
+  data.tar.gz: 66f24286910b065ffa404e312e09b843cfa311bf5637345819f9062af51d56e2
 SHA512:
-  metadata.gz: 5939468037e810437a1910ceb02b91e65f4d3e0bd7bc1399e9f79fa9b9fd93377ae60ecde9067446c75ed12be264e6007d8980504d522be6b68807f23ff83a31
-  data.tar.gz: 42a3021aa5229deac6fef388471fd5a8d21b789dde17b7cae6e479198f07adbf7b5db1b290b9c6f8282b24db03f61ac8211df8bd48db5e6b5dd27f535253f13e
+  metadata.gz: 4e18d9c4180772fe62b3ade9d834abf757e51821113804d7ec4c1155b53ef613d4023ee5663b022c42c025c3da33cfe1b24b770a687de7258f81e1910be180a2
+  data.tar.gz: 368c327ff1f89074939402e283191f33f2b1106a3a2cdcff7e9851323e80ae51f9c5a85cf451b01a30ab00327ab8f2e5bba71f43fcab3b28392e3741102f4b41

data/.github/workflows/main.yml

@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: ['2.5', '2.6', '2.7', '3.0']
+        ruby-version: ['2.4', '2.5', '2.6', '2.7', '3.0']
 
     steps:
     - uses: actions/checkout@v2
@@ -29,4 +29,4 @@ jobs:
         ruby-version: ${{ matrix.ruby-version }}
         bundler-cache: true
     - name: Run tests
-      run: bundle exec rake
+      run: bundle exec rake

data/CHANGELOG.md

@@ -1,16 +1,18 @@
 # CHANGELOG
 
-## 0.18.3 (2021-08-22)
+## 0.19.2 (2021-12-15)
 
-* Update synvert-snippets url
-* Deprecate synvert, use synvert-ruby instead
+* List sub_snippets group and name
 
-## 0.18.2 (2021-08-12)
+## 0.19.1 (2021-10-23)
 
-* Require `fileutils`
+* Make URI.open work in ruby 2.4
 
-## 0.18.1 (2021-07-23)
+## 0.19.0 (2021-09-10)
 
+* Add `--show-run-process` option
+* Deprecate `synvert`, use `synvert-ruby` instead
+* Update `synvert-snippets` url
 * Fix `affected_files` is Set
 
 ## 0.18.0 (2021-07-14)

data/README.md

@@ -1,8 +1,8 @@
 # Synvert
 
-<img src="https://xinminlabs.github.io/synvert/img/logo_96.png" alt="logo" width="32" height="32" />
+<img src="https://synvert.xinminlabs.com/img/logo_96.png" alt="logo" width="32" height="32" />
 
-![Main workflow](https://github.com/xinminlabs/synvert/actions/workflows/main.yml/badge.svg)
+![Main workflow](https://github.com/xinminlabs/synvert-ruby/actions/workflows/main.yml/badge.svg)
 [![Coverage Status](https://coveralls.io/repos/xinminlabs/synvert/badge.svg?branch=master)](https://coveralls.io/r/xinminlabs/synvert)
 [![Gem Version](https://badge.fury.io/rb/synvert.svg)](http://badge.fury.io/rb/synvert)
 
@@ -27,14 +27,14 @@ $ gem install synvert
 then run
 
 ```
-$ synvert --sync
+$ synvert-ruby --sync
 ```
 
 ## Usage
 
 ```
-$ synvert -h
-Usage: synvert [project_path]
+$ 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
@@ -48,24 +48,12 @@ Usage: synvert [project_path]
 e.g.
 
 ```
-$ synvert -r factory_girl/use_short_syntax,rails/upgrade_3_2_to_4_0 ~/Sites/railsbp/rails-bestpractices.com
-```
-
-## Docker
-
-We have a docker image to run synvert
-
-```
-$ docker pull xinminlabs/awesomecode-synvert
-
-$ docker run xinminlabs/awesomecode-synvert synvert --list
-
-$ docker run -v <your project path>:/app xinminlabs/awesomecode-synvert synvert --run default/check_syntax /app
+$ synvert-ruby -r factory_girl/use_short_syntax,rails/upgrade_3_2_to_4_0 ~/Sites/railsbp/rails-bestpractices.com
 ```
 
 ## Documentation
 
-[https://xinminlabs.github.io/synvert/][3]
+[https://synvert.xinminlabs.com][3]
 
 ## Contributing
 
@@ -75,6 +63,6 @@ $ docker run -v <your project path>:/app xinminlabs/awesomecode-synvert synvert
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
 
-[1]: https://github.com/xinminlabs/synvert-core/
-[2]: https://github.com/xinminlabs/synvert-snippets/
-[3]: https://xinminlabs.github.io/synvert/
+[1]: https://github.com/xinminlabs/synvert-core-ruby/
+[2]: https://github.com/xinminlabs/synvert-snippets-ruby/
+[3]: https://synvert.xinminlabs.com

data/lib/synvert/cli.rb

@@ -34,7 +34,6 @@ module Synvert
         load_rewriters
         query_available_rewriters
       when 'show'
-        load_rewriters
         show_rewriter
       when 'sync'
         sync_snippets
@@ -66,7 +65,7 @@ module Synvert
     def run_option_parser(args)
       optparse =
         OptionParser.new do |opts|
-          opts.banner = 'Usage: synvert [project_path]'
+          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|
@@ -75,24 +74,24 @@ module Synvert
           opts.on '-l', '--list', 'list all available snippets' do
             @options[:command] = 'list'
           end
-          opts.on '-o', '--open SNIPPET_NAME', 'Open a snippet' do |snippet_name|
-            @options[:command] = 'open'
-            @options[:snippet_name] = snippet_name
-          end
           opts.on '-q', '--query QUERY', 'query specified snippets' do |query|
             @options[:command] = 'query'
             @options[:query] = query
           end
-          opts.on '--skip FILE_PATTERNS',
-                  'skip specified files or directories, separated by comma, e.g. app/models/post.rb,vendor/plugins/**/*.rb' do |file_patterns|
-            @options[:skip_file_patterns] = file_patterns.split(',')
-          end
           opts.on '-s',
                   '--show SNIPPET_NAME',
                   'show specified snippet description, SNIPPET_NAME is combined by group and name, e.g. ruby/new_hash_syntax' do |snippet_name|
             @options[:command] = 'show'
             @options[:snippet_name] = snippet_name
           end
+          opts.on '-o', '--open SNIPPET_NAME', 'Open a snippet' do |snippet_name|
+            @options[:command] = 'open'
+            @options[:snippet_name] = snippet_name
+          end
+          opts.on '-g', '--generate NEW_SNIPPET_NAME', 'generate a new snippet' do |name|
+            @options[:command] = 'generate'
+            @options[:snippet_name] = name
+          end
           opts.on '--sync', 'sync snippets' do
             @options[:command] = 'sync'
           end
@@ -102,9 +101,12 @@ module Synvert
           opts.on '-r', '--run SNIPPET_NAME', 'run specified snippet, e.g. ruby/new_hash_syntax' do |snippet_name|
             @options[:snippet_name] = snippet_name
           end
-          opts.on '-g', '--generate NEW_SNIPPET_NAME', 'generate a new snippet' do |name|
-            @options[:command] = 'generate'
-            @options[:snippet_name] = name
+          opts.on '--show-run-process', 'show processing files when running a snippet' do
+            Core::Configuration.show_run_process = true
+          end
+          opts.on '--skip FILE_PATTERNS',
+                  'skip specified files or directories, separated by comma, e.g. app/models/post.rb,vendor/plugins/**/*.rb' do |file_patterns|
+            @options[:skip_file_patterns] = file_patterns.split(',')
           end
           opts.on '-f', '--format FORMAT', 'output format' do |format|
             @options[:format] = format
@@ -163,11 +165,14 @@ module Synvert
         Core::Rewriter.availables.each do |group, rewriters|
           rewriters.each do |name, rewriter|
             rewriter.process_with_sandbox
+            sub_snippets = rewriter.sub_snippets.map { |sub_snippet|
+              { group: sub_snippet.group, name: sub_snippet.name }
+            }
             item = {
               group: group,
               name: name,
               description: rewriter.description,
-              sub_snippets: rewriter.sub_snippets.map(&:name)
+              sub_snippets: sub_snippets
             }
             item[:ruby_version] = rewriter.ruby_version.version if rewriter.ruby_version
             item[:gem_spec] = { name: rewriter.gem_spec.name, version: rewriter.gem_spec.version } if rewriter.gem_spec
@@ -185,7 +190,7 @@ module Synvert
       return puts 'To open a synvert snippet, set $EDITOR or $SYNVERT_EDITOR' unless editor
 
       path = File.expand_path(File.join(default_snippets_home, "lib/#{@options[:snippet_name]}.rb"))
-      if File.exist? path
+      if File.exist?(path)
         system editor, path
       else
         puts "Can't run #{editor} #{path}"

data/lib/synvert/snippet.rb

@@ -8,7 +8,7 @@ module Synvert
   # Manage synvert snippets.
   class Snippet
     def self.fetch_core_version
-      content = URI.open('https://rubygems.org/api/v1/versions/synvert-core.json').read
+      content = uri_open('https://rubygems.org/api/v1/versions/synvert-core.json').read
       JSON.parse(content).first['number']
     end
 
@@ -25,5 +25,13 @@ module Synvert
         Kernel.system("git clone https://github.com/xinminlabs/synvert-snippets-ruby.git #{@snippets_path}")
       end
     end
+
+    def self.uri_open(url)
+      if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.5.0')
+        URI.open(url)
+      else
+        open(url)
+      end
+    end
   end
 end

data/lib/synvert/version.rb

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

data/{synvert.gemspec → synvert-ruby.gemspec}

@@ -11,16 +11,16 @@ Gem::Specification.new do |spec|
   spec.email         = ['flyerhzm@gmail.com']
   spec.description   = 'synvert is used to convert ruby code to better syntax.'
   spec.summary       = 'synvert = syntax + convert.'
-  spec.homepage      = 'https://github.com/xinminlabs/synvert'
+  spec.homepage      = 'https://github.com/xinminlabs/synvert-ruby'
   spec.license       = 'MIT'
 
   spec.files         = `git ls-files`.split($/)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
-  spec.post_install_message = 'Please run `synvert --sync` first to sync snippets remotely.'
+  spec.post_install_message = 'Please run `synvert-ruby --sync` first to sync snippets remotely.'
 
-  spec.add_runtime_dependency 'synvert-core', '>= 0.53.0'
+  spec.add_runtime_dependency 'synvert-core', '>= 0.61.1'
 
   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: 0.18.3
+  version: 0.19.2
 platform: ruby
 authors:
 - Richard Huang
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-22 00:00:00.000000000 Z
+date: 2021-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: synvert-core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.53.0
+        version: 0.61.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.53.0
+        version: 0.61.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -105,12 +105,12 @@ files:
 - lib/synvert/version.rb
 - spec/spec_helper.rb
 - spec/synvert/snippet_spec.rb
-- synvert.gemspec
-homepage: https://github.com/xinminlabs/synvert
+- synvert-ruby.gemspec
+homepage: https://github.com/xinminlabs/synvert-ruby
 licenses:
 - MIT
 metadata: {}
-post_install_message: Please run `synvert --sync` first to sync snippets remotely.
+post_install_message: Please run `synvert-ruby --sync` first to sync snippets remotely.
 rdoc_options: []
 require_paths:
 - lib