BibOpsworks 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de8e87cbcd343242e47fb3be31b515f37992ba93
-  data.tar.gz: 6082b361f0ad392d7e4fa395f867c693ed21094a
+  metadata.gz: ce3593a1f38211fa4b846668df48654fe75c448d
+  data.tar.gz: c2e847d8c304006942a1013d9b6554559c9372e9
 SHA512:
-  metadata.gz: 801fd1862ce38b8f6e69e850d5b09f30be517539a9c3cdbd90fa37dec7ab7ecbd100dac6b612610b6b24f67b94a46cba4e4ba3f76fe8f23a621ab6269c793240
-  data.tar.gz: bbe5d9119ea0c036eac6351b7c2852f8728d5686441e28f7fd889b413ac80ba369104a718dbf747d66fb1da33c7c9343b9a215afedceccb23a0b8a3c7fa14c89
+  metadata.gz: 655ec8a261a781c57d5d5d60cdae9803533e9ab8f6e82a059b58adf769c0e2f423e45ba575aa1a48cb226b08cb1ff51703a0e0f99ed1c550cf1e25d332c70d5a
+  data.tar.gz: 3f478d6db3ad9ae1f72fad904ffcd0203a10eecd3994abfdbaf54655bea496f8c106116cde734c06e96d5fb63ef4e1cb77bc795bfcdcce8130bbb9ef2d9636da

data/.rubocop.yml

@@ -0,0 +1,14 @@
+Metrics/AbcSize:
+  Max: 30
+
+Metrics/LineLength:
+  Max: 120
+
+Metrics/MethodLength:
+  Max: 25
+
+Style/Documentation:
+  Enabled: false
+
+Style/RegexpLiteral:
+  MaxSlashes: 0

data/.travis.yml

@@ -1,7 +1,7 @@
 language: ruby
 rvm:
-  - 1.9.3
-  - 2.0.0
+  - 2.1
 
 script:
   - bundle exec rake test
+  - rubocop

data/BibOpsworks.gemspec

@@ -4,24 +4,25 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'bib/opsworks/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "BibOpsworks"
+  spec.name          = 'BibOpsworks'
   spec.version       = Bib::Opsworks::VERSION
-  spec.authors       = ["fh", "tillk"]
-  spec.email         = ["fh-gem@fholzhauer.de"]
-  spec.homepage      = "https://github.com/easybiblabs/bib-opsworks"
-  spec.summary       = "Tools wrapper for AWS Opsworks Deploys"
+  spec.authors       = %w(fh tillk gilleyj)
+  spec.email         = ['fh-gem@fholzhauer.de']
+  spec.homepage      = 'https://github.com/easybiblabs/bib-opsworks'
+  spec.summary       = 'Tools wrapper for AWS Opsworks Deploys'
 
   spec.license       = 'BSD-2-Clause'
 
-  spec.files         = `git ls-files`.split($/)
+  spec.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
   spec.add_dependency 'json'
 
-  spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "minitest", "~> 5.0.8"
-  spec.add_development_dependency "coveralls"
+  spec.add_development_dependency 'bundler', '~> 1.3'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'minitest', '~> 5.0.8'
+  spec.add_development_dependency 'coveralls'
+  spec.add_development_dependency 'rubocop'
 end

data/Rakefile

@@ -1,7 +1,7 @@
-require "coveralls"
+require 'coveralls'
 Coveralls.wear!
 
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
 
 Encoding.default_external = Encoding::UTF_8
 Encoding.default_internal = Encoding::UTF_8
@@ -12,4 +12,3 @@ task :test do
     require f
   end
 end
-

data/lib/bib/opsworks/composer.rb

@@ -5,7 +5,6 @@ require 'bib/opsworks/logging'
 module Bib
   module Opsworks
     class Composer
-      
       include Logging
 
       def copy_vendor(release_path, deploy_user)
@@ -16,35 +15,35 @@ module Bib
         deploy_group     = deploy_user['group']
 
         release_vendor = "#{release_path}/vendor"
-        
-        
-        if ::File.exists?(vendor_dir)
+
+        if ::File.exist?(vendor_dir)
           fileutils_output = StringIO.new
           ::FileUtils.fileutils_output = fileutils_output
           log.debug("Copy Vendor: Copying from #{vendor_dir} to #{release_vendor}")
-          ::FileUtils.cp_r vendor_dir, release_vendor, :verbose => true 
+          ::FileUtils.cp_r vendor_dir, release_vendor, verbose: true
           log.debug(fileutils_output.string)
         else
           log.info("Vendor dir #{vendor_dir} does not exist")
         end
-        
-        if ::File.exists?(release_vendor)
+
+        if ::File.exist?(release_vendor)
           fileutils_output = StringIO.new
           ::FileUtils.fileutils_output = fileutils_output
           log.debug("Chown Vendor #{release_vendor} to #{deploy_username}.#{deploy_group}")
           ::FileUtils.fileutils_output = fileutils_output
-          result = ::FileUtils.chown_R deploy_username, deploy_group, release_vendor, :verbose => true 
+          result = ::FileUtils.chown_R deploy_username, deploy_group, release_vendor, verbose: true
           log.debug(fileutils_output.string)
         else
           log.info("Release vendor dir #{release_vendor} does not exist")
         end
+        result
       end
     end
   end
 end
 
 module FileUtils
-  def FileUtils.fileutils_output=(new_out)
-    @fileutils_output = new_out
+  class << self
+    attr_writer :fileutils_output
   end
-end
+end

data/lib/bib/opsworks/google.rb

@@ -3,11 +3,9 @@ require 'net/http'
 module Bib
   module Opsworks
     class Google
-
       include Logging
-      
+
       def publish_deployment(app_name, deploy_data, google_ident)
-        
         google_params = prepare_publishing_data(app_name, deploy_data)
 
         label = "#{google_params['deployment[user]']}-#{google_params['deployment[revision]']}"
@@ -16,34 +14,34 @@ module Bib
         url = URI.parse(google_url)
 
         request = Net::HTTP::Get.new(url.request_uri)
-        log.debug("google analytics sending data: " + request.inspect)
-        
+        log.debug('Google Analytics: sending data: ' + google_url)
+
         http = Net::HTTP.new(url.host, url.port)
         http.use_ssl = false
         resp = http.request(request)
-        log.debug("Google Response: " + resp.code + " " + resp.message )
+        log.debug('Google Analytics Response: ' + resp.code + ' ' + resp.message)
         resp.is_a? Net::HTTPSuccess
       end
 
       def prepare_publishing_data(app_name, deploy_data)
-        scm_revision = deploy_data["scm"]["revision"]
+        scm_revision = deploy_data['scm']['revision']
 
-        if deploy_data["deploying_user"].nil? or deploy_data["deploying_user"].empty?
-          deployment_user = "opsworks"
+        if deploy_data['deploying_user'].nil? || deploy_data['deploying_user'].empty?
+          deployment_user = 'opsworks'
         else
-          deployment_user = deploy_data["deploying_user"].split('/')[1]
+          deployment_user = deploy_data['deploying_user'].split('/')[1]
         end
 
         google_params = {}
         {
-          :app_name => app_name, 
-          :user => deployment_user, 
-          :revision => scm_revision
+          app_name: app_name,
+          user: deployment_user,
+          revision: scm_revision
         }.each do |k, v|
           google_params["deployment[#{k}]"] = v unless v.nil? || v == ''
         end
         google_params
-      end 
+      end
     end
   end
 end

data/lib/bib/opsworks/logging.rb

@@ -4,10 +4,10 @@ module Bib
   module Opsworks
     module Logging
       def log
-        if(defined?(Chef::Log))
+        if defined?(Chef::Log)
           Chef::Log
         else
-          unless(@logger)
+          unless @logger
             require 'logger'
             @logger = Logger.new(STDOUT)
           end
@@ -16,4 +16,4 @@ module Bib
       end
     end
   end
-end
+end

data/lib/bib/opsworks/newrelic.rb

@@ -3,47 +3,45 @@ require 'net/http'
 module Bib
   module Opsworks
     class Newrelic
-
       include Logging
-      
+
       def publish_deployment(app_name, deploy_data, newrelic_api_key)
-        
         newrelic_params = prepare_publishing_data(app_name, deploy_data)
 
-        newrelic_url = "https://rpm.newrelic.com/deployments.xml"
+        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-Api-Key', newrelic_api_key)
         request.set_form_data(newrelic_params)
-        
-        log.debug("Newrelic sending data: " + newrelic_params.inspect)
-        
+
+        log.debug('Newrelic sending data: ' + newrelic_params.inspect)
+
         http = Net::HTTP.new(url.host, url.port)
         http.use_ssl = true
         resp = http.request(request)
-        log.debug("Newrelic Response: " + resp.code + " " + resp.message )
+        log.debug('Newrelic Response: ' + resp.code + ' ' + resp.message)
         resp.is_a? Net::HTTPSuccess
       end
 
       def prepare_publishing_data(app_name, deploy_data)
-        scm_revision = deploy_data["scm"]["revision"]
+        scm_revision = deploy_data['scm']['revision']
 
