transpec 1.6.0 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f1f0db34870cd389ff921e495718d2d4851acdf
-  data.tar.gz: d830228d9f96cae8a3dd249294c98d2ea0f41a69
+  metadata.gz: 5c6f45e13cea25a0a7b868b61b75167e862c7fb2
+  data.tar.gz: d34f0aab8e600dd52627e25d1e636c6c130ef419
 SHA512:
-  metadata.gz: f8414386a89cab24f4f537786080bb7695375308bde074397a9958e3ad35c52b47e9b0b7e255c31be8070b91fed16c8352a8dba8a9113897930d78e233618398
-  data.tar.gz: 7feac364f4e30f95c2c00925afb73a84578ed28539b521612215a590e2fb1649e3cdce83cea55dfb6c61925263926c314f16b208ddfbf850414f747daede786a
+  metadata.gz: bf29aecabd3c9ee734eaae5f751d60fb032cc1dd4ccd2909ac27cbe76fe1e61e0dcae77e27794232bc9c99ce4c501490684aded1f6ee8c920624116deda96998
+  data.tar.gz: ae26aaec177b656156b01db64afb3a5c644b08448795f3d82ccd51d17bedacb62bf6cb13d80de2992b5286bfd7e24ae69da4909cc31e059022db5a8a576ff6e9

data/.travis.yml

@@ -4,4 +4,4 @@ rvm:
   - 2.0.0
   - 2.1.0-rc1
   - jruby-19mode
-script: bundle exec rake spec style readme:check test:all
+script: bundle exec rake travis

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Development
 
+## v1.6.1
+
+* Handle deprecation messages from `rainbow` gem
+
 ## v1.6.0
 
 * Native support for Ruby 2.1 syntax with Parser 2.1

data/Gemfile

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

data/README.md

@@ -891,7 +891,7 @@ end
 
 ## Compatibility
 
-Tested on MRI 1.9, MRI 2.0 and JRuby in 1.9 mode.
+Tested on MRI 1.9, 2.0, 2.1 and JRuby in 1.9 mode.
 
 ## Contributing
 

data/README.md.erb

@@ -868,7 +868,7 @@ Transpec::Converter.new(nil, rspec_version).convert(custom_matcher_dsl_target)
 
 ## Compatibility
 
-Tested on MRI 1.9, MRI 2.0 and JRuby in 1.9 mode.
+Tested on MRI 1.9, 2.0, 2.1 and JRuby in 1.9 mode.
 
 ## Contributing
 

data/Rakefile

@@ -9,4 +9,6 @@ Dir['tasks/**/*.rake'].each do |path|
   load(path)
 end
 
-task default: [:spec, :style, :readme]
+task default: %w(spec style readme)
+
+task travis: %w(spec style readme:check test:all)

data/lib/transpec/base_rewriter.rb

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

data/lib/transpec/option_parser.rb

@@ -85,7 +85,7 @@ module Transpec
       end
 
       define_option('--no-color') do
-        Sickill::Rainbow.enabled = false
+        Rainbow.enabled = false
       end
 
       define_option('--version') do

data/lib/transpec/report.rb

@@ -51,10 +51,10 @@ module Transpec
 
     def without_color
       # TODO: Consider using another coloring gem that does not depend global state.
-      original_coloring_state = Sickill::Rainbow.enabled
-      Sickill::Rainbow.enabled = false
+      original_coloring_state = Rainbow.enabled
+      Rainbow.enabled = false
       value = yield
-      Sickill::Rainbow.enabled = original_coloring_state
+      Rainbow.enabled = original_coloring_state
       value
     end
 

data/lib/transpec/syntax/have.rb

@@ -53,7 +53,7 @@ module Transpec
         @expectation.respond_to?(:subject_node)
       end
 
-      def have_node
+      def have_node # rubocop:disable PredicateName
         node.children.first
       end
 
@@ -67,7 +67,7 @@ module Transpec
         items_node.children.size > 2
       end
 
-      def have_method_name
+      def have_method_name # rubocop:disable PredicateName
         have_node.children[1]
       end
 

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

@@ -14,7 +14,7 @@ module Transpec
           end
         end
 
-        def have_matcher
+        def have_matcher # rubocop:disable PredicateName
           return @have_matcher if instance_variable_defined?(:@have_matcher)
 
           @have_matcher ||= if Have.conversion_target_node?(matcher_node, @runtime_data)

data/lib/transpec/version.rb

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

data/spec/spec_helper.rb

@@ -17,7 +17,7 @@ RSpec.configure do |config|
 
   config.before(:suite) do
     require 'rainbow'
-    Sickill::Rainbow.enabled = false
+    Rainbow.enabled = false
 
     if ENV['TRAVIS']
       system('git config --global user.email "you@example.com"')

data/spec/support/shared_context.rb

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

data/spec/transpec/option_parser_spec.rb

@@ -156,14 +156,14 @@ module Transpec
 
       describe '--no-color option' do
         before do
-          Sickill::Rainbow.enabled = true
+          Rainbow.enabled = true
         end
 
         let(:args) { ['--no-color'] }
 
         it 'disables color in the output' do
           parser.parse(args)
-          Sickill::Rainbow.enabled.should be_false
+          Rainbow.enabled.should be_false
         end
       end
 

data/transpec.gemspec

@@ -22,14 +22,14 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency 'parser',        '~> 2.1'
   spec.add_runtime_dependency 'bundler',       '~> 1.3'
-  spec.add_runtime_dependency 'rainbow',       '~> 1.1'
+  spec.add_runtime_dependency 'rainbow',       '~> 1.99'
   spec.add_runtime_dependency 'json',          '~> 1.8'
   spec.add_runtime_dependency 'activesupport', '~> 4.0'
 
-  spec.add_development_dependency 'rspec',         '~> 2.14'
   spec.add_development_dependency 'rake',          '~> 10.1'
+  spec.add_development_dependency 'rspec',         '~> 2.14'
   spec.add_development_dependency 'simplecov',     '~> 0.7'
-  spec.add_development_dependency 'rubocop',       '~> 0.10'
+  spec.add_development_dependency 'rubocop',       '~> 0.16'
   spec.add_development_dependency 'guard-rspec',   '~> 4.0'
   spec.add_development_dependency 'guard-rubocop', '~> 1.0'
   spec.add_development_dependency 'guard-shell',   '~> 0.5'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: transpec
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.1
 platform: ruby
 authors:
 - Yuji Nakayama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-25 00:00:00.000000000 Z
+date: 2013-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.99'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.99'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -81,33 +81,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '10.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '10.1'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.1'
+        version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.1'
+        version: '2.14'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.16'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -227,7 +227,6 @@ 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
@@ -323,7 +322,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: The RSpec syntax converter

data/lib/transpec/parser.rb

@@ -1,9 +0,0 @@
-# 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