Add Travis check to library

7akimz · Apr 5, 2012 · bcc2bdf · bcc2bdf
1 parent 44d2914
commit bcc2bdf
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -8,5 +8,6 @@ before_install:
   - sudo apt-get install cutycapt -y
 before_script:
   - "export DISPLAY=:99.0"
+  - "export TRAVIS=true"
   - "sh -e /etc/init.d/xvfb start"
   - "which cutycapt"
diff --git a/lib/capit/capture.rb b/lib/capit/capture.rb
@@ -117,14 +117,18 @@ def capture_command
       cmd += " --min-height='#{@min_height}'"
 
 
-      if determine_os == :linux and check_xvfb
+      if determine_os == :linux and check_xvfb and not_travis
         xvfb = 'xvfb-run --server-args="-screen 99, 1024x768x24" '
         xvfb.concat(cmd)
       else
         cmd
       end        
     end
 
+    def not_travis
+      !ENV.include? "TRAVIS"
+    end
+
     def check_xvfb
       !(`which xvfb-run`.empty?)
     end