synvert 0.15.0 → 0.18.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa3d4c32999b086b2c6667043c3ed62fff147badcee5d3346a754fa00d510352
-  data.tar.gz: d6a24917c14a329e64fb54142c9e65ba33c2b989eca4ba51472692735d7d1682
+  metadata.gz: 6b88f72e6317a08babbaa9770e563ba1828efb17524c400dbfa3ea9cdbfdf5aa
+  data.tar.gz: f6cec7f9e9188698145bf3ff79b7eaaa4ef79ff4752248d51380cf0838504639
 SHA512:
-  metadata.gz: 1857e7e55b03f6664324ad5a7ff1a7ff9a0c6cfcf2fb6c66b6d174080872f404fd41a1e566ab48cdaacfd570b9e6369985258ef24f4edb7d4cec6056e9dafbe7
-  data.tar.gz: 99291c2413590198482e72b37d159dd99bb528c0d15d31cee3e2abcb86c8e8b1fe67350b4c0f1cf3345d55cc4ba5e2b05d5bddd272743732cae715dcf112e3ff
+  metadata.gz: 04b9d963283fa2617efd4d0efe0c793efa2fe392d5c1a797e7aa2919d309790052b600a6ffc7471d08a027fe6e7e30f63f54345d5eeca527a713de13c509bea7
+  data.tar.gz: cde9dab396fad919547a47a050bf22d714941b657f6260dd0125035f59f5d8ecb003ecaff260072d2cbf1f13d350c73e09723d34032b4a11cb4979178277db28

data/.github/workflows/main.yml

@@ -0,0 +1,32 @@
+# 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
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  test:
+
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version: ['2.5', '2.6', '2.7', '3.0']
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true
+    - name: Run tests
+      run: bundle exec rake

data/CHANGELOG.md

@@ -1,5 +1,21 @@
 # CHANGELOG
 
+## 0.18.1 (2021-07-23)
+
+* Fix `affected_files` is Set
+
+## 0.18.0 (2021-07-14)
+
+* Execute a snippet
+
+## 0.17.0 (2021-04-19)
+
+* Run `git checkout .` before `git pull --rebase`
+
+## 0.16.0 (2021-03-24)
+
+* Add `ruby_version` and `gem_spec` to json output
+
 ## 0.15.0 (2021-03-23)
 
 * Fix reduce on empty array

data/README.md

@@ -1,6 +1,6 @@
 # Synvert
 
-[![Build Status](https://secure.travis-ci.org/xinminlabs/synvert.svg)](http://travis-ci.org/xinminlabs/synvert)
+![Main workflow](https://github.com/xinminlabs/synvert/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)
 
@@ -22,6 +22,12 @@ Install it using rubygems
 $ gem install synvert
 ```
 
+then run
+
+```
+$ synvert --sync
+```
+
 ## Usage
 
 ```
@@ -39,10 +45,6 @@ Usage: synvert [project_path]
 
 e.g.
 
-```
-$ synvert --sync
-```
-
 ```
 $ synvert -r factory_girl/use_short_syntax,rails/upgrade_3_2_to_4_0 ~/Sites/railsbp/rails-bestpractices.com
 ```

data/lib/synvert/cli.rb

@@ -40,6 +40,8 @@ module Synvert
         sync_snippets
       when 'generate'
         generate_snippet
+      when 'execute'
+        execute_snippet
       else
         # run
         load_rewriters
@@ -94,6 +96,9 @@ module Synvert
           opts.on '--sync', 'sync snippets' do
             @options[:command] = 'sync'
           end
+          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|
             @options[:snippet_name] = snippet_name
           end
@@ -158,12 +163,15 @@ module Synvert
         Core::Rewriter.availables.each do |group, rewriters|
           rewriters.each do |name, rewriter|
             rewriter.process_with_sandbox
-            output << {
+            item = {
               group: group,
               name: name,
               description: rewriter.description,
               sub_snippets: rewriter.sub_snippets.map(&:name)
             }
+            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
+            output << item
           end
         end
 
@@ -239,7 +247,29 @@ module Synvert
         group, name = snippet_name.split('/')
         rewriter = Core::Rewriter.call group, name
         output = {
-          affected_files: rewriter.affected_files.union(rewriter.sub_snippets.sum([], &:affected_files)).to_a,
+          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)),
+          todo: rewriter.todo
+        }
+        puts JSON.generate(output)
+      end
+    end
+
+    # execute snippet
+    def execute_snippet
+      input = STDIN.read
+      if plain_output?
+        puts '===== execute started ====='
+        rewriter = eval(input)
+        rewriter.warnings.each do |warning|
+          puts '[Warn] ' + warning.message
+        end
+        puts rewriter.todo if rewriter.todo
+        puts '===== execute done ====='
+      elsif json_output?
+        rewriter = eval(input)
+        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)),
           todo: rewriter.todo
         }

data/lib/synvert/snippet.rb

@@ -19,7 +19,7 @@ module Synvert
     def sync
       if File.exist?(@snippets_path)
         FileUtils.cd @snippets_path
-        Kernel.system('git pull --rebase')
+        Kernel.system('git checkout .; git pull --rebase')
       else
         Kernel.system("git clone https://github.com/xinminlabs/synvert-snippets.git #{@snippets_path}")
       end

data/lib/synvert/version.rb

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

data/spec/synvert/snippet_spec.rb

@@ -27,7 +27,7 @@ module Synvert
 
       it 'git pull snippets' do
         FileUtils.mkdir snippets_path
-        expect(Kernel).to receive(:system).with('git pull --rebase')
+        expect(Kernel).to receive(:system).with('git checkout .; git pull --rebase')
         snippet.sync
         FileUtils.cd File.dirname(__FILE__)
       end

data/synvert.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
   spec.post_install_message = 'Please run `synvert --sync` first to sync snippets remotely.'
 
-  spec.add_runtime_dependency 'synvert-core', '>= 0.25.0'
+  spec.add_runtime_dependency 'synvert-core', '>= 0.42.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.15.0
+  version: 0.18.1
 platform: ruby
 authors:
 - Richard Huang
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-23 00:00:00.000000000 Z
+date: 2021-07-23 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.25.0
+        version: 0.42.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.25.0
+        version: 0.42.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -88,9 +88,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/main.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -123,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: synvert = syntax + convert.

data/.travis.yml

@@ -1,8 +0,0 @@
-language: ruby
-rvm:
-  - 2.3
-  - 2.4
-  - 2.5
-  - 2.6
-  - 2.7
-  - 3.0