BibOpsworks 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 49712a3cafd6285b934b02dca7f1ad502713c0a1
-  data.tar.gz: ce9ab3d55447249e6f4e2e3d29742c92cbcbdfae
+  metadata.gz: 3afb8c6e35f8997c1a45aa0331eff4d2c22d7b6e
+  data.tar.gz: 28cdbe8ba37ce1a15cf62aec3e62643fd7b6b0c8
 SHA512:
-  metadata.gz: a964bb945ccdea227401d701379a8d78e4aca2488347f71b1f2f027adb138f65176acff8b1f23819fe21e483a546a4da48f52a34a5e879b8b9f476332ece3ee6
-  data.tar.gz: 133b5de5e080031a45a96e8892dc7064a9bcc464b6159ebf4212b797098474a194e9e10251dd22b36bac467832d0efb90989d230312c7bae1f8d93d3d7416c09
+  metadata.gz: 791ba09ecce264081cc57133795055597f000f055454c3bac4184e4665a948bdcb63ccc3ffdc9bd97038200ee0f91994872909f246c2506ca18784d2f2ddef9e
+  data.tar.gz: 425b14655d49e60c7e25f6ba1240e879455abfb0de764f50bc19dbe485cc7eb6b51869e4e84aef58ed1d1c31a577a21fd8ced8c64c95884cb21eb809214649a9

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    BibOpsworks (0.0.5)
+    BibOpsworks (0.0.6)
       json
 
 GEM

data/lib/bib/opsworks/newrelic.rb

@@ -5,18 +5,19 @@ module Bib
     class Newrelic
 
       def publish_deployment(app_name, deploy_data, newrelic_api_key)
-        newrelic_body = prepare_publishing_data(app_name, deploy_data)
+        newrelic_params = prepare_publishing_data(app_name, deploy_data)
 
         newrelic_url = "https://rpm.newrelic.com/deployments.xml"
         url = URI.parse(newrelic_url)
         request = Net::HTTP::Post.new(url.request_uri)
-        request.add_field('X-License-Key', newrelic_api_key)
-        request.body = newrelic_body
+        request.add_field('X-Api-Key', newrelic_api_key)
+        request.content_type = "application/octet-stream"
+        request.set_form_data(newrelic_params)
         resp = Net::HTTP.new(url.host, url.port).start do |http|
           http.request(request)
         end
 
-        resp.is_a? Net::HTTPOK
+        resp.is_a? Net::HTTPSuccess
       end
 
       def prepare_publishing_data(app_name, deploy_data)
@@ -28,11 +29,15 @@ module Bib
           deployment_user = deploy_data["deploying_user"].split('/')[1]
         end
 
-        newrelic_appid_body = "deployment[app_name]=#{app_name}"
-        newrelic_user_body = "deployment[user]=#{deployment_user}"
-        newrelic_revision_body = "deployment[revision]=#{scm_revision}"
-
-        "#{newrelic_appid_body}&#{newrelic_user_body}&#{newrelic_revision_body}"
+        newrelic_params = {}
+        {
+          :app_name => app_name, 
+          :user => deployment_user, 
+          :revision => scm_revision
+        }.each do |k, v|
+          newrelic_params["deployment[#{k}]"] = v unless v.nil? || v == ''
+        end
+        newrelic_params
       end
     end
   end

data/lib/bib/opsworks/version.rb

@@ -1,5 +1,5 @@
 module Bib
   module Opsworks
-    VERSION = "0.0.5"
+    VERSION = "0.0.6"
   end
 end

data/tests/newrelic_test.rb

@@ -12,7 +12,8 @@ class NewrelicTest < Minitest::Test
     app_name = 'unittest'
 
     result = newrelic.prepare_publishing_data(app_name, deploy_data)
-    assert_equal("deployment[app_name]=unittest&deployment[user]=gemtest&deployment[revision]=rev1", result)
+    expected = {"deployment[app_name]"=>"unittest", "deployment[user]"=>"gemtest", "deployment[revision]"=>"rev1"}
+    assert_equal(expected, result)
   end
 
   def test_publish_deployment_nouser
@@ -22,6 +23,7 @@ class NewrelicTest < Minitest::Test
     app_name = 'unittest'
 
     result = newrelic.prepare_publishing_data(app_name, deploy_data)
-    assert_equal("deployment[app_name]=unittest&deployment[user]=opsworks&deployment[revision]=rev1", result)
+    expected = {"deployment[app_name]"=>"unittest", "deployment[user]"=>"opsworks", "deployment[revision]"=>"rev1"}
+    assert_equal(expected, result)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: BibOpsworks
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - fh
@@ -101,7 +101,6 @@ files:
 - lib/bib/opsworks/version.rb
 - tests/composer_test.rb
 - tests/newrelic_test.rb
-- tests/opsworks_test.rb
 homepage: https://github.com/easybiblabs/bib-opsworks
 licenses: []
 metadata: {}

data/tests/opsworks_test.rb

@@ -1,11 +0,0 @@
-gem 'minitest'
-
-require 'minitest/autorun'
-require 'bib/opsworks'
-
-class OpsworksTest < Minitest::Test
-
-  def test_version
-    assert_equal("0.0.5", BibOpsworks.new.version)
-  end
-end