axr 0.6.1 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 14c21dbe89798e76d232c029d5cae8843e1a25bc313453abbdb9ff6e3a7feed7
-  data.tar.gz: 14771453a1f39e857f5cb0edee0670ed332dfd71f90db6ae5e40579703037911
+  metadata.gz: 8c8bc4353171b75e8721ae3a01a6094187ec2e88a77cb85a5ee13371807169ef
+  data.tar.gz: 80f6aa5204e7603bd6d392b0fcd9e60ce743e1073c1a39308dc69f97dccdbb2d
 SHA512:
-  metadata.gz: d04a46e35c7ab0c314ae88dc431ceb373822074b146c92864a6c992df352bb1d53f3e3ee3d13130e23dda6de0463cf3a1455da26caf60b5ef4be29ba7d0824bb
-  data.tar.gz: 7d586e920c1b053fae07373a41a496a9c4a4a8b1e7de661a3c902ea461d9a8080dafc97b625ab40290e0f3ca5b3912f0d43a38057a41815d37c011b0d6b32fac
+  metadata.gz: a8e77aafafe49bebf2f6cde671e5d5e26e39420a32a1f4863e93274f25b5e90b5fc5599d985e047e1feefbfcb778b3a3511ab46acf2e8fad22888a22afc5c8fd
+  data.tar.gz: e2ae37f504ae56fe70d67b1310e65e2aa7036f3f46623c293de5ec36fc769351655363a8f1272fae4d090a44fa8b1e9038eaaee51b68c03fbd47745ab2fa33f9

data/.gitignore

@@ -7,6 +7,10 @@
 /spec/reports/
 /tmp/
 
+# development files
+.ruby-gemset
+.ruby-version
+
 # rspec failure tracking
 .rspec_status
 *.gem

data/.rubocop.yml

@@ -1,23 +1,36 @@
-require: rubocop-rails
+require: rubocop
 
 AllCops:
-  TargetRubyVersion: 2.6
+  TargetRubyVersion: 2.4
+  NewCops: disable
   Exclude:
     - bin/*
     - Guardfile
+    - vendor/**/*
 
 Style/Documentation:
   Enabled: false
 
-Metrics/LineLength:
+Layout/LineLength:
   Max: 120
 
+Metrics/AbcSize:
+  Max: 20
+
 Metrics/BlockLength:
   ExcludedMethods: [
-    'describe', 'xdescribe', 'context',  'xcontext', 'it', 'xit', 'let', 'before', 'after', 'aggregate_failures'
+    'describe',
+    'xdescribe',
+    'context',
+    'xcontext',
+    'it',
+    'xit',
+    'let',
+    'before',
+    'after',
+    'aggregate_failures'
   ]
 
-
 Metrics/MethodLength:
   Max: 15
 

data/.travis.yml

@@ -1,7 +1,13 @@
 ---
-sudo: false
 language: ruby
 cache: bundler
 rvm:
-  - 2.6.3
-before_install: gem install bundler -v 2.0.2
+  - 2.5.7
+  - 2.6.5
+  - 2.7.0
+before_install:
+  - gem install bundler
+  - bundle install
+script:
+  - bundle exec rubocop
+  - bundle exec rspec

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    axr (0.6.0)
+    axr (0.8.1)
       colorize (~> 0.8.1)
       thor (~> 0.20)
 
@@ -12,7 +12,7 @@ GEM
     coderay (1.1.2)
     colorize (0.8.1)
     diff-lcs (1.3)
-    ffi (1.11.1)
+    ffi (1.12.2)
     formatador (0.2.5)
     guard (2.16.1)
       formatador (>= 0.2.4)
@@ -29,39 +29,39 @@ GEM
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
     jaro_winkler (1.5.4)
-    listen (3.2.0)
+    listen (3.2.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    lumberjack (1.0.13)
+    lumberjack (1.2.4)
     method_source (0.9.2)
     nenv (0.3.0)
     notiffany (0.1.3)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    parallel (1.18.0)
-    parser (2.6.5.0)
+    parallel (1.19.1)
+    parser (2.7.0.5)
       ast (~> 2.4.0)
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
     rainbow (3.0.0)
-    rake (10.5.0)
+    rake (12.3.3)
     rb-fsevent (0.10.3)
-    rb-inotify (0.10.0)
+    rb-inotify (0.10.1)
       ffi (~> 1.0)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
       rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.0)
-      rspec-support (~> 3.9.0)
-    rspec-expectations (3.9.0)
+    rspec-core (3.9.1)
+      rspec-support (~> 3.9.1)
+    rspec-expectations (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.0)
+    rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
-    rspec-support (3.9.0)
+    rspec-support (3.9.2)
     rubocop (0.76.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
@@ -72,7 +72,7 @@ GEM
     ruby-progressbar (1.10.1)
     shellany (0.0.1)
     thor (0.20.3)
-    unicode-display_width (1.6.0)
+    unicode-display_width (1.6.1)
 
 PLATFORMS
   ruby
@@ -82,7 +82,7 @@ DEPENDENCIES
   bundler (~> 2.0)
   guard-rspec (~> 4.7.3)
   pry (~> 0.12.2)
-  rake (~> 10.0)
+  rake (~> 12.3.3)
   rspec (~> 3.0)
   rubocop (~> 0.76.0)
 

data/README.md

@@ -2,33 +2,43 @@
 
 **Ruby architecture for simplicity and team adoption**
 
-Architecture is hard. It’s very easy to build a complex system; much harder to build a simple and adaptable one. The code doesn't matter and coding for the sake of writing code is foolish.
+Architecture's hard. It’s very easy to build a complex system. Much harder to build a simple and adaptable solution. The code doesn't matter. Coding for the sake of writing code is foolish.
 
-Few of us get to write software that survives 5-10 years or longer. 90% of our work is garbage that becomes obsolete 1-3 years after release. Most of our work hours are wasted on features that never get shipped.
+Only a few of us get to write software that survives 5-10 years or longer. 90% of our work is garbage that becomes obsolete in 1-3 years after release. Most of our work hours are wasted on features that will never be useful.
+
+This is just a reality.
 
-This is just reality.
 
 (c) Volodya Sveredyuk
 
-## Setup
+## Motivation
+Application engineering it's always about abstractions and how they describe the real world and business which pays our salaries for coding something that might improve it. Maybe. Sometimes.
 
-```sh
-gem install axr
-```
+I hate doing something alone. I am a team player and as a team player, I prefer conventions over configuration. But this is not working with knowledge responsibility segregation inside the software app. In the Ruby world (especially Rails) it's so easy to add a new feature. Just add one line, one dependency, one callback and now you share knowledge about one entity into another entity. More dependencies - more spaghetti and legacy that in future we should REWRITE EVERYTHING!
+
+<img src="docs/images/rewrite.png" alt="drawing" width="500"/>
+
+Architecture's about knowledge responsibility and not the code.
+
+The worst thing that even we write the architecture document wherein a convenient way to agree on architecture and layers and entities, etc - We are not protected from violation of these conventions.
+
+And this the place where AxR comes on the stage.
+
+Please, welcome the **DSL** that helps:
+1. Describes your application layers (modules)
+2. Defines knowledge responsibilities between them
+3. Checks if you did not violate anything
+
+## Setup
 
-or in your Gemfile
+In your Gemfile
 ```ruby
 gem 'axr'
 ```
 
-in console
-```sh
-bundle install
-```
-
 ## DSL
 
-In your ruby app: (for rails app put it into `config/initializers`)
+In your ruby app: (for rails app put it into `config/initializers/axr.rb` file)
 ```ruby
 require 'axr'
 
@@ -104,6 +114,11 @@ Run for a specific file
 axr lib/adapters/youtube.rb
 ```
 
+Finish scanning with status code 1 in case of any warnings (you can use in CI environment to fail pipeline step)
+```sh
+axr check --exit-on-warnings
+```
+
 ## More examples
 
 **ERP system**
@@ -111,20 +126,26 @@ axr lib/adapters/youtube.rb
 <img src="docs/images/erp_example.png" alt="drawing" width="500"/>
 
 ```ruby
-require 'axr'
-
-AxR.app.define(isolated: true) do
-  layer 'Api',    familiar_with: ['ERP']
-  layer 'UI',     familiar_with: ['ERP']
-  layer 'ERP',    familiar_with: %w[Inventory Sales Supply]
-  layer 'Sales',  familiar_with: 'Inventory'
-  layer 'Supply', familiar_with: 'Inventory'
-  layer 'Repo'
-  layer 'Change'
-  layer 'Query'
+if Rails.env.development? || Rails.env.test?
+  require 'axr'
+
+  AxR.app.define(isolated: true) do
+    layer 'UI',         familiar_with: %w[Docs Inventory Production]
+    layer 'API',        familiar_with: %w[Docs Inventory Production]
+    layer 'Docs',       familiar_with: %w[Inventory Accounts Repo]
+    layer 'Accounts',   familiar_with: %w[Repo]
+    layer 'Inventory',  familiar_with: %w[Repo]
+    layer 'Production', familiar_with: %w[Repo]
+    layer 'Repo'
+  end
 end
+
 ```
 
 ### TODO
+- Ignore vendor or any other directories dir as configuration
 - Add sublayers
-- Add `axr check --exit-on-warning` cli flag
+- Add rubocop cop
+- Add more app examples
+- Migrate to AST analyzer
+

data/axr.gemspec

@@ -14,6 +14,8 @@ Gem::Specification.new do |spec|
   spec.homepage    = 'https://github.com/sveredyuk/axr'
   spec.license     = 'MIT'
 
+  spec.required_ruby_version = '>= 2.4.0'
+
   spec.metadata['allowed_push_host'] = 'https://rubygems.org/'
 
   spec.metadata['homepage_uri'] = spec.homepage
@@ -30,12 +32,12 @@ Gem::Specification.new do |spec|
   spec.require_paths = 'lib'
 
   spec.add_dependency 'colorize', '~> 0.8.1'
-  spec.add_dependency 'thor', '~> 0.20'
+  spec.add_dependency 'thor',     '~> 0.20'
 
-  spec.add_development_dependency 'bundler', '~> 2.0'
+  spec.add_development_dependency 'bundler',     '~> 2.0'
   spec.add_development_dependency 'guard-rspec', '~> 4.7.3'
-  spec.add_development_dependency 'pry', '~> 0.12.2'
-  spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rspec', '~> 3.0'
-  spec.add_development_dependency 'rubocop', '~> 0.76.0'
+  spec.add_development_dependency 'pry',         '~> 0.12.2'
+  spec.add_development_dependency 'rake',        '~> 12.3.3'
+  spec.add_development_dependency 'rspec',       '~> 3.0'
+  spec.add_development_dependency 'rubocop',     '~> 0.76.0'
 end

data/lib/axr/app.rb

@@ -32,17 +32,21 @@ module AxR
     end
 
     # rubocop:disable Metrics/AbcSize
+    # rubocop:disable Metrics/CyclomaticComplexity
+    # rubocop:disable Metrics/PerceivedComplexity
     def legal?(context, dependncy)
       ctx = layers.find { |l| l.name.to_s == context.to_s }
       dep = layers.find { |l| l.name.to_s == dependncy.to_s }
 
       return false unless ctx && dep
       return false if ctx.isolated? && ctx.familiar_with.empty?
-      return true if ctx.familiar_with.map(&:to_s).include?(dependncy.to_s)
+      return true  if ctx.familiar_with.map(&:to_s).include?(dependncy.to_s)
 
       ctx.level < dep.level
     end
     # rubocop:enable Metrics/AbcSize
+    # rubocop:enable Metrics/CyclomaticComplexity
+    # rubocop:enable Metrics/PerceivedComplexity
 
     private
 

data/lib/axr/cli.rb

@@ -4,15 +4,18 @@ require 'thor'
 
 module AxR
   class CLI < Thor
-    desc 'check PATH', 'Start AxR runner'
+    desc 'check PATH',           'Start AxR runner'
+    desc '--load APP_INIT_PATH', 'Specify file to load your ruby application'
+    desc '--exit-on-warnings',   'Finish with status code 1 on any warnings'
 
-    option :format # TODO: Add formats
-    option :load # TODO: Add formats
+    option :format # TODO: Add more output formats
+    option :load
+    option :'exit-on-warnings'
 
     def check(pattern = nil)
       $LOAD_PATH << Dir.pwd
       require options['load'] if options['load']
-      AxR::Runner.new(pattern).invoke
+      AxR::Runner.new(pattern, exit_on_warnings: !options['exit-on-warnings'].nil?).invoke
     end
   end
 end

data/lib/axr/runner.rb

@@ -7,33 +7,33 @@ module AxR
   class Runner
     DOT_RB = '.rb'
 
-    attr_reader :target, :formatter
+    attr_reader :target, :formatter, :exit_on_warnings
 
-    def initialize(target = nil, formatter: AxR::Formatters::Default.new)
-      @target    = target
-      @formatter = formatter
+    def initialize(target = nil, formatter: AxR::Formatters::Default.new, exit_on_warnings: false)
+      @target            = target
+      @formatter         = formatter
+      @exit_on_warnings = exit_on_warnings
     end
 
+    alias exit_on_warnings? exit_on_warnings
+
     def invoke
       files_with_warnings = files_to_scan.each_with_object({}) do |file_path, issues|
-        scan_result = AxR::Scanner.new(file_path: file_path).scan
+        scan_result       = AxR::Scanner.new(source: File.open(file_path)).scan
         issues[file_path] = scan_result.warnings if scan_result.warnings.any?
+
         formatter.single_file(scan_result, file_path)
       end
 
       formatter.summary(files_to_scan, files_with_warnings)
 
-      # exit 1 if files_with_warnings.any?
+      exit 1 if exit_on_warnings? && files_with_warnings.any?
 
       files_with_warnings
     end
 
     def files_to_scan
-      @files_to_scan ||= if scan_single_file?
-                           [target]
-                         else
-                           Dir.glob("#{target_dir}**/*.rb")
-                         end
+      @files_to_scan ||= scan_single_file? ? [target] : Dir.glob("#{target_dir}**/*#{DOT_RB}")
     end
 
     private

data/lib/axr/scanner.rb

@@ -5,34 +5,40 @@ require_relative 'scanner/warning'
 
 module AxR
   class Scanner
-    attr_reader :file_path, :context, :dependecies, :warnings
+    attr_reader :source, :context, :dependecies, :warnings
 
-    def initialize(file_path:)
-      @file_path   = file_path
+    def initialize(source: [])
+      @source      = source
       @dependecies = []
       @warnings    = []
       @context     = nil
     end
 
     # rubocop:disable Metrics/AbcSize
+    # rubocop:disable Metrics/CyclomaticComplexity
+    # rubocop:disable Metrics/PerceivedComplexity
     def scan
-      File.open(file_path).each.with_index do |line, index|
+      source.each.with_index do |line, index|
         loc_num = index + 1
 
         line_detection    = AxR.app.layer_names.detect { |layer| line.include?(layer) }
         line_detection    = check_space_before(line, line_detection)
-        context_detection = AxR.app.layer_names.detect { |layer| line.include?("module #{layer}") }
+        line_detection    = nil if context && module_definition?(line, line_detection)
+        line_detection    = nil if commented?(line, line_detection)
+        context_detection = AxR.app.layer_names.detect { |layer| module_definition?(line, layer) }
 
-        next unless line_detection || context_detection
+        next unless context_detection || line_detection
 
         detect_context(context_detection, line, loc_num) if context_detection && !context
         detect_dependency(line_detection, line, loc_num)
-        detect_warning(line_detection,    line, loc_num) if context
+        detect_warning(line_detection,    line, loc_num) if context && line_detection
       end
 
       self
     end
     # rubocop:enable Metrics/AbcSize
+    # rubocop:enable Metrics/CyclomaticComplexity
+    # rubocop:enable Metrics/PerceivedComplexity
 
     private
 
@@ -66,5 +72,19 @@ module AxR
 
       line_detection if line[line.index(line_detection) - 1] == SPACE
     end
+
+    MODULE = 'module'
+
+    def module_definition?(line, layer)
+      line.include?("#{MODULE} #{layer}")
+    end
+
+    COMMENT = '#'
+
+    def commented?(line, layer)
+      return false if line.empty? || layer.nil?
+
+      line.split(layer).first&.include?(COMMENT)
+    end
   end
 end

data/lib/axr/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module AxR
-  VERSION = '0.6.1'
+  VERSION = '0.8.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: axr
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.8.1
 platform: ruby
 authors:
 - Volodya Sveredyuk
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-12-02 00:00:00.000000000 Z
+date: 2020-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -147,6 +147,7 @@ files:
 - bin/setup
 - docs/images/abcde_example.png
 - docs/images/erp_example.png
+- docs/images/rewrite.png
 - exe/axr
 - lib/axr.rb
 - lib/axr/app.rb
@@ -175,14 +176,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Code checker for AxR compliance.