cobra_commander 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a7c678173bc6ebeace6286a78b7bd0268c74300
-  data.tar.gz: 784e159d2a26d02842dce69296578bde9df37345
+  metadata.gz: c08e78acc81afe93b06677fe59da88133927cd5a
+  data.tar.gz: 060cc5c2e75fdd9d85d9686cb9d34f23e2b60eba
 SHA512:
-  metadata.gz: 3ff4cb4752fdcb18429da501d8dd9eac5c98f6f6a330a122ceafd1d5b2815639b65d3c0634be6b60e9e00d0a6a13eb4d603ca648cee57e38170e99168925a918
-  data.tar.gz: 904df2c43fbccb55a5002e0e83e4baa9fe237e8f46bbf24088fe6b3a7e1b82304fff7e2cb0a72e55f8da68e78f3b40d4155e70dba62c5194ced18ec78cfd8862
+  metadata.gz: 1b9341d5b477afc484ff76eff6eab70efa90ff26e9ff4df804737ecc36db2d5b4bd0d2644565226b2d46e8db69919aa70880c48a35b1138ed272a5b832d78258
+  data.tar.gz: 953c630c3f7751ad8306f8098e3bf815f0d79d57931c2b23cafdfd6e70bf5d9a0a535bc9799e3bb591226b1df28bfb68256f7c29884bab455fc4ab167578bd68

data/.gitignore

@@ -9,4 +9,7 @@
 /pkg/
 /spec/examples.txt
 /spec/reports/
+/spec/fixtures/app/node_modules/
+/spec/fixtures/app/node_manifest/node_modules/
+/spec/fixtures/app/components/*/node_modules/
 /tmp/

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Change Log
 
+## Unreleased
+
+## Version 0.2.0 - 2017-09-01
+
+### Added
+
+* Track javascript components via package.json links. PR [#10](https://github.com/powerhome/cobra_commander/pull/10)
+
+* Alphabetize dependencies in `ls` & `changes` output. PR [#10](https://github.com/powerhome/cobra_commander/pull/10)
+
+* Add component type to `changes` output. PR [#10](https://github.com/powerhome/cobra_commander/pull/10)
+
 ## Version 0.1.2 - 2017-05-08
 
 ### Fixed

data/README.md

@@ -6,7 +6,7 @@
 [![Code Climate](https://img.shields.io/codeclimate/github/powerhome/cobra_commander.svg)](https://codeclimate.com/github/powerhome/cobra_commander)
 [![Gemnasium](https://img.shields.io/gemnasium/powerhome/cobra_commander.svg)](https://gemnasium.com/github.com/powerhome/cobra_commander)
 
-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.
+Tools for working with Component Based Rails Apps (see http://shageman.github.io/cbra.info/). Includes tools for graphing both Ruby and Javascript components in an application and their relationships, as well as selectively testing components based on changes made.
 
 ## Installation
 

data/lib/cobra_commander/affected.rb

@@ -6,22 +6,29 @@ module CobraCommander
     attr_reader :directly, :transitively
 
     def initialize(tree, changes, path)
+      @tree = tree
       @changes = changes
       @path = path
-      @transitively = Set.new
-      @directly = Set.new
-      find_dependencies(tree)
-      @transitively.delete(name: UMBRELLA_APP_NAME, path: @path)
+      run!
     end
 
     def needs_testing
-      @needs_testing ||= (@directly + @transitively).map! do |component|
+      @needs_testing ||= all_affected.map! do |component|
         File.join(component[:path], "test.sh")
       end
     end
 
   private
 
+    def run!
+      @transitively = Set.new
+      @directly = Set.new
+      find_dependencies(@tree)
+      @transitively.delete(name: UMBRELLA_APP_NAME, path: @path, type: @tree[:type])
+      @transitively = @transitively.to_a.sort_by { |h| h[:name] }
+      @directly = @directly.to_a.sort_by { |h| h[:name] }
+    end
+
     def find_dependencies(parent_component)
       parent_component[:dependencies].each do |component|
         add_if_changed(component)
@@ -37,5 +44,9 @@ module CobraCommander
         end
       end
     end
+
+    def all_affected
+      (@directly + @transitively).uniq.sort_by { |h| h[:path] }
+    end
   end
 end

data/lib/cobra_commander/change.rb

@@ -63,13 +63,13 @@ module CobraCommander
 
     def directly_affected_components
       puts "<<< Directly affected components >>>"
-      @affected.directly.each { |component| puts component[:name] }
+      @affected.directly.each { |component| puts display(component) }
       puts blank_line
     end
 
     def transitively_affected_components
       puts "<<< Transitively affected components >>>"
-      @affected.transitively.each { |component| puts component[:name] }
+      @affected.transitively.each { |component| puts display(component) }
       puts blank_line
     end
 
@@ -78,6 +78,10 @@ module CobraCommander
       @affected.needs_testing.each { |script| puts script }
     end
 
+    def display(component)
+      "#{component[:name]} - #{component[:type]}"
+    end
+
     def blank_line
       ""
     end

data/lib/cobra_commander/component_tree.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "json"
+
 module CobraCommander
   # Representation of the tree of components and their dependencies
   class ComponentTree
@@ -8,50 +10,122 @@ module CobraCommander
     end
 
     def to_h
-      GemComponentTree.new(UMBRELLA_APP_NAME, @root_path).to_h
+      Tree.new(UMBRELLA_APP_NAME, @root_path).to_h
     end
 
-    # Represents a tree of gem components with dependencies extracted via Bundler
-    class GemComponentTree
+    # Generates component tree
+    class Tree
       def initialize(name, path, ancestry = Set.new)
         @name = name
         @root_path = path
         @ancestry = ancestry
+        @ruby = Ruby.new(path)
+        @js = Js.new(path)
+        @type = type_of_component
       end
 
       def to_h
         {
           name: @name,
           path: @root_path,
+          type: @type,
           ancestry: @ancestry,
-          dependencies: component_dependencies.map(&method(:dep_representation)),
+          dependencies: dependencies.map(&method(:dep_representation)),
         }
       end
 
     private
 
-      def gemfile_path
-        File.join(@root_path, "Gemfile")
+      def type_of_component
+        return "Ruby & JS" if @ruby.gem? && @js.node?
+        return "Ruby" if @ruby.gem?
+        return "JS" if @js.node?
       end
 
-      def gemfile_lock_path
-        File.join(@root_path, "Gemfile.lock")
+      def dependencies
+        @deps ||= begin
+          deps = @ruby.dependencies + @js.dependencies
+          deps.sort_by { |dep| dep[:name] }
+        end
       end
 
-      def bundler_definition
-        ::Bundler::Definition.build(gemfile_path, gemfile_lock_path, nil)
+      def dep_representation(dep)
+        full_path = File.expand_path(File.join(@root_path, dep[:path]))
+        ancestry = @ancestry + [{ name: @name, path: @root_path, type: @type }]
+        self.class.new(dep[:name], full_path, ancestry).to_h
       end
 
-      def component_dependencies
-        bundler_definition.dependencies.select do |dep|
-          dep.source&.is_a_path? && dep.source.path.to_s != "."
+      # Calculates ruby dependencies
+      class Ruby
+        def initialize(root_path)
+          @root_path = root_path
+        end
+
+        def dependencies
+          @deps ||= begin
+            return [] unless gem?
+            gems = bundler_definition.dependencies.select do |dep|
+              dep.source&.is_a_path? && dep.source.path.to_s != "."
+            end
+            format(gems)
+          end
+        end
+
+        def format(deps)
+          deps.map do |dep|
+            path = File.join(dep.source.path, dep.name)
+            { name: dep.name, path: path }
+          end
+        end
+
+        def gem?
+          @gem ||= File.exist?(gemfile_path)
+        end
+
+        def bundler_definition
+          ::Bundler::Definition.build(gemfile_path, gemfile_lock_path, nil)
+        end
+
+        def gemfile_path
+          File.join(@root_path, "Gemfile")
+        end
+
+        def gemfile_lock_path
+          File.join(@root_path, "Gemfile.lock")
         end
       end
 
-      def dep_representation(dep)
-        path = File.expand_path(File.join(@root_path, dep.source.path, dep.name))
-        ancestry = @ancestry + [{ name: @name, path: @root_path }]
-        self.class.new(dep.name, path, ancestry).to_h
+      # Calculates js dependencies
+      class Js
+        def initialize(root_path)
+          @root_path = root_path
+        end
+
+        def dependencies
+          @deps ||= begin
+            return [] unless node?
+            json = JSON.parse(File.read(package_json_path))
+            format(json["dependencies"])
+          end
+        end
+
+        def format(deps)
+          return [] if deps.nil?
+          linked_deps = deps.select { |_, v| v.start_with? "link:" }
+          linked_deps.map do |_, v|
+            relational_path = v.split("link:")[1]
+            dep_name = relational_path.split("/")[-1]
+            { name: dep_name, path: relational_path }
+          end
+        end
+
+        def node?
+          @node ||= File.exist?(package_json_path)
+        end
+
+        def package_json_path
+          File.join(@root_path, "package.json")
+        end
       end
     end
   end

data/lib/cobra_commander/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cobra_commander
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Ben Langfeld
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-08 00:00:00.000000000 Z
+date: 2017-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -193,7 +193,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Tools for working with Component Based Rails Apps