synvert 0.4.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 25902dede2581c67bde78c934df502178f3dc715
-  data.tar.gz: bf27812b8d38bad69e16b39690b9e98d5fc03aa8
+  metadata.gz: ad8467c3b26e89499b67e13b5c4441a5b9d20a69
+  data.tar.gz: 701ad231cea1d52fc69827ced8610bcb7a07ebce
 SHA512:
-  metadata.gz: 1a6ec80231ba84c4f45fb15275c7a6d48e1fb67894f7f8ddc4e7f08ead32773c5da229d4e97591f7170fa15740d9c5d03195d8e2e3d16f1d212185fc678041f8
-  data.tar.gz: 932dfcb6832a8bcba9d5c1fc56e71875d4c057b859887f42edbca8fe690b4a1602e5ed23372421c199a425c5727a2d2aa5e2617f3694d78ec092b4741ae3b2d2
+  metadata.gz: ec940d0d793d9df5183fd06a670ecd545b229db7cd69cd698120172d4d304cd5a321edb71b9693bcb021596571b8633377751898972c0fc27f65b652a50e728d
+  data.tar.gz: 1a3c11744001240a5545aeb77c7ad4cee4d1e82c3c6913b2d5dcb8dd256816743d36f3ae30139b6e2515d8e7c8f65ad87a4147d4863a6f4a464f3916ca5f81a0

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 0.5.0
+
+* rewrite cli for rewriter group
+
 ## 0.4.2
 
 * Tell user to update synvert-core if necessary after syncing snippets.

data/lib/synvert/cli.rb

@@ -34,7 +34,8 @@ module Synvert
       else
         @options[:snippet_names].each do |snippet_name|
           puts "===== #{snippet_name} started ====="
-          rewriter = Core::Rewriter.call snippet_name
+          group, name = snippet_name.split('/')
+          rewriter = Core::Rewriter.call group, name
           rewriter.warnings.each do |warning|
             puts "[Warn] " + warning.message
           end
@@ -50,10 +51,6 @@ module Synvert
       puts "file #{e.diagnostic.location.source_buffer.name}"
       puts "line #{e.diagnostic.location.line}"
       false
-    rescue Exception => e
-      print "Error: "
-      p e
-      false
     end
 
   private
@@ -75,14 +72,14 @@ module Synvert
         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' do |snippet_name|
+        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 '--sync', 'sync snippets' do
           @options[:command] = 'sync'
         end
-        opts.on '-r', '--run SNIPPET_NAMES', 'run specified snippets' do |snippet_names|
+        opts.on '-r', '--run SNIPPET_NAMES', 'run specified snippets, each SNIPPET_NAME is combined by group and name, e.g. ruby/new_hash_syntax,ruby/new_lambda_syntax' do |snippet_names|
           @options[:snippet_names] = snippet_names.split(',').map(&:strip)
         end
         opts.on '-v', '--version', 'show this version' do
@@ -114,6 +111,9 @@ module Synvert
           eval(File.read(snippet_path))
         end
       end
+    rescue
+      FileUtils.rm_rf default_snippets_path
+      retry
     end
 
     # List and print all available rewriters.
@@ -121,8 +121,11 @@ module Synvert
       if Core::Rewriter.availables.empty?
         puts "There is no snippet under ~/.synvert, please run `synvert --sync` to fetch snippets."
       else
-        Core::Rewriter.availables.each do |rewriter|
-          print rewriter.name.to_s + "  "
+        Core::Rewriter.availables.each do |group, rewriters|
+          puts group
+          rewriters.each do |name, rewriter|
+            puts "    " + name
+          end
         end
         puts
       end
@@ -130,9 +133,17 @@ module Synvert
 
     # Query and print available rewriters.
     def query_available_rewriters
-      Core::Rewriter.availables.each do |rewriter|
-        if rewriter.name.include? @options[:query]
-          print rewriter.name + "  "
+      Core::Rewriter.availables.each do |group, rewriters|
+        if group.include? @options[:query]
+          puts group
+          rewriters.each do |name, rewriter|
+            puts "    " + name
+          end
+        elsif rewriters.keys.any? { |name| name.include? @options[:query] }
+          puts group
+          rewriters.each do |name, rewriter|
+            puts "    " + name if name.include?(@options[:query])
+          end
         end
       end
       puts
@@ -140,7 +151,8 @@ module Synvert
 
     # Show and print one rewriter.
     def show_rewriter
-      rewriter = Core::Rewriter.fetch(@options[:snippet_name])
+      group, name = @options[:snippet_name].split('/')
+      rewriter = Core::Rewriter.fetch(group, name)
       if rewriter
         rewriter.process_with_sandbox
         puts rewriter.description

data/lib/synvert/snippet.rb

@@ -10,9 +10,9 @@ module Synvert
       snippets_path = Core::Configuration.instance.get :default_snippets_path
       if File.exist?(snippets_path)
         FileUtils.cd snippets_path
-        `git pull --rebase --quiet`
+        system("git pull --rebase")
       else
-        `git clone https://github.com/xinminlabs/synvert-snippets.git #{snippets_path} --quiet`
+        system("git clone https://github.com/xinminlabs/synvert-snippets.git #{snippets_path}")
       end
     end
 

data/lib/synvert/version.rb

@@ -1,5 +1,5 @@
 # coding: utf-8
 
 module Synvert
-  VERSION = "0.4.2"
+  VERSION = "0.5.0"
 end

data/spec/synvert/snippet_spec.rb

@@ -8,14 +8,14 @@ module Synvert
       after { FileUtils.rm_rf default_snippets_path }
 
       it 'git clones snippets' do
+        expect(Snippet).to receive(:system).with("git clone https://github.com/xinminlabs/synvert-snippets.git #{default_snippets_path}")
         Snippet.sync
-        expect(File.exist?(default_snippets_path)).to be_truthy
       end
 
       it 'git pull snippets' do
+        FileUtils.mkdir default_snippets_path
+        expect(Snippet).to receive(:system).with("git pull --rebase")
         Snippet.sync
-        Snippet.sync
-        expect(File.exist?(default_snippets_path)).to be_truthy
       end
     end
 

data/synvert.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "synvert-core", ">= 0.4.2"
+  spec.add_runtime_dependency "synvert-core", ">= 0.5.0"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: synvert
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors:
 - Richard Huang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-15 00:00:00.000000000 Z
+date: 2014-08-21 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.4.2
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement