gemologist 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 1ad4c58188ebd11a82ae7dcd611aa3cf5aae8710
-  data.tar.gz: 2e5832fa8760fb2fc4a0d324eab1e7fac2a4fc66
+SHA256:
+  metadata.gz: cc0fa6a1c75bb0397c1c7dd2e0e1a4c9abe7935b8dccba8cc16de7f9b4b2793e
+  data.tar.gz: 0f0da21299fba4835c8485b319d81106f34669b424be218a958ae298a8a1e236
 SHA512:
-  metadata.gz: 91c887591f986a9570e4941a88be7eae60bdefadd79fd7b5696a04150903dcd05be97523ab5ca92dec89ce2f09ab767cf0a9e8119bb7d0e7bb09f2aad9d565f5
-  data.tar.gz: 295e57513526ce0408b470b6afd922dec0a11ac96cec9db074d023c0b6fe41b0a6756c5381a4f7956d81d42a7a21e6932bc662eaf3fae13f0c020644b985ac2b
+  metadata.gz: 03a3df8cf82ea50b924bbcecfc6c381a2183b9c2818c4a8324a92bc96795ac8e9a4812a3f5c98e0ecc77271db8719540bfaf1252e9e43e82a431aff97a804ada
+  data.tar.gz: fac491afcceb14e644e9feda02eed691b44c4e74a9943888243e248da6872c1e3d32bd420a848d0585fa3a3c6a985dfade67bf6f541841d1fdafc32bdddebbf8

data/.rubocop.yml

@@ -1,12 +1,28 @@
+inherit_from: .rubocop_todo.yml
+
+AllCops:
+  TargetRubyVersion: 2.3
+
+Lint/BooleanSymbol:
+  Exclude:
+    - 'lib/gemologist/ast.rb'
+
+Lint/InterpolationCheck:
+  Exclude:
+    - 'spec/gemologist/ast_spec.rb'
+
+Metrics/BlockLength:
+  Exclude:
+    - 'spec/**/*'
+
 Metrics/ClassLength:
   Max: 150
 
 Metrics/LineLength:
   Max: 100
 
-Style/AlignHash:
-  EnforcedHashRocketStyle: table
-  EnforcedColonStyle: separator
+Naming/HeredocDelimiterNaming:
+  Enabled: false
 
 Style/Documentation:
   Enabled: false

data/.rubocop_todo.yml

@@ -0,0 +1,7 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2018-09-15 17:25:05 +0900 using RuboCop version 0.59.1.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.

data/.travis.yml

@@ -1,14 +1,10 @@
 language: ruby
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1
-  - 2.2
-  - ruby-head
-matrix:
-  allow_failures:
-    - rvm:
-      - ruby-head
-script: bundle exec rake ci
+  - 2.3.7
+  - 2.4.4
+  - 2.5.1
+  - jruby-9.2.0.0
 sudo: false
 cache: bundler
+before_install: gem update --system
+script: bundle exec rake ci

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## Development
 
+## v0.3.0
+
+* Drop support for Ruby 1.9.3 - 2.2.
+* Use `parser` gem 2.5.0.0 or later.
+* Handle deprecation message `Parser::Source::Rewriter is deprecated.` from `parser` gem.
+
 ## v0.2.1
 
 * Add missing `astrolabe` dependency definition.

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 gemspec
@@ -7,7 +9,7 @@ group :development, :test do
   gem 'pry', '~> 0.10'
   gem 'rake', '~> 10.0'
   gem 'rspec', '~> 3.2'
-  gem 'rubocop', '~> 0.30'
+  gem 'rubocop', '~> 0.52'
 end
 
 group :test do

data/README.md

