BibOpsworks 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 17d9198e5b80c83a651f659464d021699f13df71
-  data.tar.gz: 7d698c23931a5d5c9e4c39c57ccf24f94c38e0db
+  metadata.gz: adae563a8593de469e4cbf116f07573b5212498a
+  data.tar.gz: 425726bfe06f281f9324621747dd038afe8c9955
 SHA512:
-  metadata.gz: d8bfbc99a283bdd50f703fe62fb216051aecc21abb825f5cc36602a36bfbba15bdcf8dec145fb5dfa1ca0f4119d39ac98566e256e03932cef0331580f9caf82e
-  data.tar.gz: 8386a8b06db7a8179678974e508fd9e086bddb78067bc51579d434541b3c2b4525929dd203cdbc75d407e2d49049a004b7d93d8feb17bb3d588431946b936eef
+  metadata.gz: 133a277ee9bf1ae15e2d164da697c1783b9f3eebe21ca87915fddebdd7c9a503b8ebe3c44437bd0743ac4c56187ffe371c08ea6a23371a3a03fb69b37565cf42
+  data.tar.gz: 7ac2cff747a03524db8dff63100b5e1451f17ae52f2f2f548b0c4c54623cc9b4bec8e438a79fac6c0a798ea531f0db89ab9f545e5175373d0ac6d8b979da9d20

data/Gemfile.lock

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

data/lib/bib/opsworks.rb

@@ -3,21 +3,18 @@ require 'bib/opsworks/newrelic'
 require 'bib/opsworks/version'
 
 class BibOpsworks
-  def initialize(deploy_data)
-    @deploy_data = deploy_data
-  end
 
-  def copy_composer(release_path)
-    composer = Bib::Opsworks::Composer.new()
-    composer.copy_vendor(release_path, @deploy_data)
+  def copy_composer(release_path, deploy_user)
+    composer = Bib::Opsworks::Composer.new
+    composer.copy_vendor(release_path, deploy_user)
   end
 
-  def newrelic_publish_deployment(app_name, newrelic_api_key)
-    newrelic = Bib::Opsworks::Newrelic.new()
-    newrelic.publish_deployment(app_name, @deploy_data, newrelic_api_key)
+  def newrelic_publish_deployment(app_name, deploy_data, newrelic_api_key)
+    newrelic = Bib::Opsworks::Newrelic.new
+    newrelic.publish_deployment(app_name, deploy_data, newrelic_api_key)
   end
 
   def version
-    return Bib::Opsworks::VERSION
+    Bib::Opsworks::VERSION
   end
 end

data/lib/bib/opsworks/composer.rb

@@ -2,18 +2,18 @@ module Bib
   module Opsworks
     class Composer
 
-      def copy_vendor(release_path, deploy_data)
+      def copy_vendor(release_path, deploy_user)
         app_current = ::File.expand_path("#{release_path}/../../current")
         vendor_dir  = "#{app_current}/vendor"
-        
-        deploy_user  = deploy_data['deploy_user']['user']
-        deploy_group = deploy_data['deploy_user']['group']
+
+        deploy_username  = deploy_user['user']
+        deploy_group     = deploy_user['group']
 
         release_vendor = "#{release_path}/vendor"
-        
+
         ::FileUtils.cp_r vendor_dir, release_vendor if ::File.exists?(vendor_dir)
-        ::FileUtils.chown_R deploy_user, deploy_group, release_vendor if ::File.exists?(release_vendor)
+        ::FileUtils.chown_R deploy_username, deploy_group, release_vendor if ::File.exists?(release_vendor)
       end
     end
   end
-end
+end

data/lib/bib/opsworks/newrelic.rb

@@ -4,27 +4,20 @@ module Bib
     class Newrelic
 
       def publish_deployment(app_name, deploy_data, newrelic_api_key)
-        
         newrelic_body = 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
         resp = Net::HTTP.new(url.host, url.port).start do |http|
-            http.request(request)
-        end
-        
-        case resp
-        when Net::HTTPOK
-          return true
-        else
-          return false
+          http.request(request)
         end
-        
+
+        resp.is_a? Net::HTTPOK
       end
-      
+
       def prepare_publishing_data(app_name, deploy_data)
         scm_revision = deploy_data["scm"]["revision"]
 
@@ -33,16 +26,13 @@ module Bib
         else
           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_body = "#{newrelic_appid_body}&#{newrelic_user_body}&=#{newrelic_revision_body}"
-        
-        return newrelic_body
-        
+
+        "#{newrelic_appid_body}&#{newrelic_user_body}&#{newrelic_revision_body}"
       end
     end
   end
-end
+end

data/lib/bib/opsworks/version.rb

@@ -1,5 +1,5 @@
 module Bib
   module Opsworks
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

data/tests/composer_test.rb

@@ -8,7 +8,7 @@ class ComposerTest < Minitest::Test
     @fixtures_path ||= Pathname.new(File.expand_path('../tmp-fixtures/', __FILE__)).tap{|path|
       FileUtils.mkdir_p path.to_s
     }
-    
+
     @release_path = Pathname.new(File.expand_path('releases/123/', @fixtures_path))
     FileUtils.mkdir_p @release_path
     FileUtils.mkdir_p Pathname.new(File.expand_path('current/vendor/some-lib', @fixtures_path))
@@ -17,14 +17,14 @@ class ComposerTest < Minitest::Test
   def teardown
     FileUtils.rm_rf @fixtures_path
   end
-  
+
   def test_composer_copy
-    composervendor = Bib::Opsworks::Composer.new()
-    
+    composervendor = Bib::Opsworks::Composer.new
+
     #do not use www-data, or the test will fail on systems without that user
-    deploydata = { 'deploy_user' => { 'user' => Process.uid, 'group' => Process.gid }}
-    
-    composervendor.copy_vendor(@release_path, deploydata)
+    deploy_user = { 'user' => Process.uid, 'group' => Process.gid }
+
+    composervendor.copy_vendor(@release_path, deploy_user)
     assert_equal(true,::File.exists?(File.expand_path('releases/123/vendor/some-lib',@fixtures_path)))
   end
 end

data/tests/newrelic_test.rb

@@ -4,24 +4,24 @@ require 'minitest/autorun'
 require 'bib/opsworks/newrelic'
 
 class NewrelicTest < Minitest::Test
-  
+
   def test_publish_deployment
-    newrelic = Bib::Opsworks::Newrelic.new()
-    
+    newrelic = Bib::Opsworks::Newrelic.new
+
     deploy_data = { 'deploying_user' => 'arn:aws:iam::123456:user/gemtest', 'scm' => { 'revision' => 'rev1' } }
     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)
+    assert_equal("deployment[app_name]=unittest&deployment[user]=gemtest&deployment[revision]=rev1", result)
   end
-  
+
   def test_publish_deployment_nouser
-    newrelic = Bib::Opsworks::Newrelic.new()
-    
+    newrelic = Bib::Opsworks::Newrelic.new
+
     deploy_data = { 'scm' => { 'revision' => 'rev1' } }
     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)
+    assert_equal("deployment[app_name]=unittest&deployment[user]=opsworks&deployment[revision]=rev1", result)
   end
 end

data/tests/opsworks_test.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: BibOpsworks
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - fh
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-29 00:00:00.000000000 Z
+date: 2013-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -99,9 +99,9 @@ files:
 - lib/bib/opsworks/composer.rb
 - lib/bib/opsworks/newrelic.rb
 - lib/bib/opsworks/version.rb
-- tests/bib_test.rb
 - tests/composer_test.rb
 - tests/newrelic_test.rb
+- tests/opsworks_test.rb
 homepage: https://github.com/easybiblabs/bib-opsworks
 licenses: []
 metadata: {}

data/tests/bib_test.rb

@@ -1,12 +0,0 @@
-gem 'minitest'
-
-require 'minitest/autorun'
-require 'bib/opsworks'
-
-class BibTest < Minitest::Test
-
-  def test_version
-    bib = BibOpsworks.new({})
-    assert_equal("0.0.2", bib.version())
-  end
-end