bait 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b73a86de69d8c57f551e895629aa0cda4d0d8c3c
-  data.tar.gz: b22111f04d15da7b6208386a5c96e751ca638abe
+  metadata.gz: 25a481dd7eaf99ce25666d6517669073b3869278
+  data.tar.gz: 333a3a8a7c89765b3c68f6bdb12ef4036e81a318
 SHA512:
-  metadata.gz: d0f90cd0bd797023b15fdcf5286de496df0dae57bf2f8b4a7be0e848bc2e25f90c7aaf8b6b5f989a62e9c9a1967f692f6948f20ab460f6ea917d03b2e326e402
-  data.tar.gz: 22d97466385054e47abb15f10ead17c44e5a8baa74361c23a42f1edd43ccc0369332568ed5bb2bdbf1fc0ff4943d27d83f7b0e7be99ceb4e2c0ac7c55c9ad458
+  metadata.gz: aa0fed76b8214092e82b98cd08d179d0363ab6e49c697d7926e070bf958833dffa652d26995632973cd19fc64cd76fdf61ab5592d6fa78028b4e5f9d0930ab31
+  data.tar.gz: 747d2bda333bd4f8faebaa4e989eff1640cc86cd6724a2ca7150f888afc8cc7dd8b4ac916289fc31260c048a774800ca4659ed81ad2060a80d4a82adc8a80392

data/.bait/test.sh

@@ -3,5 +3,6 @@ rmts_dir=$(dirname $0)
 project_dir="$rmts_dir/.."
 cd $project_dir
 
-bundle
+echo "bundling"
+bundle > /dev/null 2>&1
 bundle exec rspec spec

data/.rspec

@@ -0,0 +1 @@
+--color --format documentation

data/Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: .
   specs:
-    bait (0.3.1)
+    bait (0.4.0)
+      ansi2html
       git
       haml
       moneta
@@ -19,6 +20,7 @@ GEM
       i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
     adapter (0.7.0)
+    ansi2html (5.3.4)
     builder (3.0.4)
     coderay (1.0.9)
     daemons (1.1.9)

data/VERSION

@@ -1,2 +1,2 @@
-0.3.2
+0.4.0
 

data/bait.gemspec

@@ -32,4 +32,5 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "git"
   spec.add_runtime_dependency "haml"
   spec.add_runtime_dependency "thin"
+  spec.add_runtime_dependency 'ansi2html'
 end

data/bin/bait

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

data/lib/bait/api.rb

@@ -30,7 +30,10 @@ module Bait
     end
 
     post '/build/create' do
-      build = Build.create(clone_url:params["clone_url"], name:'test')
+      build = Build.create({
+        clone_url:params["clone_url"],
+        name:params["clone_url"].split('/').last
+      })
       build.test_later
       redirect '/build'
     end
@@ -43,8 +46,9 @@ module Bait
     get '/build/retest/:id' do
       build = Build.find params['id']
       build.tested = false
-      build.test_later
+      build.output = ""
       build.save
+      build.test_later
       redirect '/build'
     end
   end

data/lib/bait/build.rb

@@ -1,16 +1,11 @@
-require 'bait'
-require 'moneta'
-require "toystore"
-require 'bait/simple_query'
+require 'bait/object'
 require 'bait/tester'
+require 'ansi2html/main'
 
 module Bait
-  class Build
-    include Toy::Store
-    extend Bait::SimpleQuery
-
-    @@db_file = Bait.db_file('builds')
-    adapter :memory, Moneta.new(:YAML, :file => @@db_file)
+  class Build < Bait::Object
+    adapter :memory,
+      Moneta.new(:YAML, :file => Bait.db_file('builds'))
 
     attribute :ref, String
     attribute :owner_name, String
@@ -31,11 +26,9 @@ module Bait
     def test_later
       self.tested = false
       self.save
-      unless Bait.env == "test"
-        fork do
-          self.tester.clone!
-          self.tester.test!
-        end
+      fork do
+        self.tester.clone!
+        self.tester.test!
       end
       self
     end
@@ -44,7 +37,12 @@ module Bait
       !self.reload.tested?
     end
 
-    after_destroy  { tester.cleanup! }
+    def html_output
+      out = StringIO.new
+      ::ANSI2HTML::Main.new(self.output, out)
+      return out.string
+    end
 
+    after_destroy  { tester.cleanup! }
   end
 end

data/lib/bait/cli.rb

@@ -0,0 +1,56 @@
+module Bait
+  module CLI
+    USAGE = %{usage:
+    * bait .................... alias for bait server
+    * bait server ............. start the bait server
+    * bait init ............... setup current directory as a bait project
+    * bait test ............... simulate this repo being tested with bait}
+
+    ##
+    # Start the server
+    def self.server
+      puts "Starting bait server"
+      require 'bait/api'
+      Bait::Api.run!
+    end
+
+    ##
+    # Run the test suite script in .bait/test.sh
+    def self.test
+      script = File.join(Dir.pwd, ".bait", "test.sh")
+      unless File.executable? script
+        puts "Project did not have executable #{script}"
+        puts "Run 'bait init' to create it"
+        exit 1
+      else
+        system(script)
+      end
+    end
+
+    ##
+    # Create .bait/ and executable .bait/test.sh
+    def self.init
+      bait_dir = File.join(Dir.pwd, ".bait")
+      if File.directory? bait_dir
+        puts "Directory already exists: #{bait_dir}"
+      else
+        script = File.join(bait_dir, 'test.sh')
+        FileUtils.mkdir bait_dir
+        puts "Created #{bait_dir}"
+        File.open(script, 'w') do |f|
+          f.puts "#!/bin/bash"
+          f.puts "echo edit me"
+        end
+        File.chmod(0744, script)
+        puts "Created executable script #{script}"
+      end
+    end
+
+    def self.method_missing method
+      unless method.to_sym == :help
+        puts "Command not found: #{method}"
+      end
+      puts USAGE
+    end
+  end
+end

data/lib/bait/object.rb

@@ -0,0 +1,12 @@
+require 'bait'
+require 'moneta'
+require "toystore"
+require 'bait/simple_query'
+
+module Bait
+  class Object
+    include Toy::Store
+    extend Bait::SimpleQuery
+  end
+end
+

data/lib/bait/public/css/styles.css

@@ -7,5 +7,38 @@ http://yuilibrary.com/license/
 
 html{color:#000;background:#FFF}body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,code,form,fieldset,legend,input,textarea,p,blockquote,th,td{margin:0;padding:0}table{border-collapse:collapse;border-spacing:0}fieldset,img{border:0}address,caption,cite,code,dfn,em,strong,th,var{font-style:normal;font-weight:normal}ol,ul{list-style:none}caption,th{text-align:left}h1,h2,h3,h4,h5,h6{font-size:100%;font-weight:normal}q:before,q:after{content:''}abbr,acronym{border:0;font-variant:normal}sup{vertical-align:text-top}sub{vertical-align:text-bottom}input,textarea,select{font-family:inherit;font-size:inherit;font-weight:inherit}input,textarea,select{*font-size:100%}legend{color:#000}#yui3-css-stamp.cssreset{display:none}
 
+.bold {
+  font-weight: bold;
+}
+.black {
+  color: black;
+}
+.red {
+  color: red;
+}
+.green {
+  color: green;
+}
+.yellow {
+  color: yellow;
+}
+.blue {
+  color: blue;
+}
+.magenta {
+  color: magenta;
+}
+.cyan {
+  color: cyan;
+}
+.white {
+  color: white;
+}
+.grey {
+  color: grey;
+}
 
-
+.build .output {
+  color:white;
+  background-color:black;
+}

data/lib/bait/simple_query.rb

@@ -10,12 +10,17 @@ module Bait
         self.class.ids = self.class.ids.reject{|id| id == self.id}
       end
     end
+
+    def id_list_key
+      "#{self.name.split('::').last.downcase}_ids"
+    end
+
     def ids
-      Bait.store.raw["build_ids"] ||= []
+      Bait.store.raw[id_list_key] ||= []
     end
 
     def ids=(new_ids)
-      Bait.store.raw["build_ids"] = new_ids
+      Bait.store.raw[id_list_key] = new_ids
     end
 
     def all

data/lib/bait/tester.rb

@@ -1,7 +1,7 @@
 require 'bait'
 require 'bait/build'
 require 'git'
-require 'pty'
+require 'open3'
 
 module Bait
   class Tester
@@ -20,22 +20,15 @@ module Bait
     end
 
     def test!
-      begin
-        begin
-          PTY.spawn(script) do |r, w, pid|
-            r.each { |line| @build.output << line }
-            @build.passed = PTY.check(pid).exitstatus == 0
-          end
-        rescue PTY::ChildExited => e
-          @build.output << e
-          @build.passed = false
-        end
-        @build.tested = true
-      rescue Errno::ENOENT => ex
-        @build.output << "A test script was expected but missing.\nError: #{ex.message}"
-      ensure
-        @build.save
+      Open3.popen2e(script) do |stdin, oe, wait_thr|
+        oe.each {|line| @build.output << line }
+        @build.passed = wait_thr.value.exitstatus == 0
       end
+      @build.tested = true
+    rescue Errno::ENOENT => ex
+      @build.output << "A test script was expected but missing.\nError: #{ex.message}"
+    ensure
+      @build.save
     end
 
     def clone_path
@@ -48,8 +41,7 @@ module Bait
           Git.clone(@build.clone_url, @build.name, :path => sandbox_directory)
         rescue => ex
           msg = "Failed to clone #{@build.clone_url}"
-          puts msg
-          @build.stderr = "#{msg}\n\n#{ex.message}\n\n#{ex.backtrace}"
+          @build.output << "#{msg}\n\n#{ex.message}\n\n#{ex.backtrace}"
           @build.save
         end
       end

data/lib/bait/views/builds.haml

@@ -1,7 +1,7 @@
 Listing Builds
 %ul
   - @builds.each do |build|
-    %li
+    %li.build
       %hr
       .name= build.name
       %a.clone_url{href:build.clone_url}= build.clone_url
@@ -12,9 +12,7 @@ Listing Builds
           = build.passed? ? "Passed!" : "Failed!"
         - else
           Queued
-      .output
-        Output:
-        %pre= build.output
+      %pre.output= build.html_output
       .actions
         %a{href:"/build/remove/#{build.id}"} Remove
         %a{href:"/build/retest/#{build.id}"} Retest

data/spec/lib/bait/api_spec.rb

@@ -1,18 +1,19 @@
 require 'spec_helper'
 require 'bait/api'
-require 'bait/build'
 
-describe "Sinatra App" do
+describe Bait::Api do
   let(:app) { Bait::Api }
   subject { last_response }
 
+  let (:build) { Bait::Build.last }
+
   describe "github post-receive hook" do
     let(:github_json) do
       <<-GITHUB_JSON
         { 
           "before": "5aef35982fb2d34e9d9d4502f6ede1072793222d",
           "repository": {
-            "url": "http://github.com/defunkt/github",
+            "url": "http://github.com/keyvanfatehi/bait",
             "name": "github",
             "owner": {
               "email": "chris@ozmm.org",
@@ -45,8 +46,6 @@ describe "Sinatra App" do
       GITHUB_JSON
     end
 
-    let (:build) { Bait::Build.last }
-
     describe "POST /" do
       before do
         post '/', payload: github_json
@@ -61,65 +60,69 @@ describe "Sinatra App" do
         build.ref.should eq "refs/heads/master"
       end
 
-      it { build.should be_queued }
+      specify { build.should be_queued }
     end
+  end
 
-    describe "GET /" do
-      before { get '/' }
-      it { should be_redirect }
-    end
+  describe "GET /" do
+    before { get '/' }
+    it { should be_redirect }
+  end
 
-    describe "GET /build" do
-      before do
-        Bait::Build.create(name: "quickfox", clone_url:'...')
-        Bait::Build.create(name: "slowsloth", clone_url:'...')
-        get '/build'
-      end
+  describe "GET /build" do
+    before do
+      Bait::Build.create(name: "quickfox", clone_url:'...')
+      Bait::Build.create(name: "slowsloth", clone_url:'...')
+      get '/build'
+    end
 
-      it { should be_ok }
+    it { should be_ok }
 
-      it "shows the builds" do
-        subject.body.should match /quickfox/
-        subject.body.should match /slowsloth/
-      end
+    it "shows the builds" do
+      subject.body.should match /quickfox/
+      subject.body.should match /slowsloth/
     end
+  end
 
-    describe "POST /build/create" do
-      let(:test_url){ "http://github.com/defunkt/github" }
-      before do
-        post '/build/create', {clone_url:test_url}
-      end
-      it "can create a build manually" do
-        build.clone_url.should eq test_url
-      end
-      specify { build.should be_queued }
+  describe "POST /build/create" do
+    let(:test_url){ repo_path }
+    before do
+      post '/build/create', {clone_url:test_url}
     end
+    specify { build.clone_url.should eq test_url }
+    specify { build.name.should match(/^bait/) }
+    specify { build.should be_queued }
+  end
 
-    describe "GET /build/remove/#" do
-      before do
-        @build = Bait::Build.create(name: "quickfox", clone_url:'...')
-        @sandbox = @build.tester.sandbox_directory
-        get "/build/remove/#{@build.id}"
-      end
-      it "removes the build from store and its files from the filesystem" do
-        expect{@build.reload}.to raise_error Toy::NotFound
-        Bait::Build.ids.should be_empty
-        Pathname.new(@sandbox).should_not exist
-      end
-      it { should be_redirect }
+  describe "GET /build/remove/#" do
+    before do
+      @build = Bait::Build.create(name: "quickfox", clone_url:'...')
+      @sandbox = @build.tester.sandbox_directory
+      get "/build/remove/#{@build.id}"
+    end
+    it "removes the build from store and its files from the filesystem" do
+      expect{@build.reload}.to raise_error Toy::NotFound
+      Bait::Build.ids.should be_empty
+      Pathname.new(@sandbox).should_not exist
     end
+    it { should be_redirect }
+  end
 
-    describe "GET /build/retest/#" do
-      before do
-        @build = Bait::Build.create(name: "quickfox", clone_url:'...')
-        @build.tested = true
-        @build.save
-        get "/build/retest/#{@build.id}"
-      end
-      it "queues the build for retesting" do
-        build.should be_queued
-      end
-      it { should be_redirect }
+  describe "GET /build/retest/#" do
+    before do
+      @build = Bait::Build.create(name: "quickfox", clone_url:'...')
+      @build.tested = true
+      @build.output = "bla bla old output"
+      @build.save
+      get "/build/retest/#{@build.id}"
+      @build.reload
+    end
+    it "queues the build for retesting" do
+      @build.should be_queued
+    end
+    it "clears the previous output" do
+      @build.output.should be_blank
     end
+    it { should be_redirect }
   end
 end

data/spec/lib/bait/build_spec.rb

@@ -41,6 +41,17 @@ describe Bait::Build do
 
   let (:build) { Bait::Build.create(name: "app", clone_url:'...') }
 
+  describe "#test_later" do
+    it "forks in order to clone and test" do
+      build.should_receive(:fork) do |&block|
+        build.tester.should_receive(:clone!)
+        build.tester.should_receive(:test!)
+        block.call
+      end
+      build.test_later
+    end
+  end
+
   describe "#tester" do
     specify { build.tester.should be_a Bait::Tester }
   end
@@ -75,4 +86,9 @@ describe Bait::Build do
       it { should be_queued }
     end
   end
+
+  describe "#html_output" do
+    before { build.output = "\e[33mHello\e[0m" ; build.save }
+    specify { build.html_output.should eq %{<span class="yellow">Hello</span>} }
+  end
 end

data/spec/lib/bait/tester_spec.rb

@@ -2,10 +2,6 @@ require 'spec_helper'
 require 'bait/tester'
 
 describe Bait::Tester do
-  let(:repo_path) do
-    path = File.join(File.dirname(__FILE__), '..', '..', '..')
-    File.expand_path(path)
-  end
   let(:build) { Bait::Build.create(name: "bait", clone_url:repo_path) }
   let(:tester) { build.tester }
 
@@ -24,8 +20,17 @@ describe Bait::Tester do
   end
 
   describe "#clone!" do
-    before { tester.clone! }
-    specify { tester.should be_cloned }
+    context 'valid clone url' do
+      before { tester.clone! }
+      specify { build.output.should_not match /Failed to clone/ }
+      specify { tester.should be_cloned }
+    end
+    context "invalid clone url" do
+      let(:build) { Bait::Build.create(name: "bait", clone_url:'invalid') }
+      before { tester.clone! }
+      specify { build.output.should match /Failed to clone/ }
+      specify { tester.should_not be_cloned }
+    end
   end
 
   describe "#test!" do
@@ -50,7 +55,7 @@ describe Bait::Tester do
         tester.test!
       end
       it { should_not be_tested }
-      it "has Bait errors in output" do
+      it "has errors in output" do
         subject.output.should match /script was expected but missing/
       end
     end

data/spec/spec_helper.rb

@@ -2,9 +2,20 @@ ENV['RACK_ENV'] = "test"
 require 'simplecov'
 SimpleCov.start
 
+# Use simplecov with forking specs
+pid = Process.pid
+SimpleCov.at_exit do
+  SimpleCov.result.format! if Process.pid == pid
+end
+
 require 'bait'
 require 'fileutils'
 
+def repo_path
+  path = File.join(File.dirname(__FILE__), '..')
+  File.expand_path(path)
+end
+
 def clear_storage
   FileUtils.rm_rf Bait.storage_dir
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bait
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Keyvan Fatehi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-01 00:00:00.000000000 Z
+date: 2013-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -192,6 +192,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: ansi2html
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Accepts github push event webhook to clone and execute .bait/test.sh
 email:
 - keyvan@digitalfilmtree.com
@@ -202,7 +216,7 @@ extra_rdoc_files: []
 files:
 - .bait/test.sh
 - .gitignore
-- DEVELOP
+- .rspec
 - Gemfile
 - Gemfile.lock
 - Guardfile
@@ -215,9 +229,8 @@ files:
 - lib/bait.rb
 - lib/bait/api.rb
 - lib/bait/build.rb
-- lib/bait/objective_c/dependency_orderer.rb
-- lib/bait/objective_c/project.rb
-- lib/bait/project.rb
+- lib/bait/cli.rb
+- lib/bait/object.rb
 - lib/bait/public/css/styles.css
 - lib/bait/simple_query.rb
 - lib/bait/tester.rb
@@ -226,9 +239,6 @@ files:
 - lib/bait/views/layout.haml
 - spec/lib/bait/api_spec.rb
 - spec/lib/bait/build_spec.rb
-- spec/lib/bait/objective_c/dependency_orderer_spec.rb
-- spec/lib/bait/objective_c/project_spec.rb
-- spec/lib/bait/project_spec.rb
 - spec/lib/bait/tester_spec.rb
 - spec/lib/bait_spec.rb
 - spec/spec_helper.rb
@@ -253,16 +263,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.5
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: build and integration test service
 test_files:
 - spec/lib/bait/api_spec.rb
 - spec/lib/bait/build_spec.rb
-- spec/lib/bait/objective_c/dependency_orderer_spec.rb
-- spec/lib/bait/objective_c/project_spec.rb
-- spec/lib/bait/project_spec.rb
 - spec/lib/bait/tester_spec.rb
 - spec/lib/bait_spec.rb
 - spec/spec_helper.rb

data/DEVELOP

@@ -1,5 +0,0 @@
-Write the specs
-
-http://www.sinatrarb.com/testing.html
-https://github.com/raggi/github_post_receive_server/blob/master/spec/github_post_receive_server/rack_app_spec.rb
-

data/lib/bait/objective_c/dependency_orderer.rb

@@ -1,48 +0,0 @@
-require 'bait/objective_c/project'
-
-module Bait
-  module ObjectiveC
-    class DependencyOrderer
-      attr_accessor :errors, :order, :queue, :project
-      def initialize path_array, project
-        @project = project
-        @queue = path_array
-        @order = []
-        @errors = []
-      end
-
-      def examine_file path
-        return unless path && File.exists?(path)
-        if @order.include? path
-          return
-        end
-        imports_within(path).each do |name|
-          examine_file @project.glob(name).first
-        end
-        @order << path
-      end
-
-      def imports_within path
-        imports = []
-        File.open(path, 'r') do |f|
-          f.each_line do |line|
-            if matches = line.match(/^#import "(.*)"/)
-              imports << matches[1]
-            end
-          end
-        end
-      rescue => ex
-        @errors << ex
-      ensure
-        return imports
-      end
-
-      def start
-        @queue.each do |path|
-          examine_file path
-        end
-      end
-    end
-  end
-end
-

data/lib/bait/objective_c/project.rb

@@ -1,17 +0,0 @@
-require 'bait/project'
-require 'bait/objective_c/dependency_orderer'
-
-module Bait
-  module ObjectiveC
-    class Project < Bait::Project
-      def h_files
-        @h_files ||= ordered_dependencies '*.h', ObjectiveC::DependencyOrderer
-      end
-
-      def m_files
-        @m_files ||= ordered_dependencies '*.m', ObjectiveC::DependencyOrderer
-      end
-    end
-  end
-end
-

data/lib/bait/project.rb

@@ -1,25 +0,0 @@
-module Bait
-  class Project
-    def initialize root_path
-      unless Dir.exists? root_path
-        raise "Expected a valid directory"
-      end
-      @path = Pathname.new(root_path)
-    end
-
-    def glob pattern
-      cache ||= {}
-      if value = cache[pattern]
-        value
-      else
-        cache[pattern] = Dir.glob @path.join("**/#{pattern}")
-      end
-    end
-
-    def ordered_dependencies file_pattern, klass
-      orderer = klass.new(glob(file_pattern), self)
-      orderer.start
-      orderer.order
-    end
-  end
-end

data/spec/lib/bait/objective_c/dependency_orderer_spec.rb

@@ -1,8 +0,0 @@
-require 'bait/objective_c/dependency_orderer'
-
-describe Bait::ObjectiveC::DependencyOrderer do
-  it "initializes with a path array and a Bait::Project" do
-    project = Bait::ObjectiveC::Project.new File.dirname(__FILE__)
-    Bait::ObjectiveC::DependencyOrderer.new [], project
-  end
-end

data/spec/lib/bait/objective_c/project_spec.rb

@@ -1,8 +0,0 @@
-require 'bait/objective_c/project'
-
-describe Bait::ObjectiveC::Project do
-  subject { Bait::ObjectiveC::Project.new "/" }
-  it { should respond_to :h_files }
-  it { should respond_to :m_files }
-end
-

data/spec/lib/bait/project_spec.rb

@@ -1,8 +0,0 @@
-require 'bait/project'
-
-describe Bait::Project do
-  it "requires a valid root path" do
-    expect { Bait::Project.new('fawfewa') }.to raise_error
-    expect { Bait::Project.new('/') }.not_to raise_error
-  end
-end