cobra_commander 0.7.0 → 0.9.2

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.rb

@@ -1,20 +1,19 @@
 # frozen_string_literal: true
 
+require_relative "executor/component_exec"
+require_relative "executor/multi_exec"
+
 module CobraCommander
   # Execute commands on all components of a ComponentTree
-  class Executor
-    def initialize(components)
-      @components = components
-    end
-
-    def exec(command, printer = $stdout)
-      @components.each do |component|
-        component.root_paths.each do |path|
-          printer.puts "===> #{component.name} (#{path})"
-          output, = Open3.capture2e(command, chdir: path, unsetenv_others: true)
-          printer.puts output
-        end
-      end
+  module Executor
+    def self.exec(components, command, output = $stdout, status_output = $stderr)
+      components = Array(components)
+      exec = if components.size == 1
+               ComponentExec.new(components.first)
+             else
+               MultiExec.new(components)
+             end
+      exec.run(command, output: output, spin_output: status_output)
     end
   end
 end

data/lib/cobra_commander/executor/component_exec.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require "tty-command"
+
+module CobraCommander
+  module Executor
+    # Execute a command on a single component
+    class ComponentExec
+      def initialize(component)
+        @component = component
+      end
+
+      def run(command, output: $stdout, **cmd_options)
+        tty = TTY::Command.new(pty: true, printer: :quiet, output: output)
+        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

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+require "tty-spinner"
+require "stringio"
+
+require_relative "component_exec"
+
+module CobraCommander
+  module Executor
+    # Executes a command on multiple components simultaniously
+    class MultiExec
+      def initialize(components)
+        @components = components
+      end
+
+      def run(command, output: $stdout, spin_output: $stderr, only_output_on_error: true, **cmd_options)
+        cmmd_output = StringIO.new
+        multi = TTY::Spinner::Multi.new("Running #{command}", output: spin_output)
+        @components.each do |component|
+          component_exec(multi, component, command, only_output_on_error: only_output_on_error,
+                                                    stderr: :stdout, output: cmmd_output,
+                                                    **cmd_options)
+        end
+        multi.auto_spin
+        output << cmmd_output.string
+        true
+      end
+
+    private
+
+      def component_exec(multi, component, command, **options)
+        exec = ComponentExec.new(component)
+        multi.register(*spinner(component.name)) do |spin|
+          exec.run(command, **options) ? spin.success : spin.error
+        end
+      end
+
+      def spinner(title)
+        pastel = Pastel.new
+        [":spinner #{title}", { format: :bouncing,
+                                success_mark: pastel.green("[DONE]"),
+                                error_mark: pastel.red("[ERROR]"), },]
+      end
+    end
+  end
+end

data/lib/cobra_commander/output.rb

@@ -1,74 +1,5 @@
 # frozen_string_literal: true
 
-module CobraCommander
-  # Module for pretty printing dependency trees
-  module Output
-    def self.print(node, format)
-      output = format == "list" ? Output::FlatList.new(node) : Output::Tree.new(node)
-      puts output.to_s
-    end
-
-    # Flattens a tree and prints unique items
-    class FlatList
-      def initialize(tree)
-        @tree = tree
-      end
-
-      def to_s
-        @tree.deep_dependencies.map(&:name).sort
-      end
-    end
-
-    # Prints the tree in a nice tree form
-    class Tree
-      attr_accessor :tree
-
-      SPACE  = "    "
-      BAR    = "│   "
-      TEE    = "├── "
-      CORNER = "└── "
-
-      def initialize(node)
-        @node = node
-      end
-
-      def to_s
-        StringIO.new.tap do |io|
-          io.puts @node.name
-          list_dependencies(io, @node)
-        end.string
-      end
-
-    private
-
-      def list_dependencies(io, node, outdents = [])
-        node.dependencies.each do |dep|
-          decide_on_line(io, node, dep, outdents)
-        end
-        nil
-      end
-
-      def decide_on_line(io, parent, dep, outdents)
-        if parent.dependencies.last != dep
-          add_tee(io, outdents, dep)
-        else
-          add_corner(io, outdents, dep)
-        end
-      end
-
-      def add_tee(io, outdents, dep)
-        io.puts line(outdents, TEE, dep.name)
-        list_dependencies(io, dep, (outdents + [BAR]))
-      end
-
-      def add_corner(io, outdents, dep)
-        io.puts line(outdents, CORNER, dep.name)
-        list_dependencies(io, dep, (outdents + [SPACE]))
-      end
-
-      def line(outdents, sym, name)
-        (outdents + [sym] + [name]).join
-      end
-    end
-  end
-end
+require_relative "output/flat_list"
+require_relative "output/ascii_tree"
+require_relative "output/graph_viz"

data/lib/cobra_commander/output/ascii_tree.rb

@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+module CobraCommander
+  module Output
+    # Prints the tree in a nice tree form
+    class AsciiTree
+      SPACE  = "    "
+      BAR    = "│   "
+      TEE    = "├── "
+      CORNER = "└── "
+
+      def initialize(component)
+        @component = component
+      end
+
+      def to_s
+        StringIO.new.tap do |io|
+          io.puts @component.name
+          list_dependencies(io, @component)
+        end.string
+      end
+
+    private
+
+      def list_dependencies(io, component, outdents = [])
+        component.dependencies.each do |dep|
+          decide_on_line(io, component, dep, outdents)
+        end
+        nil
+      end
+
+      def decide_on_line(io, parent, dep, outdents)
+        if parent.dependencies.last != dep
+          add_tee(io, outdents, dep)
+        else
+          add_corner(io, outdents, dep)
+        end
+      end
+
+      def add_tee(io, outdents, dep)
+        io.puts line(outdents, TEE, dep.name)
+        list_dependencies(io, dep, (outdents + [BAR]))
+      end
+
+      def add_corner(io, outdents, dep)
+        io.puts line(outdents, CORNER, dep.name)
+        list_dependencies(io, dep, (outdents + [SPACE]))
+      end
+
+      def line(outdents, sym, name)
+        (outdents + [sym] + [name]).join
+      end
+    end
+  end
+end

data/lib/cobra_commander/output/flat_list.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module CobraCommander
+  module Output
+    # Prints a list of components' names sorted alphabetically
+    class FlatList
+      def initialize(components)
+        @components = components
+      end
+
+      def to_s
+        @components.map(&:name).sort
+      end
+    end
+  end
+end

data/lib/cobra_commander/output/graph_viz.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require "graphviz"
+
+module CobraCommander
+  module Output
+    # Generates graphs of components
+    module GraphViz
+      def self.generate(component, output)
+        g = ::GraphViz.new(:G, type: :digraph, concentrate: true)
+        ([component] + component.deep_dependencies).each do |comp|
+          g.add_nodes comp.name
+          g.add_edges comp.name, comp.dependencies.map(&:name)
+        end
+
+        g.output(extract_format(output) => output)
+      end
+
+      private_class_method def self.extract_format(output)
+        format = output[-3..-1]
+        return format if %w[png dot].include?(format)
+
+        raise ArgumentError, "output format must be 'png' or 'dot'"
+      end
+    end
+  end
+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.7.0"
+  VERSION = "0.9.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cobra_commander
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.9.2
 platform: ruby
 authors:
 - Ben Langfeld
@@ -10,8 +10,36 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-08 00:00:00.000000000 Z
+date: 2020-09-23 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.17'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !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
@@ -33,61 +61,61 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.18.1
 - !ruby/object:Gem::Dependency
-  name: ruby-graphviz
+  name: tty-command
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.3
+        version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.3
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: tty-spinner
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
-  type: :development
+        version: 0.9.3
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: 0.9.3
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 0.14.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 0.14.2
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '1.17'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '1.17'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -103,47 +131,61 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: aruba
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  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
@@ -158,10 +200,10 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".editorconfig"
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
-- ".travis.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -176,20 +218,21 @@ files:
 - exe/cobra
 - lib/cobra_commander.rb
 - lib/cobra_commander/affected.rb
-- lib/cobra_commander/cached_component_tree.rb
-- lib/cobra_commander/calculated_component_tree.rb
 - lib/cobra_commander/change.rb
 - lib/cobra_commander/cli.rb
 - lib/cobra_commander/component.rb
-- lib/cobra_commander/component_tree.rb
 - lib/cobra_commander/dependencies.rb
 - lib/cobra_commander/dependencies/bundler.rb
 - lib/cobra_commander/dependencies/yarn/package.rb
 - lib/cobra_commander/dependencies/yarn/package_repo.rb
 - lib/cobra_commander/dependencies/yarn_workspace.rb
 - lib/cobra_commander/executor.rb
-- lib/cobra_commander/graph.rb
+- lib/cobra_commander/executor/component_exec.rb
+- lib/cobra_commander/executor/multi_exec.rb
 - lib/cobra_commander/output.rb
+- lib/cobra_commander/output/ascii_tree.rb
+- lib/cobra_commander/output/flat_list.rb
+- lib/cobra_commander/output/graph_viz.rb
 - lib/cobra_commander/umbrella.rb
 - lib/cobra_commander/version.rb
 - renovate.json