Merge branch 'master' into justin800/allow-router-result-to-return-html-string

Author: justin808

CHANGELOG.md

@@ -6,10 +6,17 @@ Contributors: please follow the recommendations outlined at [keepachangelog.com]
 ## [Unreleased]
 *Please add entries here for your pull requests.*
 
+## [6.4.2] - 2017-1-17
+### Fixed
+- Added OS detection for install generator, system call for Windows and unit-tests for it. [#666](https://github.com/shakacode/react_on_rails/pull/666) by [GeorgeGorbanev](https://github.com/GeorgeGorbanev).
+
+## [6.4.1] - 2017-1-17
+No changes.
+
 ## [6.4.0] - 2017-1-12
 
 ### Possible Breaking Change
-- Since foreman is no longer a dependency of the React on Rails gem, please run `gem install foreman`. If you are using rvm, you may wish to run `rvm @global do gem install foreman` to install foreman for all your gemsets. 
+- Since foreman is no longer a dependency of the React on Rails gem, please run `gem install foreman`. If you are using rvm, you may wish to run `rvm @global do gem install foreman` to install foreman for all your gemsets.
 
 ### Fixed
 - Removed foreman as a dependency. [#678](https://github.com/shakacode/react_on_rails/pull/678) by [x2es](https://github.com/x2es).
@@ -428,7 +435,9 @@ Best done with Object destructing:
 ##### Fixed
 - Fix several generator related issues.
 
-[Unreleased]: https://github.com/shakacode/react_on_rails/compare/6.4.0...master
+[Unreleased]: https://github.com/shakacode/react_on_rails/compare/6.4.2...master
+[6.4.2]: https://github.com/shakacode/react_on_rails/compare/6.4.1...6.4.2
+[6.4.1]: https://github.com/shakacode/react_on_rails/compare/6.4.0...6.4.1
 [6.4.0]: https://github.com/shakacode/react_on_rails/compare/6.3.5...6.4.0
 [6.3.5]: https://github.com/shakacode/react_on_rails/compare/6.3.4...6.3.5
 [6.3.4]: https://github.com/shakacode/react_on_rails/compare/6.3.3...6.3.4

lib/generators/react_on_rails/install_generator.rb

@@ -64,15 +64,15 @@ def installation_prerequisites_met?
       end
 
       def missing_npm?
-        return false unless `which npm`.blank?
+        return false unless ReactOnRails::Utils.running_on_windows? ? `where npm`.blank? : `which npm`.blank?
         error = "npm is required. Please install it before continuing. "
         error << "https://www.npmjs.com/"
         GeneratorMessages.add_error(error)
         true
       end
 
       def missing_node?
-        return false unless `which node`.blank?
+        return false unless ReactOnRails::Utils.running_on_windows? ? `where node`.blank? : `which node`.blank?
         error = "** nodejs is required. Please install it before continuing. "
         error << "https://nodejs.org/en/"
         GeneratorMessages.add_error(error)

lib/react_on_rails/utils.rb

@@ -20,6 +20,10 @@ def self.default_server_bundle_js_file_path
                 ReactOnRails.configuration.server_bundle_js_file)
     end
 
+    def self.running_on_windows?
+      (/cygwin|mswin|mingw|bccwin|wince|emx/ =~ RUBY_PLATFORM) != nil
+    end
+
     module Required
       def required(arg_name)
         raise ArgumentError, "#{arg_name} is required"

spec/react_on_rails/generators/install_generator_spec.rb

@@ -111,4 +111,68 @@
         .to include(GeneratorMessages.format_info(expected))
     end
   end
+
+  context "detect existing bin-files on *nix" do
+    before(:all) { @install_generator = InstallGenerator.new }
+
+    specify "when node is exist" do
+      stub_const("RUBY_PLATFORM", "linux")
+      allow(@install_generator).to receive(:`).with("which node").and_return("/path/to/bin")
+      expect(@install_generator.send(:missing_node?)).to eq false
+    end
+
+    specify "when npm is exist" do
+      stub_const("RUBY_PLATFORM", "linux")
+      allow(@install_generator).to receive(:`).with("which npm").and_return("/path/to/bin")
+      expect(@install_generator.send(:missing_npm?)).to eq false
+    end
+  end
+
+  context "detect missing bin-files on *nix" do
+    before(:all) { @install_generator = InstallGenerator.new }
+
+    specify "when node is missing" do
+      stub_const("RUBY_PLATFORM", "linux")
+      allow(@install_generator).to receive(:`).with("which node").and_return("")
+      expect(@install_generator.send(:missing_node?)).to eq true
+    end
+
+    specify "when npm is missing" do
+      stub_const("RUBY_PLATFORM", "linux")
+      allow(@install_generator).to receive(:`).with("which npm").and_return("")
+      expect(@install_generator.send(:missing_npm?)).to eq true
+    end
+  end
+
+  context "detect existing bin-files on windows" do
+    before(:all) { @install_generator = InstallGenerator.new }
+
+    specify "when node is exist" do
+      stub_const("RUBY_PLATFORM", "mswin")
+      allow(@install_generator).to receive(:`).with("where node").and_return("/path/to/bin")
+      expect(@install_generator.send(:missing_node?)).to eq false
+    end
+
+    specify "when npm is exist" do
+      stub_const("RUBY_PLATFORM", "mswin")
+      allow(@install_generator).to receive(:`).with("where npm").and_return("/path/to/bin")
+      expect(@install_generator.send(:missing_npm?)).to eq false
+    end
+  end
+
+  context "detect missing bin-files on windows" do
+    before(:all) { @install_generator = InstallGenerator.new }
+
+    specify "when node is missing" do
+      stub_const("RUBY_PLATFORM", "mswin")
+      allow(@install_generator).to receive(:`).with("where node").and_return("")
+      expect(@install_generator.send(:missing_node?)).to eq true
+    end
+
+    specify "when npm is missing" do
+      stub_const("RUBY_PLATFORM", "mswin")
+      allow(@install_generator).to receive(:`).with("where npm").and_return("")
+      expect(@install_generator.send(:missing_npm?)).to eq true
+    end
+  end
 end