transpec 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d068540b9a2d9d54a04b4314bd3c5156c423ba4f
-  data.tar.gz: cbbb7e6061a8d5cf4ee52054e1e7bb1da4ea8a08
+  metadata.gz: a6b25e36a9c0ed121a64efdb418255cc4c503112
+  data.tar.gz: ce7f2540fc51d7649fdad98c22e5e8994d7c74c5
 SHA512:
-  metadata.gz: bb03eeaa658581eb344bafff2a1bd0e38931bdd804b76be305fab9154efdb858306f8a5db2c7292210289ba5dfe74af02797a9d49896aab229c46af6ae2124a7
-  data.tar.gz: e7c2dfa4ba98e945c3d0d9363a1151d68eba25ea8c869191212b8dbc6cca7b04fd64b51af38c8b0f3855288b798f74c06719d234ab7a1723acdbed1421533802
+  metadata.gz: eb1a7aea414278e08a8f850edda5fef805f6be73428daa30bd32c855766bd6a0c7168ea4e9266b796436a5d3f1dabf4370a3a7bf8640519164b1635a3eacf08c
+  data.tar.gz: 11b6fd391046cf62018406f835d9655061dcb9f28c0745e3f4b7041ec4a56630c12869eea41c3a3e409a4fdf884741a5aebef81741840fec65d216cc74b87667

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Development
 
+## v2.2.1
+
+* Fix invalid conversion of `pending` with block including an empty line.
+
 ## v2.2.0
 
 * Add descriptive comments to auto-added configurations in `RSpec.configure`.

data/README.md

@@ -12,7 +12,7 @@ With Transpec you can upgrade your RSpec 2 specs to RSpec 3 in no time.
 It supports [conversions](#supported-conversions) for almost all of the RSpec 3 changes – not only the `expect` syntax.
 Also, you can use it on your RSpec 2 project even if you're not going to upgrade it to RSpec 3 for now.
 
-Check out the following pages for the new RSpec syntax and the changes in RSpec 3:
+Check out the following posts for the new RSpec syntax and the changes in RSpec 3:
 
 * [Myron Marston » RSpec's New Expectation Syntax](http://myronmars.to/n/dev-blog/2012/06/rspecs-new-expectation-syntax)
 * [RSpec's new message expectation syntax - Tea is awesome.](http://teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/)
@@ -1048,7 +1048,7 @@ end
 
 Or with `--no-yield-any-instance` option they will be converted to:
 
-```
+```ruby
 RSpec.configure do |rspec|
   rspec.mock_with :rspec do |mocks|
     # In RSpec 3, `any_instance` implementation blocks will be yielded the receiving
@@ -1277,7 +1277,7 @@ end
 
 Or with `--no-explicit-spec-type` option they will be converted to:
 
-```
+```ruby
 RSpec.configure do |rspec|
   # rspec-rails 3 will no longer automatically infer an example group's spec type
   # from the file location. You can explicitly opt-in to the feature using this

data/README.md.erb

@@ -12,7 +12,7 @@ With Transpec you can upgrade your RSpec 2 specs to RSpec 3 in no time.
 It supports [conversions](#supported-conversions) for almost all of the RSpec 3 changes – not only the `expect` syntax.
 Also, you can use it on your RSpec 2 project even if you're not going to upgrade it to RSpec 3 for now.
 
-Check out the following pages for the new RSpec syntax and the changes in RSpec 3:
+Check out the following posts for the new RSpec syntax and the changes in RSpec 3:
 
 * [Myron Marston » RSpec's New Expectation Syntax](http://myronmars.to/n/dev-blog/2012/06/rspecs-new-expectation-syntax)
 * [RSpec's new message expectation syntax - Tea is awesome.](http://teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/)
@@ -1137,7 +1137,7 @@ Will be converted to:
 
 Or with `--no-yield-any-instance` option they will be converted to:
 
-```
+```ruby
 <%= convert(example, cli: ['--no-yield-any-instance'], rspec_version: rspec_version) -%>
 ```
 
@@ -1332,7 +1332,7 @@ Will be converted to:
 
 Or with `--no-explicit-spec-type` option they will be converted to:
 
-```
+```ruby
 <%= convert(example, rspec_version: rspec_version, path: 'spec/models/some_model_spec.rb', cli: ['--no-explicit-spec-type']) -%>
 ```
 

data/Rakefile

@@ -3,7 +3,7 @@ require 'rspec/core/rake_task'
 require 'rubocop/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
-Rubocop::RakeTask.new(:style)
+RuboCop::RakeTask.new(:style)
 
 Dir['tasks/**/*.rake'].each do |path|
   load(path)

data/lib/transpec/commit_message.rb

@@ -21,7 +21,7 @@ module Transpec
         |
         |#{conversion_summary}
         |
-        |See also: https://github.com/yujinakayama/transpec#supported-conversions
+        |For more details: https://github.com/yujinakayama/transpec#supported-conversions
       END
     end
 

data/lib/transpec/syntax/pending.rb

@@ -55,6 +55,8 @@ module Transpec
         return unless indentation_width > 0
 
         each_line_range(target_node) do |line_range|
+          line_source = line_range.source.chomp
+          next if line_source.length < indentation_width
           remove(line_range.resize(indentation_width))
         end
       end

data/lib/transpec/version.rb

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

data/spec/transpec/commit_message_spec.rb

@@ -20,8 +20,9 @@ module Transpec
     end
 
     describe '#to_s' do
-      it 'wraps lines within 72 characters' do
+      it 'wraps lines within 72 characters except URLs' do
         commit_message.to_s.each_line do |line|
+          next if line.match(%r{\bhttps?://})
           line.chomp.size.should <= 72
         end
       end
@@ -71,7 +72,8 @@ module Transpec
         end
 
         it 'has the URL at the last line' do
-          body_lines[-1].chomp.should == 'See also: https://github.com/yujinakayama/transpec#supported-conversions'
+          body_lines[-1].chomp.should ==
+            'For more details: https://github.com/yujinakayama/transpec#supported-conversions'
         end
       end
     end

data/spec/transpec/syntax/pending_spec.rb

@@ -224,6 +224,39 @@ module Transpec
           it 'converts to `pending; do_something_fail` form' do
             rewritten_source.should == expected_source
           end
+
+          context 'and the block body includes an empty line' do
+            let(:source) do
+              <<-END
+                describe 'example' do
+                  it 'is expected to fail' do
+                    pending do
+                      do_something_first
+
+                      do_something_fail
+                    end
+                  end
+                end
+              END
+            end
+
+            let(:expected_source) do
+              <<-END
+                describe 'example' do
+                  it 'is expected to fail' do
+                    pending
+                    do_something_first
+
+                    do_something_fail
+                  end
+                end
+              END
+            end
+
+            it 'properly converts' do
+              rewritten_source.should == expected_source
+            end
+          end
         end
 
         context "with expression multiline `pending('some reason') { do_something_fail }`" do

data/tasks/fixtures/mail/2.99.0/COMMIT_EDITMSG

@@ -1,6 +1,6 @@
 Convert specs to RSpec 2.99.0.beta2 syntax with Transpec
 
-This conversion is done by Transpec 1.13.1 with the following command:
+This conversion is done by Transpec 2.2.0 with the following command:
     transpec --force
 
 * 2161 conversions
@@ -83,4 +83,4 @@ This conversion is done by Transpec 1.13.1 with the following command:
     from: obj.stub!(:message)
       to: obj.stub(:message)
 
-See also: https://github.com/yujinakayama/transpec#supported-conversions
+For more details: https://github.com/yujinakayama/transpec#supported-conversions

data/tasks/fixtures/mail/3.0.0/COMMIT_EDITMSG

@@ -1,6 +1,6 @@
-Convert specs to RSpec 3.0.0.beta2 syntax with Transpec
+Convert specs to RSpec 3.0.0 syntax with Transpec
 
-This conversion is done by Transpec 1.13.1 with the following command:
+This conversion is done by Transpec 2.2.0 with the following command:
     transpec --force --convert example_group,hook_scope
 
 * 82 conversions
@@ -27,4 +27,4 @@ This conversion is done by Transpec 1.13.1 with the following command:
     from: obj.stub(:message => value)
       to: allow(obj).to receive_messages(:message => value)
 
-See also: https://github.com/yujinakayama/transpec#supported-conversions
+For more details: https://github.com/yujinakayama/transpec#supported-conversions

data/tasks/fixtures/twitter/2.99.0/COMMIT_EDITMSG

@@ -1,6 +1,6 @@
 Convert specs to RSpec 2.99.0.beta2 syntax with Transpec
 
-This conversion is done by Transpec 1.13.1 with the following command:
+This conversion is done by Transpec 2.2.0 with the following command:
     transpec --force
 
 * 899 conversions
@@ -35,4 +35,4 @@ This conversion is done by Transpec 1.13.1 with the following command:
     from: obj.stub!(:message)
       to: allow(obj).to receive(:message)
 
-See also: https://github.com/yujinakayama/transpec#supported-conversions
+For more details: https://github.com/yujinakayama/transpec#supported-conversions

data/tasks/fixtures/twitter/3.0.0/COMMIT_EDITMSG

@@ -1,6 +1,6 @@
-Convert specs to RSpec 3.0.0.beta2 syntax with Transpec
+Convert specs to RSpec 3.0.0 syntax with Transpec
 
-This conversion is done by Transpec 1.13.1 with the following command:
+This conversion is done by Transpec 2.2.0 with the following command:
     transpec --force --convert example_group,hook_scope
 
 * 54 conversions
@@ -15,4 +15,4 @@ This conversion is done by Transpec 1.13.1 with the following command:
     from: before(:all) { }
       to: before(:context) { }
 
-See also: https://github.com/yujinakayama/transpec#supported-conversions
+For more details: https://github.com/yujinakayama/transpec#supported-conversions

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: transpec
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Yuji Nakayama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-02 00:00:00.000000000 Z
+date: 2014-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -372,8 +372,6 @@ files:
 - spec/transpec_spec.rb
 - tasks/ci/spec.rake
 - tasks/demo.rake
-- tasks/fixtures/guard/2.99.0/COMMIT_EDITMSG
-- tasks/fixtures/guard/3.0.0/COMMIT_EDITMSG
 - tasks/fixtures/mail/2.99.0/COMMIT_EDITMSG
 - tasks/fixtures/mail/3.0.0/COMMIT_EDITMSG
 - tasks/fixtures/twitter/2.99.0/COMMIT_EDITMSG

data/tasks/fixtures/guard/2.99.0/COMMIT_EDITMSG

@@ -1,82 +0,0 @@
-Convert specs to RSpec 2.99.0.beta2 syntax with Transpec
-
-This conversion is done by Transpec 1.13.1 with the following command:
-    transpec --force
-
-* 396 conversions
-    from: obj.should_receive(:message)
-      to: expect(obj).to receive(:message)
-
-* 239 conversions
-    from: obj.should
-      to: expect(obj).to
-
-* 113 conversions
-    from: obj.stub(:message)
-      to: allow(obj).to receive(:message)
-
-* 94 conversions
-    from: obj.should_not_receive(:message)
-      to: expect(obj).not_to receive(:message)
-
-* 86 conversions
-    from: == expected
-      to: eq(expected)
-
-* 16 conversions
-    from: stub('something')
-      to: double('something')
-
-* 15 conversions
-    from: be_true
-      to: be_truthy
-
-* 15 conversions
-    from: obj.stub!(:message)
-      to: allow(obj).to receive(:message)
-
-* 13 conversions
-    from: mock('something')
-      to: double('something')
-
-* 10 conversions
-    from: lambda { }.should_not
-      to: expect { }.not_to
-
-* 10 conversions
-    from: obj.should_not
-      to: expect(obj).not_to
-
-* 7 conversions
-    from: be_false
-      to: be_falsey
-
-* 7 conversions
-    from: obj.unstub(:message)
-      to: allow(obj).to receive(:message).and_call_original
-
-* 5 conversions
-    from: pending
-      to: skip
-
-* 4 conversions
-    from: lambda { }.should
-      to: expect { }.to
-
-* 4 conversions
-    from: obj.should_receive(:message).any_number_of_times
-      to: allow(obj).to receive(:message)
-
-* 3 conversions
-    from: collection.should have(n).items
-      to: expect(collection.size).to eq(n)
-
-* 1 conversion
-    from: it { should ... }
-      to: it { is_expected.to ... }
-
-* 1 conversion
-    from: it { should_not ... }
-      to: it { is_expected.not_to ... }
-
-See also: https://github.com/yujinakayama/transpec#supported-conversions

data/tasks/fixtures/guard/3.0.0/COMMIT_EDITMSG

@@ -1,34 +0,0 @@
-Convert specs to RSpec 3.0.0.beta2 syntax with Transpec
-
-This conversion is done by Transpec 1.13.1 with the following command:
-    transpec --force --convert example_group,hook_scope
-
-* 31 conversions
-    from: describe 'something' { }
-      to: RSpec.describe 'something' { }
-
-* 16 conversions
-    from: obj.stub(:message => value)
-      to: allow(obj).to receive_messages(:message => value)
-
-* 13 conversions
-    from: before(:all) { }
-      to: before(:context) { }
-
-* 10 conversions
-    from: before(:each) { }
-      to: before(:example) { }
-
-* 8 conversions
-    from: after(:all) { }
-      to: after(:context) { }
-
-* 4 conversions
-    from: shared_examples_for 'something' { }
-      to: RSpec.shared_examples_for 'something' { }
-
-* 1 conversion
-    from: after(:each) { }
-      to: after(:example) { }
-
-See also: https://github.com/yujinakayama/transpec#supported-conversions