transpec 1.4.1 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b8de9ebab18fff6380696a3a783ccf4ce9ed8af
-  data.tar.gz: e193341f8e9614397330090af1eff772a5efe427
+  metadata.gz: cb53fd56a9663b6ac60c9fcb539aa9f08ce4ef48
+  data.tar.gz: 483a8e18c082daa89c45a80a67397c5fab6dc7df
 SHA512:
-  metadata.gz: 0a77f0a729eb8d00145ff1b0c2af16d4ddb86e4187391077ff63a96be47ffebf7d9c641c43ef9c99250f99a89808c1e039d031b6bf109cf6e6bbaea2411b47e6
-  data.tar.gz: a98eb793b1d027164f716938ddec92f5ed2f70a19363fbe0a66d537d872f2e2f4d405f0dd246bada22a965366fecbb4943ffaf76b5ff04f175f7c8a8e31a13a0
+  metadata.gz: 29bdf20766286e22243e0d615b2cb934d86272ad6fec7b2a67d3e53fdb6c19d19f732c95ad3ff7fd6f7bf6732b9665c99d7f9e79a490af3ee4c2ba6a2812afe2
+  data.tar.gz: eeee1c1f55c9dfa1893be85c04a576f62286a35a60ce0359acbc91c1bf530a334cf6b47345525aa70ce2ec2730f05b20eb29f0159e3ecf700a22b0296a2dd014

data/.rubocop.yml

@@ -58,4 +58,4 @@ BracesAroundHashParameters:
 
 # TODO: Shorten to 100.
 ClassLength:
-  Max: 152
+  Max: 154

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## Development
 
+## v1.5.0
+
+* Mention the project's RSpec version in the auto-generated commit message
+* Deprecate `-m/--generate-commit-message` option (A commit message will always be generated)
+* Display actual `Proc` constructor names in the summary of expectations on block
+
 ## v1.4.1
 
 * Support Ruby 2.1 runtime by falling back to Ruby 2.0 parser

data/Guardfile

@@ -1,7 +1,7 @@
 # A sample Guardfile
 # More info at https://github.com/guard/guard#readme
 
-guard :rspec, all_after_pass: true, all_on_start: true, keep_failed: true, cmd: 'bundle exec rspec' do
+guard :rspec, all_after_pass: true, all_on_start: true, cmd: 'bundle exec rspec' do
   watch(%r{^spec/.+_spec\.rb$})
   watch(%r{^lib/(.+)\.rb$})        { |m| "spec/#{m[1]}_spec.rb" }
   watch('spec/spec_helper.rb')     { "spec" }

data/README.md

@@ -113,15 +113,15 @@ Usually you don't need to add `transpec` to your `*.gemspec` or `Gemfile` since
 
 Before converting your specs:
 
-* Make sure your project has `rspec` gem dependency `2.14` or later. If not, change your `*.gemspec` or `Gemfile` to do so.
+* Make sure your project has `rspec` gem dependency **2.14** or later. If not, change your `*.gemspec` or `Gemfile` to do so.
 * Run `rspec` and check if all the specs pass.
 * Ensure the Git repository is clean. (You don't want to mix up your changes and Transpec's changes, right?)
 
-Then, run `transpec` (using `-m/--generate-commit-message` is recommended) in the project root directory:
+Then, run `transpec` in the project root directory:
 
 ```bash
 $ cd some-project
-$ transpec -m
+$ transpec
 Copying the project for dynamic analysis...
 Running dynamic analysis with command "bundle exec rspec"...
 ...............................................................................
@@ -145,7 +145,7 @@ After the conversion, run `rspec` again and check whether everything is green:
 $ bundle exec rspec
 ```
 
