removed duplication of core files

lib/wraith/cli.rb

@@ -14,20 +14,20 @@ class Wraith::CLI < Thor
   attr_accessor :config_name
 
   def self.source_root
-    File.expand_path("../../../templates/", __FILE__)
+    File.expand_path("../../../", __FILE__)
   end
 
   desc "setup", "creates config folder and default config"
   def setup
-    template("configs/config.yaml", "configs/config.yaml")
-    template("javascript/snap.js", "javascript/snap.js")
+    template("configs/templates/config.yaml", "configs/config.yaml")
+    template("lib/wraith/javascript/snap.js", "javascript/snap.js")
   end
 
   desc "setup_casper", "creates config folder and default config for casper"
   def setup_casper
-    template("configs/component.yaml", "configs/component.yaml")
-    template("javascript/casper.js", "javascript/casper.js")
-    template("javascript/beforeCapture.js", "javascript/beforeCapture.js")
+    template("configs/templates/component.yaml", "configs/component.yaml")
+    template("lib/wraith/javascript/casper.js", "javascript/casper.js")
+    template("lib/wraith/javascript/beforeCapture.js", "javascript/beforeCapture.js")
   end
 
   desc "reset_shots [config_name]", "removes all the files in the shots folder"

lib/wraith/javascript/casper.js

@@ -7,14 +7,42 @@ var url = casper.cli.get(0);
 var view_port_width = casper.cli.get(1);
 var image_name = casper.cli.get(2);
 var selector = casper.cli.get(3);
+var globalBeforeCaptureJS = casper.cli.get(4);
+var pathBeforeCaptureJS = casper.cli.get(5);
 
-casper.start(url, function() {
-  this.viewport(view_port_width, 1500).then(function(){
-    this.wait(2000, function() {
-      this.captureSelector(image_name, selector);
-      console.log('Snapping ' + url + ' at width ' + view_port_width);
-    });
+function snap() {
+  if (selector == undefined) {
+    this.capture(image_name);
+  }
+  else {
+    this.captureSelector(image_name, selector);
+  }
+  console.log('Snapping ' + url + ' at width ' + view_port_width);
+}
+
+casper.start();
+casper.open(url);
+casper.viewport(view_port_width, 1500);
+casper.then(function() {
+  if (globalBeforeCaptureJS) {
+    require('./' + globalBeforeCaptureJS)(this);
+  }
+});
+casper.then(function() {
+  if (pathBeforeCaptureJS) {
+    require('./' + pathBeforeCaptureJS)(this);
+  }
+});
+// waits for all images to download before taking screenshots
+// (broken images are a big cause of Wraith failures!)
+// Credit: http://reff.it/8m3HYP
+casper.waitFor(function() {
+  return this.evaluate(function() {
+    var images = document.getElementsByTagName('img');
+    return Array.prototype.every.call(images, function(i) { return i.complete; });
   });
+}, function then () {
+  snap.bind(this)();
 });
 
 casper.run();