bait 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f731d3eadd100d677db8a67aea6e93cfb2fb7e71
-  data.tar.gz: c46a0e68d7812ea7107eeb91c50e8066733574f1
+  metadata.gz: b666fc3bbdb851fbda76133436c798dfa3160350
+  data.tar.gz: 3b853992f6a475aa02b7eaa518519b9e53ecb05b
 SHA512:
-  metadata.gz: f262d95d082542abb556dd864e610614057f50f63400b6a7878ffffb9a50ee244436551b7e0a01be4ddfd41df3987bc178329177028112c57e7599cdaa376912
-  data.tar.gz: 60ccfa1b81f4b92dabe717b75d88e64c5c6c14771d3c75147452e63f8bc830270f1f1511db0fc6ff7374259aa2609600d06b9bf6a1483a9e22c1b0e0b6ec0146
+  metadata.gz: b41192c233b1441cd2e4e893fe13251840944962ba25c4eb1a4fbc13f246b245d6fee38e67fbc78e5efb208596b934ec17967deeea8a90b252718921d91a947b
+  data.tar.gz: 7ab8bba3752f07e033289d9283c6a8e2767067a5317a9ad0f3574d51641728b8d71c1f37ea757d00575935ed34fb1cc27d33fc8ef953d7a4ec9cc0cce26ae40e

data/Gemfile.lock

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

data/README.md

@@ -24,18 +24,18 @@ You may also test manually by inputting a clone URL within the UI
                                          |
 +----------------------------------------|------+
 |    +------------+                  +--\|/--+  | +-------------+
-|    | new Build  <------------------|  API  <----|   Browser   |
+|    | new Build  <------------------|  API  <------  GET /     |
 |    +-----+------+                  |       |  | |             |
 |          |                         |       |  | |             |
+|          |                         |/build------> Build.all() |
 |          |        +-------------+  |       |  | |             |
-|          |        | EventStream |  |       |  | |             |
-|     +---\|/----+  | Connection  <------+   |  | |             |
-|     |Queue Job |  |             |  |   |   |  | |             |
-|     +----+-----+  |Build Events |  |   |   |  | |             |
-|          |        |Subscription |  |   |   |  | |             |
+|     +---\|/----+  |Subscription <------+   |  | |             |
+|     |Queue Job |  |  to Build   |  |   |   |  | | UI Changes  |
+|     +----+-----+  |   Event     |  |   |   |  | |     |       |
+|          |        | Broadcasts  |  |   |   |  | |     |       |
 |          |        +--+------+---+  |/events----->[EventSource]|
 |    +----\|/-----+    |      |      +---+---+  | +-------------+
-|    | Test Build |    |      |          |      |
+|    |  Workers   |    |      |          |      |
 |    |[subprocess]+----+      +----------+      |
 |    +------------+                             |
 |                                               |

data/Rakefile

@@ -1,3 +1,5 @@
+ENV['RACK_ENV'] = "development"
+
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 
@@ -8,3 +10,52 @@ task :default => :spec
 task :pry do
   require 'pry'; binding.pry
 end
+
+namespace :assets do
+  task :precompile do
+    public = File.join File.dirname(__FILE__), %w(lib bait public)
+    require 'bait/api'
+    include Sinatra::AssetSnack::InstanceMethods
+    Sinatra::AssetSnack.assets.each do |assets|
+      compiled_path = File.join public, assets[:route]
+      puts "compiling #{compiled_path}"
+      File.open(compiled_path, 'w') do |file|
+        response = compile assets[:paths]
+        file.write response[:body]
+      end
+    end
+  end
+end
+
+
+def git_master?
+  `git branch | grep '* master'`
+  $?.exitstatus == 0
+end
+
+def git_dirty?
+  `git status --porcelain`.match(/^\sM/)
+end
+
+namespace :gem do
+  task :build => 'assets:precompile' do
+    `bundle install`
+    if git_dirty?
+      puts "dirty! commit first before building"
+    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
+      else
+        puts "I'll only build the gem on the master branch"
+      end
+    end
+  end
+end

data/VERSION

@@ -1,3 +1,3 @@
-0.5.0
+0.5.1
 
 

data/lib/bait/api.rb

@@ -1,3 +1,4 @@
+require 'bait'
 require 'sinatra'
 require 'sinatra/streaming'
 require 'sinatra/asset_snack'
@@ -8,12 +9,15 @@ require 'bait/build'
 
 module Bait
   class Api < Sinatra::Base
-    register Sinatra::AssetSnack
     set :port, 8417
     set server: 'thin'
 
-    asset_map '/javascript/application.js', ['assets/js/**/*.js', 'assets/js/**/*.coffee']
-    asset_map '/stylesheets/application.css', ['assets/stylesheets/**/*.css', 'assets/stylesheets/**/*.scss']
+    unless Bait.env == "production"
+      register Sinatra::AssetSnack
+
+      asset_map '/js/application.js', ['app/js/**/*.js', 'app/js/**/*.coffee']
+      asset_map '/css/application.css', ['app/css/**/*.css', 'app/css/**/*.scss']
+    end
 
     get '/' do
       haml :builds

data/lib/bait/build.rb

@@ -1,10 +1,14 @@
 require 'bait/object'
 require 'bait/tester'
-require 'json'
+require 'bait/build_helper'
 require 'bait/pubsub'
+require 'bait/phase'
+require 'json'
 
 module Bait
   class Build < Bait::Object
+    include Bait::BuildHelper
+
     adapter :memory,
       Moneta.new(:YAML, :file => Bait.db_file('builds'))
 
@@ -28,29 +32,6 @@ module Bait
       self.cleanup!
     end
 
-    def test!
-      Open3.popen2e(self.script) do |stdin, oe, wait_thr|
-        self.status = "testing"
-        self.broadcast :status, self.status
-        self.save
-        oe.each do |line|
-          self.output << line
-          self.broadcast(:output, line)
-        end
-        if wait_thr.value.exitstatus == 0
-          self.status = "passed"
-        else
-          self.status = "failed"
-        end
-      end
-    rescue Errno::ENOENT => ex
-      self.output << "A test script was expected but missing.\nError: #{ex.message}"
-      self.status = "script missing"
-    ensure
-      self.save
-      self.broadcast(:status, status)
-    end
-
     def test_later
       self.status = "queued"
       self.output = ""
@@ -59,50 +40,42 @@ module Bait
       self
     end
 
-    def queued?
-      self.reload.status == "queued"
-    end
-
-    def passed?
-      self.reload.status == "passed"
-    end
-
-    def clone_path
-      File.join(sandbox_directory, self.name)
-    end
-
-    def bait_dir
-      File.join(clone_path, ".bait")
-    end
-
-    def script
-      File.join(bait_dir, "test.sh")
-    end
-    
-    def cloned?
-      Dir.exists? File.join(clone_path, ".git/")
-    end
-
-    def cleanup!
-      FileUtils.rm_rf(sandbox_directory) if Dir.exists?(sandbox_directory)
-    end
-
-    def sandbox_directory
-      File.join Bait.storage_dir, "tester", self.name, self.id
+    def test!
+      Bait::Phase.new(self.script("test")).on(:init) do
+        self.status = 'testing'
+        self.save
+        self.broadcast(:status, self.status)
+      end.on(:output) do |line|
+        self.output << line
+        self.broadcast(:output, line)
+      end.on(:missing) do |message|
+        self.output << message
+        self.status = "script missing"
+        self.save
+      end.on(:done) do |zerostatus|
+        if zerostatus
+          self.status = "passed"
+        else
+          self.status = "failed"
+        end
+        self.save
+        self.broadcast(:status, self.status)
+        # good place to check for a coverage report
+      end.run!
     end
 
     def clone!
-      unless cloned?
-        unless Dir.exists?(sandbox_directory)
-          FileUtils.mkdir_p sandbox_directory
-        end
-        begin
-          Git.clone(clone_url, name, :path => sandbox_directory)
-        rescue => ex
-          msg = "Failed to clone #{clone_url}"
-          self.output << "#{msg}\n\n#{ex.message}\n\n#{ex.backtrace.join("\n")}"
-          self.save
-        end
+      return if cloned?
+      unless Dir.exists?(sandbox_directory)
+        FileUtils.mkdir_p sandbox_directory
+      end
+      begin
+        Git.clone(clone_url, name, :path => sandbox_directory)
+      rescue => ex
+        msg = "Failed to clone #{clone_url}"
+        self.output << "#{msg}\n\n#{ex.message}\n\n#{ex.backtrace.join("\n")}"
+        self.status = "failed to clone"
+        self.save
       end
     end
 

data/lib/bait/build_helper.rb

@@ -0,0 +1,36 @@
+module Bait
+  module BuildHelper
+    def queued?
+      self.reload.status == "queued"
+    end
+
+    def passed?
+      self.reload.status == "passed"
+    end
+
+    def clone_path
+      File.join(sandbox_directory, self.name)
+    end
+
+    def bait_dir
+      File.join(clone_path, ".bait")
+    end
+
+    def script name
+      File.join(bait_dir, "#{name}.sh")
+    end
+
+    def cloned?
+      Dir.exists? File.join(clone_path, ".git/")
+    end
+
+    def cleanup!
+      FileUtils.rm_rf(sandbox_directory) if Dir.exists?(sandbox_directory)
+    end
+
+    def sandbox_directory
+      File.join Bait.storage_dir, "tester", self.name, self.id
+    end
+  end
+end
+

data/lib/bait/cli.rb

@@ -1,5 +1,4 @@
-require 'celluloid'
-require 'bait/build'
+require 'bait'
 
 module Bait
   module CLI
@@ -12,7 +11,7 @@ module Bait
     ##
     # Start the server
     def self.server
-      puts "== Bait/#{Bait::VERSION} booting up..."
+      puts "** Bait/#{Bait::VERSION} booting up in #{Bait.env} environment"
       require 'bait/api'
       Bait::Api.run!
     end

data/lib/bait/phase.rb

@@ -0,0 +1,56 @@
+module Bait
+  class Phase
+    class UnexpectedHandlerDefinition < StandardError ; end
+    POSSIBLE_HANDLERS = %w(init output rescue missing done)
+
+    def initialize script
+      @script = script
+      @handlers = {}
+    end
+
+    def handle name, &block
+      if POSSIBLE_HANDLERS.include? name.to_s
+        @handlers[name] = block
+      else
+        raise UnexpectedHandlerDefinition
+      end
+      self
+    end
+
+    alias_method :on, :handle
+
+    def run!
+      if File.exists?(@script)
+        handler(:init)
+        zerostatus = execute_subprocess do |output_line|
+          handler(:output, output_line)
+        end
+        handler(:done, zerostatus)
+      else
+        msg = "Script #{@script} was expected but is missing."
+        handler(:missing, msg)
+      end
+    end
+
+    private
+
+    def handler name, *args
+      if target = @handlers[name]
+        target.call(*args)
+      end
+    end
+
+    def execute_subprocess &block
+      zerostatus = false
+      Open3.popen2e(@script) do |stdin, oe, wait_thr|
+        oe.each {|line| block.call(line) }
+        zerostatus = wait_thr.value.exitstatus == 0
+      end
+    rescue => ex
+      handler(:rescue, ex)
+      zerostatus = false
+    ensure
+      return zerostatus
+    end
+  end
+end

data/lib/bait/public/css/application.css

@@ -0,0 +1,52 @@
+
+
+/** build.scss **/
+
+.build {
+  border-radius: 12px;
+  border: 2px solid RGB(201, 49, 20);
+  margin: 20px; }
+  .build .header {
+    border-top-left-radius: 10px;
+    border-top-right-radius: 10px;
+    padding: 5px;
+    position: relative; }
+    .build .header .status {
+      top: 4px;
+      right: 4px;
+      position: absolute; }
+  .build .header.passed {
+    background-color: RGB(71, 213, 86); }
+  .build .header.failed {
+    background-color: RGB(247, 65, 67); }
+  .build .output pre {
+    cursor: pointer;
+    color: white;
+    background-color: black;
+    max-height: 100px;
+    overflow-y: hidden;
+    overflow-x: scroll; }
+
+
+/** main.scss **/
+
+@font-face {
+  font-family: 'Ubuntu';
+  font-style: normal;
+  font-weight: 400;
+  src: local("Ubuntu"), url(/fonts/ubuntu.woff) format("woff"); }
+
+body {
+  font-family: 'Ubuntu';
+  background-color: RGB(255, 254, 254); }
+
+.actions {
+  background-color: RGB(254, 238, 195);
+  text-align: center;
+  border-bottom-left-radius: 10px;
+  border-bottom-right-radius: 10px; }
+  .actions a {
+    color: RGB(20, 77, 105);
+    text-decoration: none; }
+  .actions a:hover {
+    color: RGB(201, 49, 20); }

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

@@ -0,0 +1,168 @@
+
+
+/** bait.coffee **/
+
+(function() {
+  window.Bait = {
+    subscribe: function(handlers) {
+      var source;
+      source = new EventSource('/events');
+      return source.addEventListener("message", function(e) {
+        var data, handler;
+        data = JSON.parse(e.data);
+        handler = handlers[data[0]][data[1]];
+        return handler.apply(this, data.slice(2));
+      });
+    }
+  };
+
+}).call(this);
+
+
+/** build.coffee **/
+
+(function() {
+  window.Build = {
+    find: function(id) {
+      return $("#" + id);
+    },
+    all: function(cb) {
+      return $.getJSON('/build', function(data) {
+        return cb(data);
+      });
+    },
+    DOM: {
+      UIHelper: {
+        expand_toggle: function(el) {
+          return el.on("click", function(e) {
+            if (el.css("max-height") === "100px") {
+              return el.css("max-height", "100%");
+            } else {
+              return el.css("max-height", "100px");
+            }
+          });
+        },
+        enable_links: function(element) {
+          element.find('a.remove').click(function() {
+            $.ajax({
+              type: "DELETE",
+              url: $(this).data('url')
+            });
+            return false;
+          });
+          return element.find('a.retest').click(function() {
+            $(this).parents('.build').find('pre').html("");
+            $.post($(this).data('url'));
+            return false;
+          });
+        }
+      },
+      init: function(build_id) {
+        var build, output, pre;
+        build = Build.find(build_id);
+        pre = build.find(".output pre");
+        output = pre.html();
+        if ((output != null) && output.size > 0) {
+          pre.html(ansi2html(output));
+        }
+        Build.DOM.UIHelper.expand_toggle(pre);
+        return Build.DOM.UIHelper.enable_links(build);
+      }
+    },
+    List: {
+      add: function(build) {
+        var html;
+        html = Build.to_html(build);
+        if ($('.build').length > 0) {
+          $('.build').first().before(html);
+        } else {
+          $('ul#builds').append(html);
+        }
+        return Build.DOM.init(build.id);
+      }
+    },
+    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>";
+    }
+  };
+
+}).call(this);
+
+
+/** main.coffee **/
+
+(function() {
+  Zepto(function($) {
+    ManualClone.init();
+    Build.all(function(builds) {
+      $.each(builds, function(i, d) {
+        return Build.List.add(d.build);
+      });
+      return $("#loading").remove();
+    });
+    return Bait.subscribe({
+      global: {
+        new_build: function(data) {
+          return Build.List.add(data.build);
+        }
+      },
+      build: {
+        output: function(id, text) {
+          var pre;
+          pre = Build.find(id).find('pre');
+          return pre.append(ansi2html(text));
+        },
+        status: function(id, text) {
+          var header;
+          header = Build.find(id).find(".header");
+          header.find(".status").html(text);
+          return header.attr("class", "header " + text);
+        },
+        remove: function(id) {
+          return Build.find(id).remove();
+        }
+      }
+    });
+  });
+
+}).call(this);
+
+
+/** manual_clone.coffee **/
+
+(function() {
+  window.ManualClone = {
+    init: function() {
+      var button, field, form, manual_clone;
+      form = $('.manual_clone');
+      field = form.find('input');
+      button = form.find('button');
+      manual_clone = function() {
+        var input;
+        input = field.val();
+        if (input.length > 0) {
+          if (!button.attr('disabled')) {
+            button.attr('disabled', 'disabled');
+            return $.post('/build/create', {
+              clone_url: input
+            }, function(response) {
+              console.log(response);
+              return button.removeAttr('disabled');
+            });
+          }
+        } else {
+          return alert("Enter a local path or remote url to a git repo, e.g.:\n        Local: /Users/your/project\n        Remote: https://github.com/your/project");
+        }
+      };
+      field.keypress(function(e) {
+        if (e.keyCode === 13) {
+          return manual_clone();
+        }
+      });
+      return button.on('click', function() {
+        return manual_clone();
+      });
+    }
+  };
+
+}).call(this);

data/lib/bait/tester.rb

@@ -10,7 +10,10 @@ module Bait
     def perform(build_id)
       if @build = ::Bait::Build.find(build_id)
         @build.clone!