-If it's green, commit the changes with auto-generated message:
+If it's green, commit the changes with an auto-generated message that describes the conversion summary:
 
 ```bash
 $ git commit -aeF .git/COMMIT_EDITMSG
@@ -181,7 +181,7 @@ Skip dynamic analysis and convert with only static analysis. Note that specifyin
 
 ### `-c/--rspec-command`
 
-Specify a command to run RSpec that is used for dynamic analysis.
+Specify a command to run your specs 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 setups or commands to run specs, use this option.
@@ -191,17 +191,6 @@ If your project requires some special setups or commands to run specs, use this
 $ transpec --rspec-command "./special_setup.sh && bundle exec rspec"
 ```
 
-### `-m/--generate-commit-message`
-
-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:
-
-```bash
-$ git commit -eF .git/COMMIT_EDITMSG
-```
-
 ### `-k/--keep`
 
 Keep specific syntaxes by disabling conversions.
@@ -218,7 +207,7 @@ Type             | Target Syntax                    | Converted Syntax
 `oneliner`       | `it { should ... }`              | `it { is_expected.to ... }`
 `should_receive` | `obj.should_receive`             | `expect(obj).to receive`
 `stub`           | `obj.stub`                       | `allow(obj).to receive`
-`have_items`     | `expect(obj).to have(x).items`   | `expect(obj.size).to eq(x)`
+`have_items`     | `expect(obj).to have(n).items`   | `expect(obj.size).to eq(n)`
 `its`            | `its(:attr) { }`                 | `describe { subject { }; it { } }`
 `deprecated`     | `obj.stub!`, `mock('foo')`, etc. | `obj.stub`, `double('foo')`
 
@@ -620,7 +609,7 @@ allow(obj).to receive(:bar).and_return(2)
 allow(obj).to receive_messages(:foo => 1, :bar => 2)
 
 # Conversion from `stub_chain` to `receive_message_chain` is available
-# only if the target project's rspec gem dependency is 2.99.0.beta2 or later
+# only if the target project's rspec gem dependency is 3.0.0.beta2 or later
 allow(obj).to receive_message_chain(:foo, :bar, :baz)
 
 allow_any_instance_of(Klass).to receive(:foo)
@@ -648,6 +637,7 @@ Otherwise `obj.stub(:foo => 1, :bar => 2)` will be converted to two `allow(obj).
 * See also:
     * [RSpec's new message expectation syntax - Tea is awesome.](http://teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/)
     * [allow receive with multiple methods · rspec/rspec-mocks](https://github.com/rspec/rspec-mocks/issues/368)
+    * [Bring back stub_chain (receive_message_chain) · rspec/rspec-mocks](https://github.com/rspec/rspec-mocks/issues/464)
 
 ### Deprecated method stub aliases
 

data/README.md.erb

@@ -86,15 +86,15 @@ Usually you don't need to add `transpec` to your `*.gemspec` or `Gemfile` since
 
 Before converting your specs:
 
-* Make sure your project has `rspec` gem dependency `<%= Transpec.required_rspec_version %>` or later. If not, change your `*.gemspec` or `Gemfile` to do so.
+* Make sure your project has `rspec` gem dependency **<%= Transpec.required_rspec_version %>** or later. If not, change your `*.gemspec` or `Gemfile` to do so.
 * Run `rspec` and check if all the specs pass.
 * Ensure the Git repository is clean. (You don't want to mix up your changes and Transpec's changes, right?)
 
-Then, run `transpec` (using `-m/--generate-commit-message` is recommended) in the project root directory:
+Then, run `transpec` in the project root directory:
 
 ```bash
 $ cd some-project
-$ transpec -m
+$ transpec
 Copying the project for dynamic analysis...
 Running dynamic analysis with command "bundle exec rspec"...
 ...............................................................................
@@ -118,7 +118,7 @@ After the conversion, run `rspec` again and check whether everything is green:
 $ bundle exec rspec
 ```
 
-If it's green, commit the changes with auto-generated message:
+If it's green, commit the changes with an auto-generated message that describes the conversion summary:
 
 ```bash
 $ git commit -aeF .git/COMMIT_EDITMSG
@@ -154,7 +154,7 @@ Skip dynamic analysis and convert with only static analysis. Note that specifyin
 
 ### `-c/--rspec-command`
 
-Specify a command to run RSpec that is used for dynamic analysis.
+Specify a command to run your specs 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 setups or commands to run specs, use this option.
@@ -164,17 +164,6 @@ If your project requires some special setups or commands to run specs, use this
 $ transpec --rspec-command "./special_setup.sh && bundle exec rspec"
 ```
 
-### `-m/--generate-commit-message`
-
-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:
-
-```bash
-$ git commit -eF .git/COMMIT_EDITMSG
-```
-
 ### `-k/--keep`
 
 Keep specific syntaxes by disabling conversions.
@@ -193,7 +182,7 @@ conversion_type_table = <<END
 `oneliner`       | `it { should ... }`              | `it { is_expected.to ... }`
 `should_receive` | `obj.should_receive`             | `expect(obj).to receive`
 `stub`           | `obj.stub`                       | `allow(obj).to receive`
-`have_items`     | `expect(obj).to have(x).items`   | `expect(obj.size).to eq(x)`
+`have_items`     | `expect(obj).to have(n).items`   | `expect(obj.size).to eq(n)`
 `its`            | `its(:attr) { }`                 | `describe { subject { }; it { } }`
 `deprecated`     | `obj.stub!`, `mock('foo')`, etc. | `obj.stub`, `double('foo')`
 END
@@ -355,7 +344,7 @@ expect(obj).to_not matcher # with `--negative-form to_not`
 
 ### One-liner expectations
 
-**This conversion is available only if your project has `rspec` gem dependency `2.99.0.beta2` or later.**
+**This conversion is available only if your project has `rspec` gem dependency `<%= Transpec::RSpecVersion.one_liner_is_expected_available_version %>` or later.**
 
 ```ruby
 # Targets
@@ -402,7 +391,7 @@ This conversion is combined with the conversion of [standard expectations](#stan
 
 ### Boolean matchers
 
-**This conversion is available only if your project has `rspec` gem dependency `2.99.0.beta1` or later.**
+**This conversion is available only if your project has `rspec` gem dependency `<%= Transpec::RSpecVersion.be_truthy_available_version %>` or later.**
 
 ```ruby
 # Targets
@@ -608,15 +597,15 @@ Klass.any_instance.stub(:foo)
 # Converted
 allow(obj).to receive(:foo)
 
-# If the target project's rspec gem dependency is prior to 3.0.0.beta1
+# If the target project's rspec gem dependency is prior to <%= Transpec::RSpecVersion.receive_messages_available_version %>
 allow(obj).to receive(:foo).and_return(1)
 allow(obj).to receive(:bar).and_return(2)
 
-# If the target project's rspec gem dependency is 3.0.0.beta1 or later
+# If the target project's rspec gem dependency is <%= Transpec::RSpecVersion.receive_messages_available_version %> or later
 allow(obj).to receive_messages(:foo => 1, :bar => 2)
 
 # Conversion from `stub_chain` to `receive_message_chain` is available
-# only if the target project's rspec gem dependency is 2.99.0.beta2 or later
+# only if the target project's rspec gem dependency is <%= Transpec::RSpecVersion.receive_message_chain_available_version %> or later
 allow(obj).to receive_message_chain(:foo, :bar, :baz)
 
 allow_any_instance_of(Klass).to receive(:foo)
@@ -644,6 +633,7 @@ Otherwise `obj.stub(:foo => 1, :bar => 2)` will be converted to two `allow(obj).
 * See also:
     * [RSpec's new message expectation syntax - Tea is awesome.](http://teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/)
     * [allow receive with multiple methods · rspec/rspec-mocks](https://github.com/rspec/rspec-mocks/issues/368)
+    * [Bring back stub_chain (receive_message_chain) · rspec/rspec-mocks](https://github.com/rspec/rspec-mocks/issues/464)
 
 ### Deprecated method stub aliases
 
@@ -727,7 +717,7 @@ If you choose so, disable this conversion by either:
 
 ### Current example object
 
-**This conversion is available only if your project has `rspec` gem dependency `2.99.0.beta1` or later.**
+**This conversion is available only if your project has `rspec` gem dependency `<%= Transpec::RSpecVersion.yielded_example_available_version %>` or later.**
 
 ```ruby
 # Targets
@@ -751,7 +741,7 @@ END
 
 # Converted
 <%=
-rspec_version = Transpec::RSpecVersion.new('2.99')
+rspec_version = Transpec::RSpecVersion.yielded_example_available_version
 Transpec::Converter.new(nil, rspec_version).convert(example_target)
 -%>
 ```

data/lib/transpec/cli.rb

@@ -36,7 +36,7 @@ module Transpec
       process(paths)
 
       display_summary
-      generate_commit_message if @configuration.generate_commit_message?
+      generate_commit_message
       display_final_guide
 
       true
@@ -105,13 +105,15 @@ module Transpec
 
     def generate_commit_message
       return if @report.records.empty?
+      return unless Git.command_available? && Git.inside_of_repository?
 
-      commit_message = CommitMessage.new(@report, ARGV)
+      commit_message = CommitMessage.new(@report, @project.rspec_version, ARGV)
       Git.write_commit_message(commit_message.to_s)
 
       puts
-      puts 'A commit message was generated to .git/COMMIT_EDITMSG.'.color(:cyan)
-      puts 'Use the following command for the next commit:'.color(:cyan)
+      puts 'A commit message that describes the conversion summary was generated to'.color(:cyan)
+      puts '.git/COMMIT_EDITMSG. To use the message, type the following command for'.color(:cyan)
+      puts 'the next commit:'.color(:cyan)
       puts '    git commit -eF .git/COMMIT_EDITMSG'
     end
 

data/lib/transpec/commit_message.rb

@@ -4,8 +4,9 @@ require 'transpec/version'
 
 module Transpec
   class CommitMessage
-    def initialize(report, cli_args = [])
+    def initialize(report, rspec_version, cli_args = [])
       @report = report
+      @rspec_version = rspec_version
       @cli_args = cli_args
     end
 
@@ -13,7 +14,7 @@ module Transpec
       conversion_summary = @report.summary(bullet: '*', separate_by_blank_line: true)
 
       <<-END.gsub(/^\s+\|/, '').chomp
-        |Convert specs to the latest RSpec syntax with Transpec
+        |Convert specs to RSpec #{@rspec_version} syntax with Transpec
         |
         |This conversion is done by Transpec #{Transpec::Version} with the following command:
         |    transpec #{@cli_args.join(' ')}

data/lib/transpec/configuration.rb

@@ -16,8 +16,7 @@ module Transpec
       [:convert_deprecated_method, true],
       [:parenthesize_matcher_arg,  true],
       [:forced,                    false],
-      [:skip_dynamic_analysis,     false],
-      [:generate_commit_message,   false]
+      [:skip_dynamic_analysis,     false]
     ].freeze
 
     PREDICATES.each do |predicate, _|

data/lib/transpec/option_parser.rb

@@ -32,7 +32,7 @@ module Transpec
     end
 
     def parse(args)
-      args = args.dup
+      args = exclude_deprecated_options(args)
       @parser.parse!(args)
       args
     end
@@ -59,14 +59,6 @@ module Transpec
         @configuration.rspec_command = command
       end
 
-      define_option('-m', '--generate-commit-message') do
-        unless Git.inside_of_repository?
-          fail '-m/--generate-commit-message option is specified but not in a Git repository'
-        end
-
-        @configuration.generate_commit_message = true
-      end
-
       define_option('-k', '--keep TYPE[,TYPE...]') do |types|
         types.split(',').each do |type|
           config_attr = CONFIG_ATTRS_FOR_KEEP_TYPES[type.to_sym]
@@ -128,14 +120,10 @@ module Transpec
           'option decreases the conversion accuracy.'
         ],
         '-c' => [
-          'Specify command to run RSpec that is used for',
-          'dynamic analysis.',
+          'Specify a command to run your specs that is',
+          'used for dynamic analysis.',
           'Default: "bundle exec rspec"'
         ],
-        '-m' => [
-          'Generate commit message that describes',
-          'conversion summary. Only Git is supported.'
-        ],
         '-k' => [
           'Keep specific syntaxes by disabling',
           'conversions.',
@@ -144,13 +132,13 @@ module Transpec
           "  #{'oneliner'.bright} (from #{'should'.underline} to #{'is_expected.to'.underline})",
           "  #{'should_receive'.bright} (to #{'expect(obj).to receive'.underline})",
           "  #{'stub'.bright}  (to #{'allow(obj).to receive'.underline})",
-          "  #{'have_items'.bright} (to #{'expect(obj.size).to eq(x)'.underline})",
+          "  #{'have_items'.bright} (to #{'expect(obj.size).to eq(n)'.underline})",
           "  #{'its'.bright} (to #{'describe { subject { }; it { } }'.underline})",
           "  #{'deprecated'.bright} (e.g. from #{'mock'.underline} to #{'double'.underline})",
           'These are all converted by default.'
         ],
         '-n' => [
-          "Specify negative form of #{'to'.underline} that is used in",
+          "Specify a negative form of #{'to'.underline} that is used in",
           "the #{'expect(...).to'.underline} syntax.",
           "Either #{'not_to'.bright} or #{'to_not'.bright}.",
           "Default: #{'not_to'.bright}"
@@ -186,5 +174,18 @@ module Transpec
       }
     end
     # rubocop:enable MethodLength, AlignHash
+
+    def exclude_deprecated_options(args)
+      args.reject do |arg|
+        case arg
+        when '-m', '--generate-commit-message'
+          warn 'DEPRECATION: -m/--generate-commit-message option is deprecated. ' +
+               'A commit message will always be generated.'
+          true
+        else
+          false
+        end
+      end
+    end
   end
 end

data/lib/transpec/rspec_version.rb

@@ -8,20 +8,20 @@ module Transpec
   class RSpecVersion
     include Comparable
 
-    # http://www.ruby-doc.org/stdlib-2.0.0/libdoc/rubygems/rdoc/Gem/Version.html
-    #
-    # If any part contains letters (currently only a-z are supported) then that version is
-    # considered prerelease.
-    # Prerelease parts are sorted alphabetically using the normal Ruby string sorting rules.
-    # If a prerelease part contains both letters and numbers, it will be broken into multiple parts
-    # to provide expected sort behavior (1.0.a10 becomes 1.0.a.10, and is greater than 1.0.a9).
-    GEM_VERSION_2_99_0_BETA1 = Gem::Version.new('2.99.0.beta1')
-    GEM_VERSION_2_99_0_BETA2 = Gem::Version.new('2.99.0.beta2')
-    GEM_VERSION_3_0_0_BETA1  = Gem::Version.new('3.0.0.beta1')
-    GEM_VERSION_3_0_0_BETA2  = Gem::Version.new('3.0.0.beta2')
-
     attr_reader :gem_version
 
+    def self.define_feature_availability(feature, version_string)
+      available_version = new(version_string)
+
+      define_singleton_method("#{feature}_available_version") do
+        available_version
+      end
+
+      define_method("#{feature}_available?") do
+        self >= available_version
+      end
+    end
+
     def initialize(version)
       @gem_version = if version.is_a?(Gem::Version)
                        version
@@ -30,26 +30,6 @@ module Transpec
                      end
     end
 
-    def be_truthy_available?
-      @gem_version >= GEM_VERSION_2_99_0_BETA1
-    end
-
-    def yielded_example_available?
-      @gem_version >= GEM_VERSION_2_99_0_BETA1
-    end
-
-    def one_liner_is_expected_available?
-      @gem_version >= GEM_VERSION_2_99_0_BETA2
-    end
-
-    def receive_messages_available?
-      @gem_version >= GEM_VERSION_3_0_0_BETA1
-    end
-
-    def receive_message_chain_available?
-      @gem_version >= GEM_VERSION_3_0_0_BETA2
-    end
-
     def <=>(other)
       @gem_version <=> other.gem_version
     end
@@ -57,5 +37,11 @@ module Transpec
     def to_s
       @gem_version.to_s
     end
+
+    define_feature_availability :be_truthy,             '2.99.0.beta1'
+    define_feature_availability :yielded_example,       '2.99.0.beta1'
+    define_feature_availability :one_liner_is_expected, '2.99.0.beta2'
+    define_feature_availability :receive_messages,      '3.0.0.beta1'
+    define_feature_availability :receive_message_chain, '3.0.0.beta2'
   end
 end

data/lib/transpec/syntax/rspec_configure.rb

@@ -2,17 +2,16 @@
 
 require 'transpec/syntax'
 require 'transpec/util'
+require 'ast'
 
 module Transpec
   class Syntax
     class RSpecConfigure < Syntax
-      extend Util
-
       def self.target_node?(node, runtime_data = nil)
         return false unless node && node.type == :block
         send_node = node.children.first
         receiver_node, method_name, *_ = *send_node
-        const_name(receiver_node) == 'RSpec' && method_name == :configure
+        Util.const_name(receiver_node) == 'RSpec' && method_name == :configure
       end
 
       def self.add_framework_configuration(type, config_method_name)

data/lib/transpec/syntax/should.rb

@@ -46,7 +46,7 @@ module Transpec
         end
 
         if proc_literal?(subject_node)
-          replace_proc_selector_with_expect!
+          replace(range_of_subject_method_taking_block, 'expect')
         else
           wrap_subject_in_expect!
         end
@@ -61,15 +61,14 @@ module Transpec
 
       private
 
-      def replace_proc_selector_with_expect!
+      def range_of_subject_method_taking_block
         send_node = subject_node.children.first
-        range_of_subject_method_taking_block = send_node.loc.expression
-        replace(range_of_subject_method_taking_block, 'expect')
+        send_node.loc.expression
       end
 
       def register_record(negative_form_of_to)
         if proc_literal?(subject_node)
-          original_syntax = 'lambda { }.should'
+          original_syntax = "#{range_of_subject_method_taking_block.source} { }.should"
           converted_syntax = 'expect { }.'
         else
           original_syntax = 'obj.should'

data/lib/transpec/syntax/should_receive.rb

@@ -10,11 +10,8 @@ require 'transpec/syntax/mixin/any_instance'
 module Transpec
   class Syntax
     class ShouldReceive < Syntax
-      include Mixin::Send
-      include Mixin::MonkeyPatch
-      include Mixin::Expectizable
-      include Mixin::AllowNoMessage
-      include Mixin::AnyInstance
+      include Mixin::Send, Mixin::MonkeyPatch, Mixin::Expectizable, Mixin::AllowNoMessage,
+              Mixin::AnyInstance
 
       alias_method :useless_expectation?, :allow_no_message?
 

data/lib/transpec/version.rb

@@ -4,8 +4,8 @@ module Transpec
   # http://semver.org/
   module Version
     MAJOR = 1
-    MINOR = 4
-    PATCH = 1
+    MINOR = 5
+    PATCH = 0
 
     def self.to_s
       [MAJOR, MINOR, PATCH].join('.')

data/spec/transpec/cli_spec.rb

@@ -63,17 +63,32 @@ module Transpec
         end
       end
 
+      shared_examples 'generates commit message' do
+        it 'generates commit message to .git/COMMIT_EDITMSG' do
+          cli.run(args)
+          File.read('.git/COMMIT_EDITMSG').should start_with('Convert specs')
+        end
+      end
+
+      shared_examples 'does not generate commit message' do
+        it 'does not generate commit message' do
+          cli.run(args)
+          File.exist?('.git/COMMIT_EDITMSG').should be_false
+        end
+      end
+
       context 'when git is available' do
         before { Git.stub(:command_available?).and_return(true) }
 
         context 'and inside of a repository' do
-          before { Git.stub(:inside_of_repository?).and_return(true) }
+          include_context 'inside of git repository'
 
           context 'and the repository is not clean' do
             before { Git.stub(:clean?).and_return(false) }
 
             context 'and --force option is not specified' do
               include_examples 'aborts processing'
+              include_examples 'does not generate commit message'
 
               it 'warns to the user' do
                 cli.should_receive(:warn) do |arg|
@@ -85,32 +100,35 @@ module Transpec
             end
 
             context 'and --force option is specified' do
-              before do
-                args << '--force'
-                # Silence "fatal: Not a git repository (or any of the parent directories): .git"
-                # from Bundler.
-                `git init`
-              end
-
+              before { args << '--force' }
               include_examples 'rewrites files'
+              include_examples 'generates commit message'
             end
           end
 
           context 'and the repository is clean' do
             before { Git.stub(:clean?).and_return(true) }
+
             include_examples 'rewrites files'
+            include_examples 'generates commit message'
+
+            context 'and no conversion is done' do
+              let(:file_content) { '' }
+              include_examples 'does not generate commit message'
+            end
           end
         end
 
         context 'and not inside of a repository' do
-          before { Git.stub(:inside_of_repository?).and_return(false) }
           include_examples 'rewrites files'
+          include_examples 'does not generate commit message'
         end
       end
 
       context 'when git is not available' do
         before { Git.stub(:command_available?).and_return(false) }
         include_examples 'rewrites files'
+        include_examples 'does not generate commit message'
       end
 
       context "when the project's RSpec dependency is older than the required version" do
@@ -173,28 +191,6 @@ module Transpec
         end
       end
 
-      context 'when -m/--generate-commit-message option is specified' do
-        include_context 'inside of git repository'
-
-        let(:args) { ['--force', '--generate-commit-message', file_path] }
-
-        context 'and any conversion is done' do
-          it 'writes commit message to .git/COMMIT_EDITMSG' do
-            cli.run(args)
-            File.read('.git/COMMIT_EDITMSG').should start_with('Convert specs')
-          end
-        end
-
-        context 'and no conversion is done' do
-          let(:file_content) { '' }
-
-          it 'does not writes commit message' do
-            cli.run(args)
-            File.exist?('.git/COMMIT_EDITMSG').should be_false
-          end
-        end
-      end
-
       context 'when -c/--rspec-command option is specified' do
         include_context 'inside of git repository'
 

data/spec/transpec/commit_message_spec.rb

@@ -4,12 +4,14 @@ require 'spec_helper'
 require 'transpec/commit_message'
 require 'transpec/report'
 require 'transpec/record'
+require 'transpec/rspec_version'
 
 module Transpec
   describe CommitMessage do
-    subject(:commit_message) { CommitMessage.new(report, cli_args) }
+    subject(:commit_message) { CommitMessage.new(report, rspec_version, cli_args) }
     let(:report) { Report.new }
-    let(:cli_args) { %w(--force --generate-commit-message) }
+    let(:rspec_version) { RSpecVersion.new('2.99.0.beta1') }
+    let(:cli_args) { ['--force'] }
 
     before do
       report.records << Record.new('obj.stub(:message)', 'allow(obj).to receive(:message)')
@@ -28,7 +30,7 @@ module Transpec
 
       describe 'first line' do
         it 'has concise summary' do
-          lines[0].chomp.should == 'Convert specs to the latest RSpec syntax with Transpec'
+          lines[0].chomp.should == 'Convert specs to RSpec 2.99.0.beta1 syntax with Transpec'
         end
       end
 
@@ -45,7 +47,7 @@ module Transpec
           body_lines[0].chomp
             .should match(/^This conversion is done by Transpec \d+\.\d+\.\d+ with the following command:$/)
           body_lines[1].chomp
-            .should ==     '    transpec --force --generate-commit-message'
+            .should ==     '    transpec --force'
         end
 
         it 'has blank line after the preface' do

data/spec/transpec/configuration_spec.rb

@@ -19,7 +19,6 @@ module Transpec
         [:parenthesize_matcher_arg?,  true],
         [:forced?,                    false],
         [:skip_dynamic_analysis?,     false],
-        [:generate_commit_message?,   false],
         [:negative_form_of_to,        'not_to'],
         [:boolean_matcher_type,       :conditional],
         [:form_of_be_falsey,          'be_falsey']

data/spec/transpec/option_parser_spec.rb

@@ -40,23 +40,22 @@ module Transpec
       end
 
       describe '-m/--generate-commit-message option' do
-        include_context 'isolated environment'
-
         let(:args) { ['--generate-commit-message'] }
 
-        context 'when inside of git repository' do
-          include_context 'inside of git repository'
+        before do
+          parser.stub(:warn)
+        end
 
-          it 'sets Configuration#generate_commit_message? true' do
-            parser.parse(args)
-            configuration.generate_commit_message?.should be_true
+        it 'is deprecated' do
+          parser.should_receive(:warn) do |message|
+            message.should =~ /--generate-commit-message.+deprecated/i
           end
+
+          parser.parse(args)
         end
 
-        context 'when not inside of git repository' do
-          it 'raises error' do
-            -> { parser.parse(args) }.should raise_error(/not in a Git repository/)
-          end
+        it 'does not raise error' do
+          -> { parser.parse(args) }.should_not raise_error
         end
       end
 

data/spec/transpec/syntax/should_spec.rb

@@ -469,9 +469,9 @@ module Transpec
               rewritten_source.should == expected_source
             end
 
-            it 'adds record `lambda { }.should` -> `expect { }.to`' do
+            it "adds record `#{method} { }.should` -> `expect { }.to`" do
               should_object.expectize!
-              record.original_syntax.should  == 'lambda { }.should'
+              record.original_syntax.should  == "#{method} { }.should"
               record.converted_syntax.should == 'expect { }.to'
             end
           end

data/tasks/lib/transpec_demo.rb

@@ -28,7 +28,7 @@ class TranspecDemo < TranspecTest
   def run_demo(transpec_args = [])
     in_project_dir do
       with_clean_bundler_env do
-        sh File.join(Transpec.root, 'bin', 'transpec'), '--force', '--generate-commit-message'
+        sh File.join(Transpec.root, 'bin', 'transpec'), '--force'
         sh 'bundle exec rspec'
         sh "git checkout --quiet -b #{DEMO_BRANCH}"
         sh 'git commit --all --file .git/COMMIT_EDITMSG'

metadata

@@ -1,195 +1,195 @@
 --- !ruby/object:Gem::Specification
 name: transpec
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.5.0
 platform: ruby
 authors:
 - Yuji Nakayama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-04 00:00:00.000000000 Z
+date: 2013-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rainbow
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.14'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.1'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.10'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
   name: guard-rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: guard-shell
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
 - !ruby/object:Gem::Dependency
   name: ruby_gntp
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.3'
 description: Transpec converts your specs to the latest RSpec syntax with static and
@@ -201,9 +201,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rubocop.yml
-- .travis.yml
+- ".gitignore"
+- ".rubocop.yml"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - Guardfile
@@ -310,12 +310,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
@@ -361,3 +361,4 @@ test_files:
 - spec/transpec/syntax/should_spec.rb
 - spec/transpec/util_spec.rb
 - spec/transpec_spec.rb
+has_rdoc: