transpec 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f3bc90b69deb7ecd6c16aad1ea76d165efafe220
-  data.tar.gz: 27ea84e9492410a212bd0bf12f24d05ac6c578d0
+  metadata.gz: 0b8de9ebab18fff6380696a3a783ccf4ce9ed8af
+  data.tar.gz: e193341f8e9614397330090af1eff772a5efe427
 SHA512:
-  metadata.gz: a84904de40d64efeacd01ea3b987e7be6ba3ec684cd6c3c583b582ff85af474d9ee10a3b194b201aebe91b172a6cfa9ce141b3d2d04b9e2753485f72765f512c
-  data.tar.gz: 65b09567e243ee63bf39b2a35d3ce068e5573c5328e62bfe20f757b098fdc856eae83938355ae8eb980a0593b792a1c9d974c942151afe64fdd6ab3ecfeac232
+  metadata.gz: 0a77f0a729eb8d00145ff1b0c2af16d4ddb86e4187391077ff63a96be47ffebf7d9c641c43ef9c99250f99a89808c1e039d031b6bf109cf6e6bbaea2411b47e6
+  data.tar.gz: a98eb793b1d027164f716938ddec92f5ed2f70a19363fbe0a66d537d872f2e2f4d405f0dd246bada22a965366fecbb4943ffaf76b5ff04f175f7c8a8e31a13a0

data/.gitignore

@@ -15,4 +15,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
-vendor/bundle
+/vendor

data/.rubocop.yml

@@ -4,6 +4,7 @@ AllCops:
     - tasks/*.rake
   Excludes:
     - tmp/*
+    - vendor/*
 
 LineLength:
   Max: 100

data/.travis.yml

@@ -2,5 +2,6 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
+  - 2.1.0-preview2
   - jruby-19mode
 script: bundle exec rake spec style readme test:all

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Development
 
+## v1.4.1
+
+* Support Ruby 2.1 runtime by falling back to Ruby 2.0 parser
+
 ## v1.4.0
 
 * Support conversion of `RSpec::Core::ExampleGroup#example` ([#23](https://github.com/yujinakayama/transpec/issues/23))

data/Gemfile

@@ -2,6 +2,8 @@ source 'https://rubygems.org'
 
 gemspec
 
+gem 'rubocop', github: 'bbatsov/rubocop' if RUBY_VERSION.start_with?('2.1')
+
 group :test do
   gem 'coveralls',      '~> 0.6'
   gem 'simplecov-rcov', '~> 0.2'

data/README.md

@@ -122,7 +122,7 @@ Then, run `transpec` (using `-m/--generate-commit-message` is recommended) in th
 ```bash
 $ cd some-project
 $ transpec -m
-Copying project for dynamic analysis...
+Copying the project for dynamic analysis...
 Running dynamic analysis with command "bundle exec rspec"...
 ...............................................................................
 ...................
@@ -139,17 +139,16 @@ Converting spec/transpec/ast/node_spec.rb
 
 This will run the specs, convert them, and overwrite all spec files in the `spec` directory.
 
-After the conversion, run `rspec` again and check whether all pass:
+After the conversion, run `rspec` again and check whether everything is green:
 
 ```bash
 $ bundle exec rspec
 ```
 
-If all pass, commit the changes with auto-generated message:
+If it's green, commit the changes with auto-generated message:
 
 ```bash
-$ git add -u
-$ git commit -eF .git/COMMIT_EDITMSG
+$ git commit -aeF .git/COMMIT_EDITMSG
 ```
 
 And you are done!
@@ -182,19 +181,19 @@ Skip dynamic analysis and convert with only static analysis. Note that specifyin
 
 ### `-c/--rspec-command`
 
-Specify command to run RSpec that is used for dynamic analysis.
+Specify a command to run RSpec that is used for dynamic analysis.
 
 Transpec needs to run your specs in a copied project directory for dynamic analysis.
-If your project requires some special setup or commands to run specs, use this option.
+If your project requires some special setups or commands to run specs, use this option.
 `bundle exec rspec` is used by default.
 
 ```bash
-$ transpec --rspec-command "./some_special_setup.sh && bundle exec rspec"
+$ transpec --rspec-command "./special_setup.sh && bundle exec rspec"
 ```
 
 ### `-m/--generate-commit-message`
 
-Generate commit message that describes conversion summary.
+Generate a commit message that describes conversion summary.
 Currently only Git is supported.
 
 When you commit, you need to run the following command to use the generated message:
@@ -227,7 +226,7 @@ See [Supported Conversions](#supported-conversions) for more details.
 
 ### `-n/--negative-form`
 
-Specify negative form of `to` that is used in the `expect` syntax.
+Specify a negative form of `to` that is used in the `expect` syntax.
 Either `not_to` or `to_not`.
 `not_to` is used by default.
 
@@ -375,7 +374,7 @@ it { is_expected.to_not matcher } # with `--negative-form to_not`
 
 `is_expected.to` is designed for the consistency with the `expect` syntax.
 However the one-liner `should` is still _not_ deprecated in RSpec 3.0
-and available even if the `should` syntax is disabled in `RSpec.configure`.
+and available even if the `should` syntax is disabled with `RSpec.configure`.
 So if you think `is_expected.to` is verbose,
 feel free to disable this conversion and continue using the one-liner `should`.
 
@@ -433,7 +432,7 @@ expect(obj).to be false
 * `be_truthy` and `be_falsey` matchers are renamed version of `be_true` and `be_false` and their behaviors are same.
 * `be true` and `be false` are not new things. These are combinations of `be` matcher and boolean literals. These pass if expectation subject is exactly equal to boolean value.
 
-So, converting `be_true`/`be_false` to `be_truthy`/`be_falsey` never breaks your specs and this is the Transpec's default. If you are willing to test boolean values strictly, you can convert them to `be true`/`be false` with `--boolean-matcher true,false` option. Note that this may break your specs if your library codes don't return exact boolean values.
+So, converting `be_true`/`be_false` to `be_truthy`/`be_falsey` never breaks your specs and this is the Transpec's default. If you are willing to test boolean values strictly, you can convert them to `be true`/`be false` with `--boolean-matcher true,false` option. Note that this may break your specs if your application codes don't return exact boolean values.
 
 ---
 

data/README.md.erb

@@ -95,7 +95,7 @@ Then, run `transpec` (using `-m/--generate-commit-message` is recommended) in th
 ```bash
 $ cd some-project
 $ transpec -m
-Copying project for dynamic analysis...
+Copying the project for dynamic analysis...
 Running dynamic analysis with command "bundle exec rspec"...
 ...............................................................................
 ...................
@@ -112,17 +112,16 @@ Converting spec/transpec/ast/node_spec.rb
 
 This will run the specs, convert them, and overwrite all spec files in the `spec` directory.
 
-After the conversion, run `rspec` again and check whether all pass:
+After the conversion, run `rspec` again and check whether everything is green:
 
 ```bash
 $ bundle exec rspec
 ```
 
-If all pass, commit the changes with auto-generated message:
+If it's green, commit the changes with auto-generated message:
 
 ```bash
-$ git add -u
-$ git commit -eF .git/COMMIT_EDITMSG
+$ git commit -aeF .git/COMMIT_EDITMSG
 ```
 
 And you are done!
@@ -155,19 +154,19 @@ Skip dynamic analysis and convert with only static analysis. Note that specifyin
 
 ### `-c/--rspec-command`
 
-Specify command to run RSpec that is used for dynamic analysis.
+Specify a command to run RSpec that is used for dynamic analysis.
 
 Transpec needs to run your specs in a copied project directory for dynamic analysis.
-If your project requires some special setup or commands to run specs, use this option.
+If your project requires some special setups or commands to run specs, use this option.
 `bundle exec rspec` is used by default.
 
 ```bash
-$ transpec --rspec-command "./some_special_setup.sh && bundle exec rspec"
+$ transpec --rspec-command "./special_setup.sh && bundle exec rspec"
 ```
 
 ### `-m/--generate-commit-message`
 
-Generate commit message that describes conversion summary.
+Generate a commit message that describes conversion summary.
 Currently only Git is supported.
 
 When you commit, you need to run the following command to use the generated message:
@@ -218,7 +217,7 @@ See [Supported Conversions](#supported-conversions) for more details.
 
 ### `-n/--negative-form`
 
-Specify negative form of `to` that is used in the `expect` syntax.
+Specify a negative form of `to` that is used in the `expect` syntax.
 Either `not_to` or `to_not`.
 `not_to` is used by default.
 
@@ -371,7 +370,7 @@ it { is_expected.to_not matcher } # with `--negative-form to_not`
 
 `is_expected.to` is designed for the consistency with the `expect` syntax.
 However the one-liner `should` is still _not_ deprecated in RSpec 3.0
-and available even if the `should` syntax is disabled in `RSpec.configure`.
+and available even if the `should` syntax is disabled with `RSpec.configure`.
 So if you think `is_expected.to` is verbose,
 feel free to disable this conversion and continue using the one-liner `should`.
 
@@ -429,7 +428,7 @@ expect(obj).to be false
 * `be_truthy` and `be_falsey` matchers are renamed version of `be_true` and `be_false` and their behaviors are same.
 * `be true` and `be false` are not new things. These are combinations of `be` matcher and boolean literals. These pass if expectation subject is exactly equal to boolean value.
 
-So, converting `be_true`/`be_false` to `be_truthy`/`be_falsey` never breaks your specs and this is the Transpec's default. If you are willing to test boolean values strictly, you can convert them to `be true`/`be false` with `--boolean-matcher true,false` option. Note that this may break your specs if your library codes don't return exact boolean values.
+So, converting `be_true`/`be_false` to `be_truthy`/`be_falsey` never breaks your specs and this is the Transpec's default. If you are willing to test boolean values strictly, you can convert them to `be true`/`be false` with `--boolean-matcher true,false` option. Note that this may break your specs if your application codes don't return exact boolean values.
 
 ---
 

data/lib/transpec/base_rewriter.rb

@@ -1,7 +1,7 @@
 # coding: utf-8
 
 require 'transpec/ast/builder'
-require 'parser/current'
+require 'transpec/parser'
 
 module Transpec
   class BaseRewriter

data/lib/transpec/cli.rb

@@ -110,7 +110,7 @@ module Transpec
       Git.write_commit_message(commit_message.to_s)
 
       puts
-      puts 'Commit message was generated to .git/COMMIT_EDITMSG.'.color(:cyan)
+      puts 'A commit message was generated to .git/COMMIT_EDITMSG.'.color(:cyan)
       puts 'Use the following command for the next commit:'.color(:cyan)
       puts '    git commit -eF .git/COMMIT_EDITMSG'
     end
@@ -119,7 +119,7 @@ module Transpec
       return if @report.records.empty?
 
       puts
-      puts "Done! Now run #{'rspec'.bright} and check if all the converted specs pass."
+      puts "Done! Now run #{'rspec'.bright} and check if everything is green."
     end
 
     def warn_syntax_error(error)

data/lib/transpec/dynamic_analyzer/rewriter.rb

@@ -97,11 +97,6 @@ module Transpec
 
         literal << ' }'
       end
-
-      def taking_block?(node)
-        parent_node = node.parent_node
-        parent_node && parent_node.type == :block && parent_node.children.first.equal?(node)
-      end
     end
   end
 end

data/lib/transpec/parser.rb

@@ -0,0 +1,9 @@
+# coding: utf-8
+
+begin
+  require 'parser/current'
+rescue NotImplementedError
+  warn 'Falling back to Ruby 2.0 parser.'
+  require 'parser/ruby20'
+  Parser::CurrentRuby = Parser::Ruby20 # rubocop:disable ConstantName
+end

data/lib/transpec/rspec_dsl.rb

@@ -0,0 +1,20 @@
+# coding: utf-8
+
+module Transpec
+  module RSpecDSL
+    EXAMPLE_GROUP_METHODS = [
+      :describe, :context,
+      :shared_examples, :shared_context, :share_examples_for, :shared_examples_for
+    ].freeze
+
+    EXAMPLE_METHODS = [
+      :example, :it, :specify,
+      :focus, :focused, :fit,
+      :pending, :xexample, :xit, :xspecify
+    ].freeze
+
+    HOOK_METHODS = [:before, :after, :around].freeze
+
+    HELPER_METHODS = [:subject, :subject!, :let, :let!].freeze
+  end
+end

data/lib/transpec/static_context_inspector.rb

@@ -1,10 +1,11 @@
 # coding: utf-8
 
+require 'transpec/rspec_dsl'
 require 'transpec/util'
 
 module Transpec
   class StaticContextInspector
-    include Util
+    include RSpecDSL, Util
 
     SCOPE_TYPES = [:module, :class, :sclass, :def, :defs, :block].freeze
 

data/lib/transpec/syntax/example.rb

@@ -2,12 +2,13 @@
 
 require 'transpec/syntax'
 require 'transpec/syntax/mixin/send'
+require 'transpec/rspec_dsl'
 require 'transpec/util'
 
 module Transpec
   class Syntax
     class Example < Syntax
-      include Mixin::Send, Util
+      include Mixin::Send, RSpecDSL, Util
 
       METHODS_YIELD_EXAMPLE = (EXAMPLE_METHODS + HOOK_METHODS + HELPER_METHODS).freeze
 

data/lib/transpec/syntax/its.rb

@@ -114,7 +114,7 @@ module Transpec
         if attribute_expression.brackets?
           "describe '[:key]' do subject { super()[:key] }; it { } end"
         else
-          "describe 'attr' do subject { super().attr }; it { } end"
+          "describe '#attr' do subject { super().attr }; it { } end"
         end
       end
 

data/lib/transpec/syntax/mixin/expectizable.rb

@@ -13,7 +13,7 @@ module Transpec
         private
 
         def wrap_subject_with_method!(method)
-          if Util.in_parentheses?(subject_node)
+          if Util.in_explicit_parentheses?(subject_node)
             insert_before(subject_range, method)
           else
             insert_before(subject_range, "#{method}(")

data/lib/transpec/syntax/oneliner_should.rb

@@ -4,13 +4,14 @@ require 'transpec/syntax'
 require 'transpec/syntax/mixin/should_base'
 require 'transpec/syntax/mixin/send'
 require 'transpec/syntax/mixin/have_matcher'
+require 'transpec/rspec_dsl'
 require 'transpec/util'
 require 'active_support/inflector/methods'
 
 module Transpec
   class Syntax
     class OnelinerShould < Syntax
-      include Mixin::ShouldBase, Mixin::Send, Mixin::HaveMatcher, Util
+      include Mixin::ShouldBase, Mixin::Send, Mixin::HaveMatcher, RSpecDSL, Util
 
       attr_reader :current_syntax_type
 

data/lib/transpec/syntax/operator_matcher.rb

@@ -98,7 +98,7 @@ module Transpec
       end
 
       def parenthesize_single_line!(always)
-        if in_parentheses?(arg_node)
+        if in_explicit_parentheses?(arg_node)
           remove(range_in_between_selector_and_arg)
         elsif always || arg_node.type == :hash
           replace(range_in_between_selector_and_arg, '(')

data/lib/transpec/util.rb

@@ -2,21 +2,6 @@
 
 module Transpec
   module Util
-    EXAMPLE_GROUP_METHODS = %w(
-      describe context
-      shared_examples shared_context share_examples_for shared_examples_for
-    ).map(&:to_sym).freeze
-
-    EXAMPLE_METHODS = %w(
-      example it specify
-      focus focused fit
-      pending xexample xit xspecify
-    ).map(&:to_sym).freeze
-
-    HOOK_METHODS = %w(before after around).map(&:to_sym).freeze
-
-    HELPER_METHODS = %w(subject subject! let let!).map(&:to_sym).freeze
-
     LITERAL_TYPES = %w(
       true false nil
       int float
@@ -71,12 +56,17 @@ module Transpec
       here_document?(node) || node.each_descendent_node.any? { |n| here_document?(n) }
     end
 
-    def in_parentheses?(node)
+    def in_explicit_parentheses?(node)
       return false unless node.type == :begin
       source = node.loc.expression.source
       source[0] == '(' && source[-1] == ')'
     end
 
+    def taking_block?(node)
+      parent_node = node.parent_node
+      parent_node && parent_node.type == :block && parent_node.children.first.equal?(node)
+    end
+
     def indentation_of_line(arg)
       line = case arg
              when AST::Node             then arg.loc.expression.source_line

data/lib/transpec/version.rb

@@ -5,7 +5,7 @@ module Transpec
   module Version
     MAJOR = 1
     MINOR = 4
-    PATCH = 0
+    PATCH = 1
 
     def self.to_s
       [MAJOR, MINOR, PATCH].join('.')

data/spec/spec_helper.rb

@@ -15,7 +15,7 @@ RSpec.configure do |config|
   config.color_enabled = true
   config.treat_symbols_as_metadata_keys_with_true_values = true
 
-  config.before(:all) do
+  config.before(:suite) do
     require 'rainbow'
     Sickill::Rainbow.enabled = false
 

data/spec/support/shared_context.rb

@@ -11,7 +11,7 @@ shared_context 'parsed objects' do
 
   let(:ast) do
     require 'transpec/ast/builder'
-    require 'parser/current'
+    require 'transpec/parser'
     builder = Transpec::AST::Builder.new
     parser = Parser::CurrentRuby.new(builder)
     parser.parse(source_buffer)

data/spec/transpec/static_context_inspector_spec.rb

@@ -2,6 +2,7 @@
 
 require 'spec_helper'
 require 'transpec/static_context_inspector'
+require 'ast'
 
 module Transpec
   describe StaticContextInspector do

data/spec/transpec/syntax/example_spec.rb

@@ -16,7 +16,7 @@ module Transpec
           example_object.convert! unless example.metadata[:no_auto_convert]
         end
 
-        (Util::EXAMPLE_METHODS + Util::HOOK_METHODS).each do |method|
+        (RSpecDSL::EXAMPLE_METHODS + RSpecDSL::HOOK_METHODS).each do |method|
           context "when it is `#{method} do example end` form" do
             let(:source) do
               <<-END
@@ -49,7 +49,7 @@ module Transpec
           end
         end
 
-        Util::HELPER_METHODS.each do |method|
+        RSpecDSL::HELPER_METHODS.each do |method|
           context "when it is `#{method}(:name) do example end` form" do
             let(:source) do
               <<-END

data/spec/transpec/syntax/its_spec.rb

@@ -67,9 +67,9 @@ module Transpec
             rewritten_source.should == expected_source
           end
 
-          it "adds record `its(:attr) { }` -> `describe 'attr' do subject { super().attr }; it { } end`" do
+          it "adds record `its(:attr) { }` -> `describe '#attr' do subject { super().attr }; it { } end`" do
             record.original_syntax.should  == 'its(:attr) { }'
-            record.converted_syntax.should == "describe 'attr' do subject { super().attr }; it { } end"
+            record.converted_syntax.should == "describe '#attr' do subject { super().attr }; it { } end"
           end
 
           context 'and there is no blank line before #its' do
@@ -164,9 +164,9 @@ module Transpec
             rewritten_source.should == expected_source
           end
 
-          it "adds record `its(:attr) { }` -> `describe 'attr' do subject { super().attr }; it { } end`" do
+          it "adds record `its(:attr) { }` -> `describe '#attr' do subject { super().attr }; it { } end`" do
             record.original_syntax.should  == 'its(:attr) { }'
-            record.converted_syntax.should == "describe 'attr' do subject { super().attr }; it { } end"
+            record.converted_syntax.should == "describe '#attr' do subject { super().attr }; it { } end"
           end
         end
 
@@ -201,9 +201,9 @@ module Transpec
             rewritten_source.should == expected_source
           end
 
-          it "adds record `its(:attr) { }` -> `describe 'attr' do subject { super().attr }; it { } end`" do
+          it "adds record `its(:attr) { }` -> `describe '#attr' do subject { super().attr }; it { } end`" do
             record.original_syntax.should  == 'its(:attr) { }'
-            record.converted_syntax.should == "describe 'attr' do subject { super().attr }; it { } end"
+            record.converted_syntax.should == "describe '#attr' do subject { super().attr }; it { } end"
           end
         end
 
@@ -347,9 +347,9 @@ module Transpec
             rewritten_source.should == expected_source
           end
 
-          it "adds record `its(:attr) { }` -> `describe 'attr' do subject { super().attr }; it { } end`" do
+          it "adds record `its(:attr) { }` -> `describe '#attr' do subject { super().attr }; it { } end`" do
             record.original_syntax.should  == 'its(:attr) { }'
-            record.converted_syntax.should == "describe 'attr' do subject { super().attr }; it { } end"
+            record.converted_syntax.should == "describe '#attr' do subject { super().attr }; it { } end"
           end
         end
 

data/spec/transpec/util_spec.rb

@@ -2,6 +2,7 @@
 
 require 'spec_helper'
 require 'transpec/util'
+require 'ast'
 
 module Transpec
   describe Util do

data/tasks/demo.rake

@@ -11,11 +11,11 @@ namespace :demo do
   ]
   # rubocop:enable LineLength
 
-  desc 'Run demo of Transpec on all projects'
+  desc 'Publish conversion example on all projects'
   task all: demos.map(&:name)
 
   demos.each do |demo|
-    desc "Run demo of Transpec on #{demo.name.capitalize} project"
+    desc "Publish conversion example on #{demo.name} project"
     task demo.name do
       demo.run
     end

data/tasks/lib/transpec_demo.rb

@@ -12,7 +12,7 @@ class TranspecDemo < TranspecTest
   def run
     require 'transpec'
 
-    puts " Running demo on #{name} Project ".center(80, '=')
+    puts " Running demo on #{name} project ".center(80, '=')
 
     prepare_project
     run_demo

data/tasks/lib/transpec_test.rb

@@ -36,7 +36,7 @@ class TranspecTest
 
   def run
     require 'transpec'
-    puts " Testing on #{name} Project ".center(80, '=')
+    puts " Testing on #{name} project ".center(80, '=')
     prepare_project
     run_test(%w(--force))
   end

data/tasks/test.rake

@@ -27,7 +27,7 @@ namespace :test do
   task all: tests.map(&:name)
 
   tests.each do |test|
-    desc "Test Transpec on #{test.name.capitalize} project"
+    desc "Test Transpec on #{test.name} project"
     task test.name do
       test.run
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: transpec
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Yuji Nakayama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-21 00:00:00.000000000 Z
+date: 2013-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -226,9 +226,11 @@ files:
 - lib/transpec/file_finder.rb
 - lib/transpec/git.rb
 - lib/transpec/option_parser.rb
+- lib/transpec/parser.rb
 - lib/transpec/project.rb
 - lib/transpec/record.rb
 - lib/transpec/report.rb
+- lib/transpec/rspec_dsl.rb
 - lib/transpec/rspec_version.rb
 - lib/transpec/static_context_inspector.rb
 - lib/transpec/syntax.rb
@@ -318,7 +320,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: An RSpec syntax converter
@@ -359,4 +361,3 @@ test_files:
 - spec/transpec/syntax/should_spec.rb
 - spec/transpec/util_spec.rb
 - spec/transpec_spec.rb
-has_rdoc: