synvert 0.0.17 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8c931de2635de5862893c1d3ed8640bf9c34b0c
-  data.tar.gz: e0970c81b8cea4465a7fc731acceb2b669feed1d
+  metadata.gz: e8fb6fc095299f42a4e1aa2f9edf611f9fa20bd8
+  data.tar.gz: ca35e5cad1e089c9f7717a22a1de4f4f07dc0371
 SHA512:
-  metadata.gz: 1ea4728906ffb22035dfd91e3f04c6f5d74529b8636a25a0ccf21389d9b2e9a6c928583e22a6b7170b36098cb58f9392ec6664af05230cb5faf132f3978a7dba
-  data.tar.gz: d9a67c7c30139eb2ec92a31ff6aab0a26cde7ded6c98d31d446b29c3146fc399a4ba571ad8cf2794ac691bd5c97c144dda9bae5fee7a388b47e52c16cd196e0f
+  metadata.gz: 466f9e2ee560b26d06c5aa0d983449ac4f9d19b01418dccc1ac1c7fc2ef87341b95f4b05f8567bcabc4efca5f4d8c096bcbc8e925cc3b8500459312e0e73af28
+  data.tar.gz: 273a870cb6390a1c212273facb08e70b521a5a41a7cc40eaf0cea6df32627686bc4ff83f35dd0e5511c6cfdde1fdb784604f1701eef70234cbbd00d56c6e407b

data/.travis.yml

@@ -2,5 +2,4 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1.0
   - 2.1.1

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 0.1.0
+
+* Abstract synvert-core and synvert-snippets
+
 ## 0.0.17
 
 * Polish convert_rails_dynamic_finders snippet.

data/README.md

@@ -24,11 +24,12 @@ $ gem install synvert
 ```
 $ synvert -h
 Usage: synvert [project_path]
-    -d, --load SNIPPET_PATHS         load additional snippets, snippet paths can be local file path or remote http url
+    -d, --load SNIPPET_PATHS         load custom 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
+        --sync                       sync snippets
     -r, --run SNIPPET_NAMES          run specified snippets
     -v, --version                    show this version
 ```
