synvert 1.1.1 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fca31952aad5373170fb41622c3dc07c11aa605ae8d13fb8770229062f9543b8
-  data.tar.gz: b57362eedac41f759e397dd10cfb0641690844161ae36e26c5cfd4fbd926d70a
+  metadata.gz: 15c02ce8eccc05ac9bd74acc1c48a41299e7feed9e6f5aa74fbdc76001a4ed24
+  data.tar.gz: 9d9ae61df8d41a97652cf35839c76134fc1a8def2bf6ec3c1da09a80ae71b02e
 SHA512:
-  metadata.gz: c7e6e5fe021673fd412a984595258134633d2b5d4612e6e9633568865b3e676d662b597024ab3d7cfcc2d285a8586736a0ca76db33d61c401fe62d7677c48b7c
-  data.tar.gz: 60f4d25764698275cb360ef222e07e3794e4bf33f0cde79fb73c87982f43df8516330b3552a3e6d331d77d773e3777ff62854c6c376054557ac2356717391b78
+  metadata.gz: 9c69f27c9cc0a1dccb25c00732aef5ad2fcdfbdf8e43767392a6920a16265403c8e6d7f0b23682d62c0ed378cb88e052df55de14bf78dcdee8c0b27e7d41cfa1
+  data.tar.gz: 62ad7f2c78e77ee8d6f68e6820b0efd8cd86af1e219ba99248a7dd28ea9436bd33cdf92a32c56599f1f3b1cf4a3bf432bb5f89ed0d5861ba24592305aae48e5a

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # CHANGELOG
 
+## 1.1.3 (2022-10-09)
+
+* No need to read rewriters before run or test a snippet
+* Reuse `Synvert::Core::Utils.eval_snippet`
+* `rewriter.test` already returns all results
+
+## 1.1.2 (2022-10-06)
+
+* Convert github url to github raw url
+
 ## 1.1.1 (2022-10-05)
 
 * Fix get_last_snippet_name, eval snippet to get rewriter

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    synvert (1.1.1)
-      synvert-core (>= 1.9.2)
+    synvert (1.1.3)
+      synvert-core (>= 1.10.1)
 
 GEM
   remote: https://rubygems.org/
@@ -64,7 +64,7 @@ GEM
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
     sync (0.5.0)
-    synvert-core (1.9.2)
+    synvert-core (1.10.1)
       activesupport (< 7.0.0)
       erubis
       node_mutation

data/lib/synvert/cli.rb

@@ -43,15 +43,12 @@ module Synvert
       when 'generate'
         generate_snippet
       when 'execute'
-        read_rewriters
         execute_snippet(@options[:execute_command])
       when 'test'
-        read_rewriters
-        rewriter = eval_snippet(@options[:snippet_name])
+        rewriter = Synvert::Core::Utils.eval_snippet(@options[:snippet_name])
         test_snippet(rewriter)
       when 'run'
-        read_rewriters
-        rewriter = eval_snippet(@options[:snippet_name])
+        rewriter = Synvert::Core::Utils.eval_snippet(@options[:snippet_name])
         run_snippet(rewriter)
       else
         # nothing to do
@@ -233,22 +230,6 @@ module Synvert
       end
     end
 
-    # eval snippet by name
-    # it can eval by explicit snippet name,
-    # or from local path or http url.
-    def eval_snippet(snippet_name)
-      if /^http/.match?(snippet_name)
-        uri = URI.parse(snippet_name)
-        eval(uri.open.read)
-      elsif File.exists?(snippet_name)
-        eval(File.read(snippet_name))
-      else
-        require(File.join(default_snippets_home, 'lib', "#{snippet_name}.rb"))
-        group, name = snippet_name.split('/')
-        Core::Rewriter.fetch(group, name)
-      end
-    end
-
     # eval snippet name by user input
     def eval_snippet_name_by_input(input)
       eval(input)
@@ -256,15 +237,16 @@ module Synvert
 
     # run a snippet
     def run_snippet(rewriter)
-      rewriter.process
       if plain_output?
         puts "===== #{rewriter.group}/#{rewriter.name} started ====="
+        rewriter.process
         rewriter.warnings.each do |warning|
           puts '[Warn] ' + warning.message
         end
         puts rewriter.todo if rewriter.todo
         puts "===== #{rewriter.group}/#{rewriter.name} done ====="
       elsif json_output?
+        rewriter.process
         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)),
@@ -277,9 +259,6 @@ module Synvert
     # test a snippet
     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
 

data/lib/synvert/utils.rb

@@ -0,0 +1,18 @@
+module Synvert
+  module Utils
+    class << self
+      def format_url(url)
+        convert_to_github_raw_url(url)
+      end
+
+      private
+
+      def convert_to_github_raw_url(url)
+        if url.include?('//github.com/')
+          url = url.sub('//github.com/', '//raw.githubusercontent.com/').sub('/blob/', '/')
+        end
+        url
+      end
+    end
+  end
+end

data/lib/synvert/version.rb

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

data/lib/synvert.rb

@@ -6,5 +6,6 @@ require 'synvert/core'
 
 module Synvert
   autoload :CLI, 'synvert/cli'
+  autoload :Utils, 'synvert/utils'
   autoload :Snippet, 'synvert/snippet'
 end

data/spec/synvert/snippet_spec.rb

@@ -4,7 +4,7 @@ require 'spec_helper'
 
 module Synvert
   describe Snippet do
-    let(:snippets_path) { File.join(File.dirname(__FILE__), '.synvert') }
+    let(:snippets_path) { File.join(File.dirname(__FILE__), '.synvert-ruby') }
     let(:snippet) { Snippet.new(snippets_path) }
     after { FileUtils.rmdir(snippets_path) if File.exist?(snippets_path) }
 

data/spec/synvert/utils_spec.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+module Synvert
+  RSpec.describe Utils do
+    describe '.format_url' do
+      it 'converts github url to github raw url' do
+        url = 'https://github.com/xinminlabs/synvert-snippets-ruby/blob/main/lib/ruby/map_and_flatten_to_flat_map.rb'
+        raw_url = 'https://raw.githubusercontent.com/xinminlabs/synvert-snippets-ruby/main/lib/ruby/map_and_flatten_to_flat_map.rb'
+        expect(described_class.format_url(url)).to eq raw_url
+      end
+    end
+  end
+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.9.2'
+  spec.add_runtime_dependency 'synvert-core', '>= 1.10.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: 1.1.1
+  version: 1.1.3
 platform: ruby
 authors:
 - Richard Huang
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-05 00:00:00.000000000 Z
+date: 2022-10-09 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.9.2
+        version: 1.10.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.9.2
+        version: 1.10.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -103,9 +103,11 @@ files:
 - lib/synvert.rb
 - lib/synvert/cli.rb
 - lib/synvert/snippet.rb
+- lib/synvert/utils.rb
 - lib/synvert/version.rb
 - spec/spec_helper.rb
 - spec/synvert/snippet_spec.rb
+- spec/synvert/utils_spec.rb
 - synvert-ruby.gemspec
 homepage: https://github.com/xinminlabs/synvert-ruby
 licenses:
@@ -133,3 +135,4 @@ summary: synvert = syntax + convert.
 test_files:
 - spec/spec_helper.rb
 - spec/synvert/snippet_spec.rb
+- spec/synvert/utils_spec.rb