gastly 0.2.4 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 72868583159f8e35a055086dbba4130ad364589e
-  data.tar.gz: 7f86570ddc94846083a66fddc3e20234ae7ecef6
+  metadata.gz: 61481db693dd21bbbe481bc40e94cda224eeb786
+  data.tar.gz: 406d4be2fa87cb64536a8e687a1935b965e3227a
 SHA512:
-  metadata.gz: 3fe604a0a919d5d76a6be7358074e1348da096919c4db9217361d23fca30efc4d39a55d5e491772a692a87f521060a003be5c9a5820570bb9191a10b4a8bfa14
-  data.tar.gz: da9a98e0fe76658bb2a779623205e0628124c5138e0dd564c2bfe09b014e4ecf227913c7b4918f99b10991ba908d495735eef9741eadbdb313979a9feb6c4951
+  metadata.gz: 6350109f7427759e9ea898cd7caa9965efb869ce2bfd2f3c4b7dfbf02b58a9a49aaf9d94d35fc7ec387f5db9b51693d1d6ef91eb8dc7f953430b388057c153a1
+  data.tar.gz: adac8e9e13cd50ccd1b8a3bc4c1ae44a20c39057e18c7ed078116dc24bc3a3cf9fc80e2bc65cf25fcc16444d1b64ab5350bc788450ff4894d32afd691ed5c56d

data/.ruby-version

@@ -1 +1 @@
-2.2.3
+2.2.4

data/.travis.yml

@@ -1,11 +1,5 @@
-dist: trusty
 language: ruby
 rvm:
   - 2.1.7
-  - 2.2.3
+  - 2.2.4
   - 2.3.0
-before_install:
-  - mkdir travis-phantomjs
-  - wget https://s3.amazonaws.com/travis-phantomjs/phantomjs-2.0.0-ubuntu-12.04.tar.bz2 -O $PWD/travis-phantomjs/phantomjs-2.0.0-ubuntu-12.04.tar.bz2
-  - tar -xvf $PWD/travis-phantomjs/phantomjs-2.0.0-ubuntu-12.04.tar.bz2 -C $PWD/travis-phantomjs
-  - export PATH=$PWD/travis-phantomjs:$PATH

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.3.0 (29/01/2016)
+
+### Enhancements
+
+* Update PhantomJS version to 2.1.1
+
 ## 0.2.4 (24/01/2016)
 
 ### Enhancements

data/gastly.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rubocop'
   spec.add_development_dependency 'rspec', '~> 3.4.0'
 
-  spec.add_dependency 'phantomjs2', '~> 2.0'
+  spec.add_dependency 'phantomjs', '~> 2.1.1'
   spec.add_dependency 'mini_magick', '~> 4.2'
   spec.add_dependency 'activesupport', '>= 3.1'
 end

data/lib/gastly.rb

@@ -3,6 +3,7 @@ require 'mini_magick'
 require 'active_support/core_ext/hash/keys'
 require 'active_support/core_ext/object/blank'
 
+require_relative 'gastly/phantomjs_patch'
 require_relative 'gastly/image'
 require_relative 'gastly/screenshot'
 require_relative 'gastly/exceptions'

data/lib/gastly/phantomjs_patch.rb

@@ -0,0 +1,79 @@
+module Phantomjs
+  class << self
+    attr_accessor :proxy_host, :proxy_port
+  end
+
+  class Platform
+    class << self
+      def install!
+        STDERR.puts "Phantomjs does not appear to be installed in #{phantomjs_path}, installing!"
+        FileUtils.mkdir_p Phantomjs.base_dir
+
+        # Purge temporary directory if it is still hanging around from previous installs,
+        # then re-create it.
+        temp_dir = File.join(temp_path, 'phantomjs_install')
+        FileUtils.rm_rf temp_dir
+        FileUtils.mkdir_p temp_dir
+
+        Dir.chdir temp_dir do
+          unless download_via_curl or download_via_wget
+            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
+            when 'bz2'
+              system "bunzip2 #{File.basename(package_url)}"
+              system "tar xf #{File.basename(package_url).sub(/\.bz2$/, '')}"
+            when 'zip'
+              system "unzip #{File.basename(package_url)}"
+            else
+              raise "Unknown compression format for #{File.basename(package_url)}"
+          end
+
+          # Find the phantomjs build we just extracted
+          extracted_dir = Dir['phantomjs*'].find { |path| File.directory?(path) }
+
+          if extracted_dir.nil?
+            # Move the executable file
+            FileUtils.mkdir_p File.join(Phantomjs.base_dir, platform, 'bin')
+            if FileUtils.mv 'phantomjs', File.join(Phantomjs.base_dir, platform, 'bin')
+              STDOUT.puts "\nSuccessfully installed phantomjs. Yay!"
+            end
+          else
+            # Move the extracted phantomjs build to $HOME/.phantomjs/version/platform
+            if FileUtils.mv extracted_dir, File.join(Phantomjs.base_dir, platform)
+              STDOUT.puts "\nSuccessfully installed phantomjs. Yay!"
+            end
+          end
+
+          # Clean up remaining files in tmp
+          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)
+      end
+
+      private
+
+      def download_via_curl
+        system "curl -L -O #{package_url} #{curl_proxy_options}"
+      end
+
+      def download_via_wget
+        system "wget #{package_url} #{wget_proxy_options}"
+      end
+
+      def curl_proxy_options
+        return '' if Phantomjs.proxy_host.nil? && Phantomjs.proxy_port.nil?
+        "-x #{Phantomjs.proxy_host}:#{Phantomjs.proxy_port}"
+      end
+
+      def wget_proxy_options
+        return '' if Phantomjs.proxy_host.nil? && Phantomjs.proxy_port.nil?
+        "-e use_proxy=yes -e http_proxy=#{Phantomjs.proxy_host}:#{Phantomjs.proxy_port}"
+      end
+    end
+  end
+end

data/lib/gastly/version.rb

@@ -1,3 +1,3 @@
 module Gastly
-  VERSION = '0.2.4'
+  VERSION = '0.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gastly
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.3.0
 platform: ruby
 authors:
 - Mikhail Grachev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-24 00:00:00.000000000 Z
+date: 2016-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -67,19 +67,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.4.0
 - !ruby/object:Gem::Dependency
-  name: phantomjs2
+  name: phantomjs
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.1.1
 - !ruby/object:Gem::Dependency
   name: mini_magick
   requirement: !ruby/object:Gem::Requirement
@@ -132,6 +132,7 @@ files:
 - lib/gastly.rb
 - lib/gastly/exceptions.rb
 - lib/gastly/image.rb
+- lib/gastly/phantomjs_patch.rb
 - lib/gastly/screenshot.rb
 - lib/gastly/script.js
 - lib/gastly/version.rb