transpec 3.2.2 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 58cd705324fe09e4e69f7c931b8a90a27c49aea0
-  data.tar.gz: 586b58141d745f603892162073cf555fe2fb505b
+  metadata.gz: 776c4008f4f9b8774ba45005e5a01ff5ea623355
+  data.tar.gz: 590eb411838be93f6073e91e1ac62db2a2cd5169
 SHA512:
-  metadata.gz: 47f097ebd2bcd013d61e4a75562b713594b4b10d937508c59fc73f34b907a3ee837389d7ce75f9a4dc9d6c97b6cd101d971a77c2a2a3260948941c172fa88e40
-  data.tar.gz: f4afeaee5e87ef876c78d0afc95d8362977e1d0e5903b5f09d459463084dde87995036e5741ef313528420f7a23704a0f380844dec2fc5bafe2cae492f3f4f68
+  metadata.gz: ba23453c7453fda5bd427dc4ba09c56a98dc9da01c08627e2f31e7b9f1b6ab1f6c659559e5ef2237dc83cca0a491e2400b7141d5ebe67c8bcad385be859a5423
+  data.tar.gz: 8196d68cc2beaa8a10bdf6b99dfad2d11671bb97f654474f46e9ba5672b41a4ffa90da3cc75201d084e0c0d3487f9353eed5821110687f66d17bf13961444fac

data/.rubocop.yml

@@ -83,3 +83,9 @@ GuardClause:
 
 ModuleLength:
   Enabled: false
+
+Security/JSONLoad:
+  Enabled: false
+
+Security/MarshalLoad:
+  Enabled: false

data/.travis.yml

@@ -2,22 +2,25 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1
-  - 2.2
-  - 2.3.0
+  - 2.1.10
+  - 2.2.6
+  - 2.3.3
+  - 2.4.0
   - ruby-head
   - jruby-19mode
-  - jruby-9.0.0.0
+  - jruby-9.1.7.0
 env:
   - RSPEC_VERSION=2.14
   - RSPEC_VERSION=2.99
   - RSPEC_VERSION=3.0
-  - RSPEC_VERSION=3.4
-  - RSPEC_VERSION=head
+  - RSPEC_VERSION=3.5
+  - RSPEC_VERSION=master
 matrix:
   allow_failures:
     - rvm: ruby-head
-before_install: gem update --remote bundler
+before_install:
+  - gem update --system # https://github.com/sickill/rainbow/issues/49
+  - gem update --remote bundler
 script: bundle exec rake ci
 sudo: false
 cache: bundler

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Development
 
+## v3.3.0
+
+* Support `json` gem 2.x and `activesupport` gem 5.x.
+
 ## v3.2.2
 
 * Use `parser` gem 2.3.0.7 or later.

data/Gemfile

@@ -3,22 +3,22 @@ source 'https://rubygems.org'
 gemspec
 
 group :development, :test do
-  version = ENV['RSPEC_VERSION'] || '2.14'
+  rspec_version = ENV['RSPEC_VERSION'] || '2.14'
 
-  case version
-  when 'head'
-    %w(rspec rspec-core rspec-expectations rspec-mocks rspec-support).each do |lib|
-      gem lib, git: "git://github.com/rspec/#{lib}.git"
-    end
+  case rspec_version
   when /^\d+\.\d+$/
-    gem 'rspec', "~> #{version}.0"
+    gem 'rspec', "~> #{rspec_version}.0"
   else
-    fail 'RSPEC_VERSION must be specified as "major.minor" like "2.14", or "head".'
+    %w(rspec rspec-core rspec-expectations rspec-mocks rspec-support).each do |lib|
+      gem lib, git: "https://github.com/rspec/#{lib}.git", branch: rspec_version
+    end
   end
 
+  # We cannot update rake to 12.x since it breaks compatibility with RSpec 2.x.
+  # https://github.com/rspec/rspec-core/pull/2197
   gem 'rake',      '~> 11.0'
   gem 'simplecov', '~> 0.7'
-  gem 'rubocop',   '~> 0.24'
+  gem 'rubocop',   '~> 0.39'
 end
 
 group :development do

data/README.md

@@ -1454,15 +1454,16 @@ Transpec is tested on the following Ruby implementations:
 * MRI
     * 1.9.3
     * 2.0.0
-    * 2.1
-    * 2.2
-    * 2.3
+    * 2.1.10
+    * 2.2.6
+    * 2.3.3
+    * 2.4.0
 * JRuby
-    * 1.7 in 1.9 mode
-    * 9.0.0.0
+    * 1.9 mode
+    * 9.1.7.0
 
 ## License
 
-Copyright (c) 2013–2016 Yuji Nakayama
+Copyright (c) 2013–2017 Yuji Nakayama
 
 See the [LICENSE.txt](LICENSE.txt) for details.

data/README.md.erb

@@ -1473,14 +1473,17 @@ Will be converted to:
 Transpec is tested on the following Ruby implementations:
 
 * MRI
-    * 1.9.3
-    * 2.0.0
-    * 2.1
-    * 2.2
-    * 2.3
+<%= travis_config['rvm'].grep(/\A\d/).map { |version| "    * #{version}" }.join("\n") %>
 * JRuby
-    * 1.7 in 1.9 mode
-    * 9.0.0.0
+<%=
+travis_config['rvm'].grep(/\Ajruby-/).map do |name|
+  version = name.sub('jruby-', '')
+  if /\A(?<major>\d)(?<minor>\d)mode\z/ =~ version
+    version = "#{major}.#{minor} mode"
+  end
+  "    * #{version}"
+end.join("\n")
+%>
 
 ## License
 

data/lib/transpec/dynamic_analyzer/rewriter.rb

@@ -97,7 +97,7 @@ module Transpec
         literal = '{ '
 
         hash.each_with_index do |(key, value), index|
-          literal << ', ' unless index == 0
+          literal << ', ' unless index.zero?
           literal << "#{key.inspect} => #{value.inspect}"
         end
 

data/lib/transpec/dynamic_analyzer/runtime_data.rb

@@ -13,8 +13,7 @@ module Transpec
       attr_reader :data
 
       def self.load(string_or_io)
-        options = { object_class: CompatibleOpenStruct, symbolize_names: true }
-        data = JSON.load(string_or_io, nil, options)
+        data = JSON.load(string_or_io, nil, object_class: CompatibleOpenStruct)
         new(data)
       end
 

data/lib/transpec/record.rb

@@ -70,7 +70,7 @@ module Transpec
     def <=>(other)
       COMPARISON_ATTRIBUTES.each do |attribute|
         result = send(attribute) <=> other.send(attribute)
-        return result unless result == 0
+        return result unless result.zero?
       end
       0
     end

data/lib/transpec/report.rb

@@ -125,7 +125,7 @@ module Transpec
     def pluralize(number, thing, options = {})
       text = ''
 
-      if number == 0 && options[:no_for_zero]
+      if number.zero? && options[:no_for_zero]
         text = 'no'
       else
         text << number.to_s

data/lib/transpec/syntax/have.rb

@@ -26,7 +26,7 @@ module Transpec
         super &&
           receiver_node.nil? &&
           [:have, :have_exactly, :have_at_least, :have_at_most].include?(method_name) &&
-          node.sibling_index == 0
+          node.sibling_index.zero?
       end
 
       def conversion_target?

data/lib/transpec/syntax/have/dynamic_analysis.rb

@@ -43,7 +43,7 @@ module Transpec
           explicit_subject? ? 'self' : 'subject'
         end
 
-        def collection_accessor_inspection_code # rubocop:disable MethodLength
+        def collection_accessor_inspection_code
           # `expect(owner).to have(n).things` invokes private owner#things with Object#__send__
           # if the owner does not respond to any of #size, #count and #length.
           #

data/lib/transpec/version.rb

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

data/tasks/ci.rake

@@ -3,6 +3,7 @@
 tasks = %w(spec)
 
 if RSpec::Core::Version::STRING.start_with?('2.14') && RUBY_ENGINE != 'jruby'
+  tasks << 'style' if RUBY_VERSION >= '2.0.0'
   tasks.concat(%w(readme:check test:all))
 end
 

data/tasks/readme.rake

@@ -187,4 +187,11 @@ class READMEContext
       replacement << match
     end
   end
+
+  def travis_config
+    @travis_config ||= begin
+      require 'yaml'
+      YAML.parse_file('.travis.yml').to_ruby
+    end
+  end
 end

data/transpec.gemspec

@@ -27,6 +27,6 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'astrolabe',     '~> 1.2'
   spec.add_runtime_dependency 'bundler',       '~> 1.3'
   spec.add_runtime_dependency 'rainbow',       '>= 1.99.1', '< 3.0'
-  spec.add_runtime_dependency 'json',          '~> 1.8'
-  spec.add_runtime_dependency 'activesupport', '>= 3.0', '< 5.0'
+  spec.add_runtime_dependency 'json',          '>= 1.8', '< 3.0'
+  spec.add_runtime_dependency 'activesupport', '>= 3.0', '< 6.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: transpec
 version: !ruby/object:Gem::Version
-  version: 3.2.2
+  version: 3.3.0
 platform: ruby
 authors:
 - Yuji Nakayama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-25 00:00:00.000000000 Z
+date: 2017-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -76,16 +76,22 @@ dependencies:
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.8'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.8'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -95,7 +101,7 @@ dependencies:
         version: '3.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -105,7 +111,7 @@ dependencies:
         version: '3.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
 description: Transpec converts your specs to the latest RSpec syntax with static and
   dynamic code analysis.
 email:
@@ -237,7 +243,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: The RSpec syntax converter