Allow dev of installed plugin

ViacomInc · Mar 5, 2018 · 183b52f · 183b52f
1 parent 474c72f
commit 183b52f
Show file tree

Hide file tree

Showing 16 changed files with 37 additions and 16 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,8 @@
+ = 4.5.3 =
+
+ - Allow development of installed plugin
+ - Update Dependancies
+
  = 4.5.2 =
 
  - Add dev-plugin option

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    roku_builder (4.5.2)
+    roku_builder (4.5.3)
       faraday (~> 0.13)
       faraday-digestauth (~> 0.2)
       git (~> 1.3)
@@ -18,7 +18,7 @@ GEM
       public_suffix (>= 2.0.2, < 4.0)
     ansi (1.5.0)
     ast (2.4.0)
-    byebug (9.1.0)
+    byebug (10.0.0)
     coderay (1.1.2)
     coveralls (0.8.21)
       json (>= 1.8, < 3)
@@ -31,18 +31,18 @@ GEM
     docile (1.1.5)
     faraday (0.14.0)
       multipart-post (>= 1.2, < 3)
-    faraday-digestauth (0.2.1)
+    faraday-digestauth (0.3.0)
       faraday (~> 0.7)
       net-http-digest_auth (~> 1.4)
-    ffi (1.9.18)
+    ffi (1.9.23)
     ffi-win32-extensions (1.0.3)
       ffi
     formatador (0.2.5)
     git (1.3.0)
-    guard (2.14.1)
+    guard (2.14.2)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
-      lumberjack (~> 1.0)
+      lumberjack (>= 1.0.12, < 2.0)
       nenv (~> 0.1)
       notiffany (~> 0.0)
       pry (>= 0.9.12)
@@ -63,10 +63,10 @@ GEM
       method_source (>= 0.6.7)
       rake (>= 0.9.2.2)
     method_source (0.9.0)
-    minitest (5.11.0)
+    minitest (5.11.3)
     minitest-autotest (1.0.3)
       minitest-server (~> 1.0)
-    minitest-server (1.0.4)
+    minitest-server (1.0.5)
       minitest (~> 5.0)
     minitest-utils (0.4.0)
       minitest
@@ -84,9 +84,9 @@ GEM
     pry (0.11.3)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
-    public_suffix (3.0.1)
+    public_suffix (3.0.2)
     rake (12.3.0)
-    rb-fsevent (0.10.2)
+    rb-fsevent (0.10.3)
     rb-inotify (0.9.10)
       ffi (>= 0.5.0, < 2)
     ruby-ll (2.1.2)
@@ -105,7 +105,7 @@ GEM
       tins (~> 1.0)
     thor (0.19.4)
     tins (1.16.3)
-    webmock (3.1.1)
+    webmock (3.3.0)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
@@ -119,7 +119,7 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (~> 1.7)
-  byebug (~> 9.0)
+  byebug (~> 10.0)
   coveralls (~> 0.8)
   guard (~> 2.14)
   guard-minitest (~> 2.4)
@@ -130,7 +130,7 @@ DEPENDENCIES
   minitest-utils (~> 0.3)
   rake (~> 12.0)
   roku_builder!
-  simplecov (~> 0.12)
+  simplecov (~> 0.14)
   webmock (~> 3.0)
   yard (~> 0.9)
 

diff --git a/lib/roku_builder.rb b/lib/roku_builder.rb
@@ -37,6 +37,7 @@ module RokuBuilder
   # @param options [Hash] The options hash
   def self.run(options: nil)
     @@options = nil
+    @@dev = false
     setup_plugins
     setup_options(options: options)
     return unless @@options
@@ -75,6 +76,7 @@ def self.plugins
 
   def self.register_plugin(plugin)
     @@plugins ||= []
+    @@plugins.delete(plugin) if @@dev
     @@plugins << plugin
   end
 
@@ -111,9 +113,11 @@ def self.load_dev_plugin
       end
     end
     if dev_path
+      @@dev = true
       Dir.glob(File.join(dev_path, "lib", "roku_builder", "plugins", "*")).each do |path|
         require path
       end
+      @@dev = false
     end
   end
 

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.5.2"
+  VERSION = "4.5.3"
 end
diff --git a/roku_builder.gemspec b/roku_builder.gemspec
@@ -31,13 +31,13 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler",           "~> 1.7"
   spec.add_development_dependency "rake",              "~> 12.0"
-  spec.add_development_dependency "byebug",            "~> 9.0"
+  spec.add_development_dependency "byebug",            "~> 10.0"
   spec.add_development_dependency "minitest",          "~> 5.10"
   spec.add_development_dependency "minitest-autotest", "~> 1.0"
   spec.add_development_dependency "minitest-server",   "~> 1.0"
   spec.add_development_dependency "minitest-utils",    "~> 0.3"
   spec.add_development_dependency "webmock",           "~> 3.0"
-  spec.add_development_dependency "simplecov",         "~> 0.12"
+  spec.add_development_dependency "simplecov",         "~> 0.14"
   spec.add_development_dependency "coveralls",         "~> 0.8"
   spec.add_development_dependency "yard",              "~> 0.9"
   spec.add_development_dependency "guard",             "~> 2.14"

diff --git a/test/roku_builder/plugins/test_core.rb b/test/roku_builder/plugins/test_core.rb
@@ -6,6 +6,7 @@ module RokuBuilder
   class CoreTest < Minitest::Test
     def setup
       Logger.set_testing
+      RokuBuilder.class_variable_set(:@@dev, false)
       RokuBuilder.setup_plugins
       register_plugins(Core)
     end

diff --git a/test/roku_builder/plugins/test_inspector.rb b/test/roku_builder/plugins/test_inspector.rb
@@ -5,6 +5,7 @@ module RokuBuilder
   class InspectorTest < Minitest::Test
     def setup
       Logger.set_testing
+      RokuBuilder.class_variable_set(:@@dev, false)
       RokuBuilder.setup_plugins
       register_plugins(Inspector)
       @requests = []

diff --git a/test/roku_builder/plugins/test_linker.rb b/test/roku_builder/plugins/test_linker.rb
@@ -6,6 +6,7 @@ module RokuBuilder
   class LinkerTest < Minitest::Test
     def setup
       Logger.set_testing
+      RokuBuilder.class_variable_set(:@@dev, false)
       RokuBuilder.setup_plugins
       register_plugins(Linker)
       @requests = []

diff --git a/test/roku_builder/plugins/test_loader.rb b/test/roku_builder/plugins/test_loader.rb
@@ -6,6 +6,7 @@ module RokuBuilder
   class LoaderTest < Minitest::Test
     def setup
       Logger.set_testing
+      RokuBuilder.class_variable_set(:@@dev, false)
       RokuBuilder.setup_plugins
       register_plugins(Loader)
       @config, @options = build_config_options_objects(LoaderTest, {sideload: true, working: true}, false)

diff --git a/test/roku_builder/plugins/test_monitor.rb b/test/roku_builder/plugins/test_monitor.rb
@@ -6,6 +6,7 @@ module RokuBuilder
   class MonitorTest < Minitest::Test
     def setup
       Logger.set_testing
+      RokuBuilder.class_variable_set(:@@dev, false)
       RokuBuilder.setup_plugins
       unless RokuBuilder.plugins.include?(Monitor)
         RokuBuilder.register_plugin(Monitor)

diff --git a/test/roku_builder/plugins/test_navigator.rb b/test/roku_builder/plugins/test_navigator.rb
@@ -6,6 +6,7 @@ module RokuBuilder
   class NavigatorTest < Minitest::Test
     def setup
       Logger.set_testing
+      RokuBuilder.class_variable_set(:@@dev, false)
       RokuBuilder.setup_plugins
       register_plugins(Navigator)
       @requests = []

diff --git a/test/roku_builder/plugins/test_packager.rb b/test/roku_builder/plugins/test_packager.rb
@@ -6,6 +6,7 @@ module RokuBuilder
   class PackagerTest < Minitest::Test
     def setup
       Logger.set_testing
+      RokuBuilder.class_variable_set(:@@dev, false)
       RokuBuilder.setup_plugins
       register_plugins(Packager)
       @requests = []

diff --git a/test/roku_builder/plugins/test_profiler.rb b/test/roku_builder/plugins/test_profiler.rb
@@ -6,6 +6,7 @@ module RokuBuilder
   class ProfilerTest < Minitest::Test
     def setup
       Logger.set_testing
+      RokuBuilder.class_variable_set(:@@dev, false)
       RokuBuilder.setup_plugins
       unless RokuBuilder.plugins.include?(Profiler)
         RokuBuilder.register_plugin(Profiler)

diff --git a/test/roku_builder/plugins/test_scripter.rb b/test/roku_builder/plugins/test_scripter.rb
@@ -6,6 +6,7 @@ module RokuBuilder
   class ScripterTest < Minitest::Test
     def setup
       options = {print: "field", working: true}
+      RokuBuilder.class_variable_set(:@@dev, false)
       RokuBuilder.setup_plugins
       unless RokuBuilder.plugins.include?(Scripter)
         RokuBuilder.register_plugin(Scripter)

diff --git a/test/roku_builder/plugins/test_tester.rb b/test/roku_builder/plugins/test_tester.rb
@@ -5,6 +5,7 @@ module RokuBuilder
   class TesterTest < Minitest::Test
     def setup
       Logger.set_testing
+      RokuBuilder.class_variable_set(:@@dev, false)
       RokuBuilder.setup_plugins
       register_plugins(Tester)
       @connection = Minitest::Mock.new

diff --git a/test/roku_builder/test_helper.rb b/test/roku_builder/test_helper.rb
@@ -19,6 +19,7 @@
 RokuBuilder::Logger.set_testing
 WebMock.disable_net_connect!
 def register_plugins(plugin_class)
+  RokuBuilder.class_variable_set(:@@dev, false)
   plugins = [plugin_class]
   plugins.each do |plugin|
     plugins.concat(plugin.dependencies)
@@ -51,6 +52,7 @@ def test_files_path(klass)
 def build_options(options = {validate: true}, empty_plugins = true)
   if empty_plugins
     RokuBuilder.class_variable_set(:@@plugins, [])
+    RokuBuilder.class_variable_set(:@@dev, false)
     require "roku_builder/plugins/core"
     RokuBuilder.register_plugin(RokuBuilder::Core)
   end