@@ -1,8 +1,7 @@
-[![Gem Version](http://img.shields.io/gem/v/gemologist.svg?style=flat)](http://badge.fury.io/rb/gemologist)
-[![Dependency Status](http://img.shields.io/gemnasium/yujinakayama/gemologist.svg?style=flat)](https://gemnasium.com/yujinakayama/gemologist)
+[![Gem Version](https://badge.fury.io/rb/gemologist.svg)](http://badge.fury.io/rb/gemologist)
 [![Build Status](https://travis-ci.org/yujinakayama/gemologist.svg?branch=master&style=flat)](https://travis-ci.org/yujinakayama/gemologist)
-[![Coverage Status](https://coveralls.io/repos/yujinakayama/gemologist/badge.svg?branch=master)](https://coveralls.io/r/yujinakayama/gemologist?branch=master)
-[![Code Climate](https://img.shields.io/codeclimate/github/yujinakayama/gemologist.svg?style=flat)](https://codeclimate.com/github/yujinakayama/gemologist)
+[![Coverage Status](https://coveralls.io/repos/yujinakayama/gemologist/badge.svg?branch=master&service=github)](https://coveralls.io/github/yujinakayama/gemologist?branch=master)
+[![Code Climate](https://codeclimate.com/github/yujinakayama/gemologist/badges/gpa.svg)](https://codeclimate.com/github/yujinakayama/gemologist)
 
 # Gemologist
 

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 require 'rubocop/rake_task'
@@ -8,4 +10,4 @@ end
 
 RuboCop::RakeTask.new
 
-task ci: [:spec, :rubocop]
+task ci: %i[spec rubocop]

data/bin/console

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'bundler/setup'
 require 'gemologist'

data/gemologist.gemspec

@@ -1,5 +1,6 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+# frozen_string_literal: true
+
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'gemologist/version'
 
@@ -19,8 +20,9 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = '>= 1.9.3'
+  spec.required_ruby_version = '>= 2.3'
 
   spec.add_runtime_dependency 'astrolabe', '~> 1.3'
   spec.add_runtime_dependency 'bundler', '~> 1.7'
+  spec.add_runtime_dependency 'parser', '>= 2.5.0.0'
 end

data/lib/gemologist.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'gemologist/gemfile'
 require 'gemologist/gemfile_lock'
 require 'gemologist/gemspec'

data/lib/gemologist/abstract_dependency.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'gemologist/ast'
 
 module Gemologist
@@ -6,16 +8,18 @@ module Gemologist
 
     def self.valid_node?(node)
       return false unless node.send_type?
+
       _receiver_node, message, name_node, = *node
       method_names.include?(message) && name_node.str_type?
     end
 
     def self.method_names
-      fail NotImplementedError
+      raise NotImplementedError
     end
 
     def initialize(node, rewriter)
-      fail 'Invalid node.' unless self.class.valid_node?(node)
+      raise 'Invalid node.' unless self.class.valid_node?(node)
+
       @node = node
       @rewriter = rewriter
     end
@@ -25,7 +29,7 @@ module Gemologist
     end
 
     def groups
-      fail NotImplementedError
+      raise NotImplementedError
     end
 
     def version_specifiers
@@ -61,7 +65,7 @@ module Gemologist
     end
 
     def version_nodes
-      fail NotImplementedError
+      raise NotImplementedError
     end
 
     def version_range

data/lib/gemologist/abstract_gemfile.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'gemologist/ui'
 require 'astrolabe/builder'
 require 'parser/current'
@@ -17,6 +19,7 @@ module Gemologist
     def dependencies
       @dependencies ||= ast.each_node.with_object([]) do |node, dependencies|
         next unless dependency_class.valid_node?(node)
+
         dependencies << dependency_class.new(node, source_rewriter)
       end
     end
@@ -34,7 +37,7 @@ module Gemologist
     private
 
     def dependency_class
-      fail NotImplementedError
+      raise NotImplementedError
     end
 
     def ast
@@ -46,7 +49,12 @@ module Gemologist
     end
 
     def source_rewriter
-      @source_rewriter ||= Parser::Source::Rewriter.new(source_buffer)
+      @source_rewriter ||= Parser::Source::TreeRewriter.new(
+        source_buffer,
+        crossing_deletions: :accept,
+        different_replacements: :raise,
+        swallowed_insertions: :raise
+      )
     end
 
     def source_buffer

data/lib/gemologist/ast.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'gemologist/runtime_value'
 
 module Gemologist
@@ -28,9 +30,10 @@ module Gemologist
     def concretize_regexp(regexp_node)
       *body_nodes, regopt_node = *regexp_node
       return RuntimeValue.new(regexp_node) unless body_nodes.all?(&:str_type?)
+
       string = body_nodes.map { |str_node| str_node.children.first }.reduce(:+)
       options = regopt_node.children.map(&:to_s).reduce(:+)
-      eval("/#{string}/#{options}") # rubocop:disable Eval
+      eval("/#{string}/#{options}", binding, __FILE__, __LINE__) # rubocop:disable Eval
     end
 
     def concretize_array(array_node)

data/lib/gemologist/gemfile.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'gemologist/abstract_gemfile'
 
 module Gemologist

data/lib/gemologist/gemfile/dependency.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'gemologist/abstract_dependency'
 require 'gemologist/util'
 
@@ -24,6 +26,7 @@ module Gemologist
 
       def groups_via_block
         return [] unless group_node
+
         _receiver_node, _message, *arg_nodes = *group_node
         arg_nodes.map { |node| AST.concretize(node) }
       end
@@ -40,7 +43,7 @@ module Gemologist
       def options_node
         node = trailing_nodes.last
 
-        if node && node.hash_type?
+        if node&.hash_type?
           node
         else
           nil

data/lib/gemologist/gemfile_lock.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bundler'
 
 module Gemologist

data/lib/gemologist/gemspec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'gemologist/abstract_gemfile'
 
 module Gemologist

data/lib/gemologist/gemspec/dependency.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 require 'gemologist/abstract_dependency'
 
 module Gemologist
   class Gemspec
     class Dependency < AbstractDependency
-      METHOD_NAMES = [:add_runtime_dependency, :add_development_dependency, :add_dependency].freeze
+      METHOD_NAMES = %i[add_runtime_dependency add_development_dependency add_dependency].freeze
 
       def self.method_names
         METHOD_NAMES

data/lib/gemologist/runtime_value.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Gemologist
   class RuntimeValue
     attr_reader :node

data/lib/gemologist/ui.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 module Gemologist
   module UI
     module_function
 
     def deprecate(deprecated, options = {})
       message = "DEPRECATION: #{deprecated} is deprecated."
-      message << " Use #{options[:replacement]} instead." if options[:replacement]
+      message += " Use #{options[:replacement]} instead." if options[:replacement]
       warn message
     end
   end

data/lib/gemologist/util.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Gemologist
   module Util
     module_function

data/lib/gemologist/version.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 module Gemologist
   # http://semver.org/
   module Version
     MAJOR = 0
-    MINOR = 2
-    PATCH = 1
+    MINOR = 3
+    PATCH = 0
 
     def self.to_s
       [MAJOR, MINOR, PATCH].join('.')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gemologist
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Yuji Nakayama
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-06-29 00:00:00.000000000 Z
+date: 2018-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: astrolabe
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
+- !ruby/object:Gem::Dependency
+  name: parser
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.5.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.5.0.0
 description: A library for rewriting your Gemfile and gemspec.
 email:
 - nkymyj@gmail.com
@@ -48,6 +62,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
+- ".rubocop_todo.yml"
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
@@ -82,7 +97,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -90,9 +105,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: A library for rewriting your Gemfile and gemspec.
 test_files: []
-has_rdoc: