transpec 2.3.7 → 2.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ce681149f6777fb46a239bcee88f92b42523600
-  data.tar.gz: 1536c4975b64ec6168e53ec1dffd4b315abe329e
+  metadata.gz: cb9406724bb6b0b2dd4a820087ce298134d0abbf
+  data.tar.gz: c9cd123d3c4a95f6f74cb536b8f0e614362defb9
 SHA512:
-  metadata.gz: b5d797314a4304bf65be434947f3408cdeccb68379ce7696539854788b4f92cede514bed025c5d8f1876302b5535a2987186d136ca3c357f923f064c2bdd24a6
-  data.tar.gz: cd41e8284cb963cfd971fb64b05d5ca6988b406da92836ab6719ee675c3b955a47843edcb7a45b83a0399896218b90cbdb3d21ddb5a20169795f3c2de30d4b7d
+  metadata.gz: 067c988d340e8d447ec75fafd9697d465651e7731c8b43fca3b76559139c16b0ee867bc57f3a06344df5127aff1af51e2ad8b3c5531d162729e705ddb2c00e50
+  data.tar.gz: 5b96068adbf78f05d7ca66faa64b6377248b51733114f916e2a67e92b9c47b3537d1f368de2dd369f7427fa4ab979509ac92fcb469972ef432246bbf9b8d39a2

data/.rubocop.yml

@@ -18,6 +18,9 @@ CyclomaticComplexity:
 PerceivedComplexity:
   Max: 10
 
+AbcSize:
+  Max: 44
+
 WordArray:
   Enabled: false
 

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Development
 
+## v2.3.8
+
+* Fix an error on processing one-liner `should` that is not directly encloses in an example block. ([#93](https://github.com/yujinakayama/transpec/issues/93))
+
 ## v2.3.7
 
 * Fix a bug where nested example groups in `RSpec.describe` are wrongly converted to non-monkey-patch form when dynamic analysis is skipped. ([#89](https://github.com/yujinakayama/transpec/issues/89))

data/README.md

@@ -2,7 +2,7 @@
 [![Dependency Status](http://img.shields.io/gemnasium/yujinakayama/transpec.svg)](https://gemnasium.com/yujinakayama/transpec)
 [![Build Status](https://travis-ci.org/yujinakayama/transpec.svg?branch=master)](https://travis-ci.org/yujinakayama/transpec)
 [![Coverage Status](http://img.shields.io/coveralls/yujinakayama/transpec/master.svg)](https://coveralls.io/r/yujinakayama/transpec)
-[![Code Climate](http://img.shields.io/codeclimate/github/yujinakayama/transpec.svg)](https://codeclimate.com/github/yujinakayama/transpec)
+[![Code Climate](https://codeclimate.com/github/yujinakayama/transpec/badges/gpa.svg)](https://codeclimate.com/github/yujinakayama/transpec)
 
 # Transpec
 
@@ -128,21 +128,6 @@ Then, run `transpec` in the project root directory:
 ```bash
 $ cd some-project
 $ transpec
-Copying the project for dynamic analysis...
-Running dynamic analysis with command "bundle exec rspec"...
-...............................................................................
-...................
-
-Finished in 13.07 seconds
-100 examples, 0 failures
-
-Gathering the spec suite data...
-
-Converting spec/spec_helper.rb
-Converting spec/support/cache_helper.rb
-Converting spec/support/file_helper.rb
-Converting spec/support/shared_context.rb
-Converting spec/transpec/ast/node_spec.rb
 ```
 
 This will run the specs, convert them, and overwrite all spec files in the `spec` directory.

data/README.md.erb

@@ -2,7 +2,7 @@
 [![Dependency Status](http://img.shields.io/gemnasium/yujinakayama/transpec.svg)](https://gemnasium.com/yujinakayama/transpec)
 [![Build Status](https://travis-ci.org/yujinakayama/transpec.svg?branch=master)](https://travis-ci.org/yujinakayama/transpec)
 [![Coverage Status](http://img.shields.io/coveralls/yujinakayama/transpec/master.svg)](https://coveralls.io/r/yujinakayama/transpec)
-[![Code Climate](http://img.shields.io/codeclimate/github/yujinakayama/transpec.svg)](https://codeclimate.com/github/yujinakayama/transpec)
+[![Code Climate](https://codeclimate.com/github/yujinakayama/transpec/badges/gpa.svg)](https://codeclimate.com/github/yujinakayama/transpec)
 
 # Transpec
 
@@ -102,21 +102,6 @@ Then, run `transpec` in the project root directory:
 ```bash
 $ cd some-project
 $ transpec
-Copying the project for dynamic analysis...
-Running dynamic analysis with command "bundle exec rspec"...
-...............................................................................
-...................
-
-Finished in 13.07 seconds
-100 examples, 0 failures
-
-Gathering the spec suite data...
-
-Converting spec/spec_helper.rb
-Converting spec/support/cache_helper.rb
-Converting spec/support/file_helper.rb
-Converting spec/support/shared_context.rb
-Converting spec/transpec/ast/node_spec.rb
 ```
 
 This will run the specs, convert them, and overwrite all spec files in the `spec` directory.

data/lib/transpec/converter.rb

@@ -102,7 +102,7 @@ module Transpec
     def process_operator(operator)
       return unless config.convert_should?
       return if operator.expectation.is_a?(Syntax::OnelinerShould) &&
-        !rspec_version.oneliner_is_expected_available?
+                !rspec_version.oneliner_is_expected_available?
       operator.convert_operator!(config.parenthesize_matcher_arg?)
     end
 

data/lib/transpec/option_parser.rb

@@ -204,7 +204,7 @@ module Transpec
 
     def highlight_text(text)
       text.gsub(/`.+?`/) { |code| code.gsub('`', '').underline }
-          .gsub(/\*.+?\*/) { |code| code.gsub('*', '').bright }
+        .gsub(/\*.+?\*/) { |code| code.gsub('*', '').bright }
     end
 
     def convert_deprecated_options(raw_args)

data/lib/transpec/syntax/oneliner_should.rb

@@ -111,6 +111,8 @@ module Transpec
           fail 'This one-liner #should does not have #have matcher!'
         end
 
+        return unless example
+
         unless example.description?
           example.insert_description!(build_description(have_matcher.size_source))
         end
@@ -144,9 +146,9 @@ module Transpec
         param_names :should, :have, :negative_form_of_to
 
         def old_syntax
-          syntax = should.example.description? ? "it '...' do" : 'it {'
+          syntax = had_description? ? "it '...' do" : 'it {'
           syntax << " #{should.method_name} #{have.method_name}(n).#{old_items} "
-          syntax << (should.example.description? ? 'end' : '}')
+          syntax << (had_description? ? 'end' : '}')
         end
 
         def new_syntax
@@ -155,14 +157,19 @@ module Transpec
           syntax << new_expectation
           syntax << ' '
           syntax << source_builder.replacement_matcher_source
-          syntax << ' end'
+          syntax << ' '
+          syntax << (has_description? ? 'end' : '}')
         end
 
         def new_description
-          if should.example.description?
-            "it '...' do"
+          if has_description?
+            if had_description?
+              "it '...' do"
+            else
+              "it '#{should.build_description('n')}' do"
+            end
           else
-            "it '#{should.build_description('n')}' do"
+            'it {'
           end
         end
 
@@ -178,6 +185,15 @@ module Transpec
         def new_subject
           build_new_subject('subject')
         end
+
+        def had_description?
+          return false unless should.example
+          should.example.description?
+        end
+
+        def has_description? # rubocop:disable PredicateName
+          !should.example.nil?
+        end
       end
     end
   end

data/lib/transpec/version.rb

@@ -5,7 +5,7 @@ module Transpec
   module Version
     MAJOR = 2
     MINOR = 3
-    PATCH = 7
+    PATCH = 8
 
     def self.to_s
       [MAJOR, MINOR, PATCH].join('.')

data/spec/transpec/syntax/oneliner_should_spec.rb

@@ -586,6 +586,42 @@ module Transpec
             record.new_syntax.should == "it 'does not have n items' do expect(subject.size).not_to eq(n) end"
           end
         end
+
+        context 'when the oneliner #should is not directly enclosed in an example block' do
+          let(:source) do
+            <<-END
+              describe 'example' do
+                def some_method
+                  should have(2).items
+                end
+
+                it { some_method }
+              end
+            END
+          end
+
+          let(:expected_source) do
+            <<-END
+              describe 'example' do
+                def some_method
+                  expect(subject.size).to eq(2)
+                end
+
+                it { some_method }
+              end
+            END
+          end
+
+          it 'does not insert example description' do
+            rewritten_source.should == expected_source
+          end
+
+          it 'adds record ' \
+             '`it { should have(n).items }` -> `it { expect(subject.size).to eq(n) }`' do
+            record.old_syntax.should == 'it { should have(n).items }'
+            record.new_syntax.should == 'it { expect(subject.size).to eq(n) }'
+          end
+        end
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: transpec
 version: !ruby/object:Gem::Version
-  version: 2.3.7
+  version: 2.3.8
 platform: ruby
 authors:
 - Yuji Nakayama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-28 00:00:00.000000000 Z
+date: 2014-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -420,7 +420,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.3.0
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: The RSpec syntax converter