Update all gems with bundle update

justin808 · justin808 · commit 86c0983f89dc · 2016-12-23T12:27:47.000-10:00
Also updated with some rubocop fixes.
diff --git a/lib/react_on_rails/assets_precompile.rb b/lib/react_on_rails/assets_precompile.rb
@@ -69,7 +69,8 @@ def symlink_non_digested_assets
       manifest_path = manifest_glob.first
       manifest_file = File.new(manifest_path)
       manifest_data = if File.extname(manifest_file) == ".json"
-                        JSON.load(manifest_file)["assets"]
+                        manifest_file_data = File.read(manifest_path)
+                        JSON.parse(manifest_file_data)["assets"]
                       else
                         YAML.load(manifest_file)
                       end
diff --git a/lib/react_on_rails/configuration.rb b/lib/react_on_rails/configuration.rb
@@ -7,35 +7,48 @@ def self.configure
   DEFAULT_GENERATED_ASSETS_DIR = File.join(%w(app assets webpack)).freeze
 
   def self.setup_config_values
-    if @configuration.webpack_generated_files.empty?
-      files = ["webpack-bundle.js"]
-      if @configuration.server_bundle_js_file.present?
-        files << @configuration.server_bundle_js_file
-      end
-      @configuration.webpack_generated_files = files
-    end
+    ensure_webpack_generated_files_exists
+    configure_generated_assets_dirs_deprecation
+    ensure_generated_assets_dir_present
+    ensure_server_bundle_js_file_has_no_path
+  end
 
-    if @configuration.generated_assets_dirs.present?
-      puts "[DEPRECATION] ReactOnRails: Use config.generated_assets_dir rather than "\
+  def self.ensure_generated_assets_dir_present
+    return unless @configuration.generated_assets_dir.blank?
+
+    @configuration.generated_assets_dir = DEFAULT_GENERATED_ASSETS_DIR
+    puts "ReactOnRails: Set generated_assets_dir to default: #{DEFAULT_GENERATED_ASSETS_DIR}"
+  end
+
+  def self.configure_generated_assets_dirs_deprecation
+    return unless @configuration.generated_assets_dirs.present?
+
+    puts "[DEPRECATION] ReactOnRails: Use config.generated_assets_dir rather than "\
         "generated_assets_dirs"
-      if @configuration.generated_assets_dir.blank?
-        @configuration.generated_assets_dir = @configuration.generated_assets_dirs
-      else
-        puts "[DEPRECATION] ReactOnRails. You have both generated_assets_dirs and "\
+    if @configuration.generated_assets_dir.blank?
+      @configuration.generated_assets_dir = @configuration.generated_assets_dirs
+    else
+      puts "[DEPRECATION] ReactOnRails. You have both generated_assets_dirs and "\
           "generated_assets_dir defined. Define ONLY generated_assets_dir"
-      end
     end
+  end
 
-    if @configuration.generated_assets_dir.blank?
-      @configuration.generated_assets_dir = DEFAULT_GENERATED_ASSETS_DIR
-      puts "ReactOnRails: Set generated_assets_dir to default: #{DEFAULT_GENERATED_ASSETS_DIR}"
+  def self.ensure_webpack_generated_files_exists
+    return unless @configuration.webpack_generated_files.empty?
+
+    files = ["webpack-bundle.js"]
+    if @configuration.server_bundle_js_file.present?
+      files << @configuration.server_bundle_js_file
     end
+    @configuration.webpack_generated_files = files
+  end
+
+  def self.ensure_server_bundle_js_file_has_no_path
+    return unless @configuration.server_bundle_js_file.include?(File::SEPARATOR)
 
-    if @configuration.server_bundle_js_file.include?(File::SEPARATOR)
-      puts "[DEPRECATION] ReactOnRails: remove path from server_bundle_js_file in configuration. "\
+    puts "[DEPRECATION] ReactOnRails: remove path from server_bundle_js_file in configuration. "\
         "All generated files must go in #{@configuration.generated_assets_dir}"
-      @configuration.server_bundle_js_file = File.basename(@configuration.server_bundle_js_file)
-    end
+    @configuration.server_bundle_js_file = File.basename(@configuration.server_bundle_js_file)
   end
 
   def self.configuration
diff --git a/lib/react_on_rails/test_helper/node_process_launcher.rb b/lib/react_on_rails/test_helper/node_process_launcher.rb
@@ -1,12 +1,12 @@
 module ReactOnRails
   module TestHelper
     def self.launch_node
-      if ReactOnRails.configuration.server_render_method == "NodeJS"
-        path = "#{::Rails.root}/client/node"
-        puts "Launching NodeJS server at #{path}"
-        system("cd #{path} && npm start &")
-        sleep(1)
-      end
+      return unless ReactOnRails.configuration.server_render_method == "NodeJS"
+
+      path = "#{::Rails.root}/client/node"
+      puts "Launching NodeJS server at #{path}"
+      system("cd #{path} && npm start &")
+      sleep(1)
     end
   end
 end
diff --git a/spec/dummy/Gemfile.lock b/spec/dummy/Gemfile.lock
@@ -47,24 +47,25 @@ GEM
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    addressable (2.4.0)
+    addressable (2.5.0)
+      public_suffix (~> 2.0, >= 2.0.2)
     archive-zip (0.7.0)
       io-like (~> 0.3.0)
     arel (6.0.3)
-    ast (2.2.0)
-    awesome_print (1.6.1)
+    ast (2.3.0)
+    awesome_print (1.7.0)
     binding_of_caller (0.7.2)
       debug_inspector (>= 0.0.1)
     builder (3.2.2)
-    byebug (8.2.5)
+    byebug (9.0.6)
     capybara (2.7.1)
       addressable
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
-    capybara-screenshot (1.0.12)
+    capybara-screenshot (1.0.14)
       capybara (>= 1.0, < 3)
       launchy
     capybara-webkit (1.11.1)
@@ -83,86 +84,84 @@ GEM
     coffee-script (2.4.1)
       coffee-script-source
       execjs
-    coffee-script-source (1.10.0)
-    concurrent-ruby (1.0.2)
+    coffee-script-source (1.12.2)
+    concurrent-ruby (1.0.3)
     connection_pool (2.2.1)
-    coveralls (0.8.13)
-      json (~> 1.8)
-      simplecov (~> 0.11.0)
+    coveralls (0.8.17)
+      json (>= 1.8, < 3)
+      simplecov (~> 0.12.0)
       term-ansicolor (~> 1.3)
       thor (~> 0.19.1)
-      tins (~> 1.6.0)
+      tins (~> 1.6)
     debug_inspector (0.0.2)
     diff-lcs (1.2.5)
     docile (1.1.5)
     erubis (2.7.0)
     execjs (2.7.0)
-    ffi (1.9.10)
+    ffi (1.9.14)
     foreman (0.82.0)
       thor (~> 0.19.1)
     generator_spec (0.9.3)
       activesupport (>= 3.0.0)
       railties (>= 3.0.0)
-    globalid (0.3.6)
+    globalid (0.3.7)
       activesupport (>= 4.1.0)
     i18n (0.7.0)
     interception (0.5)
     io-like (0.3.0)
-    jbuilder (2.4.1)
+    jbuilder (2.6.1)
       activesupport (>= 3.0.0, < 5.1)
       multi_json (~> 1.2)
-    jquery-rails (4.1.1)
+    jquery-rails (4.2.1)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
     json (1.8.3)
     launchy (2.4.3)
       addressable (~> 2.3)
-    libv8 (5.0.71.48.3)
+    libv8 (5.3.332.38.3)
     loofah (2.0.3)
       nokogiri (>= 1.5.9)
     mail (2.6.4)
       mime-types (>= 1.16, < 4)
     method_source (0.8.2)
-    mime-types (3.0)
+    mime-types (3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0221)
+    mime-types-data (3.2016.0521)
     mini_portile2 (2.1.0)
-    mini_racer (0.1.4)
-      libv8 (~> 5.0, < 5.1.11)
-    minitest (5.9.0)
-    multi_json (1.12.0)
-    nokogiri (1.6.8)
+    mini_racer (0.1.7)
+      libv8 (~> 5.3)
+    minitest (5.10.1)
+    multi_json (1.12.1)
+    nokogiri (1.6.8.1)
       mini_portile2 (~> 2.1.0)
-      pkg-config (~> 1.1.7)
-    parser (2.3.1.0)
+    parser (2.3.3.1)
       ast (~> 2.2)
-    pkg-config (1.1.7)
-    poltergeist (1.9.0)
+    poltergeist (1.12.0)
       capybara (~> 2.1)
       cliver (~> 0.3.1)
-      multi_json (~> 1.0)
       websocket-driver (>= 0.2.0)
     powerpack (0.1.1)
-    pry (0.10.3)
+    pry (0.10.4)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    pry-byebug (3.3.0)
-      byebug (~> 8.0)
+    pry-byebug (3.4.2)
+      byebug (~> 9.0)
       pry (~> 0.10)
-    pry-doc (0.8.0)
+    pry-doc (0.9.0)
       pry (~> 0.9)
       yard (~> 0.8)
     pry-rails (0.3.4)
       pry (>= 0.9.10)
-    pry-rescue (1.4.2)
+    pry-rescue (1.4.4)
       interception (>= 0.5)
       pry
     pry-stack_explorer (0.4.9.2)
       binding_of_caller (>= 0.7)
       pry (>= 0.9.11)
-    rack (1.6.4)
+    public_suffix (2.0.4)
+    rack (1.6.5)
     rack-test (0.6.3)
       rack (>= 1.0)
     rails (4.2.3)
@@ -190,95 +189,95 @@ GEM
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rainbow (2.1.0)
-    rake (11.2.2)
-    rdoc (4.2.2)
-      json (~> 1.4)
-    rspec-core (3.4.4)
-      rspec-support (~> 3.4.0)
-    rspec-expectations (3.4.0)
+    rake (12.0.0)
+    rdoc (4.3.0)
+    rspec-core (3.5.4)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-mocks (3.4.1)
+      rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-rails (3.4.2)
-      actionpack (>= 3.0, < 4.3)
-      activesupport (>= 3.0, < 4.3)
-      railties (>= 3.0, < 4.3)
-      rspec-core (~> 3.4.0)
-      rspec-expectations (~> 3.4.0)
-      rspec-mocks (~> 3.4.0)
-      rspec-support (~> 3.4.0)
+      rspec-support (~> 3.5.0)
+    rspec-rails (3.5.2)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+      rspec-support (~> 3.5.0)
     rspec-retry (0.5.2)
       rspec-core (> 3.3, < 3.6)
-    rspec-support (3.4.1)
-    rubocop (0.42.0)
-      parser (>= 2.3.1.0, < 3.0)
+    rspec-support (3.5.0)
+    rubocop (0.46.0)
+      parser (>= 2.3.1.1, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-lint (2.1.0)
+    ruby-lint (2.3.1)
       parser (~> 2.2)
       slop (~> 3.4, >= 3.4.7)
-    ruby-progressbar (1.8.0)
+    ruby-progressbar (1.8.1)
     rubyzip (1.2.0)
-    sass (3.4.22)
-    sass-rails (5.0.4)
-      railties (>= 4.0.0, < 5.0)
+    sass (3.4.23)
+    sass-rails (5.0.6)
+      railties (>= 4.0.0, < 6)
       sass (~> 3.1)
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
       tilt (>= 1.1, < 3)
-    scss_lint (0.48.0)
-      rake (>= 0.9, < 12)
-      sass (~> 3.4.15)
-    sdoc (0.4.1)
+    scss_lint (0.51.0)
+      rake (>= 0.9, < 13)
+      sass (~> 3.4.20)
+    sdoc (0.4.2)
       json (~> 1.7, >= 1.7.7)
       rdoc (~> 4.0)
-    selenium-webdriver (2.53.0)
+    selenium-webdriver (3.0.4)
       childprocess (~> 0.5)
       rubyzip (~> 1.0)
       websocket (~> 1.0)
-    simplecov (0.11.2)
+    simplecov (0.12.0)
       docile (~> 1.1.0)
-      json (~> 1.8)
+      json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
     slop (3.6.0)
-    spring (1.7.1)
-    sprockets (3.6.0)
+    spring (2.0.0)
+      activesupport (>= 4.2)
+    sprockets (3.7.1)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.0.4)
+    sprockets-rails (3.2.0)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    sqlite3 (1.3.11)
-    term-ansicolor (1.3.2)
+    sqlite3 (1.3.12)
+    term-ansicolor (1.4.0)
       tins (~> 1.0)
-    thor (0.19.1)
+    thor (0.19.4)
     thread_safe (0.3.5)
-    tilt (2.0.2)
-    tins (1.6.0)
+    tilt (2.0.5)
+    tins (1.13.0)
     turbolinks (2.5.3)
       coffee-rails
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    uglifier (3.0.0)
+    uglifier (3.0.4)
       execjs (>= 0.3.0, < 3)
-    unicode-display_width (1.0.5)
-    web-console (3.1.1)
+    unicode-display_width (1.1.2)
+    web-console (3.3.0)
       activemodel (>= 4.2)
       debug_inspector
       railties (>= 4.2)
     websocket (1.2.3)
-    websocket-driver (0.6.3)
+    websocket-driver (0.6.4)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.2)
     xpath (2.0.0)
       nokogiri (~> 1.3)
-    yard (0.8.7.6)
+    yard (0.9.5)
 
 PLATFORMS
   ruby
diff --git a/spec/dummy/spec/features/integration_spec.rb b/spec/dummy/spec/features/integration_spec.rb
diff --git a/spec/react_on_rails/support/generator_spec_helper.rb b/spec/react_on_rails/support/generator_spec_helper.rb
