spot_build 0.0.4 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 58c259e6f3b6c9e4ccbc8682426d3ab23b257406
-  data.tar.gz: 9a6d4d033c24ab2778946281c967e359968e9f12
+SHA256:
+  metadata.gz: c740d2bdc6f1ab910728822d03e4a857e4ffc144f50c5bcb4d15dd402c730d76
+  data.tar.gz: 167ece42931edd0c434d00eb9409714fe6a0458160da2397f68f89719d2d2bb0
 SHA512:
-  metadata.gz: bd29f93748e8113a7c31ad592eeef931cecdd6b75dc40884760013261e62d0138fd3dad58ec556f2852fbf4900173c432acb32f2b0405566f2bdee1db582d758
-  data.tar.gz: 9db1142b19e9fcd33367394df0bccafad2bb655e8ba37ff9d7ac46864687726bfcdb60f9ccf53c2c51352cd8d3129cf5d20b93cccd2271bb297bdeb9e93fec05
+  metadata.gz: d62f1d929dfeef74c78e176d405cae7ba6acb536042b273100edc2a19f79c451ef2fd260f3fb1d8a8ed1797254e87a7e5b57fdccbc12ac3376a964e828f00239
+  data.tar.gz: 7a037186b55880955ff82fa4101e126137b2e8789d19a6d8421d3ce151ea430dc586ec1a3896026f4510339f1dbfee7734fa21e8f360b69260d608c5dc298d70

data/.travis.yml

@@ -0,0 +1,8 @@
+language: ruby
+# Fixes issues with ruby 2.5 https://github.com/travis-ci/travis-ci/issues/8978
+before_install:
+  - gem install bundler
+rvm:
+  - 2.3
+  - 2.4
+  - 2.5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    spot_build (0.0.2)
+    spot_build (0.0.4)
       aws-sdk (~> 2)
       buildkit (~> 0.4)
       link_header (~> 0.0.2)
@@ -10,21 +10,36 @@ GEM
   remote: https://rubygems.org/
   specs:
     addressable (2.3.8)
-    aws-sdk (2.6.38)
-      aws-sdk-resources (= 2.6.38)
-    aws-sdk-core (2.6.38)
+    aws-sdk (2.11.33)
+      aws-sdk-resources (= 2.11.33)
+    aws-sdk-core (2.11.33)
       aws-sigv4 (~> 1.0)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.6.38)
-      aws-sdk-core (= 2.6.38)
-    aws-sigv4 (1.0.0)
+    aws-sdk-resources (2.11.33)
+      aws-sdk-core (= 2.11.33)
+    aws-sigv4 (1.0.2)
     buildkit (0.4.0)
       sawyer (~> 0.6.0)
+    diff-lcs (1.3)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
-    jmespath (1.3.1)
+    jmespath (1.4.0)
     link_header (0.0.8)
     multipart-post (2.0.0)
+    rake (12.3.1)
+    rspec (3.7.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+    rspec-core (3.7.1)
+      rspec-support (~> 3.7.0)
+    rspec-expectations (3.7.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.7.0)
+    rspec-mocks (3.7.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.7.0)
+    rspec-support (3.7.1)
     sawyer (0.6.0)
       addressable (~> 2.3.5)
       faraday (~> 0.8, < 0.10)
@@ -33,7 +48,9 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  rake
+  rspec (~> 3)
   spot_build!
 
 BUNDLED WITH
-   1.13.6
+   1.16.1

data/Rakefile

@@ -0,0 +1,6 @@
+require "bundler/gem_tasks"
+require "rspec/core/rake_task"
+
+RSpec::Core::RakeTask.new(:spec)
+
+task :default => :spec

data/lib/spot_build/buildkite_agent.rb

@@ -19,6 +19,8 @@ module SpotBuild
     def stop(force="false")
       return unless agent_running?
       @client.stop_agent(@org_slug, agent_id, "{\"force\": #{force}}")
+    rescue Buildkit::UnprocessableEntity
+      # Swallow the error, this is generally thrown when the agent has already stopped
     end
 
     def agent_running?
@@ -42,11 +44,11 @@ module SpotBuild
     end
 
     def current_job
-      agent[:job]
+      agent.job
     end
 
     def agent_id
-      @agent_id ||= agent[:id]
+      @agent_id ||= agent.id
     end
 
     def agent

data/spec/buildkite_agent_spec.rb

@@ -0,0 +1,74 @@
+require 'spec_helper'
+
+describe SpotBuild::BuildkiteAgent do
+  let(:org_slug) { "envato" }
+  subject { described_class.new('deadbeef', org_slug) }
+  
+  let(:last_response_stub) { instance_double(Sawyer::Response) }
+  let(:buildkit_stub) { double("Buildkit", :agents => agent_stubs) }
+  let(:hostname) { "i-1234567890" }
+
+  before do
+    allow(Buildkit).to receive(:new).and_return(buildkit_stub)
+    allow(Socket).to receive(:gethostname).and_return(hostname)
+    allow(buildkit_stub).to receive(:last_response).and_return(last_response_stub)
+    allow(last_response_stub).to receive(:headers).and_return({"link" => nil})
+  end
+
+  describe '#the_end_is_nigh' do
+    context 'the agent is not running' do
+      let(:agent_stubs) { [] }
+
+      it 'returns nil' do
+        expect(subject.the_end_is_nigh).to equal(nil)
+      end
+    end
+
+    context 'the agent is running' do
+      let(:agent_id) { 9876 }
+      let(:agent_stubs) { 
+        [double("BuildkiteAgent",
+          hostname: hostname,
+          id: agent_id,
+          job: {build_url: "organizations/#{org_slug}/pipelines/my-app/builds/12345678", id: "12345678"}
+        )]
+      }
+
+      before do
+        allow(buildkit_stub).to receive(:stop_agent)
+        allow(buildkit_stub).to receive(:retry_job)
+      end
+
+      it 'stops the agent forcefully' do
+        expect(buildkit_stub).to receive(:stop_agent).with(org_slug, agent_id, '{"force": true}')
+        subject.the_end_is_nigh
+      end
+
+      it 'reschedules the job' do
+        expect(buildkit_stub).to receive(:retry_job)
+        subject.the_end_is_nigh
+      end
+    end
+
+    context 'the agent stops while we are trying to stop it' do
+      let(:agent_id) { 9876 }
+      let(:agent_stubs) { 
+        [double("BuildkiteAgent",
+          hostname: hostname,
+          id: agent_id,
+          job: {build_url: "organizations/#{org_slug}/pipelines/my-app/builds/12345678", id: "12345678"}
+        )]
+      }
+
+      before do
+        allow(buildkit_stub).to receive(:stop_agent).and_raise(Buildkit::UnprocessableEntity)
+        allow(buildkit_stub).to receive(:retry_job)
+      end
+
+      it 'retries the job' do
+        expect(buildkit_stub).to receive(:retry_job)
+        subject.the_end_is_nigh
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,2 @@
+$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
+require 'spot_build'

data/spot_build.gemspec

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |gem|
   gem.name          = 'spot_build'
-  gem.version       = '0.0.4'
+  gem.version       = '1.0.0'
   gem.authors       = ['Patrick Robinson']
   gem.email         = []
   gem.description   = 'Helps manage Buildkite Agents running on EC2 Spot instances'
@@ -18,4 +18,6 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'buildkit', '~> 0.4'
   gem.add_dependency 'aws-sdk', '~> 2'
   gem.add_dependency 'link_header', '~> 0.0.2'
+  gem.add_development_dependency 'rspec',  '~> 3'
+  gem.add_development_dependency 'rake'
 end

metadata

@@ -1,57 +1,85 @@
 --- !ruby/object:Gem::Specification
 name: spot_build
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 1.0.0
 platform: ruby
 authors:
 - Patrick Robinson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-30 00:00:00.000000000 Z
+date: 2018-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: buildkit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
 - !ruby/object:Gem::Dependency
   name: link_header
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.2
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Helps manage Buildkite Agents running on EC2 Spot instances
 email: []
 executables:
@@ -59,16 +87,20 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .ruby-version
+- ".ruby-version"
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - LICENSE
 - README.md
+- Rakefile
 - bin/spot_build
 - lib/spot_build.rb
 - lib/spot_build/buildkite_agent.rb
 - lib/spot_build/spot_instance.rb
 - lib/spot_build/sqs_event.rb
+- spec/buildkite_agent_spec.rb
+- spec/spec_helper.rb
 - spot_build.gemspec
 homepage: https://github.com/envato/spot_build
 licenses: []
@@ -79,18 +111,20 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14.1
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Helps manage Buildkite Agents running on EC2 Spot instances
-test_files: []
+test_files:
+- spec/buildkite_agent_spec.rb
+- spec/spec_helper.rb