Fix loading of railties; add specs for Rails::Server detection

CHANGELOG.md

@@ -115,3 +115,7 @@ Thanks to @sponomarev !
 * Added support for checking [scoped](https://docs.npmjs.com/misc/scope) npm modules (Thanks to @psdcoder !)
 
 * npmdc now starts only with `rails server` when using Rails (Thanks to @iskvmk !)
+
+### 0.5.1
+
+* Fix bug with server detection (always include Railtie in Rails)

lib/npmdc.rb

@@ -20,5 +20,5 @@ def configure
     end
   end
 
-  require "npmdc/railtie" if defined?(Rails::Server)
+  require "npmdc/railtie" if defined?(Rails)
 end

lib/npmdc/railtie.rb

@@ -12,6 +12,7 @@ class Railtie < Rails::Railtie # :nodoc:
     end
 
     initializer "npmdc.environment_check" do
+      next unless defined?(Rails::Server)
       unless config.npmdc.environments.include?(Rails.env)
         abort <<-END.strip_heredoc
           Npmdc is trying to be activated in the #{Rails.env} environment.
@@ -27,7 +28,7 @@ class Railtie < Rails::Railtie # :nodoc:
     end
 
     initializer "npmdc.call" do
-      Npmdc.call
+      Npmdc.call if defined?(Rails::Server)
     end
   end
 end

lib/npmdc/version.rb

@@ -1,3 +1,3 @@
 module Npmdc
-  VERSION = '0.5.0'
+  VERSION = '0.5.1'
 end

spec/railtie_spec.rb

@@ -63,43 +63,71 @@ def within_new_app(root = File.expand_path('../dummy', __FILE__))
         )
       end
 
-      it "aborts initialization" do
-        within_new_app do |app|
-          initializer = app.initializers.find { |i| i.name == name }
+      context "when Rails::Server is not defined" do
+        it "is skipped" do
+          within_new_app do |app|
+            initializer = app.initializers.find { |i| i.name == name }
+            expect(Rails).not_to receive(:env)
+            initializer.run(app)
+          end
+        end
+      end
 
-          expect_any_instance_of(described_class).to receive(:abort)
+      context "when Rails::Server is defined" do
+        before { stub_const("Rails::Server", double) }
 
-          initializer.run(app)
+        it "aborts initialization" do
+          within_new_app do |app|
+            initializer = app.initializers.find { |i| i.name == name }
+
+            expect_any_instance_of(described_class).to receive(:abort)
+
+            initializer.run(app)
+          end
         end
-      end
 
-      it "allows initialization" do
-        within_new_app do |app|
-          initializer = app.initializers.find { |i| i.name == name }
+        it "allows initialization" do
+          within_new_app do |app|
+            initializer = app.initializers.find { |i| i.name == name }
 
-          expect_any_instance_of(described_class).not_to receive(:abort)
+            expect_any_instance_of(described_class).not_to receive(:abort)
 
-          allow(app.config.npmdc).to receive(:environments).and_return(%w(test))
+            allow(app.config.npmdc).to receive(:environments).and_return(%w(test))
 
-          initializer.run(app)
+            initializer.run(app)
+          end
         end
       end
     end
 
     context "call" do
       let(:name) { 'npmdc.call'}
 
-      it "shows input" do
-        within_new_app do |app|
-          initializer = app.initializers.find { |i| i.name == name }
+      context "when Rails::Server is not defined" do
+        it "is skipped" do
+          within_new_app do |app|
+            initializer = app.initializers.find { |i| i.name == name }
+            expect(Npmdc).not_to receive(:call)
+            initializer.run(app)
+          end
+        end
+      end
+
+      context "when Rails::Server is defined" do
+        before { stub_const("Rails::Server", double) }
+
+        it "shows output" do
+          within_new_app do |app|
+            initializer = app.initializers.find { |i| i.name == name }
 
-          output_msg = <<-output.strip_heredoc
-            Checking dependencies:
-              ✗ foo
-              ✗ bar
-          output
+            output_msg = <<-output.strip_heredoc
+              Checking dependencies:
+                ✗ foo
+                ✗ bar
+            output
 
-          expect { initializer.run(app) }.to write_output(output_msg)
+            expect { initializer.run(app) }.to write_output(output_msg)
+          end
         end
       end
     end