linkey 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b94c57d6ea72b04ee98820691f8bc15c203232a
-  data.tar.gz: 3db6a0e7ef0533d89688b044f73b3b457e926ce3
+  metadata.gz: 7cf7d38db7c5c755398ed59a5523d7d33051e1d8
+  data.tar.gz: 8b4751d3e83b5021b1a794b99e7389d51003f960
 SHA512:
-  metadata.gz: 61ad15a2d2cc0b56ec2eb59b4762bec6c6b77d9c7815582dade5bfee497587f486db30560fe20824e5940a3648fedfbb69ef04c37a6b80b4df8a77d3460a7f8b
-  data.tar.gz: a3d66df5a6378ccd868567726c2c62a3876e262a3d978a3fef80c1991ac6904f9b47df628b757a8373f0986649142653c88b863b49bfe3dfb04510ff15580842
+  metadata.gz: 6c9780f42a16f54e4f9c5a272e72ecd5b3d0fe798e834ec1d9722709f533e965e4a9e5a8d338df667334d07bd7e630d14b1434e14bdac343a0a03f125cbbc181
+  data.tar.gz: 4dea5a21089542399ae016d129ca922fb9ed36071a404d2b1d78f12187aa8927e3fc0070b0c8690d97de64ab11c5529605a3143c246a897f2c7bd336194895d5

data/.rubocop.yml

@@ -1,3 +1,7 @@
+AllCops:
+  Exclude:
+    - "**/*.gemspec"
+
 Lint/SpaceBeforeFirstArg:
   Severity: fatal
   Enabled: true
@@ -33,6 +37,10 @@ Style/BracesAroundHashParameters:
   Severity: fatal
   Enabled: true
 
+ClassAndModuleChildren:
+  Severity: fatal
+  Enabled: true
+
 Style/ConstantName:
   Severity: fatal
   Enabled: true

data/lib/linkey.rb

@@ -1,10 +1,6 @@
 require "linkey/version"
 require "yaml"
-require "parallel"
 require "typhoeus"
-require "faraday"
-require "typhoeus/adapters/faraday"
-require 'faraday_middleware'
 
 module Linkey
   autoload :CLI, "linkey/cli"
@@ -72,27 +68,45 @@ module Linkey
   end
 
   class Getter
+    HYDRA = Typhoeus::Hydra.new(:max_concurrency => 100)
+
     def self.status(urls, base, headers = {}, status_code = 200)
       @output = []
       puts "Checking..."
 
-      Parallel.each(urls, :in_threads => 4) do |page_path|
-        request = Faraday.new(:url => base, :ssl => { :verify => false }, :headers => headers[:headers]) do |faraday|
-          faraday.use FaradayMiddleware::FollowRedirects
-          faraday.adapter :typhoeus
+      options = { :followlocation => true, :ssl_verifypeer => false, :headers => headers[:headers] }
+
+      requests = urls.map do |page_paths|
+        begin
+          request = Typhoeus::Request.new(base + page_paths, options)
+          HYDRA.queue(request)
+          request
+        rescue
+          puts "Error with URL #{page_paths}, please check config"
         end
-        status = request.get(page_path).status
-        make_request(page_path, base, status, status_code)
       end
+
+      HYDRA.run
+
+      requests.map do |request|
+        begin
+          status = request.response.code
+          url = request.response.options[:effective_url]
+          make_request(url, status, status_code)
+        rescue
+          puts "Unable to get status code"
+        end
+      end
+
       check_for_broken
     end
 
-    def self.make_request(page_path, base, status, status_code)
+    def self.make_request(url, status, status_code)
       if status != status_code
-        puts "Status is NOT GOOD for #{base}#{page_path}, response is #{status}"
-        @output << page_path
+        puts "Status is NOT GOOD for #{url}, response is #{status}"
+        @output << url
       else
-        puts "Status is #{status} for #{base}#{page_path}"
+        puts "Status is #{status} for #{url}"
       end
     end
 
@@ -102,7 +116,7 @@ module Linkey
         puts 'URL\'s are good, All Done!'
         exit 0
       else
-        puts "Buddy, you got a broken link"
+        puts "Buddy, you got a bad link"
         puts @output
         exit 1
       end

data/lib/linkey/version.rb

@@ -1,3 +1,3 @@
 module Linkey
-  VERSION = "1.2.0"
+  VERSION = "1.3.0"
 end

data/linkey.gemspec

@@ -18,8 +18,5 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "thor"
-  spec.add_runtime_dependency "parallel"
   spec.add_runtime_dependency "typhoeus"
-  spec.add_runtime_dependency "faraday"
-  spec.add_runtime_dependency "faraday_middleware"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: linkey
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Dave Blooman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-17 00:00:00.000000000 Z
+date: 2015-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -24,20 +24,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: parallel
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: typhoeus
   requirement: !ruby/object:Gem::Requirement
@@ -52,34 +38,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: faraday
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: faraday_middleware
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Linkey
 email:
 - david.blooman@gmail.com