buildbox 0.0.4 → 0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ae40618215e45c8217f4089029f72106f0b3201
-  data.tar.gz: cba478aafb75089f7796eb58b36ebbe7058533b9
+  metadata.gz: 66614e4105648eff90b766f903b11c2c4b6ef0dd
+  data.tar.gz: e9cbf92473c31e2c409b4c480b224804753c62d4
 SHA512:
-  metadata.gz: 2f59b811b325337a6a3b0686358915e643d3dc2fe5d6ef5808ef946bfbfdb0f054d8145a0cfbf9b09ba4ea5d7de071c613c84ed5c2a99379f948814c8d87cf09
-  data.tar.gz: 7553cc4351956d502101f57a0827f02ab33bc346b6c89614fc003f4d7223a5bf3deaf5cd78f0e268526acc159e013e9adfeccb3df36a9a251384ce532cd056e8
+  metadata.gz: 9fa87cfddeb44df24337f914e4482240d5cae39af7a42c77eab2942938bb5fddf62d808901d0c023942905a9e600005b5452faf82abaea74b85d32f3ed8ff894
+  data.tar.gz: 349f14e0d21f46fca21cf84654b8e064d595a5405eec95f08c8c2f202c69a8c8839ee9f4b440e17ea32ddd0bebe4dc634d56c4bf64faee82baae7b9ee2a774fa

data/.gitignore

@@ -3,7 +3,6 @@
 .bundle
 .config
 .yardoc
-Gemfile.lock
 InstalledFiles
 _yardoc
 coverage
@@ -14,3 +13,4 @@ rdoc
 spec/reports
 spec/tmp
 tmp
+.DS_Store

data/.ruby-version

@@ -0,0 +1 @@
+2.0.0-p247

data/Gemfile

@@ -1,4 +1,7 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in ci-ruby.gemspec
+gem 'rake'
+gem 'rspec'
+gem 'webmock'
+
 gemspec

data/Gemfile.lock

@@ -0,0 +1,49 @@
+PATH
+  remote: .
+  specs:
+    buildbox (0.1)
+      celluloid (~> 0.14)
+      faraday (~> 0.8)
+      faraday_middleware (~> 0.9)
+      hashie (~> 2.0)
+      multi_json (~> 1.7)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    addressable (2.3.5)
+    celluloid (0.14.1)
+      timers (>= 1.0.0)
+    crack (0.4.1)
+      safe_yaml (~> 0.9.0)
+    diff-lcs (1.2.4)
+    faraday (0.8.8)
+      multipart-post (~> 1.2.0)
+    faraday_middleware (0.9.0)
+      faraday (>= 0.7.4, < 0.9)
+    hashie (2.0.5)
+    multi_json (1.7.9)
+    multipart-post (1.2.0)
+    rake (10.1.0)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.5)
+    rspec-expectations (2.14.2)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.3)
+    safe_yaml (0.9.5)
+    timers (1.1.0)
+    webmock (1.13.0)
+      addressable (>= 2.2.7)
+      crack (>= 0.3.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  buildbox!
+  rake
+  rspec
+  webmock

data/README.md

@@ -6,13 +6,13 @@ Install the gem
 
     $ gem install buildbox
 
-Then authenticate
+Add your worker tokens
 
-    $ buildbox auth:login [apikey]
+    $ buildbox worker:add [token]
 
 Then you can start monitoring for builds like so:
 
-    $ buildbox monitor:start --daemon
+    $ buildbox server:start
 
 For more help with the command line interface
 

data/Rakefile

@@ -1 +1,5 @@
 require "bundler/gem_tasks"
+
+task :default do
+  exec 'rspec'
+end

data/bin/buildbox

@@ -2,98 +2,6 @@
 
 dir = File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(dir) unless $LOAD_PATH.include?(dir)
-require 'buildbox'
-require 'optparse'
-
-commands = {}
-options = {}
-
-help = <<HELP
-
-  auth     #  authentication (login, logout)
-  monitor  #  monitor builds (start, stop)
-  version  #  display version
-
-HELP
-
-global = OptionParser.new do |opts|
-  opts.version = Buildbox::VERSION
-  opts.banner  = 'Usage: buildbox COMMAND [command-specific-actions]'
-
-  opts.separator help
-end
-
-commands['auth:login'] = OptionParser.new do |opts|
-  opts.banner = "Usage: buildbox auth:login API_KEY"
-end
-
-commands['auth:logout'] = OptionParser.new do |opts|
-  opts.banner = "Usage: buildbox auth:logout"
-end
-
-commands['monitor:start'] = OptionParser.new do |opts|
-  opts.banner = "Usage: buildbox monitor:start"
-
-  opts.on("-d", "--daemon", "Runs as a daemon") do
-    options[:daemon] = true
-  end
-
-  opts.on("--help", "You're looking at it.") do
-    puts commands['monitor:start']
-    exit
-  end
-end
 
-commands['monitor:stop'] = OptionParser.new do |opts|
-  opts.banner = "Usage: buildbox monitor:stop"
-end
-
-commands['version'] = OptionParser.new do |opts|
-  opts.banner = "Usage: buildbox version"
-end
-
-global.order!
-
-args = ARGV
-
-if command = args.shift
-  if commands.has_key?(command)
-    commands[command].parse!
-  else
-    puts "`#{command}` is an unknown command"
-    exit 1
-  end
-
-  if command == "version"
-    puts Buildbox::VERSION
-    exit
-  end
-
-  if command =~ /^monitor/
-    client = Buildbox::Client.new(options)
-    if command == "monitor:start"
-      client.start
-    elsif command == "monitor:stop"
-      client.stop
-    end
-  end
-
-  if command =~ /^auth/
-    auth = Buildbox::Auth.new
-
-    if command == "auth:login"
-      api_key = args[0]
-
-      unless api_key
-        puts commands['auth:login']
-        exit
-      end
-
-      auth.login(:api_key => args[0])
-    elsif command == "auth:logout"
-      auth.logout
-    end
-  end
-else
-  puts global.help
-end
+require 'buildbox'
+Buildbox::CLI.new(ARGV).parse

data/buildbox-ruby.gemspec

@@ -18,8 +18,9 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec"
-  spec.add_development_dependency "dotenv"
+  spec.add_dependency 'faraday',            '~> 0.8'
+  spec.add_dependency 'faraday_middleware', '~> 0.9'
+  spec.add_dependency 'hashie',             '~> 2.0'
+  spec.add_dependency 'multi_json',         '~> 1.7'
+  spec.add_dependency 'celluloid',          '~> 0.14'
 end

data/lib/buildbox.rb

@@ -1,40 +1,27 @@
-require "buildbox/utf8"
-require "buildbox/command"
-require "buildbox/result"
-require "buildbox/build"
-require "buildbox/version"
-require "buildbox/client"
-require "buildbox/api"
-require "buildbox/worker"
-require "buildbox/pid_file"
-require "buildbox/configuration"
-require "buildbox/auth"
-require "buildbox/response"
-require "buildbox/observer"
+require 'pathname'
 
 module Buildbox
-  require 'fileutils'
-  require 'pathname'
-  require 'logger'
+  autoload :API,           "buildbox/api"
+  autoload :Build,         "buildbox/build"
+  autoload :Command,       "buildbox/command"
+  autoload :CLI,           "buildbox/cli"
+  autoload :Configuration, "buildbox/configuration"
+  autoload :Environment,   "buildbox/environment"
+  autoload :Monitor,       "buildbox/monitor"
+  autoload :Runner,        "buildbox/runner"
+  autoload :Script,        "buildbox/script"
+  autoload :UTF8,          "buildbox/utf8"
+  autoload :Worker,        "buildbox/worker"
+  autoload :VERSION,       "buildbox/version"
 
-  class << self
-    def configuration
-      @configuration ||= Configuration.load
-    end
+  def self.config
+    @config ||= Configuration.new.tap(&:reload)
+ end
 
-    def root_path
-      path = Pathname.new File.join(ENV['HOME'], ".buildbox")
-      path.mkpath unless path.exist?
+  def self.root_path
+    path = Pathname.new File.join(ENV['HOME'], ".buildbox")
+    path.mkpath unless path.exist?
 
-      Pathname.new(path)
-    end
-
-    def logger=(logger)
-      @logger = logger
-    end
-
-    def logger
-      @logger ||= Logger.new(STDOUT)
-    end
+    Pathname.new(path)
   end
 end

data/lib/buildbox/api.rb

@@ -1,112 +1,57 @@
+require 'rubygems'
+require 'faraday'
+require 'faraday_middleware'
+require 'hashie/mash'
+
 module Buildbox
   class API
-    require 'net/http'
-    require 'openssl'
-    require 'json'
-
-    def initialize(options)
-      @options = options
-      @queue   = ::Queue.new
-    end
-
-    def crash(exception, information = {})
-      payload = {
-        :exception => exception.class.name,
-        :message   => exception.message,
-        :backtrace => exception.backtrace,
-        :meta      => {}
-      }
-
-      payload[:meta][:worker_uuid] = worker_uuid if worker_uuid
-      payload[:meta][:build_uuid]  = information[:build] if information[:build]
-      payload[:meta][:client_version] = Buildbox::VERSION
-
-      request(:post, "crashes", payload)
+    def initialize(config = Buildbox.config)
+      @config = config
     end
 
-    def register(payload)
-      request(:post, "workers", payload)
+    def worker(access_token: access_token, hostname: hostname)
+      put("workers/#{access_token}", :hostname => hostname)
     end
 
-    def login
-      request(:get, "user")
+    def scheduled_builds(project)
+      get(project.scheduled_builds_url).map { |build| Buildbox::Build.new(build) }
     end
 
-    def builds(options = {})
-      request(:get, "workers/#{worker_uuid}/builds")
-    end
-
-    def update_build_state_async(*args)
-      async :update_build_state, args
-    end
-
-    def update_build_state(build_uuid, state)
-      request(:put, "workers/#{worker_uuid}/builds/#{build_uuid}", :state => state)
-    end
-
-    def update_build_result_async(*args)
-      async :update_build_result, args
-    end
-
-    def update_build_result(build_uuid, result_uuid, attributes)
-      request(:put, "workers/#{worker_uuid}/builds/#{build_uuid}/results/#{result_uuid}", attributes)
+    def update_build(build)
+      put(build.url, :output => build.output, :exit_status => build.exit_status)
     end
 
     private
 
-    def async(method, args)
-      @queue << [ method, args ]
+    def connection
+      @connection ||= Faraday.new(:url => @config.api_endpoint) do |faraday|
+        faraday.request  :json
 
-      if !@thread || !@thread.alive?
-        @thread = Thread.new do
-          loop do
-            async_call = @queue.pop
-            Thread.exit if async_call.nil?
+        faraday.response :logger
+        faraday.response :mashify
 
-            self.send(async_call[0], *async_call[1])
-          end
-        end
-
-        @thread.abort_on_exception = true
-      end
-    end
+        # json needs to come after mashify as it needs to run before the mashify
+        # middleware.
+        faraday.response :json
 
-    def http(uri)
-      Net::HTTP.new(uri.host, uri.port).tap do |http|
-        http.use_ssl     = uri.scheme == "https"
-        http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+        faraday.adapter Faraday.default_adapter
       end
     end
 
-    def request(method, path, payload = nil)
-      klass   = case method
-                when :get  then Net::HTTP::Get
-                when :put  then Net::HTTP::Put
-                when :post then Net::HTTP::Post
-                else raise "No request class defined for `#{method}`"
-                end
-
-      uri     = URI.parse(endpoint(path))
-      request = klass.new(uri.request_uri, 'Content-Type' => 'application/json',
-                                           'Accept' => 'application/json')
-
-      if payload.nil?
-        Buildbox.logger.debug "#{method.to_s.upcase} #{uri}"
-      else
-        request.body = JSON.dump(payload)
-        Buildbox.logger.debug "#{method.to_s.upcase} #{uri} #{payload.inspect}"
-      end
-
-      Response.new http(uri).request(request)
+    def post(path, body = {})
+      connection.post(path) do |request|
+        request.body = body
+      end.body
     end
 
-    def worker_uuid
-      Buildbox.configuration.worker_uuid
+    def put(path, body = {})
+      connection.put(path) do |request|
+        request.body = body
+      end.body
     end
 
-    def endpoint(path)
-      (Buildbox.configuration.use_ssl ? "https://" : "http://") +
-        "#{Buildbox.configuration.endpoint}/v#{Buildbox.configuration.api_version}/#{path}"
+    def get(path)
+      connection.get(path).body
     end
   end
 end

data/lib/buildbox/build.rb

@@ -1,72 +1,18 @@
-module Buildbox
-  class Build
-    attr_reader :uuid
-
-    def initialize(options)
-      @uuid       = options[:uuid]
-      @repository = options[:repository]
-      @commit     = options[:commit]
-      @config     = options[:config]
-    end
-
-    def start(observer = nil)
-      @observer = observer
-
-      unless build_path.exist?
-        setup_build_path
-        clone_repository
-      end
-
-      fetch_and_checkout
-      build
-
-      true
-    end
-
-    private
-
-    def setup_build_path
-      run %{mkdir -p "#{build_path}"}
-    end
+require 'rubygems'
+require 'hashie/mash'
 
-    def clone_repository
-      run %{git clone "#{@repository}" . -q}
-    end
-
-    def fetch_and_checkout
-      run %{git clean -fd}
-      run %{git fetch}
-      run %{git checkout -qf "#{@commit}"}
-    end
-
-    def build
-      @config[:build][:commands].each { |command| run command }
-    end
-
-    def folder_name
-      @repository.gsub(/[^a-zA-Z0-9]/, '-')
+module Buildbox
+  class Build < Hashie::Mash
+    def success?
+      exit_status == 0
     end
 
-    def build_path
-      Buildbox.root_path.join folder_name
+    def started?
+      output.kind_of?(String) && output.length > 0
     end
 
-    def run(command)
-      path    = build_path if build_path.exist?
-      started = false
-
-      result = Buildbox::Command.new(path).run(command) do |result, chunk|
-        if started
-          @observer.chunk(result)
-        else
-          @observer.started(result)
-          started = true
-        end
-      end
-
-      @observer.finished(result)
-
-      result
+    def finished?
+      exit_status != nil
     end
   end
 end