buildbox 0.3.9.1 → 0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 24043ce2077ac39aa6d5a6205291bef303eee5b7
-  data.tar.gz: fac6040beba83e33006d18b7aa3da0a1bfcac0db
+  metadata.gz: 27d1513d8d309bceab4f388476844564a5163ff7
+  data.tar.gz: 40dca9e43b72d5faff3e1bd0fa0b50da2fea8de7
 SHA512:
-  metadata.gz: 9c72ff89331bfb556082c0a9c73867b6598f84fa3a8ecfe14f746648b965ca6ae968d8062f21363aa458e382179ff505c68f769673f88fabddfa8cb0a9541a13
-  data.tar.gz: 38ddcbd216f2c29d1af27e300ee9abf37119239f1333b3a9a88af10e2db6e9150ab76608a1c3af62e82df10f6180663e03fc5e7bee424ba8b0cf0508ae7719e8
+  metadata.gz: d737db962c9335eb724e0538813282e5a2f197431fc49bb17f05b7e20d5a5908f227db59a8af6976a7f7eb4fab813dffef28fd8924b6cf76835f9234bf40b69d
+  data.tar.gz: 3ba1a9106292b8e7c42518a4b46488079d6ca28d76cc88abbfabace11cc28391ffaf552320af0de72cf2e6a1fb8c2c4e4f835b7532df33f249e85f9e439e200b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    buildbox (0.3.9)
+    buildbox (0.4)
       celluloid (~> 0.14)
       childprocess (~> 0.3)
       faraday (~> 0.8)

data/README.md

@@ -5,14 +5,10 @@
 Install the gem
 
     $ gem install buildbox
-    
-Authenticate
 
-    $ buildbox auth:login [api_key]
+Add your agent access token
 
-Add your worker tokens
-
-    $ buildbox agent:setup [token]
+    $ buildbox agent:setup [agent_access_token]
 
 Then you can start monitoring for builds like so:
 

data/lib/buildbox/agent.rb

@@ -19,9 +19,9 @@ module Buildbox
 
         while build = @queue.pop do
           # Let the agent know that we're about to start running this build
-          @api.update_build(build, :agent_accepted => @access_token)
+          @api.update_build(@access_token, build, :agent_accepted => @access_token)
 
-          Monitor.new(build, @api).async.monitor
+          Monitor.new(build, @access_token, @api).async.monitor
           Runner.new(build).start
         end
 
@@ -32,8 +32,8 @@ module Buildbox
     private
 
     def scheduled_builds
-      agent = @api.agent(@access_token, :hostname => hostname, :version => Buildbox::VERSION)
-      @api.scheduled_builds agent
+      @api.agent(@access_token, :hostname => hostname, :version => Buildbox::VERSION)
+      @api.scheduled_builds(@access_token)
     rescue Buildbox::API::AgentNotFoundError
       warn "Agent `#{@access_token}` does not exist"
       [] # return empty array to avoid breakage

data/lib/buildbox/api.rb

@@ -12,6 +12,7 @@ module Buildbox
       def initialize(logger)
         @logger = logger
       end
+
       def info(*args)
         @logger.debug(*args)
       end
@@ -29,35 +30,28 @@ module Buildbox
       @logger = logger
     end
 
-    def authenticate(api_key)
-      @api_key = api_key
-
-      get("user")
-    end
-
     def agent(access_token, options)
-      put("agents/#{access_token}", options)
+      put(access_token, options)
     rescue Faraday::Error::ClientError => e
-      if e.response[:status] == 404
+      if e.response && e.response[:status] == 404
         raise AgentNotFoundError.new(e, e.response)
       else
         raise ServerError.new(e, e.response)
       end
     end
 
-    def scheduled_builds(agent)
-      get(agent.scheduled_builds_url).map { |build| Buildbox::Build.new(build) }
+    def scheduled_builds(access_token)
+      get("#{access_token}/builds/scheduled").map { |build| Buildbox::Build.new(build) }
     end
 
-    def update_build(build, options)
-      put(build.url, options)
+    def update_build(access_token, build, options)
+      put("#{access_token}/builds/#{build.id}", options)
     end
 
     private
 
     def connection
       @connection ||= Faraday.new(:url => @config.api_endpoint) do |faraday|
-        faraday.basic_auth @api_key || @config.api_key, ''
         faraday.request :retry
         faraday.request :json
 

data/lib/buildbox/cli.rb

@@ -9,11 +9,11 @@ module Buildbox
       @commands = {}
       @options  = {}
 
-      @commands['auth:login'] = OptionParser.new do |opts|
-        opts.banner = "Usage: buildbox auth:login"
+      @commands['agent:setup'] = OptionParser.new do |opts|
+        opts.banner = "Usage: buildbox agent:setup [token]"
 
         opts.on("--help", "You're looking at it.") do
-          puts @commands['auth:login']
+          puts @commands['agent:setup']
           exit
         end
       end
@@ -27,15 +27,6 @@ module Buildbox
         end
       end
 
-      @commands['agent:setup'] = OptionParser.new do |opts|
-        opts.banner = "Usage: buildbox agent:setup [token]"
-
-        opts.on("--help", "You're looking at it.") do
-          puts @commands['agent:setup']
-          exit
-        end
-      end
-
       @commands['version'] = OptionParser.new do |opts|
         opts.banner = "Usage: buildbox version"
       end
@@ -74,24 +65,6 @@ module Buildbox
           puts "Successfully added agent access token"
           puts "You can now start the agent with: buildbox agent:start."
           puts "If the agent is already running, you'll have to restart it for the new changes to take effect"
-        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 agents with: buildbox agent:setup [agent_token]"
-          rescue
-            puts "Could not authenticate your api_key"
-            exit 1
-          end
         end
       else
         puts global.help
@@ -112,7 +85,6 @@ module Buildbox
     def help
 <<HELP
 
-  auth:login  [api_key]      # login to buildbox
   agent:setup [access_token] # set the access token for the agent
   agent:start                # start the buildbox agent
   version  #  display version

data/lib/buildbox/configuration.rb

@@ -18,14 +18,7 @@ module Buildbox
     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 auth:login [api_key]"
-        exit 1
-      end
+      ENV['BUILDBOX_API_ENDPOINT'] || self[:api_endpoint] || "https://agent.buildbox.io/v1"
     end
 
     def update(attributes)

data/lib/buildbox/monitor.rb

@@ -4,9 +4,10 @@ module Buildbox
   class Monitor
     include Celluloid
 
-    def initialize(build, api)
-      @build = build
-      @api   = api
+    def initialize(build, access_token, api)
+      @build        = build
+      @access_token = access_token
+      @api          = api
     end
 
     def monitor
@@ -17,10 +18,10 @@ module Buildbox
           # same finished_at timestamp throughout the entire method.
           finished_at = @build.finished_at
 
-          updated_build = @api.update_build(@build, :started_at  => @build.started_at,
-                                                    :finished_at => finished_at,
-                                                    :output      => @build.output,
-                                                    :exit_status => @build.exit_status)
+          updated_build = @api.update_build(@access_token, @build, :started_at  => @build.started_at,
+                                                                   :finished_at => finished_at,
+                                                                   :output      => @build.output,
+                                                                   :exit_status => @build.exit_status)
 
           if updated_build.state == 'canceled' && !@build.cancelling?
             Buildbox::Canceler.new(@build).async.cancel

data/lib/buildbox/version.rb

@@ -1,3 +1,3 @@
 module Buildbox
-  VERSION = "0.3.9.1"
+  VERSION = "0.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: buildbox
 version: !ruby/object:Gem::Version
-  version: 0.3.9.1
+  version: '0.4'
 platform: ruby
 authors:
 - Keith Pitt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-23 00:00:00.000000000 Z
+date: 2013-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -225,7 +225,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.3
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Ruby agent for buildbox