r2m 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 39cf102836307d757425f6c28d74674bb77001f61f7506ef1babf56b531f0405
-  data.tar.gz: a481c0b6dd240ea5f908d6481f8cdef1b61fa748bdf83d3c526890b0be9be894
+  metadata.gz: 51ea8c25dfef6661109caeee0ca628389434080b154b1beeb1aad1c1515846f7
+  data.tar.gz: 4dd1416feddfc8b52e79dfcf4970cdcf3fb8d385885f7f261a8c5e2d0ca23e7c
 SHA512:
-  metadata.gz: 26b7a0da0e111484d6fcd55954c9d8efbccfc223279a220abe81b0438225fc868335051e2d77e78542ad8126d75115712a67cf156c927ed9f9402e284c889c84
-  data.tar.gz: 3db7a67f1bbfef5c88e1a95e942b0b93e37230c9417334a78c56d3fdaacf063c234db93389b17b59feb28ac275c344bc788ca80c7989ee883f091903635e62fd
+  metadata.gz: b470cdccf3d24ae191eb6b8b5d956a34f112c297a2be1f1e162ec240cdad5f225ec57df18b056905d8149bd4046f145b1570d563c04ad59a95974b829d0be4a1
+  data.tar.gz: f9dd5ca8be65e5ac323fb16f462ca0daa277a4ac059ca8a06cea3e394f22a25140e638d4036131b38dd5a1492c296969d929687293b8e3a315849bbf56a94f9c

data/.github/FUNDING.yml

@@ -1,5 +1,5 @@
 # These are supported funding model platforms
 
-# github: [pftg]
+github: [pftg]
 patreon: pftg
 custom: ['https://www.jetthoughts.com', 'https://jtway.co']

data/Gemfile

@@ -1,11 +1,11 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
 # Specify your gem's dependencies in r2m.gemspec
 gemspec
 
-gem "rake", "~> 12.0"
-gem "minitest", "~> 5.0"
+gem 'minitest', '~> 5.0'
+gem 'rake', '~> 12.0'
 
-gem 'rspec'
 gem 'minitest-around'
 gem 'minitest-spec-rails'
+gem 'rspec'

data/README.md

@@ -1,8 +1,6 @@
-# R2m
+# RSpec To minitest
 
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/r2m`. To experiment with that code, run `bin/console` for an interactive prompt.
-
-TODO: Delete this and the text above, and describe your gem
+* Support Rails Matchers
 
 ## Installation
 
@@ -22,7 +20,7 @@ Or install it yourself as:
 
 ## Usage
 
-    $ r2m convert test/system/**/*_spec.rb
+    $ r2m convert "test/system/**/*_spec.rb"
 
 ## Development
 

data/Rakefile

@@ -1,10 +1,10 @@
-require "bundler/gem_tasks"
-require "rake/testtask"
+require 'bundler/gem_tasks'
+require 'rake/testtask'
 
 Rake::TestTask.new(:test) do |t|
-  t.libs << "test"
-  t.libs << "lib"
-  t.test_files = FileList["test/**/*_test.rb"]
+  t.libs << 'test'
+  t.libs << 'lib'
+  t.test_files = FileList['test/**/*_test.rb']
 end
 
-task :default => :test
+task default: :test

data/bin/console

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
-require "bundler/setup"
-require "r2m"
+require 'bundler/setup'
+require 'r2m'
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
@@ -10,5 +10,5 @@ require "r2m"
 # require "pry"
 # Pry.start
 
-require "irb"
+require 'irb'
 IRB.start(__FILE__)

data/lib/r2m/command.rb

@@ -1,7 +1,10 @@
 # frozen_string_literal: true
 
 require 'thor'
-require_relative './processor'
+require 'pathname'
+
+require_relative './spec_convector'
+require_relative './spec_migration'
 
 module R2M
   # Adds CLI commands convert and migrate
@@ -15,30 +18,43 @@ module R2M
       true
     end
 
-    desc 'convert [path...]', 'Convert Rspec to minitest'
-    def convert(pathes)
-      files(pathes).each { |file| process file }
+    desc 'convert [path1 path2 ...]', 'Convert Rspec to minitest'
+    def convert(*paths)
+      files(paths.flatten).each { |path| run_convert path }
     end
 
-    desc 'migrate [path...]', 'Move found specs to test folder and convert them'
-    method_option :replace_suffix,
+    desc 'migrate [path1 path2 ...]', 'Move found specs to test folder and convert them'
+    method_option(
+      :replace_suffix,
       desc: 'Renames *_spec.rb to *_test.rb',
       default: true,
       aliases: ['s'],
       type: :boolean
-    def migrate(pathes)
-      pp files(pathes)
+    )
+    def migrate(*paths)
+      files(paths.flatten).each do |path|
+        say "Processing #{path}"
+        run_migrate(path)
+        run_convert(path)
+      end
     end
 
     private
 
-    def process(file)
-      Processor.new(self).process(file)
+    def run_migrate(path)
+      SpecMigration.new(Pathname.pwd).migrate(File.realpath(path))
+    end
+
+    def run_convert(file)
+      say "Processing #{file}"
+      SpecConvector.new(self).process(file)
     end
 
-    def files(pathes)
-      Array(pathes).map do |path|
-        if Dir.exist?(path)
+    def files(paths)
+      Array(paths).map do |path|
+        if File.exist?(path) && !File.directory?(path)
+          path
+        elsif Dir.exist?(path)
           Dir.glob(File.join(path, '**', '*_spec.rb'))
         else
           Dir.glob(path)

data/lib/r2m/{processor.rb → spec_convector.rb}

@@ -4,7 +4,7 @@ require 'thor'
 
 module R2M
   # Process input RSpec and convert it to minitest
-  class Processor
+  class SpecConvector # rubocop:todo Metrics/ClassLength
     def initialize(command)
       @command = command
     end
@@ -76,18 +76,23 @@ module R2M
       @command.gsub_file(file, /\bhelper\./, '') if located_in_helpers?(file)
     end
 
-    def convert_declarations(file)
+    # rubocop:todo Metrics/MethodLength
+    def convert_declarations(file) # rubocop:todo Metrics/AbcSize
       @command.gsub_file(file, /RSpec\.describe (['"])(.*?)\1 do\b/) do |match|
         title = match[/RSpec\.describe (['"])(.*?)\1 do/, 2]
 
+        # rubocop:todo Naming/VariableName
         camelCasedTitle = title.split('::').map do |title_part|
           title_part
             .split
             .reject(&:empty?)
             .map { |part| part[0].upcase + part[1..-1] }.join
         end.join('::')
+        # rubocop:enable Naming/VariableName
 
+        # rubocop:todo Naming/VariableName
         "RSpec.describe '#{camelCasedTitle}' do"
+        # rubocop:enable Naming/VariableName
       end
 
       @command.gsub_file(
@@ -129,6 +134,7 @@ module R2M
         'class \1Test < ActiveSupport::TestCase'
       )
     end
+    # rubocop:enable Metrics/MethodLength
 
     MANUAL_AROUND_PROCESS = "skip 'TODO: Remove this skip when `around` will be migrated manually by replacing `run` with `call`'"
     def convert_around(file)
@@ -148,7 +154,7 @@ module R2M
     end
 
     def located_in?(file, sub_folder)
-      file =~ /(test|spec)\/#{sub_folder}\//
+      file =~ %r{(test|spec)/#{sub_folder}/}
     end
   end
 end

data/lib/r2m/spec_migration.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require 'rake/file_utils'
+
+class SpecMigration # rubocop:todo Style/Documentation
+  def initialize(basedir)
+    @basedir = Pathname(basedir)
+  end
+
+  def migrate(spec_file) # rubocop:todo Metrics/AbcSize
+    move_and_rename_spec_to_test(spec_file)
+  end
+
+  def split_path(file)
+    spec_root = @basedir / 'spec'
+    dirname, basename = Pathname(file).split
+    relative_path = dirname.relative_path_from(spec_root)
+
+    [relative_path, basename]
+  end
+
+  def move_and_rename_spec_to_test(spec_file)
+    relative_path, spec_basename = split_path(spec_file)
+    test_root = @basedir / 'test'
+
+    test_dirname = test_root + relative_path
+    FileUtils.mkdir_p test_dirname
+
+    test_basename = spec_basename.sub(/_spec(?=\.rb)/, '_test')
+    test_file = test_dirname + test_basename
+    FileUtils.cp spec_file, test_file
+  end
+end

data/lib/r2m/version.rb

@@ -1,3 +1,3 @@
 module R2M
-  VERSION = "0.2.3"
+  VERSION = '0.2.4'.freeze
 end

data/lib/r2m.rb

@@ -1,4 +1,4 @@
-require "r2m/version"
+require 'r2m/version'
 
 module R2M
   class Error < StandardError; end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: r2m
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Paul Keen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-02 00:00:00.000000000 Z
+date: 2020-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -50,9 +50,12 @@ files:
 - exe/rspec2minitest
 - lib/r2m.rb
 - lib/r2m/command.rb
-- lib/r2m/processor.rb
+- lib/r2m/spec_convector.rb
+- lib/r2m/spec_migration.rb
 - lib/r2m/version.rb
 - r2m.gemspec
+- sample_app/test/example_spec/example_test.rb
+- sample_app/test/example_test.rb
 homepage: https://github.com/jetthoughts/r2m
 licenses:
 - MIT