backstop-deploys 0.0.2 → 0.0.3

data/lib/backstop-deploys/version.rb

@@ -1,5 +1,5 @@
 module Backstop
   module Deploys
-    VERSION = '0.0.2'
+    VERSION = '0.0.3'
   end
 end

data/lib/backstop-deploys/web.rb

@@ -24,10 +24,17 @@ module Backstop
         halt [400, {:message => ':id should be in the format of app.version.epoch'}.to_json] if app.nil? or version.nil? or start_time.nil?
         end_time = params[:end_time]
         halt [400, {:message => ':source is a required param'}.to_json] unless source = params[:source]
-        json = RestClient.get "#{api_endpoint}/annotations/deploys", :params => {'sources[0]' => source, :start_time => start_time}
-        data = JSON.parse(json)
+        stream_exists = true
+        data = nil
 
-        if events = data['events'].first
+        begin
+          json = RestClient.get "#{api_endpoint}/annotations/deploys", :params => {'sources[0]' => source, :start_time => start_time}
+          data = JSON.parse(json)
+        rescue RestClient::ResourceNotFound
+          stream_exists = false
+        end
+
+        if stream_exists and events = data['events'].first
           # events already exists, we just need to update
           event = events[source].first
           event_id = event['id']
@@ -38,7 +45,7 @@ module Backstop
           # new event needs to be created
           payload = { :start_time => start_time, :title => "#{app}.#{version}" }
           payload[:end_time] = end_time if end_time
-          RestClient.put "#{api_endpoint}/annotations/deploys", "title=#{app}.#{version}&start_time=#{start_time}"
+          RestClient.post "#{api_endpoint}/annotations/deploys", "title=#{app}.#{version}&start_time=#{start_time}"
         end
       end
     end

data/spec/backstop-deploys/web_spec.rb

@@ -44,10 +44,23 @@ describe Backstop::Deploys::Web do
           it('should return a 200') { last_response.status.should eq(200) }
         end
 
+        context 'non-existent annotation stream' do
+          let(:stub_missing_stream) { stub_request(:get, "#{api_endpoint}/annotations/deploys").with(:query => { :sources => [source], :start_time => t.to_i }).to_return(:status => 404) }
+          let(:stub_new_request) { stub_request(:post, "#{api_endpoint}/annotations/deploys").with(:body => "title=#{title}&start_time=#{t.to_i}") }
+          before(:each) do
+            stub_missing_stream
+            stub_new_request
+            put "/deploys/#{id}", params
+          end
+          it('should ask Librato for the proper annotation') { stub_missing_stream.should have_been_made.once }
+          it('should create a new annotation') { stub_new_request.should have_been_made.once }
+          it('should be 200') { last_response.status.should eq(200) }
+        end
+
         context 'non-existent annotation' do
           let(:stub_get_missing_body) { {:name => 'deploys', :events => []} } 
           let(:stub_get_missing_request) { stub_request(:get, "#{api_endpoint}/annotations/deploys").with(:query => { :sources => [source], :start_time => t.to_i }).to_return(:body => stub_get_missing_body.to_json)}
-          let(:stub_new_request) { stub_request(:put, "#{api_endpoint}/annotations/deploys").with(:body => "title=#{title}&start_time=#{t.to_i}") }
+          let(:stub_new_request) { stub_request(:post, "#{api_endpoint}/annotations/deploys").with(:body => "title=#{title}&start_time=#{t.to_i}") }
           before(:each) do
             stub_get_missing_request
             stub_new_request

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: backstop-deploys
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70361437411980 !ruby/object:Gem::Requirement
+  requirement: &70136571084140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70361437411980
+  version_requirements: *70136571084140
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70361437411020 !ruby/object:Gem::Requirement
+  requirement: &70136571083620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70361437411020
+  version_requirements: *70136571083620
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70361437409820 !ruby/object:Gem::Requirement
+  requirement: &70136571082580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70361437409820
+  version_requirements: *70136571082580
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70361437409160 !ruby/object:Gem::Requirement
+  requirement: &70136571081440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70361437409160
+  version_requirements: *70136571081440
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70361437408340 !ruby/object:Gem::Requirement
+  requirement: &70136571080860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70361437408340
+  version_requirements: *70136571080860
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70361437407140 !ruby/object:Gem::Requirement
+  requirement: &70136571079760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70361437407140
+  version_requirements: *70136571079760
 description: An extension to backstop to allow submission to Librato Metrics
 email:
 - michael.gorsuch@gmail.com
@@ -109,18 +109,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1902119296020262380
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1902119296020262380
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10
@@ -130,3 +124,4 @@ summary: An extension to backstop to allow submission to Librato Metrics
 test_files:
 - spec/backstop-deploys/web_spec.rb
 - spec/spec_helper.rb
+has_rdoc: