baleen 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2926ffd6301f080fb74885a2d760a53d5155bef7
-  data.tar.gz: 7ab9916383f64ee4fa05c409aeab5dd026b3dc79
+  metadata.gz: 4af7f0392de6df6c5592edcee4322f81cf9167ba
+  data.tar.gz: 740218a0bcf6abaf941ce0b67a2a3901210841f4
 SHA512:
-  metadata.gz: 64ea677e359b427e402a1b061221063f24435c7805ff96ce12f3d308454ddbb96ecb8ced0184c0b334b51c13ad0e70b2c7a3d6ee5124f297381e9851d0b048d3
-  data.tar.gz: 7784401b71d0e19d4ef0ad49a72a7c73f509e110cd7b89cc4bd97778fe8d365f4363d238d0fb6b50ceb6c75feb1bd2a789f2bc5a30ee9cca77ce708a8cecb96c
+  metadata.gz: 0c0aa63594939b929aaa2f876ea9e67744244e357cb1eff814cae89952d6bc63302dd054378ea867498c6adcdf5766ab5cbc022488fd265fd45804c5408d950b
+  data.tar.gz: 0c9e7dab585817eb3b495e0e0c0bb31cee27d164ebf9ef999a70ac62377fa7722692bb31494564fec63cdf4902c3da43155a405b2c250619213567e21e6c6c67

data/.gitignore

@@ -17,3 +17,4 @@ test/version_tmp
 tmp
 poc/db/.*sqlite3
 poc/log/*
+baleen/*

data/.gitmodules

@@ -0,0 +1,3 @@
+[submodule "poc"]
+	path = poc
+	url = https://github.com/kimh/baleen-poc

data/Dockerfile

@@ -0,0 +1 @@
+From ubuntu

data/Gemfile

@@ -2,3 +2,4 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in baleen.gemspec
 gemspec
+

data/README.md

@@ -122,6 +122,7 @@ Finally, run baleen. Make sure to specify correct ip of the machine that is runn
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
+6. Work hard!!
 
 
 

data/baleen.gemspec

@@ -25,12 +25,14 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "pry"
   spec.add_development_dependency "awesome_print"
   spec.add_development_dependency "interactive_editor"
+  spec.add_development_dependency "rspec"
 
   spec.add_runtime_dependency 'celluloid'
   spec.add_runtime_dependency 'celluloid-io'
   spec.add_runtime_dependency 'docker-api'
   spec.add_runtime_dependency 'colorize'
   spec.add_runtime_dependency 'thor'
+  spec.add_runtime_dependency 'sinatra'
 
 end
 

data/baleen.yml.sample

@@ -0,0 +1,46 @@
+# baleen.yml: Configuration file to run baleen
+#
+# This file is used to specify the configuration for your baleen job.
+# The file has three top sections and config file must have each section
+#
+# base:
+#   Mandatory
+#     baleen-server: IP address or host of baleen server
+#
+#   Optional
+#     port: port that baleen server is listening. Default: 5533
+#
+# runner:
+#   Mandatory
+#     image: name of image to run Docker container where your tests will be run
+#
+#   Optional
+#     work_dir: working directory of container. Default: ./
+#     concurrency: number of containers to run at one time. Default: 2
+#     before_command: commands to run before running your tests.
+#
+# framework:
+#   Mandatory
+#     type: your test framework
+#
+#   Optional
+#     features: place of your feature files when your framework type is cucumber. Default: ./features
+#
+
+base:
+  baleen_server: 127.0.0.1
+  port: 5533
+
+runner:
+  image: kimh/baleen-poc
+  work_dir: /git/baleen/poc
+  concurrency: 3
+  before_command: bundle install
+  # If you want to specify multiple commands, you can use block style syntax of YAML
+  # before_command: |
+  #   source /etc/profile.d/rvm.sh
+  #   bundle install
+
+framework:
+  type: cucumber
+  features: ./

data/bin/baleen

@@ -3,29 +3,98 @@
 require "thor"
 require "baleen"
 
-class BaleenCommand < Thor
-
-  desc "cucumber", "Running cucumber features"
-  option :image, :required => true
-  option :work_dir, :default => "./"
-  option :files, :default => "features"
-  option :before_command, :default => nil
-  option :host, :default => "127.0.0.1"
-  option :port, :default => "5533"
-  option :concurrency, :default => 2
-  def cucumber
-    client  = Baleen::Client.new(options[:host], options[:port])
-    request = Baleen::Message::Request::Cucumber.new(
-                image: options[:image],
-                work_dir: options[:work_dir],
-                files: options[:files],
-                before_command: options[:before_command],
-                concurrency: options[:concurrency].to_i,
-              )
-
-    job     = Baleen::Job.new(client, request)
+module BaleenCliHelper
+  def job_start(project)
+    klass = project[:framework][:type].to_s.capitalize
+    task = Baleen::Task.const_get(klass).new(
+      image: project[:runner][:image],
+      work_dir: project[:runner][:work_dir],
+      files: project[:framework][:files],
+      before_command: project[:runner][:before_command],
+      concurrency: project[:runner][:concurrency].to_i,
+    )
+    client  = Baleen::Client.new(project[:base][:baleen_server], project[:base][:port])
+    job     = Baleen::Job.new(client, task)
     job.start
   end
 end
 
-BaleenCommand.start
+module BaleenCLI
+  class Project < Thor
+
+    include Baleen::Default
+
+    option :baleen_server
+    option :port
+    option :debug, :type => :boolean
+
+    desc "start", "Running baleen project"
+    def start(name)
+      baleen_server = ENV["baleen_server"] || options[:baleen_server] || default_baleen_server
+      debug = options[:debug]
+      port = ENV["baleen_port"] || options[:port] || default_port
+      task = Baleen::Task::RunProject.new(
+        :project => name
+      )
+      client  = Baleen::Client.new(baleen_server, port, debug)
+      job     = Baleen::Job.new(client, task)
+      job.start
+    end
+    default_task :start
+
+    desc "list", "List baleen projects registered at baleen-server"
+    def list
+      #TODO
+    end
+  end
+
+  class Cucumber < Thor
+
+    include Baleen::Default
+    include BaleenCliHelper
+
+    option :baleen_server, :required => true
+    option :port
+    option :before_command
+    option :concurrency
+    option :work_dir
+    option :features
+    option :image, :required => true
+    option :debug, :type => :boolean
+
+    desc "cucumber", "Running cucumber project from options"
+    def start
+     project = {
+       base: {
+         baleen_server: options[:baleen_server],
+         port: options[:port]                    || default_port
+       },
+       runner: {
+         before_command: options[:before_command] || default_before_command,
+         concurrency: options[:concurrency]       || default_concurrency,
+         work_dir: options[:work_dir]             || default_work_dir,
+         image: options[:image],
+       },
+       framework: {
+         files: options[:features] || default_features,
+         type: "cucumber"
+       }
+     }
+
+     job_start(project)
+    end
+    default_task :start
+
+  end
+
+  class Main < Thor
+
+    desc "project", "Project"
+    subcommand "project", Project
+
+    desc "cucumber", "Running cucumber project from options"
+    subcommand "cucumber", Cucumber
+  end
+end
+
+BaleenCLI::Main.start

data/bin/baleen-server

@@ -18,31 +18,61 @@ def running?
   end
 end
 
+
 class BaleenServerCli < Thor
 
+  include Baleen
+  include Baleen::Default
+
   desc "start", "Start Baleen server"
-  option :docker_host, :default => "127.0.0.1"
-  option :docker_port, :default => 4243
-  option :port,        :default => 5533
-  option :debug,       :type    => :boolean
+  option :docker_host,   :desc => "Host of Docker"
+  option :docker_port,   :desc => "Port that Docker is listening to"
+  option :port,          :desc => "Port that baleen server is listening to"
+  option :ci,            :desc => "When specified, baleen-server will receive github post-receive"
+  option :ci_port,       :desc => "Port to accept github post-receive"
+  option :project_file,  :desc => "Path to project file (baleen.yml)"
+  option :dir,           :desc => "Specify the directory for baleen to save temp files, logs, caches, etc."
+  option :log_level,     :desc => "Specify log level"
+  option :debug,         :desc => "Run with debug mode. Alias to set log_level to debug", :type => :boolean
   def start
     if running?
-      warning "baleen-server is already running"
-      warning "Exiting..."
+      BL.error "baleen-server is already running"
+      BL.error "Exiting..."
       exit
     end
 
-    docker_host = options[:docker_host]
-    docker_port = options[:docker_port]
-    port        = options[:port]
-    debug       = options[:debug]
+    docker_host   = options[:docker_host]   || default_docker_host
+    docker_port   = options[:docker_port]   || default_docker_port
+    port          = options[:port]          || default_port
+    dir           = options[:dir]           || default_dir
+    project_file  = options[:project_file]  || default_project_file
+    ci_port       = options[:ci_port]       || default_ci_port
+    ci            = options[:ci]
+    debug         = options[:debug]
+    log_level     = options[:log_level]
 
-    info "Starting baleen-server..."
-    info "  Listening on: #{port}"
-    info "  Docker API: http://#{docker_host}:#{docker_port}"
+    config        = Configuration.instance
+    config.dir    = dir
+    config.debug  = debug
+    log_levels    = {"debug" => DEBUG, "info" => INFO, "warn" => WARN, "error" => ERROR}
+
+    if log_level.nil?
+      config.log_level = default_log_level
+    else
+      unless log_levels.keys.include? log_level
+        hl_error "Unknown log level: #{log_level}"
+        exit 1
+      end
+      config.log_level = log_levels[log_level]
+    end
+
+    BL.notice("Starting baleen-server...")
+    BL.notice("  Listening on: #{port}")
+    BL.notice("  Docker API: http://#{docker_host}:#{docker_port}").eol
 
     Process.daemon(true, debug)
-    Baleen::Server.new(docker_host: docker_host, docker_port: docker_port, port: port)
+    Baleen::Server.new(docker_host, docker_port, port, project_file)
+    Baleen::CiServer.run!(docker_host: docker_host, docker_port: docker_port, port: ci_port, log_level: log_level) if ci
 
     # Prevent main thread from exiting for Celluloid actors to continue running
     # See https://github.com/celluloid/celluloid/wiki/Frequently-Asked-Questions
@@ -52,10 +82,10 @@ class BaleenServerCli < Thor
   desc "stop", "Stop Baleen server"
   def stop
     if running?
-      notice "Stopping Baleen server..."
+      BL.warn "Stopping Baleen server..."
       `kill -9 #{pid.first}`
     else
-      notice "baleen-server is not running"
+      BL.warn "baleen-server is not running"
     end
   end
 
@@ -64,6 +94,7 @@ class BaleenServerCli < Thor
     self.stop
     self.start
   end
+
 end
 
 BaleenServerCli.start

data/lib/baleen/builder.rb

@@ -0,0 +1,46 @@
+require "find"
+require "excon"
+require "rubygems/package"
+
+module Baleen
+  class Builder
+
+    def initialize(project, docker_url)
+      @project = project
+      @docker_url = docker_url
+    end
+
+    def build
+      config     = Configuration.instance
+      url        = @project.ci[:url]
+      repo       = @project.ci[:repo]
+      tmp_dir    = File.join(config.dir, "tmp/build")
+      dir        = File.join(tmp_dir, repo)
+      output     = StringIO.new
+      connection = Docker::Connection.new(@docker_url, {})
+
+      FileUtils.mkdir_p(tmp_dir)
+
+      if File.exists?(dir)
+        Dir::chdir(dir)
+        `git pull`
+      else
+        `git clone #{url} #{dir}`
+        Dir::chdir(dir)
+      end
+
+      Gem::Package::TarWriter.new(output) do |tar|
+        Find.find("./") do |f|
+          if File::ftype(f) == "directory"
+            tar.mkdir(f, 0640)
+          else
+            tar.add_file(f, 0640) { |tar_file| tar_file.write(File.open(f){|fl| fl.read})}
+          end
+        end
+      end
+
+      tar = output.tap(&:rewind).string
+      connection.post('/build', {}, :body => tar)
+    end
+  end
+end

data/lib/baleen/ci_server.rb

@@ -0,0 +1,63 @@
+require 'sinatra/base'
+require 'docker'
+require 'baleen'
+
+module Baleen
+  class CiServer < Sinatra::Base
+
+    include Celluloid::IO
+    include Baleen
+    extend Baleen::Default
+
+    def self.run!(params={})
+      docker_host  = params[:docker_host]
+      docker_port  = params[:docker_port]
+      project_file = params[:project_file] || default_project_file
+      log_level    = params[:log_level]    || default_log_level
+
+      Docker.url  = "http://#{docker_host}:#{docker_port}"
+      Baleen::Project.load_project(project_file)
+      Baleen::Configuration.log_level = log_level
+
+      set :port, params[:port]
+      set :environment, :production
+      super
+    end
+
+    post '/' do
+      payload = JSON.parse(params[:payload])
+      repo    = payload["repository"]["name"]
+      branch  = payload["ref"].split("/").last
+      project = Baleen::Project.find_project_by_ci({repo: repo, branch: branch})
+      BL.notice("Receiving post receive hook for #{project.url}").eol
+
+     if project
+        async.ci_run(project)
+      end
+    end
+
+    private
+
+    def ci_run(project)
+      BL.notice("CI started")
+      BL.info(" Project: #{project.name}")
+      BL.info(" Repo:    #{project.repo}")
+      BL.info(" Branch:  #{project.branch}").eol
+
+      if project.ci[:build]
+        BL.notice("Building new image for #{project.image} before running tests...")
+        result = Baleen::Builder.new(project, Docker.url).build
+        BL.info (result)
+      end
+
+      BL.notice("Start running tests...")
+      RunnerManager.new(nil, project.task).run do |response|
+        logger  = Baleen::BL.instance
+        display = ResultDisplay.new(response.results, Time.now, Time.now, logger)
+        display.summary
+        display.detail
+      end
+      BL.notice("Finish running tests...").eol
+    end
+  end
+end

data/lib/baleen/client.rb

@@ -1,13 +1,14 @@
 require 'celluloid/io'
 require 'celluloid/autostart'
-require 'baleen/utils/colored_puts'
+require 'baleen/utils/highlighter'
 
 module Baleen
   class Client
     include Celluloid::IO
     finalizer :close
 
-    def initialize(host, port=12345)
+    def initialize(host, port, debug=false)
+      Celluloid.logger = nil unless debug
       @socket = TCPSocket.open(host, port)
     end
 
@@ -17,25 +18,34 @@ module Baleen
 
     def wait_response
       loop {
-        if response = handle_response(@socket.gets)
-          return response
-        end
+        response = handle_response(@socket.gets)
+        return response if response
       }
     end
 
     def close
       @socket.close if @socket
-      info "connection closed"
+      hl_warn "Connection closed"
 
     rescue IOError; nil
     end
 
-    def handle_response(response)
-      if response.nil?
+    def handle_response(msg)
+      if msg.nil?
         raise RuntimeError, 'Connection closed by server'
       end
 
-      Baleen::Message::Decoder.new(response).decode
+      response = Serializable.deserialize(msg)
+
+      if response.is_a? Message::Base
+        response.print_message
+      end
+
+      if response.terminate?
+        response
+      else
+        nil
+      end
     end
 
   end

data/lib/baleen/configuration.rb

@@ -0,0 +1,24 @@
+require "singleton"
+
+module Baleen
+  class Configuration
+    include Singleton
+    include Baleen::Default
+
+    attr_accessor :log_level, :dir, :debug
+
+    def initialize
+      @log_level = INFO
+      @dir       = default_dir
+    end
+
+    def self.log_level=(level)
+      instance.log_level = level
+    end
+
+    def self.debug=(bool)
+      instance.debug = bool
+    end
+
+  end
+end

data/lib/baleen/connection.rb

@@ -0,0 +1,47 @@
+module Baleen
+  class Connection
+    def initialize(socket=nil)
+      @socket = socket
+    end
+
+    def notify_info(msg)
+      notify_to_client(msg, "info")
+    end
+
+    def notify_warn(msg)
+      notify_to_client(msg, "warn")
+    end
+
+    def notify_error(msg)
+      notify_to_client(msg, "error")
+    end
+
+    def respond(response)
+      write(response.to_json)
+    end
+
+    def close
+      @socket.close
+    end
+
+    def notify_exception(msg)
+      response = Baleen::Message::Exception.new({:message => msg})
+      write(response.to_json)
+    end
+
+    private
+
+    def notify_to_client(msg, level)
+      response = Baleen::Message::ToClient.new({:message => msg, :level => level})
+      write(response.to_json)
+    end
+
+    def write(json_data)
+      if @socket
+        @socket.puts(json_data)
+      else
+        nil
+      end
+    end
+  end
+end

data/lib/baleen/default.rb

@@ -0,0 +1,57 @@
+module Baleen
+  module Default
+
+    def default_baleen_server
+      "127.0.0.1"
+    end
+
+    def default_port
+      5533
+    end
+
+    def default_dir
+      "./baleen"
+    end
+
+    def default_concurrency
+      2
+    end
+
+    def default_before_command
+      nil
+    end
+
+    def default_features
+      "./features"
+    end
+
+    def default_work_dir
+      "./"
+    end
+
+    def default_docker_host
+      "127.0.0.1"
+    end
+
+    def default_docker_port
+      4243
+    end
+
+    def default_ci_port
+      4567
+    end
+
+    def default_project_file
+      File.join(ENV["HOME"], "baleen.yml")
+    end
+
+    def default_branch
+      "master"
+    end
+
+    def default_log_level
+      Baleen::INFO
+    end
+
+  end
+end

data/lib/baleen/error.rb

@@ -1,5 +1,14 @@
 module Baleen
   module Error
     class StartContainerFail < StandardError; end
+    class ProjectNotFound < StandardError; end
+    class ConfigMissing < StandardError; end
+
+    module Validator
+      class FrameworkMissing < StandardError; end
+      class MandatoryMissing < StandardError; end
+    end
+
   end
+
 end

data/lib/baleen/job.rb

@@ -13,16 +13,18 @@ module Baleen
       start_time = Time.now
       @client.request(@msg.params)
       @response = @client.wait_response
-      end_time = Time.now
-      show_results(start_time, end_time)
+
+      unless @response.nil?
+        end_time = Time.now
+        show_results(start_time, end_time)
+      end
     end
 
     private
 
     def show_results(s_time, e_time)
-      display = ResultDisplay.new(@response, start_time: s_time, end_time: e_time)
-      display.summary
-      display.detail
+      display = ResultDisplay.new(@response.results, s_time, e_time, STDOUT)
+      display.report_result
     end
 
   end