buildbox 0.2 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b7056fe7aa77fdbeac77396ab8bb9939e6fa63e8
-  data.tar.gz: f994d5019faba63cc0840248974183777757be4a
+  metadata.gz: d5f35ee004e331b0dc73aaa7810c3205fee9e94e
+  data.tar.gz: e9c09f2b873eaa48ee5a796e0aa5e8fb0ff1b4c7
 SHA512:
-  metadata.gz: 39b14fa4bbfa431c6c918b08c8c23570bc39473432b8e7caa331a57ea2d816ef0f7ae7035bae57473aad3b8ee143816f8f41e1a4e4d3433afbb1b2e2af9b5f68
-  data.tar.gz: eb8ab79fe1c7c55ac9492297f4cd5b88fe69e1c76af611854e5f2630f7bc5be386acc479bd34cbba65d9655e47dc8ac2dc9bd4a7e16e1e2664a1353f5a8a01ec
+  metadata.gz: 9571f31377b47d64915fb3040d21f36c5d980c54acc9fa23c9ee5c3aa05b7c97b5cf80a6940a8be2981b99815d4477d4a362723f527a6100cafdd8c7431c0229
+  data.tar.gz: 84841e7ad0466986a09a699582c74f6414a09be3affd6c1c0a110fb83727aac795a04a770236194660eb8bc8cf947f2e751281b12b89e12a659b57655a490f22

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    buildbox (0.2)
+    buildbox (0.2.1)
       celluloid (~> 0.14)
       faraday (~> 0.8)
       faraday_middleware (~> 0.9)

data/README.md

@@ -12,7 +12,7 @@ Add your worker tokens
 
 Then you can start monitoring for builds like so:
 
-    $ buildbox server:start
+    $ buildbox worker:start
 
 For more help with the command line interface
 
@@ -25,3 +25,7 @@ For more help with the command line interface
 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
+
+## Copyright
+
+Copyright (c) 2013 Keith Pitt. See LICENSE for details.

data/lib/buildbox/api.rb

@@ -6,10 +6,15 @@ require 'hashie/mash'
 module Buildbox
   class API
     def initialize(config = Buildbox.config)
-      @config = config
+      @config  = config
     end
 
-    def worker(access_token: access_token, hostname: hostname)
+    def authenticate(api_key)
+      @api_key = api_key
+      get("user")
+    end
+
+    def worker(access_token, hostname)
       put("workers/#{access_token}", :hostname => hostname)
     end
 
@@ -25,6 +30,8 @@ module Buildbox
 
     def connection
       @connection ||= Faraday.new(:url => @config.api_endpoint) do |faraday|
+        faraday.basic_auth @api_key || @config.api_key, ''
+
         faraday.request  :json
 
         faraday.response :logger, Buildbox.logger

data/lib/buildbox/cli.rb

@@ -9,6 +9,15 @@ module Buildbox
       @commands = {}
       @options  = {}
 
+      @commands['auth:login'] = OptionParser.new do |opts|
+        opts.banner = "Usage: buildbox auth:login"
+
+        opts.on("--help", "You're looking at it.") do
+          puts @commands['auth:login']
+          exit
+        end
+      end
+
       @commands['worker:start'] = OptionParser.new do |opts|
         opts.banner = "Usage: buildbox worker:start"
 
@@ -18,11 +27,11 @@ module Buildbox
         end
       end
 
-      @commands['worker:setup'] = OptionParser.new do |opts|
-        opts.banner = "Usage: buildbox worker:setup [token]"
+      @commands['worker:add'] = OptionParser.new do |opts|
+        opts.banner = "Usage: buildbox worker:add [token]"
 
         opts.on("--help", "You're looking at it.") do
-          puts @commands['worker:setup']
+          puts @commands['worker:add']
           exit
         end
       end
@@ -52,7 +61,7 @@ module Buildbox
 
         if command == "worker:start"
           Buildbox::Server.new.start
-        elsif command == "worker:setup"
+        elsif command == "worker:add"
           if @argv.length == 0
             puts "No token provided"
             exit 1
@@ -63,7 +72,25 @@ module Buildbox
           Buildbox.config.update(:worker_access_tokens => worker_access_tokens << access_token)
 
           puts "Successfully added worker access token"
-          puts "You can now start the worker with `buildbox worker:start`"
+          puts "You can now start the worker with: buildbox worker:start"
+        elsif command == "auth:login"
+          if @argv.length == 0
+            puts "No api key provided"
+            exit 1
+          end
+
+          api_key = @argv.first
+
+          begin
+            Buildbox::API.new.authenticate(api_key)
+            Buildbox.config.update(:api_key => api_key)
+
+            puts "Successfully added your api_key"
+            puts "You can now add workers with: buildbox worker:add [worker_token]"
+          rescue
+            puts "Could not authenticate your api_key"
+            exit 1
+          end
         end
       else
         puts global.help

data/lib/buildbox/configuration.rb

@@ -14,10 +14,21 @@ module Buildbox
       end
     end
 
+    def api_key
+      ENV['BUILDBOX_API_KEY'] || self[:api_key]
+    end
+
     def api_endpoint
       ENV['BUILDBOX_API_ENDPOINT'] || self[:api_endpoint] || "https://api.buildbox.io/v1"
     end
 
+    def check
+      unless api_key
+        puts "No api_key set. You can set it with\nbuildbox authenticate [api_key]"
+        exit 1
+      end
+    end
+
     def update(attributes)
       attributes.each_pair { |key, value| self[key] = value }
       save

data/lib/buildbox/server.rb

@@ -9,12 +9,13 @@ module Buildbox
 
     def start
       loop do
+        @config.check
+        @config.reload
+
         worker_access_tokens.each do |access_token|
           Buildbox::Worker.new(access_token, api).work
         end
 
-        @config.reload
-
         @logger.info "Sleeping for #{INTERVAL} seconds"
         sleep INTERVAL
       end

data/lib/buildbox/version.rb

@@ -1,3 +1,3 @@
 module Buildbox
-  VERSION = "0.2"
+  VERSION = "0.2.1"
 end

data/lib/buildbox/worker.rb

@@ -23,7 +23,7 @@ module Buildbox
     private
 
     def projects
-      @api.worker(:access_token => @access_token, :hostname => hostname).projects
+      @api.worker(@access_token, hostname).projects
     rescue Faraday::Error::ClientError
       warn "Worker #{@access_token} doesn't exist"
       [] # return empty array to avoid breakage

data/spec/buildbox/buildbox/api_spec.rb

@@ -0,0 +1,4 @@
+require 'spec_helper'
+
+describe Buildbox::API do
+end

data/spec/buildbox/buildbox/build_spec.rb

@@ -0,0 +1,4 @@
+require 'spec_helper'
+
+describe Buildbox::Build do
+end

data/spec/buildbox/buildbox/cli_spec.rb

@@ -0,0 +1,4 @@
+require 'spec_helper'
+
+describe Buildbox::CLI do
+end

data/spec/buildbox/buildbox/command_spec.rb

@@ -4,6 +4,12 @@ require "spec_helper"
 
 describe Buildbox::Command do
   describe "#run" do
+    it "is run within a tty" do
+      result = Buildbox::Command.run(%{ruby -e "puts STDOUT.tty?"})
+
+      result.output.should == "true"
+    end
+
     it "successfully runs and returns the output from a simple comment" do
       result = Buildbox::Command.run('echo hello world')
 

data/spec/buildbox/buildbox/configuration_spec.rb

@@ -0,0 +1,4 @@
+require 'spec_helper'
+
+describe Buildbox::Configuration do
+end

data/spec/buildbox/buildbox/environment_spec.rb

@@ -0,0 +1,4 @@
+require 'spec_helper'
+
+describe Buildbox::Environment do
+end

data/spec/buildbox/buildbox/monitor_spec.rb

@@ -0,0 +1,4 @@
+require 'spec_helper'
+
+describe Buildbox::Monitor do
+end

data/spec/buildbox/buildbox/runner_spec.rb

@@ -0,0 +1,4 @@
+require 'spec_helper'
+
+describe Buildbox::Runner do
+end

data/spec/buildbox/buildbox/server_spec.rb

@@ -0,0 +1,4 @@
+require 'spec_helper'
+
+describe Buildbox::Server do
+end

data/spec/buildbox/buildbox/utf8_spec.rb

@@ -0,0 +1,4 @@
+require 'spec_helper'
+
+describe Buildbox::UTF8 do
+end

data/spec/buildbox/buildbox/version_spec.rb

@@ -0,0 +1,4 @@
+require 'spec_helper'
+
+describe Buildbox::VERSION do
+end

data/spec/buildbox/buildbox/worker_spec.rb

@@ -0,0 +1,4 @@
+require 'spec_helper'
+
+describe Buildbox::Worker do
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: buildbox
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: 0.2.1
 platform: ruby
 authors:
 - Keith Pitt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-30 00:00:00.000000000 Z
+date: 2013-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -90,7 +90,6 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
-- .ruby-version
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -111,7 +110,18 @@ files:
 - lib/buildbox/utf8.rb
 - lib/buildbox/version.rb
 - lib/buildbox/worker.rb
+- spec/buildbox/buildbox/api_spec.rb
+- spec/buildbox/buildbox/build_spec.rb
+- spec/buildbox/buildbox/cli_spec.rb
 - spec/buildbox/buildbox/command_spec.rb
+- spec/buildbox/buildbox/configuration_spec.rb
+- spec/buildbox/buildbox/environment_spec.rb
+- spec/buildbox/buildbox/monitor_spec.rb
+- spec/buildbox/buildbox/runner_spec.rb
+- spec/buildbox/buildbox/server_spec.rb
+- spec/buildbox/buildbox/utf8_spec.rb
+- spec/buildbox/buildbox/version_spec.rb
+- spec/buildbox/buildbox/worker_spec.rb
 - spec/fixtures/repo.git/HEAD
 - spec/fixtures/repo.git/config
 - spec/fixtures/repo.git/description
@@ -162,7 +172,18 @@ signing_key:
 specification_version: 4
 summary: Ruby client for buildbox
 test_files:
+- spec/buildbox/buildbox/api_spec.rb
+- spec/buildbox/buildbox/build_spec.rb
+- spec/buildbox/buildbox/cli_spec.rb
 - spec/buildbox/buildbox/command_spec.rb
+- spec/buildbox/buildbox/configuration_spec.rb
+- spec/buildbox/buildbox/environment_spec.rb
+- spec/buildbox/buildbox/monitor_spec.rb
+- spec/buildbox/buildbox/runner_spec.rb
+- spec/buildbox/buildbox/server_spec.rb
+- spec/buildbox/buildbox/utf8_spec.rb
+- spec/buildbox/buildbox/version_spec.rb
+- spec/buildbox/buildbox/worker_spec.rb
 - spec/fixtures/repo.git/HEAD
 - spec/fixtures/repo.git/config
 - spec/fixtures/repo.git/description

data/.ruby-version

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