buildbox 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9695125aaee3d822bac58ccacfe3acb3e6af8a9c
-  data.tar.gz: c03eddbac8c47d1022f0efb5dd33e0f4c1b5afd3
+  metadata.gz: 50ef87e918e385b0169d8bc601aa29f94c6a7dbf
+  data.tar.gz: 8aeb7524a9a4df2b8f74fb80bcff2d6669d4b380
 SHA512:
-  metadata.gz: e957e054f341e19ef76811b343de8954fb860709f7afd7723e010c03d87cbc42d6ae5df09de42b5a1ff44143f38f82afc299d255a5e047a0726d07ac91078d8a
-  data.tar.gz: 52ab5893fe9cc9405a11807e16fc7d36b7e0bc5f94fe2b0a3f4bc5fd6a01e75c2e879434b906ad9ed4d9d2908c9ac5c9b6f77898e3ddf7f7e9c69dfd878b4f19
+  metadata.gz: 6c46f041eeb2929692d1f4a90d8a931cc10f9de14dab779b116737e4a2553d9d2f4159e36d71d332253269ee46a4649f6919113529d42fcb750e389c7b9e4de0
+  data.tar.gz: a3903b0189b3907b5ccea550ef619cb2f2ba7a40a27a5975c18c62b395c4f82493dc1ecb7cf372c60f11db344ca95cd13a79aaba01802675f57313533d1d4da2

data/.rspec

@@ -0,0 +1,3 @@
+--color
+--profile
+-Ilib

data/README.md

@@ -1,24 +1,22 @@
-# Ci::Ruby
-
-TODO: Write a gem description
+# Buildbox
 
 ## Installation
 
-Add this line to your application's Gemfile:
+Install the gem
 
-    gem 'ci-ruby'
+    $ gem install buildbox
 
-And then execute:
+Then authenticate
 
-    $ bundle
+    $ buildbox auth:login [apikey]
 
-Or install it yourself as:
+Then you can start monitoring for builds like so:
 
-    $ gem install ci-ruby
+    $ buildbox monitor:start
 
-## Usage
+For more help with the command line interface
 
-TODO: Write usage instructions here
+    $ buildbox --help
 
 ## Contributing
 

data/bin/buildbox

@@ -2,30 +2,98 @@
 
 dir = File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(dir) unless $LOAD_PATH.include?(dir)
-require 'trigger'
+require 'buildbox'
 require 'optparse'
 
-COMMANDS = %w(start stop)
+commands = {}
+options = {}
 
-options = {}.tap do |options|
-  OptionParser.new do |opts|
-    opts.version = Trigger::VERSION
-    opts.banner  = 'Usage: trigger command [options]'
+help = <<HELP
 
-    opts.separator ""
-    opts.separator "Options:"
+  auth     #  authentication (login, logout)
+  monitor  #  monitor builds (start, stop)
+  version  #  display version
 
-    opts.on("-d", "--daemon", "Runs trigger as a daemon") do |user_agent|
-      options[:daemon] = true
-    end
+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
 
-  end.parse!
+commands['auth:logout'] = OptionParser.new do |opts|
+  opts.banner = "Usage: buildbox auth:logout"
 end
 
-client = Trigger::Client.new(options)
+commands['monitor:start'] = OptionParser.new do |opts|
+  opts.banner = "Usage: buildbox monitor:start"
 
-if command = ARGV[0]
-  client.public_send(command)
+  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
-  abort 'No command specified'
+  puts global.help
 end

data/lib/buildbox.rb

@@ -8,6 +8,8 @@ require "buildbox/api"
 require "buildbox/worker"
 require "buildbox/pid_file"
 require "buildbox/configuration"
+require "buildbox/auth"
+require "buildbox/response"
 
 module Buildbox
   require 'fileutils'

data/lib/buildbox/api.rb

@@ -4,24 +4,39 @@ module Buildbox
     require 'openssl'
     require 'json'
 
-    def update(build, data)
-      put("repos/#{build.repository_uuid}/builds/#{build.uuid}", normalize_data('build' => data))
+    def initialize(options)
+      @options = options
     end
 
-    def scheduled(options = {})
-      builds = []
+    def crash(exception, information = {})
+      payload = {
+        :exception => exception.class.name,
+        :message   => exception.message,
+        :backtrace => exception.backtrace,
+        :meta      => {}
+      }
 
-      options[:repositories].each do |repository|
-        response = get("repos/#{repository}/builds/scheduled")
-        json     = JSON.parse(response.body)
+      payload[:meta][:worker_uuid] = worker_uuid if worker_uuid
+      payload[:meta][:build_uuid]  = information[:build] if information[:build]
+      payload[:meta][:client_version] = Buildbox::VERSION
 
-        json['response']['builds'].map do |build|
-          # really smelly way of converting keys to symbols
-          builds << Build.new(symbolize_keys(build).merge(:repository_uuid => repository))
-        end
-      end
+      request(:post, "crashes", :crash => payload)
+    end
+
+    def register(payload)
+      request(:post, "workers", :worker => payload)
+    end
 
-      builds
+    def login
+      request(:get, "user")
+    end
+
+    def update(build, payload)
+      request(:put, "workers/#{worker_uuid}/builds/#{build.uuid}", :build => payload)
+    end
+
+    def builds(options = {})
+      request(:get, "workers/#{worker_uuid}/builds")
     end
 
     private
@@ -33,25 +48,31 @@ module Buildbox
       end
     end
 
-    def get(path)
-      uri     = URI.parse(endpoint(path))
-      request = Net::HTTP::Get.new(uri.request_uri)
+    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
 
-      Buildbox.logger.debug "GET #{uri}"
+      uri     = URI.parse(endpoint(path))
+      request = klass.new(uri.request_uri)
 
-      http(uri).request(request)
-    end
+      if payload.nil?
+        Buildbox.logger.debug "#{method.to_s.upcase} #{uri}"
+      else
+        normalized_payload = normalize_payload(payload)
+        request.set_form_data normalized_payload
 
-    def put(path, data)
-      uri     = URI.parse(endpoint(path))
-      request = Net::HTTP::Put.new(uri.request_uri)
-      request.set_form_data data
+        Buildbox.logger.debug "#{method.to_s.upcase} #{uri} #{normalized_payload.inspect}"
+      end
 
-      Buildbox.logger.debug "PUT #{uri}"
+      Response.new http(uri).request(request)
+    end
 
-      response = http(uri).request(request)
-      raise response.body unless response.code.to_i == 200
-      response
+    def worker_uuid
+      Buildbox.configuration.worker_uuid
     end
 
     def endpoint(path)
@@ -59,22 +80,36 @@ module Buildbox
         "#{Buildbox.configuration.endpoint}/v#{Buildbox.configuration.api_version}/#{path}"
     end
 
-    def symbolize_keys(hash)
-      Hash[hash.map{ |k, v| [k.to_sym, v] }]
+    # { :foo => { :bar => { :bang => "yolo" } } } => { "foo[bar][bang]" => "yolo" }
+    def normalize_payload(params, key=nil)
+      params = flatten_keys(params) if params.is_a?(Hash)
+      result = {}
+      params.each do |k,v|
+        case v
+        when Hash
+          result[k.to_s] = normalize_params(v)
+        when Array
+          v.each_with_index do |val,i|
+            result["#{k.to_s}[#{i}]"] = val.to_s
+          end
+        else
+          result[k.to_s] = v.to_s
+        end
+      end
+      result
     end
 
-    def normalize_data(hash)
-      hash.inject({}) do |target, member|
-        key, value = member
-
-        if value.kind_of?(Hash)
-          value.each { |key2, value2| target["#{key}[#{key2}]"] = value2.to_s }
+    def flatten_keys(hash, newhash={}, keys=nil)
+      hash.each do |k, v|
+        k = k.to_s
+        keys2 = keys ? keys+"[#{k}]" : k
+        if v.is_a?(Hash)
+          flatten_keys(v, newhash, keys2)
         else
-          target[key] = value.to_s
+          newhash[keys2] = v
         end
-
-        target
       end
+      newhash
     end
   end
 end

data/lib/buildbox/auth.rb

@@ -0,0 +1,37 @@
+module Buildbox
+  class Auth
+    def login(options)
+      if Buildbox.configuration.api_key
+        error "You have already authentication. To unauthenticate, run `buildbox auth:logout`"
+      end
+
+      key = options[:api_key]
+      api = Buildbox::API.new(:api_key => key)
+
+      if api.login.success?
+        Buildbox.configuration.update :api_key, key
+        info "Authentication successful"
+      end
+    end
+
+    def logout
+      if Buildbox.configuration.api_key.nil?
+        error "You are currently not logged in. To authenticate, run: `buildbox auth:login`"
+      end
+
+      Buildbox.configuration.update :api_key, nil
+      info "You have successfuly logged out"
+    end
+
+    private
+
+    def info(message)
+      Buildbox.logger.info message
+    end
+
+    def error(message)
+      Buildbox.logger.error message
+      exit 1
+    end
+  end
+end

data/lib/buildbox/build.rb

@@ -1,13 +1,12 @@
 module Buildbox
   class Build
-    attr_reader :uuid, :repository_uuid
+    attr_reader :uuid
 
     def initialize(options)
-      @uuid            = options[:uuid]
-      @repo            = options[:repo]
-      @commit          = options[:commit]
-      @repository_uuid = options[:repository_uuid]
-      @command         = options[:command] || "bundle && rspec"
+      @uuid       = options[:uuid]
+      @repository = options[:repository]
+      @commit     = options[:commit]
+      @command    = options[:command] || "bundle && rspec"
     end
 
     def start(&block)
@@ -25,7 +24,7 @@ module Buildbox
       unless build_path.exist?
         build_path.mkpath
 
-        command.run! %{git clone "#{@repo}" .}
+        command.run! %{git clone "#{@repository}" .}
       end
     end
 
@@ -40,7 +39,7 @@ module Buildbox
     end
 
     def folder_name
-      @repo.gsub(/[^a-zA-Z0-9]/, '-')
+      @repository.gsub(/[^a-zA-Z0-9]/, '-')
     end
 
     def command

data/lib/buildbox/client.rb

@@ -10,6 +10,8 @@ module Buildbox
 
       Buildbox.logger.info "Starting client..."
 
+      register_client
+
       begin
         daemonize if @options[:daemon]
         pid_file.save
@@ -19,6 +21,8 @@ module Buildbox
           process_build_queue
           wait_for_interval
         end
+      rescue => e
+        api.crash(e, :build => @build)
       ensure
         pid_file.delete
       end
@@ -36,25 +40,35 @@ module Buildbox
       if @options[:daemon]
         Process.daemon
 
-        Buildbox.logger = Logger.new(Buildbox.root_path.join("ci.log"))
+        Buildbox.logger = Logger.new(Buildbox.root_path.join("buildbox.log"))
       end
     end
 
+    def register_client
+      worker_uuid = Buildbox.configuration.worker_uuid
+      response    = api.register(:uuid => worker_uuid, :hostname => `hostname`.chomp)
 
-    def process_build_queue
-      build = api.scheduled(:repositories => Buildbox.configuration.repositories).first
+      Buildbox.configuration.update :worker_uuid, response.payload[:uuid]
+    end
 
-      Buildbox::Worker.new(build, api).run if build
+    def process_build_queue
+      scheduled = api.builds.payload.first
+
+      if scheduled
+        # store build in an instance variable so we can report on it in
+        # the event of a crash
+        @build = Build.new(scheduled)
+        Buildbox::Worker.new(@build, api).run
+        @build = nil
+      end
     end
 
     def reload_configuration
-      Buildbox.logger.info "Reloading configuration"
-
       Buildbox.configuration.reload
     end
 
     def wait_for_interval
-      Buildbox.logger.info "Sleeping for #{@interval} seconds"
+      Buildbox.logger.debug "Sleeping for #{@interval} seconds"
 
       sleep(@interval)
     end
@@ -68,7 +82,7 @@ module Buildbox
     end
 
     def api
-      @api ||= Buildbox::API.new
+      @api ||= Buildbox::API.new(:api_key => Buildbox.configuration.api_key)
     end
 
     def pid_file

data/lib/buildbox/configuration.rb

@@ -6,22 +6,28 @@ module Buildbox
 
     require 'json'
 
+    attr_accessor :worker_uuid
+    attr_accessor :api_key
     attr_accessor :endpoint
     attr_accessor :use_ssl
     attr_accessor :api_version
-    attr_accessor :repositories
 
     def initialize
-      @use_ssl       = true
-      @endpoint      = 'api.buildboxci.com'
+      @use_ssl       = false
+      @endpoint      = 'api.buildbox.io'
       @api_version   = 1
-      @repositories = []
+    end
+
+    def update(key, value)
+      self.public_send("#{key}=", value)
+      save
     end
 
     def save
       File.open(path, 'w+') do |file|
         file.write(to_json)
       end
+      Buildbox.logger.debug "Configuration saved to `#{path}`"
     end
 
     def reload
@@ -39,13 +45,16 @@ module Buildbox
     private
 
     def to_json
-      JSON.generate(:endpoint => endpoint,
-                    :use_ssl => use_ssl,
-                    :api_version => api_version,
-                    :repositories => repositories)
+      JSON.pretty_generate(:endpoint    => endpoint,
+                           :use_ssl     => use_ssl,
+                           :api_version => api_version,
+                           :api_key     => api_key,
+                           :worker_uuid => worker_uuid)
     end
 
     def read
+      Buildbox.logger.debug "Reading configuration `#{path}`"
+
       JSON.parse(path.read)
     end
 

data/lib/buildbox/pid_file.rb

@@ -5,7 +5,7 @@ module Buildbox
     end
 
     def path
-      Buildbox.root_path.join("ci.pid")
+      Buildbox.root_path.join("buildbox.pid")
     end
 
     def pid

data/lib/buildbox/response.rb

@@ -0,0 +1,49 @@
+module Buildbox
+  class Response
+    attr_reader :payload
+
+    def initialize(response)
+      @response = response
+
+      unless success?
+        raise "API Error: #{@response.code} #{@response.body}"
+      end
+
+      if json?
+        json = JSON.parse(@response.body)
+
+        if json.kind_of?(Array)
+          @payload = json.map { |item| symbolize_keys(item) }
+        else
+          @payload = symbolize_keys(json)
+        end
+      end
+    end
+
+    def success?
+      @response.code.to_i == 200
+    end
+
+    private
+
+    def json?
+      @response['content-type'] =~ /json/
+    end
+
+    def symbolize_keys(hash)
+      hash.inject({}) do |result, item|
+        key, value = item
+        new_key   = case key
+                    when String then key.to_sym
+                    else key
+                    end
+        new_value = case value
+                    when Hash then symbolize_keys(value)
+                    else value
+                    end
+        result[new_key] = new_value
+        result
+      end
+    end
+  end
+end

data/lib/buildbox/version.rb

@@ -1,3 +1,3 @@
 module Buildbox
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: buildbox
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Keith Pitt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-07 00:00:00.000000000 Z
+date: 2013-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -75,6 +75,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rspec
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -83,11 +84,13 @@ files:
 - buildbox-ruby.gemspec
 - lib/buildbox.rb
 - lib/buildbox/api.rb
+- lib/buildbox/auth.rb
 - lib/buildbox/build.rb
 - lib/buildbox/client.rb
 - lib/buildbox/command.rb
 - lib/buildbox/configuration.rb
 - lib/buildbox/pid_file.rb
+- lib/buildbox/response.rb
 - lib/buildbox/result.rb
 - lib/buildbox/utf8.rb
 - lib/buildbox/version.rb