-        if deploy_data["deploying_user"].nil? or deploy_data["deploying_user"].empty?
-          deployment_user = "opsworks"
+        if deploy_data['deploying_user'].nil? || deploy_data['deploying_user'].empty?
+          deployment_user = 'opsworks'
         else
-          deployment_user = deploy_data["deploying_user"].split('/')[1]
+          deployment_user = deploy_data['deploying_user'].split('/')[1]
         end
 
         newrelic_params = {}
         {
-          :app_name => app_name, 
-          :user => deployment_user, 
-          :revision => scm_revision
+          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
   end
 end

data/lib/bib/opsworks/qafoo.rb

@@ -0,0 +1,45 @@
+require 'net/http'
+
+module Bib
+  module Opsworks
+    class Qafoo
+      include Logging
+
+      def publish_deployment(app_name, deploy_data, qafoo_api_key)
+        qafoo_params = prepare_publishing_data(app_name, deploy_data)
+        qafoo_params['apiKey'] = qafoo_api_key
+
+        qafoo_url = 'https://app.tideways.io/api/events'
+        url = URI.parse(qafoo_url)
+        request = Net::HTTP::Post.new(url.request_uri)
+        request.body = qafoo_params.to_json
+
+        log.debug('qafoo sending data: ' + qafoo_params.to_json)
+
+        http = Net::HTTP.new(url.host, url.port)
+        http.use_ssl = true
+        resp = http.request(request)
+        log.debug('qafoo Response: ' + resp.code + ' ' + resp.message)
+        resp.is_a? Net::HTTPSuccess
+      end
+
+      def prepare_publishing_data(app_name, deploy_data)
+        scm_revision = deploy_data['scm']['revision']
+
+        if deploy_data['deploying_user'].nil? || deploy_data['deploying_user'].empty?
+          deployment_user = 'opsworks'
+        else
+          deployment_user = deploy_data['deploying_user'].split('/')[1]
+        end
+
+        name_text = "#{scm_revision} by #{deployment_user}"
+
+        qafoo_params = {}
+        qafoo_params['name'] = name_text
+        qafoo_params['environment'] = app_name
+        qafoo_params['type'] = 'release'
+        qafoo_params
+      end
+    end
+  end
+end

data/lib/bib/opsworks/version.rb

@@ -1,5 +1,5 @@
 module Bib
   module Opsworks
-    VERSION = "0.1.2"
+    VERSION = '0.1.3'
   end
 end

data/lib/bib/opsworks.rb

@@ -1,13 +1,13 @@
 require 'bib/opsworks/composer'
 require 'bib/opsworks/newrelic'
+require 'bib/opsworks/qafoo'
 require 'bib/opsworks/google'
 require 'bib/opsworks/version'
 
 class BibOpsworks
-
   def initialize
   end
-  
+
   def copy_composer(release_path, deploy_user)
     composer = Bib::Opsworks::Composer.new
     composer.copy_vendor(release_path, deploy_user)
@@ -18,6 +18,11 @@ class BibOpsworks
     newrelic.publish_deployment(app_name, deploy_data, newrelic_api_key)
   end
 
+  def qafoo_publish_deployment(app_name, deploy_data, qafoo_api_key)
+    qafoo = Bib::Opsworks::Qafoo.new
+    qafoo.publish_deployment(app_name, deploy_data, qafoo_api_key)
+  end
+
   def google_publish_deployment(app_name, deploy_data, google_ident)
     google = Bib::Opsworks::Google.new
     google.publish_deployment(app_name, deploy_data, google_ident)

data/tests/composer_test.rb

@@ -5,9 +5,9 @@ require 'bib/opsworks/composer'
 
 class ComposerTest < Minitest::Test
   def setup
-    @fixtures_path ||= Pathname.new(File.expand_path('../tmp-fixtures/', __FILE__)).tap{|path|
+    @fixtures_path ||= Pathname.new(File.expand_path('../tmp-fixtures/', __FILE__)).tap do |path|
       FileUtils.mkdir_p path.to_s
-    }
+    end
 
     @release_path = Pathname.new(File.expand_path('releases/123/', @fixtures_path))
     FileUtils.mkdir_p @release_path
@@ -21,10 +21,10 @@ class ComposerTest < Minitest::Test
   def test_composer_copy
     composervendor = Bib::Opsworks::Composer.new
 
-    #do not use www-data, or the test will fail on systems without that user
+    # do not use www-data, or the test will fail on systems without that user
     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)))
+    assert_equal(true, ::File.exist?(File.expand_path('releases/123/vendor/some-lib', @fixtures_path)))
   end
 end

data/tests/google_test.rb

@@ -4,7 +4,6 @@ require 'minitest/autorun'
 require 'bib/opsworks/google'
 
 class GoogleTest < Minitest::Test
