synvert 1.1.0 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab295abb4db951a0f0503a8de8b08a3a4ab63a94aebee8013022b9e162008fda
-  data.tar.gz: 9405de0a2fb2e50eff97377d2781922d0c8799d23e039b42b26bb858efaa8e11
+  metadata.gz: 1d1c0fbeb63275ae605f0b709a33ee2b0cae147e503d775316f4aac6fb613d98
+  data.tar.gz: d971eaab50b37a77e7b2949bd65e764a1011424da5ecd7b6cae9f74a1e27c7d0
 SHA512:
-  metadata.gz: 11f76d1eca1d2f997b7627fc764c9273a0d6c407614c87193d6e29a9130979413779db59d371d46a07c0fcbb619f0ca35340e456a0e20606d91876a5bfa63700
-  data.tar.gz: d1946063321f8dac68689ef96f0ce4ebef5ebe607c4cadd2440a2955eac8cc02c8ff6c23a5f5a563402a69f46fa003d184f40296faf7d9e53d7d256fa64044e8
+  metadata.gz: 0b7f15432a9f4e5da206c155df3129d1b583c23098b506cd34b3ba82f6aab96504671600a2c64510e199ddd67a5a00c060f3b774bd4b24b3eec8335c86128c78
+  data.tar.gz: 294a5b5ee299a9e7702a4f0b17d883ddc253d5a8978c609f12d2246ae67489ab7442d1536d34961aec586c58e540537f2c9750d2cb01884c781841d4893ceb1a

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # CHANGELOG
 
+## 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
+
 ## 1.1.0 (2022-10-03))
 
 * Fix sub snippet not found

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    synvert (1.1.0)
+    synvert (1.1.2)
       synvert-core (>= 1.9.2)
 
 GEM

data/lib/synvert/cli.rb

@@ -47,12 +47,12 @@ module Synvert
         execute_snippet(@options[:execute_command])
       when 'test'
         read_rewriters
-        group, name = get_snippet_name(@options[:snippet_name])
-        test_snippet(group, name)
+        rewriter = eval_snippet(@options[:snippet_name])
+        test_snippet(rewriter)
       when 'run'
         read_rewriters
-        group, name = get_snippet_name(@options[:snippet_name])
-        run_snippet(group, name)
+        rewriter = eval_snippet(@options[:snippet_name])
+        run_snippet(rewriter)
       else
         # nothing to do
       end
@@ -233,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)
+        uri = URI.parse(Utils.format_url(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)),
@@ -278,8 +275,7 @@ 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
@@ -289,11 +285,11 @@ module Synvert
 
     # 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
 
@@ -356,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/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.0'
+  VERSION = '1.1.2'
 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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: synvert
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.2
 platform: ruby
 authors:
 - Richard Huang
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-03 00:00:00.000000000 Z
+date: 2022-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: synvert-core
@@ -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:
@@ -126,10 +128,11 @@ 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.
 test_files:
 - spec/spec_helper.rb
 - spec/synvert/snippet_spec.rb
+- spec/synvert/utils_spec.rb