synvert 0.0.16 → 0.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a783bc0774369db2befc3887b41e955cae2adbe0
-  data.tar.gz: a5969647ad5a16adea6f8da5144c92acbc5011e7
+  metadata.gz: a8c931de2635de5862893c1d3ed8640bf9c34b0c
+  data.tar.gz: e0970c81b8cea4465a7fc731acceb2b669feed1d
 SHA512:
-  metadata.gz: 8df94cd6b38513ad2f99b24b426f8275f929c1a98746a628ff6a47908c71372bc4bb379501c389d486b1b040435ed5a2185b4b72fe817eb51d32447d3e271203
-  data.tar.gz: 79ab182f79f99c14fe07e3dda0e6ddc99d587355b05d1cff763fe8fc2a054c24884628a45a2b323910ea95679d831fba5aa232354c9c3ad0278abfc5829efe2c
+  metadata.gz: 1ea4728906ffb22035dfd91e3f04c6f5d74529b8636a25a0ccf21389d9b2e9a6c928583e22a6b7170b36098cb58f9392ec6664af05230cb5faf132f3978a7dba
+  data.tar.gz: d9a67c7c30139eb2ec92a31ff6aab0a26cde7ded6c98d31d446b29c3146fc399a4ba571ad8cf2794ac691bd5c97c144dda9bae5fee7a388b47e52c16cd196e0f

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # CHANGELOG
 
+## 0.0.17
+
+* Polish convert_rails_dynamic_finders snippet.
+* Add --skip option to cli to skip files and directories.
+
 ## 0.0.16
 
 * Add -v, --version cli option.

data/README.md

@@ -27,6 +27,7 @@ Usage: synvert [project_path]
     -d, --load SNIPPET_PATHS         load additional snippets, snippet paths can be local file path or remote http url
     -l, --list                       list all available snippets
     -q, --query QUERY                query specified snippets
+        --skip FILE_PATTERNS         skip specified files or directories, separated by comma, e.g. app/models/post.rb,vendor/plugins/**/*.rb
     -s, --show SNIPPET_NAME          show specified snippet description
     -r, --run SNIPPET_NAMES          run specified snippets
     -v, --version                    show this version

data/lib/synvert/cli.rb

@@ -16,6 +16,7 @@ module Synvert
     # Initialize a CLI.
     def initialize
       @options = {command: 'run', snippet_paths: [], snippet_names: []}
+      Configuration.instance.set :skip_files, []
     end
 
     # Run the CLI.
@@ -67,6 +68,9 @@ module Synvert
           @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' do |snippet_name|
           @options[:command] = 'show'
           @options[:snippet_name] = snippet_name
@@ -81,6 +85,13 @@ module Synvert
       end
       paths = optparse.parse(args)
       Configuration.instance.set :path, paths.first || Dir.pwd
+      if @options[:skip_file_patterns] && !@options[:skip_file_patterns].empty?
+        skip_files = @options[:skip_file_patterns].map { |file_pattern|
+          full_file_pattern = File.join(Configuration.instance.get(:path), file_pattern)
+          Dir.glob(full_file_pattern)
+        }.flatten
+        Configuration.instance.set :skip_files, skip_files
+      end
     end
 
     # Load all rewriters.

data/lib/synvert/rewriter/instance.rb

@@ -32,30 +32,32 @@ module Synvert
       parser = Parser::CurrentRuby.new
       file_pattern = File.join(Configuration.instance.get(:path), @file_pattern)
       Dir.glob(file_pattern).each do |file_path|
-        begin
-          source = File.read(file_path)
-          buffer = Parser::Source::Buffer.new file_path
-          buffer.source = source
-
-          parser.reset
-          ast = parser.parse buffer
-
-          @current_file = file_path
-          @current_source = source
-          @current_node = ast
-          instance_eval &@block
-          @current_node = ast
-
-          @actions.sort!
-          check_conflict_actions
-          @actions.reverse.each do |action|
-            source[action.begin_pos...action.end_pos] = action.rewritten_code
-            source = remove_code_or_whole_line(source, action.line)
-          end
-          @actions = []
-
-          File.write file_path, source
-        end while !@conflict_actions.empty?
+        unless Configuration.instance.get(:skip_files).include? file_path
+          begin
+            source = File.read(file_path)
+            buffer = Parser::Source::Buffer.new file_path
+            buffer.source = source
+
+            parser.reset
+            ast = parser.parse buffer
+
+            @current_file = file_path
+            @current_source = source
+            @current_node = ast
+            instance_eval &@block
+            @current_node = ast
+
+            @actions.sort!
+            check_conflict_actions
+            @actions.reverse.each do |action|
+              source[action.begin_pos...action.end_pos] = action.rewritten_code
+              source = remove_code_or_whole_line(source, action.line)
+            end
+            @actions = []
+
+            File.write file_path, source
+          end while !@conflict_actions.empty?
+        end
       end
     end
 

data/lib/synvert/snippets/rails/convert_dynamic_finders.rb

@@ -23,7 +23,7 @@ It converts rails dynamic finders to arel syntax.
 
   within_files '**/*.rb' do
     # find_all_by_... => where(...)
-    with_node type: 'send', message: /find_all_by_/ do
+    with_node type: 'send', message: /^find_all_by_/ do
       hash_params = dynamic_finder_to_hash("find_all_by_")
       if node.receiver
         replace_with "{{receiver}}.where(#{hash_params})"
@@ -33,7 +33,7 @@ It converts rails dynamic finders to arel syntax.
     end
 
     # find_by_... => where(...).first
-    with_node type: 'send', message: /find_by_/ do
+    with_node type: 'send', message: /^find_by_/ do
       if :find_by_id == node.message
         if node.receiver
           replace_with "{{receiver}}.find({{arguments}})"
@@ -51,7 +51,7 @@ It converts rails dynamic finders to arel syntax.
     end
 
     # find_last_by_... => where(...).last
-    with_node type: 'send', message: /find_last_by_/ do
+    with_node type: 'send', message: /^find_last_by_/ do
       hash_params = dynamic_finder_to_hash("find_last_by_")
       if node.receiver
         replace_with "{{receiver}}.where(#{hash_params}).last"
@@ -61,7 +61,7 @@ It converts rails dynamic finders to arel syntax.
     end
 
     # scoped_by_... => where(...)
-    with_node type: 'send', message: /scoped_by_/ do
+    with_node type: 'send', message: /^scoped_by_/ do
       hash_params = dynamic_finder_to_hash("scoped_by_")
       if node.receiver
         replace_with "{{receiver}}.where(#{hash_params})"
@@ -71,7 +71,7 @@ It converts rails dynamic finders to arel syntax.
     end
 
     # find_or_initialize_by_... => find_or_initialize_by(...)
-    with_node type: 'send', message: /find_or_initialize_by_/ do
+    with_node type: 'send', message: /^find_or_initialize_by_/ do
       hash_params = dynamic_finder_to_hash("find_or_initialize_by_")
       if node.receiver
         replace_with "{{receiver}}.find_or_initialize_by(#{hash_params})"
@@ -81,7 +81,7 @@ It converts rails dynamic finders to arel syntax.
     end
 
     # find_or_create_by_... => find_or_create_by(...)
-    with_node type: 'send', message: /find_or_create_by_/ do
+    with_node type: 'send', message: /^find_or_create_by_/ do
       hash_params = dynamic_finder_to_hash("find_or_create_by_")
       if node.receiver
         replace_with "{{receiver}}.find_or_create_by(#{hash_params})"

data/lib/synvert/version.rb

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

data/spec/spec_helper.rb

@@ -19,4 +19,8 @@ RSpec.configure do |config|
   config.filter_run :focus
 
   config.order = 'random'
+
+  config.before do
+    Synvert::Configuration.instance.set :skip_files, []
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: synvert
 version: !ruby/object:Gem::Version
-  version: 0.0.16
+  version: 0.0.17
 platform: ruby
 authors:
 - Richard Huang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-18 00:00:00.000000000 Z
+date: 2014-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser