learn-co 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 34448b9d97446002e6fbc78655f02f5efe881a5f
-  data.tar.gz: 0651b33c999c105f72f7b0cfb064a3fc806a6e47
+  metadata.gz: cc8b9c2023ac3e8a100f64fe06afaefc9f76c993
+  data.tar.gz: 22e8f9e293483fae528242e0b959ef2738e31ebc
 SHA512:
-  metadata.gz: 4cd341a55af8084d4525baf09728ce50e8659b69169bb261da21b7b2c31945339723b1033ef79a0a35fbc21e4bf4e39d20a9464e9f6cb53a7e6c21c79b5b27f9
-  data.tar.gz: e468526d0e4b35d129a5ac21984099e199a34a22e96fd8d69ec81ec86d5af985ef757a0c2671a3d40d759cf132b7544fbf81619121f5a921b035a8e85028dc53
+  metadata.gz: 67ac18038bfb615cf0a7984684d0570c4eff0f76b63ce4a2c0fa4ba7dae098269699740bb55f934396aa1aa8616c946eadd9e8c2aefc75166ff0bd1ed6f8f909
+  data.tar.gz: 8eb3e6460c650ce66ee5cfbc50a84507329236bb7c1d4a20edbc4eb52de6fa1cc06388b011087ca24763755a7dc0f243214ee4966140e802420eb96d3f1103b1

data/lib/learn/jasmine/phantom_checker.rb

@@ -6,12 +6,18 @@ module Learn
       end
 
       def check_installation
-        if !brew_installed?
-          puts "You must have Homebrew installed."
-          exit
+        if running_on_mac?
+          if !brew_installed?
+            puts "You must have Homebrew installed."
+            exit
+          else
+            if !phantom_installed_on_mac?
+              install_phantomjs
+            end
+          end
         else
-          if !phantom_installed?
-            install_phantomjs
+          if !phantom_installed_on_linux?
+            puts "You must have PhantomJS installed: http://phantomjs.org/download.html"
           end
         end
       end
@@ -20,13 +26,29 @@ module Learn
         !`which brew`.empty?
       end
 
-      def phantom_installed?
+      def phantom_installed_on_mac?
+        phantom_installed_by_brew? || phantom_installed?
+      end
+
+      def phantom_installed_on_linux?
+        phantom_installed?
+      end
+
+      def phantom_installed_by_brew?
         !`brew ls --versions phantomjs`.empty?
       end
 
+      def phantom_installed?
+        !`which phantomjs`.empty?
+      end
+
       def install_phantomjs
         `brew install phantomjs`
       end
+
+      def running_on_mac?
+        !!RUBY_PLATFORM.match(/darwin/)
+      end
     end
   end
 end

data/lib/learn/version.rb

@@ -1,3 +1,3 @@
 module Learn
-  VERSION = "1.0.3"
+  VERSION = "1.0.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: learn-co
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Flatiron School
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-06 00:00:00.000000000 Z
+date: 2015-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler