synvert-core 0.8.2 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 50629c1df6f1807a908e29168151ce28b9aad353
-  data.tar.gz: 95c03ecdfc6097da06f34102d6e99ab5ca76929d
+  metadata.gz: 7e22816d20d86721074e337cb21835d2d511aca1
+  data.tar.gz: 9b29d40275b347297b50a30facd15e3a5c766693
 SHA512:
-  metadata.gz: 5023594501e0f72371ba9857649893c109fc682fc4235692bdd9e8e79291453533c6b41c46e9d8d93fd7af2823e3c94fcae599d24a1b5ca2f820b48e63262b5a
-  data.tar.gz: 86905f7dfe07be1fba1274759d8c9efc217c9cf6dd59b2e81861eee79a2f89ee1f0efe6a3adc483540743e9cac8f9e9212f11630e067525a8353b54689dce1d3
+  metadata.gz: 78bc7c57442b48eb5814ef6433cd82b819a98d13c10b714879d41895274fd0bb62a5b3a8e6d8ce21c2acff8565caddf0a4f2ab8946cad4eede82a93837df459b
+  data.tar.gz: 54ab3b4ea2d3ea576dc4bf95f84ce93a476ec253b32857ec7556e8dabaf3a58b189be316432c733e33a5aa0ceb06b09760be9f8cf06bedd8d4756d9e63a44a47

data/CHANGELOG.md

@@ -1,11 +1,9 @@
 # CHANGELOG
 
-## 0.8.2
+## 0.9.0 (2015-12-23)
 
+* Add if_ruby dsl
 * Fix rewritten indent when number of lines and arguments are equal
-
-## 0.8.1
-
 * Fix match_value between symbol and string
 
 ## 0.8.0 (2014-10-26)

data/lib/synvert/core/rewriter/ruby_version.rb

@@ -0,0 +1,22 @@
+# encoding: utf-8
+
+module Synvert::Core
+  # GemSpec checks and compares gem version.
+  class Rewriter::RubyVersion
+    # Initialize a ruby_version.
+    #
+    # @param version [String] ruby version
+    def initialize(version)
+      @version = version
+    end
+
+    # Check if the specified ruby version matches current ruby version.
+    #
+    # @return [Boolean] true if matches, otherwise false.
+    def match?
+      # Gem::Version initialize will strip RUBY_VERSION directly in ruby 1.9,
+      # which is solved from ruby 2.0.0, which calls dup internally.
+      Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new(@version)
+    end
+  end
+end

data/lib/synvert/core/rewriter.rb

@@ -39,6 +39,7 @@ module Synvert::Core
 
     autoload :Helper, 'synvert/core/rewriter/helper'
 
+    autoload :RubyVersion, 'synvert/core/rewriter/ruby_version'
     autoload :GemSpec, 'synvert/core/rewriter/gem_spec'
 
     class <<self
@@ -185,6 +186,13 @@ module Synvert::Core
       end
     end
 
+    # Parse if_ruby dal, it checks if ruby version if greater than or equal to the specified ruby version.
+    #
+    # @param version, [String] specified ruby version.
+    def if_ruby(version)
+      @ruby_version = Rewriter::RubyVersion.new(version)
+    end
+
     # Parse if_gem dsl, it compares version of the specified gem.
     #
     # @param name [String] gem name.
@@ -202,7 +210,8 @@ module Synvert::Core
     def within_files(file_pattern, &block)
       return if @sandbox
 
-      if !@gem_spec || @gem_spec.match?
+      if (!@ruby_version || @ruby_version.match?) &&
+        (!@gem_spec || @gem_spec.match?)
         Rewriter::Instance.new(self, file_pattern, &block).process
       end
     end

data/lib/synvert/core/version.rb

@@ -2,6 +2,6 @@
 
 module Synvert
   module Core
-    VERSION = "0.8.2"
+    VERSION = "0.9.0"
   end
 end

data/spec/synvert/core/rewriter_spec.rb

@@ -10,6 +10,14 @@ module Synvert::Core
       expect(rewriter.description).to eq 'rewriter description'
     end
 
+    it 'parses if_ruby' do
+      #stub_const("RUBY_VERSION", '2.0.0')
+      rewriter = Rewriter.new 'group', 'name' do
+        if_ruby '2.0.0'
+      end
+      rewriter.process
+    end
+
     it 'parses if_gem' do
       expect(Rewriter::GemSpec).to receive(:new).with('synvert', {gte: '1.0.0'})
       rewriter = Rewriter.new 'group', 'name' do
@@ -19,19 +27,31 @@ module Synvert::Core
     end
 
     describe 'parses within_file' do
-      it 'does nothing if if_gem not match' do
-        expect_any_instance_of(Rewriter::GemSpec).to receive(:match?).and_return(false)
+      it 'does nothing if if_ruby does not match' do
+        stub_const('RUBY_VERSION', '2.0.0')
         expect_any_instance_of(Rewriter::Instance).not_to receive(:process)
         rewriter = Rewriter.new 'group', 'name' do
-          if_gem 'synvert', '1.0.0'
+          if_ruby '2.2.3'
           within_file 'config/routes.rb' do; end
         end
         rewriter.process
       end
 
-      it 'delegates process to instances if if_gem not exist' do
+      it 'delegates process to instances if if_ruby matches' do
+        stub_const('RUBY_VERSION', '2.0.0')
         expect_any_instance_of(Rewriter::Instance).to receive(:process)
         rewriter = Rewriter.new 'group', 'name' do
+          if_ruby '1.9.3'
+          within_file 'config/routes.rb' do; end
+        end
+        rewriter.process
+      end
+
+      it 'does nothing if if_gem does not match' do
+        expect_any_instance_of(Rewriter::GemSpec).to receive(:match?).and_return(false)
+        expect_any_instance_of(Rewriter::Instance).not_to receive(:process)
+        rewriter = Rewriter.new 'group', 'name' do
+          if_gem 'synvert', '1.0.0'
           within_file 'config/routes.rb' do; end
         end
         rewriter.process
@@ -47,6 +67,14 @@ module Synvert::Core
         rewriter.process
       end
 
+      it 'delegates process to instances if if_ruby and if_gem do not exist' do
+        expect_any_instance_of(Rewriter::Instance).to receive(:process)
+        rewriter = Rewriter.new 'group', 'name' do
+          within_file 'config/routes.rb' do; end
+        end
+        rewriter.process
+      end
+
       it 'does nothing in sandbox mode' do
         expect_any_instance_of(Rewriter::GemSpec).not_to receive(:match?)
         expect_any_instance_of(Rewriter::Instance).not_to receive(:process)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: synvert-core
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.9.0
 platform: ruby
 authors:
 - Richard Huang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-01 00:00:00.000000000 Z
+date: 2015-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -159,6 +159,7 @@ files:
 - lib/synvert/core/rewriter/gem_spec.rb
 - lib/synvert/core/rewriter/helper.rb
 - lib/synvert/core/rewriter/instance.rb
+- lib/synvert/core/rewriter/ruby_version.rb
 - lib/synvert/core/rewriter/scope.rb
 - lib/synvert/core/rewriter/scope/goto_scope.rb
 - lib/synvert/core/rewriter/scope/within_scope.rb
@@ -209,7 +210,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: convert ruby code to better syntax.