@@ -36,7 +37,7 @@ Usage: synvert [project_path]
 e.g.
 
 ```
-$ synvert -l
+$ synvert --sync
 ```
 
 ```
@@ -45,32 +46,11 @@ $ synvert -r factory_girl_short_syntax,upgrade_rails_3_2_to_4_0 ~/Sites/railsbp/
 
 ## Snippets
 
-name | description
---- | ---
-factory_girl_short_syntax                | FactoryGirl uses short syntax
-convert_rails_dynamic_finders            | Convert rails dynamic finders
-strong_parameters                        | Use strong_parameters syntax
-upgrade_rails_3_0_to_3_1                 | Upgrade rails from 3.0 to 3.1
-upgrade_rails_3_1_to_3_2                 | Upgrade rails from 3.1 to 3.2
-upgrade_rails_3_2_to_4_0                 | Upgrade rails from 3.2 to 4.0, it contains convert_dynamic_finder and strong_parameters snippets
-convert_rspec_be_close_to_be_within      | RSpec converts be_close to be_within
-convert_rspec_block_to_expect            | RSpec converts block to expect
-convert_rspec_boolean_matcher            | RSpec converts boolean matcher
-convert_rspec_collection_matcher         | RSpec converts collection matcher
-convert_rspec_its_to_it                  | RSpec converts its to it
-convert_rspec_message_expectation        | RSpec converts message expectation
-convert_rspec_method_stub                | RSpec converts method stub
-convert_rspec_negative_error_expectation | RSpec converts negative error expectation
-rspec_new_syntax                         | Use RSpec new syntax, it contains all convert_rspec_* snippets
-convert_rspec_one_liner_expectation      | RSpec converts one liner expectation
-convert_rspec_should_to_expect           | RSpec converts should to expect
-convert_rspec_stub_and_mock_to_double    | RSpec converts stub and mock to double
-ruby_new_hash_syntax                     | Ruby uses new hash syntax
-ruby_new_lambda_syntax                   | Ruby uses new lambda syntax
+[https://github.com/xinminlabs/synvert-snippets/][1]
 
 ## Documentation
 
-[http://xinminlabs.github.io/synvert/][1]
+[http://xinminlabs.github.io/synvert/][2]
 
 ## Contributing
 
@@ -80,4 +60,5 @@ ruby_new_lambda_syntax                   | Ruby uses new lambda syntax
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
 
-[1]: http://xinminlabs.github.io/synvert/
+[1]: https://github.com/xinminlabs/synvert-snippets/
+[2]: http://xinminlabs.github.io/synvert/

data/bin/synvert

@@ -3,7 +3,6 @@
 
 $LOAD_PATH.unshift(File.expand_path('../../lib', __FILE__))
 require 'synvert'
-require 'synvert/cli'
 
 result = Synvert::CLI.run
 exit(result ? 0 : 1)

data/lib/synvert/cli.rb

@@ -15,8 +15,9 @@ module Synvert
 
     # Initialize a CLI.
     def initialize
-      @options = {command: 'run', snippet_paths: [], snippet_names: []}
-      Configuration.instance.set :skip_files, []
+      @options = {command: 'run', custom_snippet_paths: [], snippet_names: []}
+      Core::Configuration.instance.set :skip_files, []
+      Core::Configuration.instance.set :default_snippets_path, File.join(ENV['HOME'], '.synvert')
     end
 
     # Run the CLI.
@@ -30,10 +31,11 @@ module Synvert
       when 'list' then list_available_rewriters
       when 'query' then query_available_rewriters
       when 'show' then show_rewriter
+      when 'sync' then sync_snippets
       else
         @options[:snippet_names].each do |snippet_name|
           puts "===== #{snippet_name} started ====="
-          rewriter = Rewriter.call snippet_name
+          rewriter = Core::Rewriter.call snippet_name
           puts rewriter.todo if rewriter.todo
           puts "===== #{snippet_name} done ====="
         end
@@ -58,8 +60,8 @@ module Synvert
     def run_option_parser(args)
       optparse = OptionParser.new do |opts|
         opts.banner = "Usage: synvert [project_path]"
-        opts.on '-d', '--load SNIPPET_PATHS', 'load additional snippets, snippet paths can be local file path or remote http url' do |snippet_paths|
-          @options[:snippet_paths] = snippet_paths.split(',').map(&:strip)
+        opts.on '-d', '--load SNIPPET_PATHS', 'load custom snippets, snippet paths can be local file path or remote http url' do |snippet_paths|
+          @options[:custom_snippet_paths] = snippet_paths.split(',').map(&:strip)
         end
         opts.on '-l', '--list', 'list all available snippets' do
           @options[:command] = 'list'
@@ -75,30 +77,34 @@ module Synvert
           @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|
           @options[:snippet_names] = snippet_names.split(',').map(&:strip)
         end
         opts.on '-v', '--version', 'show this version' do
-          puts Synvert::VERSION
+          puts Core::VERSION
           exit
         end
       end
       paths = optparse.parse(args)
-      Configuration.instance.set :path, paths.first || Dir.pwd
+      Core::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)
+          full_file_pattern = File.join(Core::Configuration.instance.get(:path), file_pattern)
           Dir.glob(full_file_pattern)
         }.flatten
-        Configuration.instance.set :skip_files, skip_files
+        Core::Configuration.instance.set :skip_files, skip_files
       end
     end
 
     # Load all rewriters.
     def load_rewriters
-      Dir.glob(File.join(File.dirname(__FILE__), 'snippets/**/*.rb')).each { |file| eval(File.read(file)) }
+      default_snippets_path = Core::Configuration.instance.get :default_snippets_path
+      Dir.glob(File.join(default_snippets_path, 'lib/**/*.rb')).each { |file| eval(File.read(file)) }
 
-      @options[:snippet_paths].each do |snippet_path|
+      @options[:custom_snippet_paths].each do |snippet_path|
         if snippet_path =~ /^http/
           uri = URI.parse snippet_path
           eval(uri.read)
@@ -110,7 +116,7 @@ module Synvert
 
     # List and print all available rewriters.
     def list_available_rewriters
-      Rewriter.availables.each do |rewriter|
+      Core::Rewriter.availables.each do |rewriter|
         print rewriter.name.to_s + "  "
       end
       puts
@@ -118,7 +124,7 @@ module Synvert
 
     # Query and print available rewriters.
     def query_available_rewriters
-      Rewriter.availables.each do |rewriter|
+      Core::Rewriter.availables.each do |rewriter|
         if rewriter.name.include? @options[:query]
           print rewriter.name + "  "
         end
@@ -128,7 +134,7 @@ module Synvert
 
     # Show and print one rewriter.
     def show_rewriter
-      rewriter = Rewriter.fetch(@options[:snippet_name])
+      rewriter = Core::Rewriter.fetch(@options[:snippet_name])
       if rewriter
         rewriter.process_with_sandbox
         puts rewriter.description
@@ -143,5 +149,11 @@ module Synvert
         puts "snippet #{@options[:snippet_name]} not found"
       end
     end
+
+    # sync snippets
+    def sync_snippets
+      Snippet.sync
+      puts "synvert snippets are synced"
+    end
   end
 end

data/lib/synvert/snippet.rb

@@ -0,0 +1,17 @@
+# coding: utf-8
+
+module Synvert
+  # Manage synvert snippets.
+  class Snippet
+    # synchronize snippets from github.
+    def self.sync
+      snippets_path = Core::Configuration.instance.get :default_snippets_path
+      if File.exist?(snippets_path)
+        FileUtils.cd snippets_path
+        `git pull --rebase --quiet`
+      else
+        `git clone https://github.com/xinminlabs/synvert-snippets.git #{snippets_path} --quiet`
+      end
+    end
+  end
+end

