cohesion 0.0.5 → 0.0.6

data/.rvmrc

@@ -6,7 +6,7 @@
 # First we specify our desired <ruby>[@<gemset>], the @gemset name is optional,
 # Only full ruby name is supported here, for short names use:
 #     echo "rvm use 1.9.3" > .rvmrc
-environment_id="ruby-1.9.3-p125@cohesion"
+environment_id="ruby-1.9.3@cohesion"
 
 # Uncomment the following lines if you want to verify rvm version per project
 # rvmrc_rvm_version="1.10.3" # 1.10.1 seams as a safe start

data/Gemfile

@@ -3,7 +3,7 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in cohesion.gemspec
 gemspec
 
-gem "cobweb", ">= 1.0.8"
+gem "cobweb", ">= 1.0.10"
 
 gem 'rspec'
 gem 'awesome_print'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cohesion (0.0.4)
+    cohesion (0.0.5)
       cobweb
       ptools
 
@@ -10,7 +10,7 @@ GEM
   specs:
     addressable (2.3.2)
     awesome_print (1.1.0)
-    cobweb (1.0.8)
+    cobweb (1.0.10)
       addressable
       awesome_print
       haml
@@ -25,9 +25,10 @@ GEM
     daemons (1.1.9)
     diff-lcs (1.1.3)
     eventmachine (1.0.0)
-    haml (3.1.7)
+    haml (4.0.0)
+      tilt
     json (1.7.7)
-    multi_json (1.5.1)
+    multi_json (1.6.0)
     namespaced_redis (1.0.4)
       redis
     nokogiri (1.5.6)
@@ -70,7 +71,7 @@ PLATFORMS
 
 DEPENDENCIES
   awesome_print
-  cobweb (>= 1.0.8)
+  cobweb (>= 1.0.10)
   cohesion!
   ptools
   rspec

data/README.textile

@@ -21,7 +21,36 @@ h3. Executable
 
 Running from the command line has the following syntax
 
-bc. cohesion check http://your-site-to-check.com/
+bc. cohesion --url http://your-site-to-check.com/
+
+
+h4. Options
+
+Cohesion allows you to control the crawl through various command line options.  These are available through help (see below) and are listed here.
+
+
+  * --url <start_url>                               Url to start crawl from
+  * --internal_urls <url1,url2>                     List of url patterns to include
+  * --external_urls <exclude_url1, exclude_url2>    List of url patterns to exclude
+  * --seed_urls <seed_url1,seed_url2>               Seed urls
+  * --crawl_limit <number_of_urls>                  Limit the crawl to a number of urls
+  * --thread_count <number_of_threads>              Set the number of threads used
+  * --timeout <timeout_in_seconds>                  Sets the timeout for http requests
+  * --output <filename>                             Path to output data to
+
+  * -v, --verbose                                   Display crawl information
+  * -d, --debug                                     Display debug information
+  * -w, --web_statistics                            Start web stats server
+
+
+
+h4. Help
+
+Help with available options is available with --help
+
+bc. cohesion --help
+
+
 
 
 h3. Checking an external site

data/bin/cohesion

@@ -7,24 +7,37 @@ require 'cohesion'
 require 'slop'
 
 opts = Slop.parse(:help => true) do
-  banner 'Usage: cohesion check [options]'
+  banner 'Usage: cohesion [options]'
+
+  on 'url=', 'URL to start crawl from'
+  on 'internal_urls=', 'Url patterns to include', :as => Array
+  on 'external_urls=', 'Url patterns to exclude', :as => Array
+  on 'seed_urls=', "Seed urls", :as => Array
+  on 'crawl_limit=', 'Limit the crawl to a number of urls', :as => Integer
+  on 'thread_count=', "Set the number of threads used", :as => Integer
+  on 'timeout=', "Sets the timeout for http requests", :as => Integer
+
+  on 'output=', 'Path to output data to'
 
-  on 'u', 'url', 'URL to start crawl from'
-  on 'i', 'internal_urls', 'Url patterns to include', :as => Array
-  on 'e', 'external_urls', 'Url patterns to exclude', :as => Array
-  on 's', 'seed_urls', "Seed urls", :as => Array
   on 'v', 'verbose', 'Display crawl information'
   on 'd', 'debug', 'Display debug information'
-  on 'l', 'crawl_limit', 'Limit the crawl to a number of urls'
-  on 't', 'thread_count', "Set the number of threads used"
+  on 'w', 'web_statistics', 'Start web stats server'
 end
 
 if opts[:url]
-  failures = Cohesion::Check.site(opts[:url], opts)
 
+  options = opts.to_hash.delete_if { |k, v| v.nil? || k == :url}
+  ap options
+
+  failures = Cohesion::Check.site(opts[:url], options)
   if failures.count == 0
     exit(true)
   else
+    if opts[:output]
+      File.open(opts[:output], 'w') do |f|
+        f.write failures.to_json
+      end
+    end
     exit(false)
   end
 else

data/lib/cohesion.rb

@@ -78,14 +78,17 @@ module Cohesion
         end
       end
 
+      issues = []
       if failures.count == 0
         puts "All links working!"
       else
         puts "Failed urls:"
         failures.each do |f|
+          inbound_links = statistics.inbound_links_for(f[:url])
+          issues << {:issue => f, :inbound => inbound_links}
           puts ""
           puts "#{f[:url]} [ #{f[:status_code]} ]"
-          statistics.inbound_links_for(f[:url]).each do |inbound_link|
+          inbound_links.each do |inbound_link|
             puts "  - #{inbound_link}"
           end
         end
@@ -93,7 +96,7 @@ module Cohesion
       end
       puts
 
-      failures
+      return issues
     end
   end
 end

data/lib/cohesion/version.rb

@@ -1,3 +1,3 @@
 module Cohesion
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cohesion
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-12 00:00:00.000000000 Z
+date: 2013-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cobweb
-  requirement: &70138774814400 !ruby/object:Gem::Requirement
+  requirement: &70099176390280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70138774814400
+  version_requirements: *70099176390280
 - !ruby/object:Gem::Dependency
   name: ptools
-  requirement: &70138774813340 !ruby/object:Gem::Requirement
+  requirement: &70099176389260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70138774813340
+  version_requirements: *70099176389260
 description: Gem to test the cohesion of links within a rails site.  The gem crawls
   the site and checks that external and internal links are valid
 email: