Remove analyze config and add to main config

ViacomInc · Nov 29, 2018 · 727eec6 · 727eec6
1 parent 5875a0b
commit 727eec6
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    roku_builder (4.9.3)
+    roku_builder (4.9.4)
       faraday (~> 0.13)
       faraday-digestauth (~> 0.2)
       git (~> 1.3)
@@ -30,7 +30,7 @@ GEM
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     docile (1.3.1)
-    faraday (0.15.3)
+    faraday (0.15.4)
       multipart-post (>= 1.2, < 3)
     faraday-digestauth (0.3.0)
       faraday (~> 0.7)
@@ -137,4 +137,4 @@ DEPENDENCIES
   yard (~> 0.9)
 
 BUNDLED WITH
-   1.16.1
+   1.17.1
diff --git a/lib/roku_builder/config.rb b/lib/roku_builder/config.rb
@@ -192,7 +192,7 @@ def fix_config_symbol_values
     end
 
     def fix_project_config_symbol_values
-      if @config[:projects] [:default]
+      if @config[:projects][:default]
         @config[:projects][:default] = @config[:projects][:default].to_sym
       end
       @config[:projects].each_pair do |key,value|

diff --git a/lib/roku_builder/plugins/analyzer.rb b/lib/roku_builder/plugins/analyzer.rb
@@ -30,7 +30,6 @@ def self.dependencies
     def analyze(options:, quiet: false)
       @options = options
       @warnings = []
-      plugin_config = get_config(".roku_builder_analyze.json", true) || {}
       analyzer_config = get_config("inspector_config.json")
       performance_config = get_config("performance_config.json")
       @inspector_config = analyzer_config[:inspectors]
@@ -41,7 +40,7 @@ def analyze(options:, quiet: false)
         manifest_inspector = ManifestInspector.new(config: @config, dir: dir, raf: raf_inspector)
         @warnings.concat(manifest_inspector.run(analyzer_config[:inspectors]))
         has_source_dir = false
-        libraries = plugin_config[:libraries]
+        libraries = @config.project[:libraries]
         libraries ||= []
         Dir.glob(File.join(dir, "**", "*")).each do |file_path|
           file = file_path.dup; file.slice!(dir)

diff --git a/lib/roku_builder/version.rb b/lib/roku_builder/version.rb
@@ -2,5 +2,5 @@
 
 module RokuBuilder
   # Version of the RokuBuilder Gem
-  VERSION = "4.9.3"
+  VERSION = "4.9.4"
 end