cobra_commander 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d77734cb3eeb9f21c539f66a92d15e8aa94030046db7cdad3be8f6ed191c00aa
-  data.tar.gz: feacbdfbafb7baf191948e81014d9335b1cddf4a1ddd0f0a2aeac13af823efb3
+  metadata.gz: 8e12f66b669fc83fc691deb3f67183550c5341f6ce8fdf18d8f43ce5b5859589
+  data.tar.gz: 7a15cc9bbc0226df01609c96917c5e2d750376a2ef68769dc7153eb4a0224cd7
 SHA512:
-  metadata.gz: dd926a0cc0bf9978b9b3dae6319e5b33853a2191f0d3b82645e696355a671769bf23894de45a58fb02fe5d0bb302c986d2ec8b3d71559c414248a82e2822c921
-  data.tar.gz: 60c750c84313992647cf94463ecc31fda2e5e3502f21a6eaacf4d6dbf206eddb8cacbd28d8925547c2851034bb64e3775413467f0c00962397e42af7484ac986
+  metadata.gz: 1077abb8aac431dec03d9f2ab79e95d411fa451ef1f6381a984fda377e8f4ee96c9084de69b2062712f7b943b03a74316e47aacce73cfca20475d128027aeee7
+  data.tar.gz: 5cf5496ed9ff196ca395a4474be66ddafaebd1fd0073d2a5b7bb957d2cd90dfc3f6a36706782bac361029996798cd5520093a3275126240df867a90791ec20e7

data/.github/workflows/ci.yml

@@ -31,7 +31,7 @@ jobs:
     - name: rubocop
       uses: reviewdog/action-rubocop@v1
       with:
-        rubocop_version: 0.48.1
+        rubocop_version: 0.88.0
         filter_mode: nofilter
         fail_on_error: true
         rubocop_extensions: ""

data/.rubocop.yml

@@ -1,50 +1,20 @@
 AllCops:
-  TargetRubyVersion: 2.3
-
-Metrics/LineLength:
-  Max: 120
+  TargetRubyVersion: 2.5
+  NewCops: enable
 
 Metrics/BlockLength:
   Exclude:
     - spec/**/*.rb
     - cobra_commander.gemspec
 
-Metrics/ClassLength:
-  Exclude:
-    - spec/**/*.rb
-    - cobra_commander.gemspec
-
-Style/AccessModifierIndentation:
+Layout/AccessModifierIndentation:
   EnforcedStyle: outdent
 
-Style/Documentation:
-  Enabled: true
-
-Style/ExtraSpacing:
-  Exclude:
-    - cobra_commander.gemspec
-
-Style/SpaceAroundOperators:
-  Exclude:
-    - cobra_commander.gemspec
-
-Style/Lambda:
-  EnforcedStyle: literal
-
-Style/PercentLiteralDelimiters:
-  PreferredDelimiters:
-    default: ()
-    '%i': '[]'
-    '%I': '[]'
-    '%r': '{}'
-    '%w': '[]'
-    '%W': '[]'
-
-# Single quotes being faster is hardly measurable and only affects parse time.
-# Enforcing double quotes reduces the times where you need to change them when introducing an interpolation.
-# Use single quotes only if their semantics are needed.
 Style/StringLiterals:
   EnforcedStyle: double_quotes
 
-Style/TrailingCommaInLiteral:
-  EnforcedStyleForMultiline: comma
+Style/TrailingCommaInArrayLiteral:
+  EnforcedStyleForMultiline: consistent_comma
+
+Style/TrailingCommaInHashLiteral:
+  EnforcedStyleForMultiline: consistent_comma

data/cobra_commander.gemspec

@@ -1,7 +1,6 @@
-# coding: utf-8
 # frozen_string_literal: true
 
-lib = File.expand_path("../lib", __FILE__)
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "cobra_commander/version"
 
@@ -13,7 +12,7 @@ Gem::Specification.new do |spec|
     "Garett Arrowood",
     "Carlos Palhares",
   ]
-  spec.email         = [
+  spec.email = [
     "blangfeld@powerhrg.com",
     "garett.arrowood@powerhrg.com",
     "carlos.palhares@powerhrg.com",
@@ -23,7 +22,7 @@ Gem::Specification.new do |spec|
     Tools for working with Component Based Rails Apps (see http://shageman.github.io/cbra.info/).
     Includes tools for graphing the components of an app and their relationships, as well as selectively
     testing components based on changes made.
-DESCRIPTION
+  DESCRIPTION
   spec.homepage      = "http://tech.powerhrg.com/cobra_commander/"
   spec.license       = "MIT"
 
@@ -35,16 +34,16 @@ DESCRIPTION
   spec.require_paths = ["lib"]
 
   spec.add_dependency "bundler", "~> 1.17"
-  spec.add_dependency "thor", ["< 2.0", ">= 0.18.1"]
   spec.add_dependency "ruby-graphviz", "~> 1.2.3"
+  spec.add_dependency "thor", ["< 2.0", ">= 0.18.1"]
   spec.add_dependency "tty-command", "~> 0.9.0"
   spec.add_dependency "tty-spinner", "~> 0.9.3"
 
+  spec.add_development_dependency "aruba", "~> 0.14.2"
   spec.add_development_dependency "bundler", "~> 1.17"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.5"
   spec.add_development_dependency "guard-rspec"
-  spec.add_development_dependency "aruba", "~> 0.14.2"
-  spec.add_development_dependency "rubocop", "0.48.1"
   spec.add_development_dependency "pry"
+  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rspec", "~> 3.5"
+  spec.add_development_dependency "rubocop", "0.88.0"
 end

data/lib/cobra_commander/change.rb

@@ -42,16 +42,16 @@ module CobraCommander
           Open3.capture3("git", "diff", "--name-only", @branch)
         end
 
-        if result.exitstatus == 128
-          raise InvalidSelectionError, "Specified --branch could not be found"
-        end
+        raise InvalidSelectionError, "Specified --branch could not be found" if result.exitstatus == 128
 
         diff.split("\n").map { |f| File.join(@root_dir, f) }
       end
     end
 
     def assert_valid_result_choice
-      raise InvalidSelectionError, "--results must be 'test', 'full', 'name' or 'json'" unless %w[test full name json].include?(@results) # rubocop:disable Metrics/LineLength
+      return if %w[test full name json].include?(@results)
+
+      raise InvalidSelectionError, "--results must be 'test', 'full', 'name' or 'json'"
     end
 
     def selected_result?(result)

data/lib/cobra_commander/cli.rb

@@ -39,7 +39,7 @@ module CobraCommander
     def exec(command_or_component, command = nil)
       CobraCommander::Executor.exec(
         components_filtered(command && command_or_component),
-        command ? command : command_or_component
+        command || command_or_component
       )
     end
 
@@ -58,8 +58,8 @@ module CobraCommander
         options.output
       )
       puts "Graph generated at #{options.output}"
-    rescue ArgumentError => error
-      error error.message
+    rescue ArgumentError => e
+      error e.message
     end
 
     desc "changes [--results=RESULTS] [--branch=BRANCH]", "Prints list of changed files"
@@ -83,10 +83,12 @@ module CobraCommander
 
     def components_filtered(component_name)
       return umbrella.components unless component_name
+
       component = find_component(component_name)
 
       return component.deep_dependencies if options.dependencies
       return component.deep_dependents if options.dependents
+
       [component]
     end
   end

data/lib/cobra_commander/component.rb

@@ -3,7 +3,7 @@
 module CobraCommander
   # Represents a component withing an Umbrella
   class Component
-    attr_reader :name, :dependencies, :sources
+    attr_reader :name, :sources
 
     def initialize(umbrella, name)
       @umbrella = umbrella

data/lib/cobra_commander/dependencies/bundler.rb

@@ -1,23 +1,22 @@
 # frozen_string_literal: true
 
+require "bundler"
+require "bundler/lockfile_parser"
+require "pathname"
+
 module CobraCommander
   module Dependencies
     # Calculates ruby bundler dependencies
     class Bundler
-      def initialize(root)
-        @definition = ::Bundler::Definition.build(
-          Pathname.new(File.join(root, "Gemfile")).realpath,
-          Pathname.new(File.join(root, "Gemfile.lock")).realpath,
-          false
-        )
-      end
+      attr_reader :path
 
-      def path
-        @definition.lockfile
+      def initialize(root)
+        @root = root
+        @path = Pathname.new(File.join(root, "Gemfile.lock")).realpath
       end
 
       def dependencies
-        @definition.dependencies.map(&:name)
+        lockfile.dependencies.values.map(&:name)
       end
 
       def components
@@ -28,9 +27,14 @@ module CobraCommander
 
     private
 
+      def lockfile
+        @lockfile ||= ::Bundler::LockfileParser.new(::Bundler.read_file(path))
+      end
+
       def components_source
-        @components_source ||= @definition.send(:sources).path_sources.find do |source|
-          source.path.to_s.eql?("components")
+        @components_source ||= begin
+          source = @lockfile.sources.find { |s| s.path.to_s.eql?("components") }
+          ::Bundler::Source::Path.new(source.options.merge("root_path" => @root))
         end
       end
     end

data/lib/cobra_commander/dependencies/yarn/package.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "json"
+require "pathname"
 
 module CobraCommander
   module Dependencies
@@ -10,11 +11,11 @@ module CobraCommander
         attr_reader :path
 
         def initialize(path)
-          @path = Pathname.new(File.join(path, "package.json")).realpath
+          @path = ::Pathname.new(File.join(path, "package.json")).realpath
         end
 
         def project_tag
-          name.match(%r{^@[\w-]+\/}).to_s
+          name.match(%r{^@[\w-]+/}).to_s
         end
 
         def name

data/lib/cobra_commander/dependencies/yarn/package_repo.rb

@@ -6,7 +6,7 @@ module CobraCommander
       # Yarn package repository to load and cache package.json files
       class PackageRepo
         def initialize
-          @specs ||= {}
+          @specs = {}
         end
 
         def specs
@@ -14,8 +14,9 @@ module CobraCommander
         end
 
         def load_linked_specs(package)
-          package.dependencies.values.each do |spec|
+          package.dependencies.each_value do |spec|
             next unless spec =~ /link:(.+)/
+
             load_spec(File.join(package.path, "..", Regexp.last_match(1)))
           end
         end

data/lib/cobra_commander/executor/component_exec.rb

@@ -12,12 +12,22 @@ module CobraCommander
 
       def run(command, output: $stdout, **cmd_options)
         tty = TTY::Command.new(pty: true, printer: :quiet, output: output)
-        Bundler.with_original_env do
+        isolate_bundle do
           @component.root_paths.all? do |path|
             tty.run!(command, chdir: path, **cmd_options).success?
           end
         end
       end
+
+    private
+
+      def isolate_bundle(&block)
+        if Bundler.respond_to?(:with_unbundled_env)
+          Bundler.with_unbundled_env(&block)
+        else
+          Bundler.with_clean_env(&block)
+        end
+      end
     end
   end
 end

data/lib/cobra_commander/executor/multi_exec.rb

@@ -36,9 +36,9 @@ module CobraCommander
 
       def spinner(title)
         pastel = Pastel.new
-        [":spinner #{title}", format: :bouncing,
-                              success_mark: pastel.green("[DONE]"),
-                              error_mark: pastel.red("[ERROR]")]
+        [":spinner #{title}", { format: :bouncing,
+                                success_mark: pastel.green("[DONE]"),
+                                error_mark: pastel.red("[ERROR]"), },]
       end
     end
   end

data/lib/cobra_commander/output/graph_viz.rb

@@ -18,7 +18,7 @@ module CobraCommander
 
       private_class_method def self.extract_format(output)
         format = output[-3..-1]
-        return format if format == "png" || format == "dot"
+        return format if %w[png dot].include?(format)
 
         raise ArgumentError, "output format must be 'png' or 'dot'"
       end

data/lib/cobra_commander/umbrella.rb

@@ -21,6 +21,7 @@ module CobraCommander
 
     def resolve(component_root_path)
       return root if root.root_paths.include?(component_root_path)
+
       components.find do |component|
         component.root_paths.include?(component_root_path)
       end

data/lib/cobra_commander/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module CobraCommander
-  VERSION = "0.9.0"
+  VERSION = "0.9.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cobra_commander
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Ben Langfeld
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-08-26 00:00:00.000000000 Z
+date: 2020-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -26,6 +26,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.17'
+- !ruby/object:Gem::Dependency
+  name: ruby-graphviz
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.2.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.2.3
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -46,20 +60,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.18.1
-- !ruby/object:Gem::Dependency
-  name: ruby-graphviz
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.2.3
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.2.3
 - !ruby/object:Gem::Dependency
   name: tty-command
   requirement: !ruby/object:Gem::Requirement
@@ -89,49 +89,49 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.9.3
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: 0.14.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: 0.14.2
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '1.17'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '1.17'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: guard-rspec
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -145,47 +145,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: aruba
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.2
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.2
+        version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.48.1
+        version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.48.1
+        version: '3.5'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.88.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.88.0
 description: |
   Tools for working with Component Based Rails Apps (see http://shageman.github.io/cbra.info/).
   Includes tools for graphing the components of an app and their relationships, as well as selectively