synvert 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 614d00dc632a03aa4e33b46e9abd3632e3cd1192
-  data.tar.gz: cda16861b6998679c265db36fa32c094ca391417
+  metadata.gz: 8950014c1ee881965625f25681c35b66b28234da
+  data.tar.gz: 5abd928e4478a5830a35488884cfcb6c85325d3d
 SHA512:
-  metadata.gz: dc0094150dfdc672a9f4cbe95ba484cedf065d778a988b60790c2a417748b1e7b07c50e74df7fe3b44835f32313c4ac7708e0928b5cac4db41f5fd9ad59c8f24
-  data.tar.gz: 2531c8a731dcfcf741634f23450abd0415b630197c64845958a3f81dd3f7d7b43b3d07ef706c31c1bf7d650beb04e9b4c7c768ad05fdb22694212f1fe90ed781
+  metadata.gz: 62e2fc5bb3639aea6a190feba903f7566ef30d5150ad13d7731aa4952e15de676bc83ff6ab9aa5119b4e12b2122019b6e941a4f03bdb1718994cd034e1e84aab
+  data.tar.gz: 89fa91f3f7c0275c85ba29942b5211ede25ba0576a0c89b0978930f372c464ad215f4e20a8ec4749abcc102c4d2fa9c35c9c2ce6596c1dd11481f6aac510bd39

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 0.0.11
+
+* Rename gem_spec to if_gem dsl
+
 ## 0.0.10
 
 * Add not ast node operator

data/README.md

@@ -56,7 +56,7 @@ 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
+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

data/lib/synvert/rewriter/gem_spec.rb

@@ -2,9 +2,16 @@
 
 module Synvert
   class Rewriter::GemSpec
-    def initialize(name, version)
+    OPERATORS = {eq: '==', lt: '<', gt: '>', lte: '<=', gte: '>=', ne: '!='}
+    def initialize(name, comparator)
       @name = name
-      @version = Gem::Version.new version
+      if Hash === comparator
+        @operator = comparator.keys.first
+        @version = Gem::Version.new comparator.values.first
+      else
+        @operator = :eq
+        @version = Gem::Version.new comparator
+      end
     end
 
     def match?
@@ -12,7 +19,7 @@ module Synvert
       if File.exists? gemfile_lock_path
         parser = Bundler::LockfileParser.new(File.read(gemfile_lock_path))
         if spec = parser.specs.find { |spec| spec.name == @name }
-          Gem::Version.new(spec.version) >= @version
+          Gem::Version.new(spec.version).send(OPERATORS[@operator], @version)
         else
           false
         end

data/lib/synvert/rewriter.rb

@@ -56,8 +56,8 @@ module Synvert
       self.instance_eval &@block
     end
 
-    def gem_spec(name, version)
-      @gem_spec = Rewriter::GemSpec.new(name, version)
+    def if_gem(name, comparator)
+      @gem_spec = Rewriter::GemSpec.new(name, comparator)
     end
 
     def within_file(file_pattern, &block)

data/lib/synvert/snippets/factory_girl/syntax_methods.rb

@@ -1,5 +1,5 @@
 Synvert::Rewriter.new "factory_girl_short_syntax", "FactoryGirl uses short syntax" do
-  gem_spec 'factory_girl', '2.0.0'
+  if_gem 'factory_girl', {gte: '2.0.0'}
 
   # insert include FactoryGirl::Syntax::Methods
   within_file 'spec/spec_helper.rb' do

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

@@ -1,5 +1,5 @@
 Synvert::Rewriter.new 'upgrade_rails_3_0_to_3_1', 'Upgrade rails from 3.0 to 3.1' do
-  gem_spec 'rails', '3.0.0'
+  if_gem 'rails', {gte: '3.0.0'}
 
   within_file 'config/application.rb' do
     # insert config.assets.version = '1.0'

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

@@ -1,5 +1,5 @@
 Synvert::Rewriter.new 'upgrade_rails_3_1_to_3_2', 'Upgrade rails from 3.1 to 3.2' do
-  gem_spec 'rails', '3.1.0'
+  if_gem 'rails', {gte: '3.1.0'}
 
   within_file 'config/environments/development.rb' do
     # insert config.active_record.auto_explain_threshold_in_seconds = 0.5

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

@@ -1,7 +1,7 @@
 require 'securerandom'
 
 Synvert::Rewriter.new "upgrade_rails_3_2_to_4_0", "Upgrade rails from 3.2 to 4.0, it contains convert_dynamic_finder and strong_parameters snippets" do
-  gem_spec 'rails', '3.2.0'
+  if_gem 'rails', {gte: '3.2.0'}
 
   within_file 'config/application.rb' do
     # if defined?(Bundler)

data/lib/synvert/snippets/rspec/be_close_to_be_within.rb

@@ -1,5 +1,5 @@
 Synvert::Rewriter.new "convert_rspec_be_close_to_be_within", "RSpec converts be_close to be_within" do
-  gem_spec 'rspec', '2.1.0'
+  if_gem 'rspec', {gte: '2.1.0'}
 
   within_files 'spec/**/*.rb' do
     # expect(1.0 / 3.0).to be_close(0.333, 0.001) => expect(1.0 / 3.0).to be_within(0.001).of(0.333)

data/lib/synvert/snippets/rspec/block_to_expect.rb

@@ -1,5 +1,5 @@
 Synvert::Rewriter.new "convert_rspec_block_to_expect", "RSpec converts block to expect" do
-  gem_spec 'rspec', '2.11.0'
+  if_gem 'rspec', {gte: '2.11.0'}
 
   {should: 'to', should_not: 'not_to'}.each do |old_message, new_message|
     within_files 'spec/**/*.rb' do

data/lib/synvert/snippets/rspec/boolean_matcher.rb

@@ -1,5 +1,5 @@
 Synvert::Rewriter.new "convert_rspec_boolean_matcher", "RSpec converts boolean matcher" do
-  gem_spec 'rspec', '2.99.0'
+  if_gem 'rspec', {gte: '2.99.0'}
 
   {be_true: 'be_truthy', be_false: 'be_falsey'}.each do |old_matcher, new_matcher|
     within_files 'spec/**/*_spec.rb' do

data/lib/synvert/snippets/rspec/collection_matcher.rb

@@ -1,5 +1,5 @@
 Synvert::Rewriter.new "convert_rspec_collection_matcher", "RSpec converts collection matcher" do
-  gem_spec 'rspec', '2.99.0'
+  if_gem 'rspec', {gte: '2.11.0'}
 
   {have: 'eq', have_exactly: 'eq', have_at_least: 'be >=', have_at_most: 'be <='}.each do |old_matcher, new_matcher|
     within_files 'spec/**/*_spec.rb' do

data/lib/synvert/snippets/rspec/its_to_it.rb

@@ -1,5 +1,5 @@
 Synvert::Rewriter.new "convert_rspec_its_to_it", "RSpec converts its to it" do
-  gem_spec 'rspec', '2.99.0'
+  if_gem 'rspec', {gte: '2.99.0'}
 
   [:should, :should_not].each do |message|
     within_files 'spec/**/*.rb' do

data/lib/synvert/snippets/rspec/message_expectation.rb

@@ -1,5 +1,5 @@
 Synvert::Rewriter.new "convert_rspec_message_expectation", "RSpec converts message expectation" do
-  gem_spec 'rspec', '2.14.0'
+  if_gem 'rspec', {gte: '2.14.0'}
 
   within_files 'spec/**/*.rb' do
     # obj.should_receive(:message) => expect(obj).to receive(:message)

data/lib/synvert/snippets/rspec/method_stub.rb

@@ -1,5 +1,5 @@
 Synvert::Rewriter.new "convert_rspec_method_stub", "RSpec converts method stub" do
-  gem_spec 'rspec', '2.14.0'
+  if_gem 'rspec', {gte: '2.14.0'}
 
   within_files 'spec/**/*.rb' do
     # obj.stub!(:message) => obj.stub(:message)
@@ -36,7 +36,7 @@ Synvert::Rewriter.new "convert_rspec_method_stub", "RSpec converts method stub"
     end
   end
 
-  gem_spec 'rspec', '3.0.0'
+  if_gem 'rspec', {gte: '3.0.0'}
 
   within_files 'spec/**/*.rb' do
     # obj.stub_chain(:foo, :bar, :baz) => allow(obj).to receive_message_chain(:foo, :bar, :baz)

data/lib/synvert/snippets/rspec/negative_error_expectation.rb

@@ -1,5 +1,5 @@
 Synvert::Rewriter.new "convert_rspec_negative_error_expectation", "RSpec converts negative error expectation" do
-  gem_spec 'rspec', '2.14.0'
+  if_gem 'rspec', {gte: '2.14.0'}
 
   within_files 'spec/**/*.rb' do
     # expect { do_something }.not_to raise_error(SomeErrorClass) => expect { do_something }.not_to raise_error

data/lib/synvert/snippets/rspec/new_syntax.rb

@@ -1,4 +1,4 @@
-Synvert::Rewriter.new "rspec_new_syntax", "Use RSpec new syntax" do
+Synvert::Rewriter.new "rspec_new_syntax", "Use RSpec new syntax, it contains all convert_rspec_* snippets" do
   add_snippet "convert_rspec_should_to_expect"
   add_snippet "convert_rspec_block_to_expect"
   add_snippet "convert_rspec_one_liner_expectation"

data/lib/synvert/snippets/rspec/one_liner_expectation.rb

@@ -1,5 +1,5 @@
 Synvert::Rewriter.new "convert_rspec_one_liner_expectation", "RSpec converts one liner expectation" do
-  gem_spec 'rspec', '2.99.0'
+  if_gem 'rspec', {gte: '2.99.0'}
 
   {should: 'to', should_not: 'not_to'}.each do |old_message, new_message|
     matcher_converters = {have: 'eq', have_exactly: 'eq', have_at_least: 'be >=', have_at_most: 'be <='}

data/lib/synvert/snippets/rspec/should_to_expect.rb

@@ -1,5 +1,5 @@
 Synvert::Rewriter.new "convert_rspec_should_to_expect", "RSpec converts should to expect" do
-  gem_spec 'rspec', '2.11.0'
+  if_gem 'rspec', {gte: '2.11.0'}
 
   {should: 'to', should_not: 'not_to'}.each do |old_message, new_message|
     within_files 'spec/**/*.rb' do

data/lib/synvert/snippets/rspec/stub_and_mock_to_double.rb

@@ -1,5 +1,5 @@
 Synvert::Rewriter.new "convert_rspec_stub_and_mock_to_double", "RSpec converts stub and mock to double" do
-  gem_spec 'rspec', '2.14.0'
+  if_gem 'rspec', {gte: '2.14.0'}
 
   within_files 'spec/**/*.rb' do
     # stub('something') => double('something')

data/lib/synvert/version.rb

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

data/spec/synvert/rewriter/gem_spec_spec.rb

@@ -18,7 +18,7 @@ GEM
     it 'returns true if version in Gemfile.lock is greater than definition' do
       expect(File).to receive(:exists?).with('./Gemfile.lock').and_return(true)
       expect(File).to receive(:read).with('./Gemfile.lock').and_return(gemfile_lock_content)
-      gem_spec = Rewriter::GemSpec.new('ast', '1.0.0')
+      gem_spec = Rewriter::GemSpec.new('ast', {gte: '1.0.0'})
       expect(gem_spec).to be_match
     end
 
@@ -32,7 +32,7 @@ GEM
     it 'returns false if version in Gemfile.lock is less than definition' do
       expect(File).to receive(:exists?).with('./Gemfile.lock').and_return(true)
       expect(File).to receive(:read).with('./Gemfile.lock').and_return(gemfile_lock_content)
-      gem_spec = Rewriter::GemSpec.new('ast', '1.2.0')
+      gem_spec = Rewriter::GemSpec.new('ast', {lt: '1.2.0'})
       expect(gem_spec).not_to be_match
     end
 

data/spec/synvert/rewriter_spec.rb

@@ -2,26 +2,26 @@ require 'spec_helper'
 
 module Synvert
   describe Rewriter do
-    it 'parses gem_spec' do
+    it 'parses if_gem' do
       expect(Rewriter::GemSpec).to receive(:new).with('synvert', '1.0.0')
       rewriter = Rewriter.new 'name', 'description' do
-        gem_spec 'synvert', '1.0.0'
+        if_gem 'synvert', '1.0.0'
       end
       rewriter.process
     end
 
     describe 'parses within_file' do
-      it 'does nothing if gem_spec not match' do
+      it 'does nothing if if_gem 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 'name', 'description' do
-          gem_spec 'synvert', '1.0.0'
+          if_gem 'synvert', '1.0.0'
           within_file 'config/routes.rb' do; end
         end
         rewriter.process
       end
 
-      it 'delegates process to instances if gem_spec not exist' do
+      it 'delegates process to instances if if_gem not exist' do
         expect_any_instance_of(Rewriter::Instance).to receive(:process)
         rewriter = Rewriter.new 'name', 'description' do
           within_file 'config/routes.rb' do; end
@@ -29,11 +29,11 @@ module Synvert
         rewriter.process
       end
 
-      it 'delegates process to instances if gem_spec matches' do
+      it 'delegates process to instances if if_gem matches' do
         expect_any_instance_of(Rewriter::GemSpec).to receive(:match?).and_return(true)
         expect_any_instance_of(Rewriter::Instance).to receive(:process)
         rewriter = Rewriter.new 'name', 'description' do
-          gem_spec 'synvert', '1.0.0'
+          if_gem 'synvert', '1.0.0'
           within_file 'config/routes.rb' do; end
         end
         rewriter.process

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: synvert
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Richard Huang