backstop-deploys 0.0.3 → 0.0.4

data/lib/backstop-deploys/version.rb

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

data/lib/backstop-deploys/web.rb

@@ -28,24 +28,25 @@ module Backstop
         data = nil
 
         begin
-          json = RestClient.get "#{api_endpoint}/annotations/deploys", :params => {'sources[0]' => source, :start_time => start_time}
+          json = RestClient.get "#{api_endpoint}/annotations/deploys?sources[]=#{source}&start_time=#{start_time}"
           data = JSON.parse(json)
         rescue RestClient::ResourceNotFound
           stream_exists = false
         end
 
-        if stream_exists and events = data['events'].first
+        if stream_exists and events = data['events'][source]
           # events already exists, we just need to update
-          event = events[source].first
+          event = events.first
           event_id = event['id']
           payload = { :title => "#{app}.#{version}" }
           payload[:end_time] = params[:end_time] if params[:end_time]
           RestClient.put "#{api_endpoint}/annotations/deploys/#{event_id}", payload
         else
           # new event needs to be created
-          payload = { :start_time => start_time, :title => "#{app}.#{version}" }
+          payload = { :start_time => start_time, :title => "#{app}.#{version}", :source => source }
           payload[:end_time] = end_time if end_time
-          RestClient.post "#{api_endpoint}/annotations/deploys", "title=#{app}.#{version}&start_time=#{start_time}"
+          q = payload.map { |k,v| "#{k}=#{v}" }.sort.join("&")
+          RestClient.post "#{api_endpoint}/annotations/deploys", q
         end
       end
     end

data/spec/backstop-deploys/web_spec.rb

@@ -31,7 +31,7 @@ describe Backstop::Deploys::Web do
         context 'existing annotation' do
           let(:event_id) { 12345 }
           let(:stub_events) { [{:title => title, :source => source, :start_time => t.to_i, :id => event_id}] }
-          let(:stub_get_existing_body) { {:name => 'deploys', :events => [{source => stub_events}]} } 
+          let(:stub_get_existing_body) { {:name => 'deploys', :events => {source => stub_events}} } 
           let(:stub_get_existing_request) { stub_request(:get, "#{api_endpoint}/annotations/deploys").with(:query => { :sources => [source], :start_time => t.to_i }).to_return(:body => stub_get_existing_body.to_json)}
           let(:stub_update_request) { stub_request(:put, "#{api_endpoint}/annotations/deploys/#{event_id}").with(:body => {:title => title}) }
           before(:each) do
@@ -46,7 +46,7 @@ describe Backstop::Deploys::Web do
 
         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}") }
+          let(:stub_new_request) { stub_request(:post, "#{api_endpoint}/annotations/deploys").with(:body => "source=#{source}&start_time=#{t.to_i}&title=#{title}") }
           before(:each) do
             stub_missing_stream
             stub_new_request
@@ -58,9 +58,9 @@ describe Backstop::Deploys::Web do
         end
 
         context 'non-existent annotation' do
-          let(:stub_get_missing_body) { {:name => 'deploys', :events => []} } 
+          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(:post, "#{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 => "source=#{source}&start_time=#{t.to_i}&title=#{title}") }
           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.3
+  version: 0.0.4
   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: &70136571084140 !ruby/object:Gem::Requirement
+  requirement: &70282066218840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70136571084140
+  version_requirements: *70282066218840
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70136571083620 !ruby/object:Gem::Requirement
+  requirement: &70282066217880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70136571083620
+  version_requirements: *70282066217880
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70136571082580 !ruby/object:Gem::Requirement
+  requirement: &70282066217260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70136571082580
+  version_requirements: *70282066217260
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70136571081440 !ruby/object:Gem::Requirement
+  requirement: &70282066216820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70136571081440
+  version_requirements: *70282066216820
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70136571080860 !ruby/object:Gem::Requirement
+  requirement: &70282066216280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70136571080860
+  version_requirements: *70282066216280
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70136571079760 !ruby/object:Gem::Requirement
+  requirement: &70282066215580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70136571079760
+  version_requirements: *70282066215580
 description: An extension to backstop to allow submission to Librato Metrics
 email:
 - michael.gorsuch@gmail.com