phantomjs 1.6.0.0 → 1.8.1.0

data/.travis.yml

@@ -0,0 +1,11 @@
+script:
+  - bundle
+  - bundle exec rspec
+rvm:
+  - 1.9.3
+  - 2.0.0
+  - rbx-19mode
+notifications:
+  email:
+    on_success: always
+    on_failure: always

data/README.md

@@ -9,7 +9,7 @@ It keeps installations of phantomjs in `$HOME/.phantomjs/VERSION/PLATFORM`. When
 will return the path to the phantomjs executable in there. If that is not present, it will first fetch and
 install the prebuilt packages suitable for the current plattform (currently Linux 32/64 or OS X supported).
 
-You will need `wget` on your system. For extraction, `bunzip2` and `tar` are required on Linux, and `unzip`
+You will need `cURL` or `wget` on your system. For extraction, `bunzip2` and `tar` are required on Linux, and `unzip`
 on OS X. They should be installed already.
 
 **TL;DR:** Instead of manually installing phantomjs on your machines, use this gem. It will take care of it.
@@ -40,6 +40,8 @@ the Poltergeist capybara driver to use the phantomjs package from this gem:
       Capybara::Poltergeist::Driver.new(app, :phantomjs => Phantomjs.path)
     end
 
+Check out [the poltergeist docs](https://www.ruby-toolbox.com/gems/phantomjs) for all the options you can pass in there.
+
 ## A note about versions.
 
 The gem version consists of 4 digits: The first 3 indicate the phantomjs release installed via this gem,

data/lib/phantomjs/platform.rb

@@ -10,11 +10,29 @@ module Phantomjs
       end
 
       def phantomjs_path
-        File.expand_path File.join(Phantomjs.base_dir, platform, 'bin/phantomjs')
+        if system_phantomjs_installed?
+          system_phantomjs_path
+        else
+          File.expand_path File.join(Phantomjs.base_dir, platform, 'bin/phantomjs')
+        end
+      end
+
+      def system_phantomjs_path
+        `which phantomjs`.delete("\n")
+      rescue
+      end
+
+      def system_phantomjs_version
+        `phantomjs --version`.delete("\n")
+      rescue
+      end
+
+      def system_phantomjs_installed?
+        system_phantomjs_version == Phantomjs.version
       end
 
       def installed?
-        File.exist? phantomjs_path
+        File.exist?(phantomjs_path) || system_phantomjs_installed?
       end
 
       # TODO: Clean this up, it looks like a pile of...
@@ -29,8 +47,8 @@ module Phantomjs
         FileUtils.mkdir_p temp_dir
 
         Dir.chdir temp_dir do
-          unless system "wget #{package_url}"
-            raise "Failed to load phantomjs from #{package_url} :("
+          unless system "curl -O #{package_url}" or system "wget #{package_url}"
+            raise "\n\nFailed to load phantomjs! :(\nYou need to have cURL or wget installed on your system.\nIf you have, the source of phantomjs might be unavailable: #{package_url}\n\n"
           end
 
           case package_url.split('.').last
@@ -47,10 +65,14 @@ module Phantomjs
           extracted_dir = Dir['phantomjs*'].find { |path| File.directory?(path) }
 
           # Move the extracted phantomjs build to $HOME/.phantomjs/version/platform
-          FileUtils.mv extracted_dir, File.join(Phantomjs.base_dir, platform)
+          if FileUtils.mv extracted_dir, File.join(Phantomjs.base_dir, platform)
+            STDOUT.puts "\nSuccessfully installed phantomjs. Yay!"
+          end
 
           # Clean up remaining files in tmp
-          FileUtils.rm_rf temp_dir
+          if FileUtils.rm_rf temp_dir
+            STDOUT.puts "Removed temporarily downloaded files."
+          end
         end
 
         raise "Failed to install phantomjs. Sorry :(" unless File.exist?(phantomjs_path)
@@ -72,7 +94,7 @@ module Phantomjs
         end
 
         def package_url
-          'http://phantomjs.googlecode.com/files/phantomjs-1.6.0-linux-x86_64-dynamic.tar.bz2'
+          'http://phantomjs.googlecode.com/files/phantomjs-1.8.1-linux-x86_64.tar.bz2'
         end
       end
     end
@@ -88,7 +110,7 @@ module Phantomjs
         end
 
         def package_url
-          'http://phantomjs.googlecode.com/files/phantomjs-1.6.0-linux-i686-dynamic.tar.bz2'
+          'http://phantomjs.googlecode.com/files/phantomjs-1.8.1-linux-i686.tar.bz2'
         end
       end
     end
@@ -104,7 +126,7 @@ module Phantomjs
         end
 
         def package_url
-          'http://phantomjs.googlecode.com/files/phantomjs-1.6.0-macosx-static.zip'
+          'http://phantomjs.googlecode.com/files/phantomjs-1.8.1-macosx.zip'
         end
       end
     end

data/lib/phantomjs/version.rb

@@ -1,3 +1,3 @@
 module Phantomjs
-  VERSION = "1.6.0.0"
+  VERSION = "1.8.1.0"
 end

data/phantomjs.gemspec

@@ -8,9 +8,11 @@ Gem::Specification.new do |gem|
   gem.summary       = %q{Auto-install phantomjs on demand for current platform. Comes with poltergeist integration.}
   gem.homepage      = "https://github.com/colszowka/phantomjs-gem"
 
-  gem.add_development_dependency 'rspec', "~> 2.10.0"
-  gem.add_development_dependency 'poltergeist'
+  gem.add_runtime_dependency 'poltergeist'
+
+  gem.add_development_dependency 'rspec', ">= 2.11.0"
   gem.add_development_dependency 'simplecov'
+  gem.add_development_dependency 'rake'
 
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

data/spec/platform_spec.rb

@@ -2,6 +2,25 @@ require 'spec_helper'
 
 describe Phantomjs::Platform do
   before(:each) { Phantomjs.reset! }
+  describe "with a system install present" do
+    describe "#system_phantomjs_installed?" do
+      it "is true when the system version matches Phantomjs.version" do
+        Phantomjs::Platform.should_receive(:system_phantomjs_version).and_return(Phantomjs.version)
+        expect(Phantomjs::Platform.system_phantomjs_installed?).to be_true
+      end
+
+      it "is false when the system version does not match Phantomjs.version" do
+        Phantomjs::Platform.should_receive(:system_phantomjs_version).and_return('1.2.3')
+        expect(Phantomjs::Platform.system_phantomjs_installed?).to be_false
+      end
+
+      it "is false when there's no system version" do
+        Phantomjs::Platform.should_receive(:system_phantomjs_version).and_return(nil)
+        expect(Phantomjs::Platform.system_phantomjs_installed?).to be_false
+      end
+    end
+  end
+
   describe "on a 64 bit linux" do
     before do
       Phantomjs::Platform.stub(:host_os).and_return('linux-gnu')
@@ -12,8 +31,23 @@ describe Phantomjs::Platform do
       Phantomjs::Platform::Linux64.should be_useable
     end
 
-    it "returns the correct phantom js executable path for the platform" do
-      Phantomjs.path.should =~ /x86_64-linux\/bin\/phantomjs$/
+    describe "without system install" do
+      before(:each) { Phantomjs::Platform.stub(:system_phantomjs_version).and_return(nil) }
+
+      it "returns the correct phantom js executable path for the platform" do
+        Phantomjs.path.should =~ /x86_64-linux\/bin\/phantomjs$/
+      end
+    end
+
+    describe "with system install" do
+      before(:each) do
+        Phantomjs::Platform.stub(:system_phantomjs_version).and_return(Phantomjs.version)
+        Phantomjs::Platform.stub(:system_phantomjs_path).and_return('/tmp/path')
+      end
+
+      it "returns the correct phantom js executable path for the platform" do
+        expect(Phantomjs.path).to be == '/tmp/path'
+      end
     end
 
     it "reports the Linux32 platform as unuseable" do
@@ -41,8 +75,23 @@ describe Phantomjs::Platform do
       Phantomjs::Platform::Linux32.should be_useable
     end
 
-    it "returns the correct phantom js executable path for the platform" do
-      Phantomjs.path.should =~ /x86_32-linux\/bin\/phantomjs$/
+    describe "without system install" do
+      before(:each) { Phantomjs::Platform.stub(:system_phantomjs_version).and_return(nil) }
+
+      it "returns the correct phantom js executable path for the platform" do
+        Phantomjs.path.should =~ /x86_32-linux\/bin\/phantomjs$/
+      end
+    end
+
+    describe "with system install" do
+      before(:each) do
+        Phantomjs::Platform.stub(:system_phantomjs_version).and_return(Phantomjs.version)
+        Phantomjs::Platform.stub(:system_phantomjs_path).and_return('/tmp/path')
+      end
+
+      it "returns the correct phantom js executable path for the platform" do
+        expect(Phantomjs.path).to be == '/tmp/path'
+      end
     end
 
     it "reports the Linux64 platform as unuseable" do
@@ -64,8 +113,23 @@ describe Phantomjs::Platform do
       Phantomjs::Platform::OsX.should be_useable
     end
 
-    it "returns the correct phantom js executable path for the platform" do
-      Phantomjs.path.should =~ /darwin\/bin\/phantomjs$/
+    describe "without system install" do
+      before(:each) { Phantomjs::Platform.stub(:system_phantomjs_version).and_return(nil) }
+
+      it "returns the correct phantom js executable path for the platform" do
+        Phantomjs.path.should =~ /darwin\/bin\/phantomjs$/
+      end
+    end
+
+    describe "with system install" do
+      before(:each) do
+        Phantomjs::Platform.stub(:system_phantomjs_version).and_return(Phantomjs.version)
+        Phantomjs::Platform.stub(:system_phantomjs_path).and_return('/tmp/path')
+      end
+
+      it "returns the correct phantom js executable path for the platform" do
+        expect(Phantomjs.path).to be == '/tmp/path'
+      end
     end
 
     it "reports the Linux32 Platform as unuseable" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phantomjs
 version: !ruby/object:Gem::Version
-  version: 1.6.0.0
+  version: 1.8.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,26 +9,42 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-20 00:00:00.000000000 Z
+date: 2013-02-28 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: poltergeist
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.10.0
+        version: 2.11.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.10.0
+        version: 2.11.0
 - !ruby/object:Gem::Dependency
-  name: poltergeist
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -44,7 +60,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -70,6 +86,7 @@ files:
 - .gitignore
 - .rspec
 - .simplecov
+- .travis.yml
 - Gemfile
 - LICENSE
 - README.md
@@ -94,15 +111,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3414073590874210701
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3414073590874210701
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Auto-install phantomjs on demand for current platform. Comes with poltergeist
@@ -111,4 +134,3 @@ test_files:
 - spec/phantomjs_spec.rb
 - spec/platform_spec.rb
 - spec/spec_helper.rb
-has_rdoc: