transpec 1.12.0 → 1.13.0

data/spec/transpec/dynamic_analyzer_spec.rb

@@ -27,7 +27,7 @@ module Transpec
 
         it 'changes working directory to copied project directory' do
           initial_directory = Dir.pwd
-          DynamicAnalyzer.new(silent: true) do |analyzer|
+          DynamicAnalyzer.new(silent: true) do
             Dir.pwd.should_not == initial_directory
           end
         end

data/spec/transpec/record_spec.rb

@@ -9,6 +9,21 @@ module Transpec
     let(:original_syntax) { 'obj.should' }
     let(:converted_syntax) { 'expect(obj).to' }
 
+    [
+      :original_syntax,
+      :original_syntax_type,
+      :converted_syntax,
+      :converted_syntax_type
+    ].each do |method|
+      it "forbids override of ##{method}" do
+        lambda do
+          Class.new(Record) do
+            define_method(method) {}
+          end
+        end.should raise_error(/override/)
+      end
+    end
+
     describe '#to_s' do
       it 'returns "`original syntax` -> `converted syntax`"' do
         report.to_s.should == '`obj.should` -> `expect(obj).to`'

data/spec/transpec_spec.rb

@@ -4,6 +4,14 @@ require 'spec_helper'
 require 'transpec'
 
 module Transpec
+  describe '.root' do
+    it 'returns the path for project root directory' do
+      Dir.chdir(Transpec.root) do
+        File.should exist('Gemfile')
+      end
+    end
+  end
+
   describe '.required_rspec_version' do
     subject { Transpec.required_rspec_version }
 

data/tasks/lib/test.rb

@@ -25,6 +25,7 @@ class Test < Project
       return if simple?
       compare_summary!('2.99.0')
 
+      puts 'Rewriting `rspec` version in Gemfile as 3.0.0'
       add_rspec_3_to_gemfile
       sh 'bundle update'
 

data/tasks/readme.rake

@@ -2,11 +2,15 @@
 
 desc 'Generate README.md'
 task :readme do
+  puts 'Generating README.md...'
   File.write('README.md', generate_readme)
+  puts 'Done.'
 end
 
 namespace :readme do
   task :check do
+    puts 'Checking README.md...'
+
     unless File.read('README.md') == generate_readme
       fail <<-END.gsub(/^\s+\|/, '').chomp
         |README.md and README.md.erb are out of sync!
@@ -16,77 +20,142 @@ namespace :readme do
         |  * Commit both files.
       END
     end
+
+    puts 'Done.'
   end
 end
 
 def generate_readme
   require 'erb'
-  require 'transpec/cli'
-
   readme = File.read('README.md.erb')
   erb = ERB.new(readme, nil, '-')
-  erb.result(binding)
+  erb.result(READMEContext.new(readme).binding)
 end
 
-def convert(source, configuration = nil, rspec_version = nil)
-  spec_suite = FakeSpecSuite.new
-  converter = Transpec::Converter.new(spec_suite, configuration, rspec_version)
-  converter.convert_source(source)
-end
+class READMEContext
+  attr_reader :readme
+
+  def initialize(readme)
+    @readme = readme
+    require 'transpec'
+    require 'transpec/cli'
+    require 'stringio'
+    require 'tmpdir'
+    require 'rspec/mocks/standalone'
+    require File.join(Transpec.root, 'spec/support/file_helper')
+  end
 
-def select_sections(content, header_level, *section_names)
-  header_pattern = pattern_for_header_level(header_level)
-  sections = content.each_line.slice_before(header_pattern)
+  def binding
+    super
+  end
+
+  def convert(source, options = {}) # rubocop:disable MethodLength
+    cli = Transpec::CLI.new
+    cli.project.stub(:rspec_version).and_return(options[:rspec_version]) if options[:rspec_version]
 
-  sections.select do |section|
-    header_line = section.first
-    section_names.any? { |name| header_line.include?(name) }
+    cli_args = Array(options[:cli])
+    cli_args << '--skip-dynamic-analysis' unless options[:dynamic] # For performance
+
+    hidden_code = options[:hidden]
+    if hidden_code
+      hidden_code += "\n"
+      source = hidden_code + source
+    end
+
+    source = wrap_source(source, options[:wrap_with])
+
+    converted_source = nil
+
+    in_isolated_env do
+      FileHelper.create_file('spec/example_spec.rb', source)
+      cli.run(cli_args)
+      converted_source = File.read('spec/example_spec.rb')
+    end
+
+    converted_source = unwrap_source(converted_source, options[:wrap_with])
+    converted_source = converted_source[hidden_code.length..-1] if hidden_code
+    converted_source
   end
-end
 
-def table_of_contents(lines, header_level)
-  header_pattern = pattern_for_header_level(header_level)
+  def wrap_source(source, wrapper)
+    source = "it 'is example' do\n" + source + "end\n" if wrapper == :example
 
-  titles = lines.map do |line|
-    next unless line.match(header_pattern)
-    line.sub(/^[#\s]*/, '').chomp
-  end.compact
+    if [:example, :group].include?(wrapper)
+      source = "describe 'example group' do\n" + source + "end\n"
+    end
 
-  titles.map do |title|
-    anchor = '#' + title.gsub(/[^\w_\- ]/, '').downcase.gsub(' ', '-')
-    "* [#{title}](#{anchor})"
-  end.join("\n")
-end
+    source
+  end
 
-def pattern_for_header_level(level)
-  /^#{'#' * level}[^#]/
-end
+  def unwrap_source(source, wrapper)
+    return source unless wrapper
 
-def validate_syntax_type_table(markdown_table, types_in_code)
-  types_in_doc = markdown_table.lines.map do |line|
-    first_column = line.split('|').first
-    first_column.gsub(/[^\w]/, '').to_sym
-  end.sort
+    unwrap_count = case wrapper
+                   when :group then 1
+                   when :example then 2
+                   end
 
-  types_in_code.sort!
+    lines = source.lines.to_a
 
-  unless types_in_doc == types_in_code
-    types_missing_description = types_in_code - types_in_doc
-    fail "No descriptions for syntax types #{types_missing_description}"
+    unwrap_count.times do
+      lines = lines[1..-2]
+    end
+
+    lines.join('')
   end
-end
 
-require 'transpec/spec_suite'
+  def in_isolated_env
+    original_stdout = $stdout
+    $stdout = StringIO.new
 
-class FakeSpecSuite < Transpec::SpecSuite
-  def analyze
+    Dir.mktmpdir do |tmpdir|
+      Dir.chdir(tmpdir) do
+        yield
+      end
+    end
+  ensure
+    $stdout = original_stdout
   end
 
-  def need_to_modify_yield_receiver_to_any_instance_implementation_blocks_config?
-    true
+  def select_sections(content, header_level, *section_names)
+    header_pattern = pattern_for_header_level(header_level)
+    sections = content.each_line.slice_before(header_pattern)
+
+    sections.select do |section|
+      header_line = section.first
+      section_names.any? { |name| header_line.include?(name) }
+    end
   end
 
-  def main_rspec_configure_node?(node)
-    true
+  def table_of_contents(lines, header_level)
+    header_pattern = pattern_for_header_level(header_level)
+
+    titles = lines.map do |line|
+      next unless line.match(header_pattern)
+      line.sub(/^[#\s]*/, '').chomp
+    end.compact
+
+    titles.map do |title|
+      anchor = '#' + title.gsub(/[^\w_\- ]/, '').downcase.gsub(' ', '-')
+      "* [#{title}](#{anchor})"
+    end.join("\n")
+  end
+
+  def pattern_for_header_level(level)
+    /^#{'#' * level}[^#]/
+  end
+
+  def validate_syntax_type_table(markdown_table, types_in_code)
+    types_in_doc = markdown_table.lines.map do |line|
+      first_column = line.split('|').first
+      first_column.gsub(/[^\w]/, '').to_sym
+    end.sort
+
+    types_in_code.sort!
+
+    unless types_in_doc == types_in_code
+      types_missing_description = types_in_code - types_in_doc
+      fail "No descriptions for syntax types #{types_missing_description}"
+    end
   end
 end

data/tasks/test.rake

@@ -14,13 +14,9 @@ namespace :test do
   tests = [
     Test.new(Transpec.root, nil, ['--quiet'], true),
     Test.new('https://github.com/yujinakayama/twitter.git', 'transpec-test-rspec-2-99', bundler_args),
-    Test.new('https://github.com/yujinakayama/mail.git', 'transpec-test-rspec-2-99', bundler_args)
+    Test.new('https://github.com/yujinakayama/mail.git', 'transpec-test-rspec-2-99', bundler_args),
+    # Test.new('https://github.com/yujinakayama/guard.git', 'transpec-test-rspec-2-99', bundler_args + %w(--without development))
   ]
-
-  # Sometimes Guard fails with JRuby randomly.
-  unless RUBY_ENGINE == 'jruby'
-    tests << Test.new('https://github.com/yujinakayama/guard.git', 'transpec-test-rspec-2-99', bundler_args + %w(--without development))
-  end
   # rubocop:enable LineLength
 
   desc 'Test transpec on all projects'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: transpec
 version: !ruby/object:Gem::Version
-  version: 1.12.0
+  version: 1.13.0
 platform: ruby
 authors:
 - Yuji Nakayama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-07 00:00:00.000000000 Z
+date: 2014-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -448,3 +448,4 @@ test_files:
 - spec/transpec/syntax/should_spec.rb
 - spec/transpec/util_spec.rb
 - spec/transpec_spec.rb
+has_rdoc: