buildbox 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d5f35ee004e331b0dc73aaa7810c3205fee9e94e
-  data.tar.gz: e9c09f2b873eaa48ee5a796e0aa5e8fb0ff1b4c7
+  metadata.gz: f440103d7897a20e804e7a4a24b81699cd29e3b3
+  data.tar.gz: 1c70d6f1809989aba284dd197a9804bf84693e1e
 SHA512:
-  metadata.gz: 9571f31377b47d64915fb3040d21f36c5d980c54acc9fa23c9ee5c3aa05b7c97b5cf80a6940a8be2981b99815d4477d4a362723f527a6100cafdd8c7431c0229
-  data.tar.gz: 84841e7ad0466986a09a699582c74f6414a09be3affd6c1c0a110fb83727aac795a04a770236194660eb8bc8cf947f2e751281b12b89e12a659b57655a490f22
+  metadata.gz: 3fe2b5ab4c51c94ccd7efa13d69757decc2f48448ce206ef51f0ae4735090b05a947b257590bf21e1e6647f7a53b0bde114813afdd74abd729b7c7caaebd104c
+  data.tar.gz: f3a8445fe4b4af7aa8eaf8d16f8935980b051461de31638afbd2509f5e0979dc174cadabe2469d8c53c0fd53671bde7457601f516d80c129a2d3c4b55cb69497

data/Gemfile.lock

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

data/lib/buildbox.rb

@@ -13,7 +13,7 @@ module Buildbox
   autoload :Script,        "buildbox/script"
   autoload :Server,        "buildbox/server"
   autoload :UTF8,          "buildbox/utf8"
-  autoload :Worker,        "buildbox/worker"
+  autoload :Agent,         "buildbox/agent"
   autoload :VERSION,       "buildbox/version"
 
   def self.config

data/lib/buildbox/{worker.rb → agent.rb}

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'celluloid'
 
 module Buildbox
-  class Worker
+  class Agent
     include Celluloid::Logger
 
     def initialize(access_token, api)
@@ -23,9 +23,9 @@ module Buildbox
     private
 
     def projects
-      @api.worker(@access_token, hostname).projects
+      @api.agent(@access_token, hostname).projects
     rescue Faraday::Error::ClientError
-      warn "Worker #{@access_token} doesn't exist"
+      warn "Agent #{@access_token} doesn't exist"
       [] # return empty array to avoid breakage
     end
 

data/lib/buildbox/api.rb

@@ -14,8 +14,8 @@ module Buildbox
       get("user")
     end
 
-    def worker(access_token, hostname)
-      put("workers/#{access_token}", :hostname => hostname)
+    def agent(access_token, hostname)
+      put("agents/#{access_token}", :hostname => hostname)
     end
 
     def scheduled_builds(project)

data/lib/buildbox/cli.rb

@@ -18,20 +18,20 @@ module Buildbox
         end
       end
 
-      @commands['worker:start'] = OptionParser.new do |opts|
-        opts.banner = "Usage: buildbox worker:start"
+      @commands['agent:start'] = OptionParser.new do |opts|
+        opts.banner = "Usage: buildbox agent:start"
 
         opts.on("--help", "You're looking at it.") do
-          puts @commands['worker:start']
+          puts @commands['agent:start']
           exit
         end
       end
 
-      @commands['worker:add'] = OptionParser.new do |opts|
-        opts.banner = "Usage: buildbox worker:add [token]"
+      @commands['agent:setup'] = OptionParser.new do |opts|
+        opts.banner = "Usage: buildbox setup:add [token]"
 
         opts.on("--help", "You're looking at it.") do
-          puts @commands['worker:add']
+          puts @commands['setup:add']
           exit
         end
       end
@@ -59,20 +59,20 @@ module Buildbox
           exit
         end
 
-        if command == "worker:start"
+        if command == "agent:start"
           Buildbox::Server.new.start
-        elsif command == "worker:add"
+        elsif command == "setup:add"
           if @argv.length == 0
             puts "No token provided"
             exit 1
           end
 
           access_token = @argv.first
-          worker_access_tokens = Buildbox.config.worker_access_tokens
-          Buildbox.config.update(:worker_access_tokens => worker_access_tokens << access_token)
+          agent_access_tokens = Buildbox.config.agent_access_tokens
+          Buildbox.config.update(:agent_access_tokens => agent_access_tokens << access_token)
 
-          puts "Successfully added worker access token"
-          puts "You can now start the worker with: buildbox worker:start"
+          puts "Successfully added agent access token"
+          puts "You can now start the agent with: buildbox agent:start"
         elsif command == "auth:login"
           if @argv.length == 0
             puts "No api key provided"
@@ -86,7 +86,7 @@ module Buildbox
             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]"
+            puts "You can now add agents with: buildbox setup:add [agent_token]"
           rescue
             puts "Could not authenticate your api_key"
             exit 1
@@ -111,7 +111,7 @@ module Buildbox
     def help
 <<HELP
 
-  worker   #  worker management (setup, server)
+  agent   #  agent management (setup, server)
   version  #  display version
 
 HELP

data/lib/buildbox/configuration.rb

@@ -4,13 +4,13 @@ require 'json'
 
 module Buildbox
   class Configuration < Hashie::Mash
-    def worker_access_tokens
-      env_workers = ENV['BUILDBOX_WORKERS']
+    def agent_access_tokens
+      env_agents = ENV['BUILDBOX_WORKERS']
 
-      if env_workers.nil?
-        self[:worker_access_tokens] || []
+      if env_agents.nil?
+        self[:agent_access_tokens] || []
       else
-        env_workers.to_s.split(",")
+        env_agents.to_s.split(",")
       end
     end
 

data/lib/buildbox/server.rb

@@ -12,8 +12,8 @@ module Buildbox
         @config.check
         @config.reload
 
-        worker_access_tokens.each do |access_token|
-          Buildbox::Worker.new(access_token, api).work
+        agent_access_tokens.each do |access_token|
+          Buildbox::Agent.new(access_token, api).work
         end
 
         @logger.info "Sleeping for #{INTERVAL} seconds"
@@ -27,8 +27,8 @@ module Buildbox
       @api ||= Buildbox::API.new
     end
 
-    def worker_access_tokens
-      @config.worker_access_tokens
+    def agent_access_tokens
+      @config.agent_access_tokens
     end
   end
 end

data/lib/buildbox/version.rb

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

data/spec/buildbox/buildbox/agent_spec.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: buildbox
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Keith Pitt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-05 00:00:00.000000000 Z
+date: 2013-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -98,6 +98,7 @@ files:
 - bin/buildbox
 - buildbox-ruby.gemspec
 - lib/buildbox.rb
+- lib/buildbox/agent.rb
 - lib/buildbox/api.rb
 - lib/buildbox/build.rb
 - lib/buildbox/cli.rb
@@ -109,7 +110,7 @@ files:
 - lib/buildbox/server.rb
 - lib/buildbox/utf8.rb
 - lib/buildbox/version.rb
-- lib/buildbox/worker.rb
+- spec/buildbox/buildbox/agent_spec.rb
 - spec/buildbox/buildbox/api_spec.rb
 - spec/buildbox/buildbox/build_spec.rb
 - spec/buildbox/buildbox/cli_spec.rb
@@ -121,7 +122,6 @@ files:
 - 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
@@ -172,6 +172,7 @@ signing_key:
 specification_version: 4
 summary: Ruby client for buildbox
 test_files:
+- spec/buildbox/buildbox/agent_spec.rb
 - spec/buildbox/buildbox/api_spec.rb
 - spec/buildbox/buildbox/build_spec.rb
 - spec/buildbox/buildbox/cli_spec.rb
@@ -183,7 +184,6 @@ test_files:
 - 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/spec/buildbox/buildbox/worker_spec.rb

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