chusaku 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 46b0340d8c2c5cde79a47703b564be4bec987b2fed0e9561ce658227ac3a2076
-  data.tar.gz: 8d2384684ad0c72d2f763446177b16d97d76f2c84c95bf4a7b5ff8e08cf32c23
+  metadata.gz: 714c60f9b5f8e9ebd4db391daa894dfa96a1ec95b7773900988df7b9a24677da
+  data.tar.gz: 1d7adffa9c39bb7dd7cd2f6d6b86fd7844bfbe77a207988eebd1469d5a74d0de
 SHA512:
-  metadata.gz: a8e8d607f077c5de894d5fd70989d595fda9f4fab5d5111eeedb4acfa526d4f94cc7cb64abc64b42ac2968ef9e7f16bbf413a4329b46e919f0b46d8e9bc5c527
-  data.tar.gz: 72a674b922b87067ea2c3276f111603ee377a25bff277862187aa879b11ac83909877749b6b0cd5ff3315429e95b482da211f54b74b460eff129015780734e6c
+  metadata.gz: 0bc70bbe88b4cde24d236ac000bf13533fdad892413dc03cf8b8c4eca9f6eb7f21bd8f5a6df382521898a7baddc07f74e1444067ec0f2febd828603c79cfe020
+  data.tar.gz: 9a51c9476b1585c1f382f3845a202b6ea4eeed70e30d2cb450de4d01ed59c084ec2d7c1b11930bd6f62a9264129d21b545e0270bf9ea52d2cb92724d520cf924

data/.github/workflows/linting.yml

@@ -1,18 +1,14 @@
 name: Linting
 on: [pull_request]
 jobs:
-  rubocop:
+  standard:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-    - name: Set up Ruby
-      uses: ruby/setup-ruby@473e4d8fe5dd94ee328fdfca9f8c9c7afc9dae5e
-      with:
-        ruby-version: 3.0.0
-        bundler-cache: true
-    - name: Run RuboCop
-      uses: reviewdog/action-rubocop@v2
-      with:
-        rubocop_version: gemfile
-        github_token: ${{ secrets.github_token }}
-        reporter: github-pr-review
+      - uses: actions/checkout@v2
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@473e4d8fe5dd94ee328fdfca9f8c9c7afc9dae5e
+        with:
+          ruby-version: 3.0.0
+          bundler-cache: true
+      - name: Run Standard
+        run: bundle exec standardrb --fail-level A

data/.github/workflows/testing.yml

@@ -5,13 +5,13 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: ['2.6', '2.7', '3.0']
+        ruby-version: ["2.6", "2.7", "3.0"]
     steps:
-    - uses: actions/checkout@v2
-    - name: Set up Ruby
-      uses: ruby/setup-ruby@473e4d8fe5dd94ee328fdfca9f8c9c7afc9dae5e
-      with:
-        ruby-version: ${{ matrix.ruby-version }}
-        bundler-cache: true
-    - name: Run tests
-      run: bundle exec rake
+      - uses: actions/checkout@v2
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@473e4d8fe5dd94ee328fdfca9f8c9c7afc9dae5e
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+          bundler-cache: true
+      - name: Run tests
+        run: bundle exec rake

data/.rubocop.yml

@@ -1,35 +1,7 @@
-require:
-  - rubocop-performance
+require: standard
 
-inherit_mode:
-  merge:
-    - Exclude
+inherit_gem:
+  standard: config/base.yml
 
 AllCops:
-  NewCops: enable
-  Exclude:
-    - 'bin/**/*'
-    - 'test/mock/app/**/*'
-    - 'test/mock/examples/**/*'
-
-Gemspec/RequiredRubyVersion:
-  Enabled: false
-
-Layout/LineLength:
-  Max: 120
-
-Metrics/AbcSize:
-  Exclude:
-    - 'test/**/*'
-
-Metrics/MethodLength:
-  Max: 25
-  Exclude:
-    - 'test/**/*'
-
-Metrics/ModuleLength:
-  Max: 250
-
-Style/ClassAndModuleChildren:
-  Exclude:
-    - 'test/**/*'
+  DisabledByDefault: true

data/Gemfile

@@ -1,6 +1,4 @@
-# frozen_string_literal: true
-
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 # Specify your gem's dependencies in chusaku.gemspec
 gemspec

data/README.md

@@ -27,7 +27,7 @@ Add this line to your Rails application's Gemfile:
 ```ruby
 group :development do
   # ...
-  gem 'chusaku', require: false
+  gem "chusaku", require: false
   # ...
 end
 ```

data/Rakefile

@@ -1,12 +1,10 @@
-# frozen_string_literal: true
-
-require 'bundler/gem_tasks'
-require 'rake/testtask'
+require "bundler/gem_tasks"
+require "rake/testtask"
 
 Rake::TestTask.new(:test) do |t|
-  t.libs << 'test'
-  t.libs << 'lib'
-  t.test_files = FileList['test/**/*_test.rb']
+  t.libs << "test"
+  t.libs << "lib"
+  t.test_files = FileList["test/**/*_test.rb"]
 end
 
 task default: :test

data/bin/chusaku

@@ -1,19 +1,19 @@
 #!/usr/bin/env ruby
 
-require 'rubygems'
+require "rubygems"
 
 begin
   # Use project's bundle.
-  require 'bundler'
+  require "bundler"
   Bundler.setup
 
   # Use project's environment.
-  require 'rake'
-  load './Rakefile'
+  require "rake"
+  load "./Rakefile"
   Rake::Task[:environment].invoke
-rescue StandardError
+rescue
 end
 
-require 'chusaku/cli'
+require "chusaku/cli"
 
 exit Chusaku::CLI.new.call

data/bin/console

@@ -1,8 +1,7 @@
 #!/usr/bin/env ruby
-# frozen_string_literal: true
 
-require 'bundler/setup'
-require 'chusaku'
+require "bundler/setup"
+require "chusaku"
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
@@ -11,5 +10,5 @@ require 'chusaku'
 # require "pry"
 # Pry.start
 
-require 'irb'
+require "irb"
 IRB.start(__FILE__)

data/chusaku.gemspec

@@ -1,32 +1,30 @@
-# frozen_string_literal: true
-
-lib = File.expand_path('lib', __dir__)
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'chusaku/version'
+require "chusaku/version"
 
 Gem::Specification.new do |spec|
-  spec.name = 'chusaku'
+  spec.name = "chusaku"
   spec.version = Chusaku::VERSION
-  spec.authors = ['Nishiki Liu']
-  spec.email = ['nishiki@hey.com']
+  spec.authors = ["Nishiki Liu"]
+  spec.email = ["hello@nshki.com"]
 
-  spec.summary = 'Annotate your Rails controllers with route info.'
-  spec.description = 'Annotate your Rails controllers with route info.'
-  spec.homepage = 'https://github.com/nshki/chusaku'
-  spec.license = 'MIT'
+  spec.summary = "Annotate your Rails controllers with route info."
+  spec.description = "Annotate your Rails controllers with route info."
+  spec.homepage = "https://github.com/nshki/chusaku"
+  spec.license = "MIT"
 
   # Prevent pushing this gem to RubyGems.org. To allow pushes either set the
   # 'allowed_push_host' to allow pushing to a single host or delete this section
   # to allow pushing to any host.
   if spec.respond_to?(:metadata)
-    spec.metadata['allowed_push_host'] = 'https://rubygems.org'
+    spec.metadata["allowed_push_host"] = "https://rubygems.org"
 
-    spec.metadata['homepage_uri'] = spec.homepage
-    spec.metadata['source_code_uri'] = spec.homepage
-    spec.metadata['changelog_uri'] = spec.homepage
+    spec.metadata["homepage_uri"] = spec.homepage
+    spec.metadata["source_code_uri"] = spec.homepage
+    spec.metadata["changelog_uri"] = spec.homepage
   else
-    raise 'RubyGems 2.0 or newer is required to protect against ' \
-          'public gem pushes.'
+    raise "RubyGems 2.0 or newer is required to protect against " \
+          "public gem pushes."
   end
 
   # Specify which files should be added to the gem when it is released.
@@ -37,15 +35,14 @@ Gem::Specification.new do |spec|
       f.match(%r{^(test|spec|features)/})
     end
   end
-  spec.bindir = 'bin'
-  spec.executables = 'chusaku'
-  spec.require_paths = ['lib']
+  spec.bindir = "bin"
+  spec.executables = "chusaku"
+  spec.require_paths = ["lib"]
 
-  spec.add_development_dependency 'bundler', '~> 2.2'
-  spec.add_development_dependency 'minitest', '~> 5.14'
-  spec.add_development_dependency 'rake', '~> 13.0'
-  spec.add_development_dependency 'rubocop', '~> 1.7'
-  spec.add_development_dependency 'rubocop-performance', '~> 1.9'
+  spec.add_development_dependency "bundler", "~> 2.2"
+  spec.add_development_dependency "minitest", "~> 5.14"
+  spec.add_development_dependency "rake", "~> 13.0"
+  spec.add_development_dependency "standardrb", "~> 1.0"
 
-  spec.add_dependency 'railties', '>= 3.0'
+  spec.add_dependency "railties", ">= 3.0"
 end

data/lib/chusaku/cli.rb

@@ -1,7 +1,5 @@
-# frozen_string_literal: true
-
-require 'optparse'
-require 'chusaku'
+require "optparse"
+require "chusaku"
 
 module Chusaku
   # Enables flags for the `chusaku` executable.
