bait 0.5.2 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9fe195857876671d375066afecae961fb185ccb1
-  data.tar.gz: 53d06eac61cdd882820ae351d40dab48f81fa55e
+  metadata.gz: 58891295fc38209a37141334e62a3a03561bcffc
+  data.tar.gz: 0aefe33c5cd7c7f2cbb9a3231a8258e196352f53
 SHA512:
-  metadata.gz: 29d4ae74154488fbb614dd99b00405bbf46cea6a0a526a31cadf581a54ee3a6093f7c3cece7c83652fe84282e5846a935a42c4dce9bb3ce360e4ca7dccfe06a2
-  data.tar.gz: 534f2278236b01cd6230c42d6b8a175f38ddfd68c775d3256b85c9376c2ff8b5f21e5b938f3fbbd98da5e9a680d936fea866b57d1b1ef1c45751657832b301af
+  metadata.gz: 1127e37a377f460b70fcdccec3a8b6491b6636b5cddfa6479475ea622ecda0f77623679572f23fc167927a90ab0841f040864106f37eb9a9409e62d73d3ef9ad
+  data.tar.gz: 5b544f86eca0307b17b5fb6e9547eea4659c9fc5e57ec8f76e14867bbcf9f673dda983321bf6eb7bfad91b7aa8e9f0febe4d4ace33015132637a077d096ed764

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bait (0.5.2)
+    bait (0.5.4)
       git
       haml
       moneta

data/README.md

@@ -118,11 +118,16 @@ bait_dir=$(dirname $0)
 project_dir="$bait_dir/.."
 cd $project_dir
 
-export BUNDLE_GEMFILE=$project_dir/Gemfile
+export BUNDLE_GEMFILE=./Gemfile
 
 echo "bundling"
 bundle install > /dev/null 2>&1
-bundle exec cucumber
+
+# The following will create screenshots and html report in report/
+# It will also output to the console as usual for display in bait
+SCREENSHOT_PATH=./report/ cucumber --format 'Calabash::Formatters::Html' \
+  --out report/index.html \
+  --format pretty --
 ```
 
 #### Other Projects

data/Rakefile

@@ -38,23 +38,24 @@ def git_dirty?
 end
 
 namespace :gem do
-  task :build => 'assets:precompile' do
+  task :build do
     `bundle install`
-    if git_dirty?
-      puts "dirty! commit first before building"
+    if !git_master?
+      puts "I'll only build the gem on the master branch"
     else
-      if git_master?
-        puts "On master branch"
-        `rspec spec`
-        if $?.exitstatus == 0
-          puts "Specs pass. you're ready"
-          puts `gem build bait.gemspec`
-          puts "Done! You can gem push that now"
-        else
-          puts "Uhh.. you have failing specs -- not building the gem"
-        end
+      puts "On master branch"
+      `rspec spec`
+      if $?.exitstatus != 0
+        puts "Uhh.. you have failing specs -- not building the gem"
       else
-        puts "I'll only build the gem on the master branch"
+        puts "Specs pass. you're ready"
+        Rake::Task['assets:precompile'].invoke
+        if git_dirty?
+          puts "Dirty working tree! Commit first before building!"
+          exit
+        end
+        puts `gem build bait.gemspec`
+        puts "Done! You can gem push that now"
       end
     end
   end

data/VERSION

@@ -1,3 +1,3 @@
-0.5.2
+0.5.4
 
 

data/app/js/build.coffee

@@ -47,6 +47,12 @@ window.Build =
         $('ul#builds').append html
       Build.DOM.init build.id
 
+  SimpleCov:
+    url: (id) ->
+      "/build/#{id}/coverage/index.html"
+    text: (truthy) ->
+      if truthy then "Coverage" else ""
+
   to_html: (build) ->
     """
     <li id="#{build.id}" class="build">
@@ -54,6 +60,9 @@ window.Build =
         <div class="status">#{build.status}</div>
         <a href="#{build.clone_url}">#{build.name}</a>
         <div class="ref">#{build.ref?=''}</div>
+        <a href="#{Build.SimpleCov.url(build.id)}"
+           class="simplecov">
+             #{Build.SimpleCov.text(build.simplecov)}</a>
       </div>
       <div class="output">
         <pre>#{build.output}</pre>

data/app/js/main.coffee

@@ -20,3 +20,7 @@ Zepto ($) ->
         header.attr "class", "header #{text}"
       remove: (id) ->
         Build.find(id).remove()
+      simplecov: (id, supported) ->
+        link = Build.find(id).find('.simplecov')
+        link.attr 'href', Build.SimpleCov.url(id)
+        link.text Build.SimpleCov.text(supported)

data/app/js/manual_clone.coffee

@@ -9,7 +9,7 @@ window.ManualClone =
         if not button.attr('disabled')
           button.attr('disabled', 'disabled')
           $.post '/build/create', {clone_url: input}, (response) ->
-            console.log response
+            field.val('')
             button.removeAttr('disabled')
       else
         alert "Enter a local path or remote url to a git repo, e.g.:\n

data/bin/bait

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-ENV['RACK_ENV'] = 'production'
+ENV['RACK_ENV'] ||= 'production'
 require 'rubygems'
 require 'bait/cli'
 Bait::CLI.send(ARGV[0] || :server)

data/lib/bait/api.rb

@@ -6,9 +6,15 @@ require 'json'
 require 'bait/pubsub'
 require 'bait/build'
 
-unless Bait.env == "production"
-  require 'sinatra/asset_snack'
+if Bait.env != "production"
+  require 'sinatra/asset_snack' 
   DYNAMIC_ASSETS = true
+  require 'fileutils'
+  public = File.join File.dirname(__FILE__), %w(public)
+  [%w(js application.js), %w(css application.css)].each do |i|
+    path = File.join(public, i)
+    FileUtils.rm(path) if File.exists?(path)
+  end
 end
 
 module Bait
@@ -72,5 +78,14 @@ module Bait
         end
       end
     end
+
+    ##
+    # SimpleCov Passthrough
+    get '/build/:id/coverage/*' do
+      build = Build.find params[:id]
+      if build.simplecov
+        send_file File.join(build.coverage_dir, params[:splat])
+      end
+    end
   end
 end

data/lib/bait/build.rb

@@ -1,6 +1,7 @@
 require 'bait/object'
 require 'bait/tester'
 require 'bait/build_helper'
+require 'bait/simplecov_support'
 require 'bait/pubsub'
 require 'bait/phase'
 require 'json'
@@ -8,10 +9,12 @@ require 'json'
 module Bait
   class Build < Bait::Object
     include Bait::BuildHelper
+    include Bait::SimpleCovSupport
 
     adapter :memory,
       Moneta.new(:YAML, :file => Bait.db_file('builds'))
 
+    attribute :simplecov, Boolean, default: false
     attribute :ref, String
     attribute :owner_name, String
     attribute :owner_email, String
@@ -60,7 +63,7 @@ module Bait
         end
         self.save
         self.broadcast(:status, self.status)
-        # good place to check for a coverage report
+        check_for_simplecov
       end.run!
     end
 

data/lib/bait/cli.rb

@@ -25,7 +25,10 @@ module Bait
         puts "Run 'bait init' to create it"
         exit 1
       else
-        system(script)
+        system script
+        status = $?.exitstatus
+        puts "exited with status #{status}"
+        exit status
       end
     end
 

data/lib/bait/public/js/application.js

@@ -81,8 +81,20 @@
         return Build.DOM.init(build.id);
       }
     },
+    SimpleCov: {
+      url: function(id) {
+        return "/build/" + id + "/coverage/index.html";
+      },
+      text: function(truthy) {
+        if (truthy) {
+          return "Coverage";
+        } else {
+          return "";
+        }
+      }
+    },
     to_html: function(build) {
-      return "<li id=\"" + build.id + "\" class=\"build\">\n  <div class=\"header " + build.status + "\">\n    <div class=\"status\">" + build.status + "</div>\n    <a href=\"" + build.clone_url + "\">" + build.name + "</a>\n    <div class=\"ref\">" + (build.ref != null ? build.ref : build.ref = '') + "</div>\n  </div>\n  <div class=\"output\">\n    <pre>" + build.output + "</pre>\n  </div>\n  <div class=\"actions\">\n    <a href=\"#\" class=\"remove\" data-url=\"/build/" + build.id + "\">Remove</a>\n    |\n    <a href=\"#\" class=\"retest\" data-url=\"/build/" + build.id + "/retest\">Retest</a>\n  </div>\n</li>";
+      return "<li id=\"" + build.id + "\" class=\"build\">\n  <div class=\"header " + build.status + "\">\n    <div class=\"status\">" + build.status + "</div>\n    <a href=\"" + build.clone_url + "\">" + build.name + "</a>\n    <div class=\"ref\">" + (build.ref != null ? build.ref : build.ref = '') + "</div>\n    <a href=\"" + (Build.SimpleCov.url(build.id)) + "\"\n       class=\"simplecov\">\n         " + (Build.SimpleCov.text(build.simplecov)) + "</a>\n  </div>\n  <div class=\"output\">\n    <pre>" + build.output + "</pre>\n  </div>\n  <div class=\"actions\">\n    <a href=\"#\" class=\"remove\" data-url=\"/build/" + build.id + "\">Remove</a>\n    |\n    <a href=\"#\" class=\"retest\" data-url=\"/build/" + build.id + "/retest\">Retest</a>\n  </div>\n</li>";
     }
   };
 
@@ -120,6 +132,12 @@
         },
         remove: function(id) {
           return Build.find(id).remove();
+        },
+        simplecov: function(id, supported) {
+          var link;
+          link = Build.find(id).find('.simplecov');
+          link.attr('href', Build.SimpleCov.url(id));
+          return link.text(Build.SimpleCov.text(supported));
         }
       }
     });
@@ -146,7 +164,7 @@
             return $.post('/build/create', {
               clone_url: input
             }, function(response) {
-              console.log(response);
+              field.val('');
               return button.removeAttr('disabled');
             });
           }

data/lib/bait/simplecov_support.rb

@@ -0,0 +1,30 @@
+module Bait
+  module SimpleCovSupport
+    def coverage_dir
+      File.join(clone_path, 'coverage')
+    end
+
+    def simplecov_html_path
+      File.join(coverage_dir, "index.html")
+    end
+
+    def check_for_simplecov
+      if File.exists? simplecov_html_path
+        self.simplecov = true
+        convert_paths
+        self.broadcast :simplecov, 'supported'
+        self.save
+      end
+    end
+
+    def convert_paths
+      buffer = ""
+      File.open(simplecov_html_path, "r") do |file|
+        buffer = file.read.gsub("./assets", "/build/#{self.id}/coverage/assets")
+      end
+      File.open(simplecov_html_path, "w") do |file|
+        file.write buffer
+      end
+    end
+  end
+end

data/spec/lib/bait/{app/api_spec.rb → api_spec.rb}

@@ -134,4 +134,18 @@ describe Bait::Api do
       last_response.content_type.should match(/text\/event-stream/)
     end
   end
+
+  describe "GET /build/:id/coverage/index.html" do
+    before do
+      @build = Bait::Build.create(name: "quickfox", clone_url:'...')
+      FileUtils.mkdir_p File.dirname @build.simplecov_html_path
+      File.open(@build.simplecov_html_path, "w") {|f| f.puts "test string" }
+      @build.simplecov = true
+      @build.save
+      get "/build/#{@build.id}/coverage/index.html"
+    end
+    it "renders the file" do
+      last_response.body.strip.should eq "test string"
+    end
+  end
 end

data/spec/lib/bait/build_spec.rb

@@ -103,4 +103,34 @@ describe Bait::Build do
       Dir.exists?(build.sandbox_directory).should be_false
     end
   end
+
+  describe "simplecov support" do
+    context 'has simplecov files' do
+      before do
+        FileUtils.mkdir_p File.dirname build.simplecov_html_path
+        FileUtils.touch build.simplecov_html_path
+      end
+      it "sends an event that it discovered simplecov" do
+        Bait.should_receive(:broadcast).with(:build, :simplecov, build.id, 'supported')
+        build.check_for_simplecov
+      end
+      it "sets the simplecov flag to true" do
+        build.reload.simplecov.should be_false
+        build.check_for_simplecov
+        build.reload.simplecov.should be_true
+      end
+    end
+
+    context 'has no simplecov files' do
+      before { build }
+      it "does not broadcast a simplecov supported message" do
+        Bait.should_not_receive(:broadcast).with(:build, :simplecov, build.id, 'supported')
+        build.check_for_simplecov
+      end
+      it "does not set the simplecov flag to true" do
+        build.check_for_simplecov
+        build.reload.simplecov.should be_false
+      end
+    end
+  end
 end

data/spec/lib/bait/tester_spec.rb

@@ -6,12 +6,6 @@ describe Bait::Tester do
   let(:tester) { Bait::Tester.new }
 
   describe "#perform" do
-    shared_examples_for "a test run" do
-      it "saves output into the build" do
-        build.reload.output.should match "this is a test script"
-      end
-    end
-
     subject { build.reload }
     before { build.clone! }
 
@@ -45,6 +39,13 @@ describe Bait::Tester do
         write_script_with_status build.script('test'), status
         tester.perform build.id
       end
+
+      shared_examples_for "a test run" do
+        it "saves output into the build" do
+          build.reload.output.should match "this is a test script"
+        end
+      end
+
       context "successful" do
         let(:status) { 0 }
         it { should be_passed }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bait
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.4
 platform: ruby
 authors:
 - Keyvan Fatehi
@@ -274,12 +274,13 @@ files:
 - lib/bait/public/js/zepto.min.js
 - lib/bait/pubsub.rb
 - lib/bait/simple_query.rb
+- lib/bait/simplecov_support.rb
 - lib/bait/tester.rb
 - lib/bait/version.rb
 - lib/bait/views/builds.haml
 - lib/bait/views/layout.haml
 - spec/lib/bait/analyzer_spec.rb
-- spec/lib/bait/app/api_spec.rb
+- spec/lib/bait/api_spec.rb
 - spec/lib/bait/build_spec.rb
 - spec/lib/bait/pubsub_spec.rb
 - spec/lib/bait/tester_spec.rb
@@ -312,7 +313,7 @@ specification_version: 4
 summary: build and integration test service
 test_files:
 - spec/lib/bait/analyzer_spec.rb
-- spec/lib/bait/app/api_spec.rb
+- spec/lib/bait/api_spec.rb
 - spec/lib/bait/build_spec.rb
 - spec/lib/bait/pubsub_spec.rb
 - spec/lib/bait/tester_spec.rb