-        @build.test!
+        if @build.cloned?
+          @build.test!
+        end
+        # @build.analyze!
       end
     end
   end

data/lib/bait/views/layout.haml

@@ -2,11 +2,11 @@
 %html
   %head
     %title Bait
-    %link{rel:'stylesheet', href:'/stylesheets/reset.css'}
-    %link{rel:'stylesheet', href:nocache('/stylesheets/application.css')}
-    %script{src:'/javascript/zepto.min.js'}
-    %script{src:'/javascript/ansi2html.js'}
-    %script{src:nocache('/javascript/application.js')}
+    %link{rel:'stylesheet', href:'/css/reset.css'}
+    %link{rel:'stylesheet', href:'/css/application.css'}
+    %script{src:'/js/zepto.min.js'}
+    %script{src:'/js/ansi2html.js'}
+    %script{src:'/js/application.js'}
   %body
     #nav
       %a{href:'/'}Home

data/spec/lib/bait/tester_spec.rb

@@ -17,7 +17,7 @@ describe Bait::Tester do
 
     describe "real-time events" do
       before do
-        write_script_with_status build.script, 0
+        write_script_with_status build.script("test"), 0
       end
       it "push updates directly to the browser" do
         Bait.should_receive(:broadcast).with(:build, :status, build.id, 'testing')
@@ -29,11 +29,11 @@ describe Bait::Tester do
 
     context "build repo did not have a test script" do
       before do
-        FileUtils.rm build.script
+        FileUtils.rm build.script("test")
         tester.perform build.id
       end
       it "has errors in output" do
-        build.reload.output.should match /script was expected but missing/
+        build.reload.output.should match /was expected but is missing/
       end
       it "has a useful status" do
         build.reload.status.should eq "script missing"
@@ -42,7 +42,7 @@ describe Bait::Tester do
 
     context "has a test script" do
       before do
-        write_script_with_status build.script, status
+        write_script_with_status build.script('test'), status
         tester.perform build.id
       end
       context "successful" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bait
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Keyvan Fatehi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-04 00:00:00.000000000 Z
+date: 2013-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -251,30 +251,35 @@ files:
 - README.md
 - Rakefile
 - VERSION
-- assets/js/bait.coffee
-- assets/js/build.coffee
-- assets/js/main.coffee
-- assets/js/manual_clone.coffee
-- assets/stylesheets/build.scss
-- assets/stylesheets/main.scss
+- app/css/build.scss
+- app/css/main.scss
+- app/js/bait.coffee
+- app/js/build.coffee
+- app/js/main.coffee
+- app/js/manual_clone.coffee
 - bait.gemspec
 - bin/bait
 - lib/bait.rb
 - lib/bait/api.rb
 - lib/bait/build.rb
+- lib/bait/build_helper.rb
 - lib/bait/cli.rb
 - lib/bait/object.rb
+- lib/bait/phase.rb
+- lib/bait/public/css/application.css
+- lib/bait/public/css/reset.css
 - lib/bait/public/fonts/ubuntu.woff
-- lib/bait/public/javascript/ansi2html.js
-- lib/bait/public/javascript/zepto.min.js
-- lib/bait/public/stylesheets/reset.css
+- lib/bait/public/js/ansi2html.js
+- lib/bait/public/js/application.js
+- lib/bait/public/js/zepto.min.js
 - lib/bait/pubsub.rb
 - lib/bait/simple_query.rb
 - lib/bait/tester.rb
 - lib/bait/version.rb
 - lib/bait/views/builds.haml
 - lib/bait/views/layout.haml
-- spec/lib/bait/api_spec.rb
+- spec/lib/bait/analyzer_spec.rb
+- spec/lib/bait/app/api_spec.rb
 - spec/lib/bait/build_spec.rb
 - spec/lib/bait/pubsub_spec.rb
 - spec/lib/bait/tester_spec.rb
@@ -306,7 +311,8 @@ signing_key:
 specification_version: 4
 summary: build and integration test service
 test_files:
-- spec/lib/bait/api_spec.rb
+- spec/lib/bait/analyzer_spec.rb
+- spec/lib/bait/app/api_spec.rb
 - spec/lib/bait/build_spec.rb
 - spec/lib/bait/pubsub_spec.rb
 - spec/lib/bait/tester_spec.rb