@@ -30,7 +28,7 @@ module Chusaku
       check_for_rails_project
       Chusaku.call(options)
     rescue NotARailsProject
-      warn('Please run chusaku from the root of your project.')
+      warn("Please run chusaku from the root of your project.")
       STATUS_ERROR
     rescue Finished
       STATUS_SUCCESS
@@ -43,8 +41,8 @@ module Chusaku
     # @raise [Chusaku::CLI::NotARailsProject] Exception if not Rails project
     # @return [void]
     def check_for_rails_project
-      has_controllers = File.directory?('./app/controllers')
-      has_rakefile = File.exist?('./Rakefile')
+      has_controllers = File.directory?("./app/controllers")
+      has_rakefile = File.exist?("./Rakefile")
       raise NotARailsProject unless has_controllers && has_rakefile
     end
 
@@ -53,7 +51,7 @@ module Chusaku
     # @return [OptionParser] Preconfigured OptionParser instance
     def optparser
       OptionParser.new do |opts|
-        opts.banner = 'Usage: chusaku [options]'
+        opts.banner = "Usage: chusaku [options]"
         add_dry_run_flag(opts)
         add_error_on_annotation_flag(opts)
         add_verbose_flag(opts)
@@ -67,7 +65,7 @@ module Chusaku
     # @param opts [OptionParser] OptionParser instance
     # @return [void]
     def add_dry_run_flag(opts)
-      opts.on('--dry-run', 'Run without file modifications') do
+      opts.on("--dry-run", "Run without file modifications") do
         @options[:dry] = true
       end
     end
@@ -77,7 +75,7 @@ module Chusaku
     # @param opts [OptionParser] OptionParser instance
     # @return [void]
     def add_error_on_annotation_flag(opts)
-      opts.on('--exit-with-error-on-annotation', 'Fail if any file was annotated') do
+      opts.on("--exit-with-error-on-annotation", "Fail if any file was annotated") do
         @options[:error_on_annotation] = true
       end
     end
@@ -87,7 +85,7 @@ module Chusaku
     # @param opts [OptionParser] OptionParser instance
     # @return [void]
     def add_verbose_flag(opts)
-      opts.on('--verbose', 'Print all annotations') do
+      opts.on("--verbose", "Print all annotations") do
         @options[:verbose] = true
       end
     end
@@ -97,7 +95,7 @@ module Chusaku
     # @param opts [OptionParser] OptionParser instance
     # @return [void]
     def add_version_flag(opts)
-      opts.on('-v', '--version', 'Show Chusaku version number and quit') do
+      opts.on("-v", "--version", "Show Chusaku version number and quit") do
         puts(Chusaku::VERSION)
         raise Finished
       end
@@ -108,7 +106,7 @@ module Chusaku
     # @param opts [OptionParser] OptionParser instance
     # @return [void]
     def add_help_flag(opts)
-      opts.on('-h', '--help', 'Show this help message and quit') do
+      opts.on("-h", "--help", "Show this help message and quit") do
         puts(opts)
         raise Finished
       end

data/lib/chusaku/parser.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Chusaku
   # Handles parsing a file and groups its lines into categories.
   module Parser
@@ -61,7 +59,7 @@ module Chusaku
 
       # Push the last group onto the array and return.
       groups.push(group)
-      { content: content, groups: groups }
+      {content: content, groups: groups}
     end
 
     # Given a line and actions, returns the line's type.
@@ -85,11 +83,11 @@ module Chusaku
       def_match = /^\s*def\s+(\w*)\s*\w*.*$/.match(line)
 
       if !comment_match.nil?
-        { type: :comment, body: line, action: nil }
+        {type: :comment, body: line, action: nil}
       elsif !def_match.nil? && actions.include?(def_match[1])
-        { type: :action, body: line, action: def_match[1] }
+        {type: :action, body: line, action: def_match[1]}
       else
-        { type: :code, body: line, action: nil }
+        {type: :code, body: line, action: nil}
       end
     end
   end

data/lib/chusaku/routes.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Chusaku
   # Handles extracting information about the Rails project's routes.
   class Routes
@@ -9,18 +7,18 @@ module Chusaku
       # Example output:
       #
       #   {
-      #     'users' => {
-      #       'edit' => [
-      #         { verb: 'GET', path: '/users/:id', name: 'edit_user' }
+      #     "users" => {
+      #       "edit" => [
+      #         {verb: "GET", path: "/users/:id", name: "edit_user"}
       #       ],
-      #       'update' => [
-      #         { verb: 'PATCH', path: '/users', name: 'edit_user' },
-      #         { verb: 'PUT', path: '/users', name: 'edit_user' }
+      #       "update" => [
+      #         {verb: "PATCH", path: "/users", name: "edit_user"},
+      #         {verb: "PUT", path: "/users", name: "edit_user"}
       #       ]
       #     },
-      #     'empanadas' => {
-      #       'create' => [
-      #         { verb: 'POST', path: '/empanadas', name: nil }
+      #     "empanadas" => {
+      #       "create" => [
+      #         {verb: "POST", path: "/empanadas", name: nil}
       #       ]
       #     }
       #   }
@@ -86,7 +84,7 @@ module Chusaku
       def format(route:, verb:, defaults:)
         {
           verb: verb,
-          path: route.path.spec.to_s.gsub('(.:format)', ''),
+          path: route.path.spec.to_s.gsub("(.:format)", ""),
           name: route.name,
           defaults: defaults
         }

data/lib/chusaku/version.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Chusaku
-  VERSION = '0.6.0'
+  VERSION = "0.6.1"
 end

data/lib/chusaku.rb

@@ -1,8 +1,6 @@
-# frozen_string_literal: true
-
-require 'chusaku/version'
-require 'chusaku/parser'
-require 'chusaku/routes'
+require "chusaku/version"
+require "chusaku/parser"
+require "chusaku/routes"
 
 # Handles core functionality of annotating projects.
 module Chusaku
@@ -21,7 +19,8 @@ module Chusaku
       @flags = flags
       @routes = Chusaku::Routes.call
       @changes = []
-      controllers_pattern = 'app/controllers/**/*_controller.rb'
+      @changed_files = []
+      controllers_pattern = "app/controllers/**/*_controller.rb"
 
       Dir.glob(Rails.root.join(controllers_pattern)).each do |path|
         controller = %r{controllers/(.*)_controller\.rb}.match(path)[1]
@@ -92,9 +91,9 @@ module Chusaku
     def clean_group(group)
       return unless group[:type] == :comment
 
-      group[:body] = group[:body].gsub(/^\s*#\s*@route.*$\n/, '')
+      group[:body] = group[:body].gsub(/^\s*#\s*@route.*$\n/, "")
       group[:body] =
-        group[:body].gsub(%r{^\s*# (GET|POST|PATCH/PUT|DELETE) /\S+$\n}, '')
+        group[:body].gsub(%r{^\s*# (GET|POST|PATCH/PUT|DELETE) /\S+$\n}, "")
     end
 
     # Add an annotation to the given group given by Chusaku::Parser that looks
@@ -125,8 +124,8 @@ module Chusaku
       if defaults&.any?
         defaults_str =
           defaults
-          .map { |key, value| "#{key}: #{value.inspect}" }
-          .join(', ')
+            .map { |key, value| "#{key}: #{value.inspect}" }
+            .join(", ")
         annotation += " {#{defaults_str}}"
       end
       annotation += " (#{name})" unless name.nil?
@@ -143,6 +142,7 @@ module Chusaku
       return if parsed_file[:content] == new_content
 
       !@flags.include?(:dry) && perform_write(path: path, content: new_content)
+      @changed_files.push(path)
     end
 
     # Extracts the new file content for the given parsed file.
@@ -174,7 +174,7 @@ module Chusaku
     #
     # @return [String] 'r' or 'w'
     def file_mode
-      File.instance_methods.include?(:test_write) ? 'r' : 'w'
+      File.instance_methods.include?(:test_write) ? "r" : "w"
     end
 
     # Output results to user.
@@ -183,7 +183,7 @@ module Chusaku
     def output_results
       puts(output_copy)
       exit_code = 0
-      exit_code = 1 if @changes.any? && @flags.include?(:error_on_annotation)
+      exit_code = 1 if @changed_files.any? && @flags.include?(:error_on_annotation)
       exit_code
     end
 
@@ -191,7 +191,7 @@ module Chusaku
     #
     # @return [String] Copy to be outputted to user
     def output_copy
-      return 'Nothing to annotate.' if @changes.empty?
+      return "Nothing to annotate." if @changed_files.empty?
 
       copy = changes_copy
       copy += "\nChusaku has finished running."
@@ -204,7 +204,7 @@ module Chusaku
     #
     # @return [String] Copy of recorded changes
     def changes_copy
-      return '' unless @flags.include?(:verbose)
+      return "" unless @flags.include?(:verbose)
 
       @changes.map do |change|
         <<~CHANGE_OUTPUT

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chusaku
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Nishiki Liu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-30 00:00:00.000000000 Z
+date: 2021-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -53,33 +53,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '13.0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: standardrb
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
-- !ruby/object:Gem::Dependency
-  name: rubocop-performance
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.9'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
@@ -96,7 +82,7 @@ dependencies:
         version: '3.0'
 description: Annotate your Rails controllers with route info.
 email:
-- nishiki@hey.com
+- hello@nshki.com
 executables:
 - chusaku
 extensions: []