data/lib/synvert/version.rb

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

data/lib/synvert.rb

@@ -1,17 +1,9 @@
 # coding: utf-8
 require "synvert/version"
 require 'bundler'
-require 'parser'
-require 'parser/current'
-require 'ast'
-require 'active_support/inflector'
-require 'synvert/node_ext'
+require 'synvert/core'
 
 module Synvert
-  autoload :CheckingVisitor, 'synvert/checking_visitor'
-  autoload :Configuration, 'synvert/configuration'
-  autoload :Rewriter, 'synvert/rewriter'
-  autoload :RewriterNotFound, 'synvert/exceptions'
-  autoload :GemfileLockNotFound, 'synvert/exceptions'
-  autoload :MethodNotSupported, 'synvert/exceptions'
+  autoload :CLI, 'synvert/cli'
+  autoload :Snippet, 'synvert/snippet'
 end

data/synvert.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["flyerhzm@gmail.com"]
   spec.description   = %q{synvert is used to convert ruby code to better syntax.}
   spec.summary       = %q{synvert = syntax + convert.}
-  spec.homepage      = ""
+  spec.homepage      = "https://github.com/xinminlabs/synvert"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files`.split($/)
@@ -18,8 +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 "parser"
-  spec.add_runtime_dependency "activesupport"
+  spec.add_runtime_dependency "synvert-core"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"

metadata

@@ -1,31 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: synvert
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  version: 0.1.0
 platform: ruby
 authors:
 - Richard Huang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-22 00:00:00.000000000 Z
+date: 2014-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: parser
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: activesupport
+  name: synvert-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -113,57 +99,10 @@ files:
 - bin/synvert
 - lib/synvert.rb
 - lib/synvert/cli.rb
-- lib/synvert/configuration.rb
-- lib/synvert/exceptions.rb
-- lib/synvert/node_ext.rb
-- lib/synvert/rewriter.rb
-- lib/synvert/rewriter/action.rb
-- lib/synvert/rewriter/condition.rb
-- lib/synvert/rewriter/gem_spec.rb
-- lib/synvert/rewriter/instance.rb
-- lib/synvert/rewriter/scope.rb
-- lib/synvert/snippets/check_syntax.rb
-- lib/synvert/snippets/factory_girl/syntax_methods.rb
-- lib/synvert/snippets/rails/convert_dynamic_finders.rb
-- lib/synvert/snippets/rails/strong_parameters.rb
-- lib/synvert/snippets/rails/upgrade_3_0_to_3_1.rb
-- lib/synvert/snippets/rails/upgrade_3_1_to_3_2.rb
-- lib/synvert/snippets/rails/upgrade_3_2_to_4_0.rb
-- lib/synvert/snippets/rspec/be_close_to_be_within.rb
-- lib/synvert/snippets/rspec/block_to_expect.rb
-- lib/synvert/snippets/rspec/boolean_matcher.rb
-- lib/synvert/snippets/rspec/collection_matcher.rb
-- lib/synvert/snippets/rspec/its_to_it.rb
-- lib/synvert/snippets/rspec/message_expectation.rb
-- lib/synvert/snippets/rspec/method_stub.rb
-- lib/synvert/snippets/rspec/negative_error_expectation.rb
-- lib/synvert/snippets/rspec/new_syntax.rb
-- lib/synvert/snippets/rspec/one_liner_expectation.rb
-- lib/synvert/snippets/rspec/should_to_expect.rb
-- lib/synvert/snippets/rspec/stub_and_mock_to_double.rb
-- lib/synvert/snippets/ruby/new_hash_syntax.rb
-- lib/synvert/snippets/ruby/new_lambda_syntax.rb
+- lib/synvert/snippet.rb
 - lib/synvert/version.rb
-- spec/spec_helper.rb
-- spec/support/parser_helper.rb
-- spec/synvert/node_ext_spec.rb
-- spec/synvert/rewriter/action_spec.rb
-- spec/synvert/rewriter/condition_spec.rb
-- spec/synvert/rewriter/gem_spec_spec.rb
-- spec/synvert/rewriter/instance_spec.rb
-- spec/synvert/rewriter/scope_spec.rb
-- spec/synvert/rewriter_spec.rb
-- spec/synvert/snippets/factory_girl/syntax_methods_spec.rb
-- spec/synvert/snippets/rails/convert_dynamic_finders_spec.rb
-- spec/synvert/snippets/rails/strong_parameters_spec.rb
-- spec/synvert/snippets/rails/upgrade_3_0_to_3_1_spec.rb
-- spec/synvert/snippets/rails/upgrade_3_1_to_3_2_spec.rb
-- spec/synvert/snippets/rails/upgrade_3_2_to_4_0_spec.rb
-- spec/synvert/snippets/rspec/new_syntax_spec.rb
-- spec/synvert/snippets/ruby/new_hash_syntax_spec.rb
-- spec/synvert/snippets/ruby/new_lambda_syntax_spec.rb
 - synvert.gemspec
-homepage: ''
+homepage: https://github.com/xinminlabs/synvert
 licenses:
 - MIT
 metadata: {}
@@ -187,22 +126,4 @@ rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: synvert = syntax + convert.
-test_files:
-- spec/spec_helper.rb
-- spec/support/parser_helper.rb
-- spec/synvert/node_ext_spec.rb
-- spec/synvert/rewriter/action_spec.rb
-- spec/synvert/rewriter/condition_spec.rb
-- spec/synvert/rewriter/gem_spec_spec.rb
-- spec/synvert/rewriter/instance_spec.rb
-- spec/synvert/rewriter/scope_spec.rb
-- spec/synvert/rewriter_spec.rb
-- spec/synvert/snippets/factory_girl/syntax_methods_spec.rb
-- spec/synvert/snippets/rails/convert_dynamic_finders_spec.rb
-- spec/synvert/snippets/rails/strong_parameters_spec.rb
-- spec/synvert/snippets/rails/upgrade_3_0_to_3_1_spec.rb
-- spec/synvert/snippets/rails/upgrade_3_1_to_3_2_spec.rb
-- spec/synvert/snippets/rails/upgrade_3_2_to_4_0_spec.rb
-- spec/synvert/snippets/rspec/new_syntax_spec.rb
-- spec/synvert/snippets/ruby/new_hash_syntax_spec.rb
-- spec/synvert/snippets/ruby/new_lambda_syntax_spec.rb
+test_files: []

data/lib/synvert/configuration.rb

@@ -1,25 +0,0 @@
-# encoding: utf-8
-require 'singleton'
-
-module Synvert
-  # Synvert global configuration.
-  class Configuration < Hash
-    include Singleton
-
-    # Set the configuration.
-    #
-    # @param key [String] configuration key.
-    # @param value [Object] configuration value.
-    def set(key, value)
-      self[key] = value
-    end
-
-    # Get the configuration.
-    #
-    # @param key [String] configuration key.
-    # @return [Object] configuration value.
-    def get(key)
-      self[key]
-    end
-  end
-end

data/lib/synvert/exceptions.rb

@@ -1,13 +0,0 @@
-module Synvert
-  # Rewriter not found exception.
-  class RewriterNotFound < Exception
-  end
-
-  # Gemfile.lock not found exception.
-  class GemfileLockNotFound < Exception
-  end
-
-  # Method not supported exception.
-  class MethodNotSupported < Exception
-  end
-end