-
   def test_publish_deployment_user
     google = Bib::Opsworks::Google.new
 
@@ -12,7 +11,11 @@ class GoogleTest < Minitest::Test
     app_name = 'unittest'
 
     result = google.prepare_publishing_data(app_name, deploy_data)
-    expected = {"deployment[app_name]"=>"unittest", "deployment[user]"=>"gemtest", "deployment[revision]"=>"rev1"}
+    expected = {
+      'deployment[app_name]' => 'unittest',
+      'deployment[user]' => 'gemtest',
+      'deployment[revision]' => 'rev1'
+    }
     assert_equal(expected, result)
   end
 
@@ -23,18 +26,11 @@ class GoogleTest < Minitest::Test
     app_name = 'unittest'
 
     result = google.prepare_publishing_data(app_name, deploy_data)
-    expected = {"deployment[app_name]"=>"unittest", "deployment[user]"=>"opsworks", "deployment[revision]"=>"rev1"}
-    assert_equal(expected, result)
-  end
-
-  def test_publish_deployment
-   google = Bib::Opsworks::Google.new
-
-    deploy_data = { 'deploying_user' => 'arn:aws:iam::123456:user/gemtest', 'scm' => { 'revision' => 'rev1' } }
-    app_name = 'unittest'
-    google_ident = 'UA-1869721-12'
-    result = google.publish_deployment(app_name, deploy_data, google_ident)
-    expected = true
+    expected = {
+      'deployment[app_name]' => 'unittest',
+      'deployment[user]' => 'opsworks',
+      'deployment[revision]' => 'rev1'
+    }
     assert_equal(expected, result)
   end
 end

data/tests/newrelic_test.rb

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

data/tests/qafoo_test.rb

@@ -0,0 +1,52 @@
+gem 'minitest'
+
+require 'minitest/autorun'
+require 'bib/opsworks/qafoo'
+
+class QafooTest < Minitest::Test
+  def test_publish_deployment_user
+    qafoo = Bib::Opsworks::Qafoo.new
+
+    deploy_data = { 'deploying_user' => 'arn:aws:iam::123456:user/gemtest', 'scm' => { 'revision' => 'rev1' } }
+    app_name = 'unittest'
+
+    scm_revision = deploy_data['scm']['revision']
+    if deploy_data['deploying_user'].nil? || deploy_data['deploying_user'].empty?
+      deployment_user = 'opsworks'
+    else
+      deployment_user = deploy_data['deploying_user'].split('/')[1]
+    end
+    name_text = "#{scm_revision} by #{deployment_user}"
+
+    result = qafoo.prepare_publishing_data(app_name, deploy_data)
+    expected = {
+      'name' => name_text,
+      'environment' => 'unittest',
+      'type' => 'release'
+    }
+    assert_equal(expected, result)
+  end
+
+  def test_publish_deployment_nouser
+    qafoo = Bib::Opsworks::Qafoo.new
+
+    deploy_data = { 'scm' => { 'revision' => 'rev1' } }
+    app_name = 'unittest'
+
+    scm_revision = deploy_data['scm']['revision']
+    if deploy_data['deploying_user'].nil? || deploy_data['deploying_user'].empty?
+      deployment_user = 'opsworks'
+    else
+      deployment_user = deploy_data['deploying_user'].split('/')[1]
+    end
+    name_text = "#{scm_revision} by #{deployment_user}"
+
+    result = qafoo.prepare_publishing_data(app_name, deploy_data)
+    expected = {
+      'name' => name_text,
+      'environment' => 'unittest',
+      'type' => 'release'
+    }
+    assert_equal(expected, result)
+  end
+end

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: BibOpsworks
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - fh
 - tillk
+- gilleyj
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-30 00:00:00.000000000 Z
+date: 2015-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -81,6 +82,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  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: 
 email:
 - fh-gem@fholzhauer.de
@@ -89,6 +104,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop.yml"
 - ".travis.yml"
 - BibOpsworks.gemspec
 - Gemfile
@@ -100,10 +116,12 @@ files:
 - lib/bib/opsworks/google.rb
 - lib/bib/opsworks/logging.rb
 - lib/bib/opsworks/newrelic.rb
+- lib/bib/opsworks/qafoo.rb
 - lib/bib/opsworks/version.rb
 - tests/composer_test.rb
 - tests/google_test.rb
 - tests/newrelic_test.rb
+- tests/qafoo_test.rb
 homepage: https://github.com/easybiblabs/bib-opsworks
 licenses:
 - BSD-2-Clause
@@ -124,9 +142,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Tools wrapper for AWS Opsworks Deploys
 test_files: []
-has_rdoc: