solano_notify_and_deploy 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 44c13d61e6e37e7c6720b1466a06ff9c3c6f6caa
-  data.tar.gz: 5e20fee0c986b0119fde609e8322f7f8e0fc0390
+  metadata.gz: 452aa1dafc665615f73ba814b540e9af40df70fc
+  data.tar.gz: 10da2903fa341cdc736ddeda1a7c8e7936b9f1a0
 SHA512:
-  metadata.gz: accf24fe796211518ef0bb46799e820e9f7985489f0829002785f0658d2e05e919307a8960bf8540a0c21eed816e7061bb806202132657096318a28830c46560
-  data.tar.gz: 65be527cd7547e4560daa8bf67cf4542bd8196253635912f51934dcdf6b750ea113872769f320f7833f9d61ef1a904e6d283a7356070d1b6c6d3da74b86da269
+  metadata.gz: eb1d0de5a558fc6ec3e72b0656892df19e881e06305ad7ad0b91950975812f9d170e2ec3124102f0e3d084088edddd8619b7acb0da4fa5021ed139eec8aef2ae
+  data.tar.gz: 4a81d61cda879f1bdebeba0b5419b8736becbbe31add43a5b054931244c3324b375f0869d749a0d8e80ff81ac30fafdd76800779fbc8e6c732934b1f320c3812

data/lib/generators/solano/solano_generator.rb

@@ -9,4 +9,7 @@ class SolanoGenerator < Rails::Generators::Base
     template 'solano.yml.erb', 'solano.yml'
   end
 
+  def create_deploy_task
+    template 'deploy.rake.erb', 'lib/tasks/solano/deploy.rake'
+  end
 end

data/lib/generators/solano/templates/deploy.rake.erb

@@ -0,0 +1,60 @@
+namespace :solano do
+  desc 'notify hipchat on build events'
+  task :notify do
+    notify_build_status
+  end
+
+  desc 'notify hipchat on build events, deploy on successful build'
+  task :notify_and_deploy do
+    notify_build_status "- will not deploy, to deploy manually try rake solano:deploy"
+    next unless build_passed?
+    deploy
+  end
+
+  desc 'run the deploy (notify on failure)'
+  task :deploy do
+    deploy
+  end
+
+  private
+
+    def tddium?
+      ENV['TDDIUM'].present?
+    end
+
+    def passed?
+      ENV['TDDIUM_BUILD_STATUS'] == 'passed'
+    end
+
+    def build_passed?
+      tddium? && passed?
+    end
+
+    def deploy
+      succeeded = false
+      message = ""
+
+      begin
+        succeeded = system('curl -X POST -d "" <%= deploy_hook_url %>')
+      rescue Exception => e
+        succeeded = false
+        message = e.message
+      end
+
+      unless succeeded
+        notify "Deploy failed: #{message}", 'red'
+        raise "deployment failed"
+      end
+    end
+
+    def notify_build_status(failed_message = '')
+      notify hipchat_api_key, hipchat_room_id, "Build succeeded", "green" and return if build_passed?
+      notify hipchat_api_key, hipchat_room_id, "Build failed #{failed_message}", "yellow"
+    end
+
+    def notify(message, colour)
+      client = HipChat::Client.new('<%= hipchat_api_key %>')
+      client['<%= hipchat_room_id %>'].send('Solano CI', message, :color => colour)
+    end
+
+end

data/lib/generators/solano/templates/solano.yml.erb

@@ -1,5 +1,8 @@
 ---
 :hooks:
-  <%- if deploy_hook_url.nil? %>  :post_build: bundle exec rake solano:notify[<%= hipchat_api_key %>, <%= hipchat_room_id %>]
-  <%- else %> :post_build: bundle exec rake solano:notify_and_deploy[<%= hipchat_api_key %>, <%= hipchat_room_id %>, <%= deploy_hook_url %>]
+  :worker_setup: RAILS_ENV=test bundle exec rake db:test:prepare
+  <%- if deploy_hook_url.nil? %>
+  :post_build: bundle exec rake solano:notify
+  <%- else %>
+  :post_build: bundle exec rake solano:notify_and_deploy
   <%- end %>

data/lib/solano_notify_and_deploy/railtie.rb

@@ -5,10 +5,6 @@ module SolanoNotifyAndDeploy
   class Railtie < Rails::Railtie
     railtie_name :solano_notify_and_deploy
 
-    rake_tasks do
-      load File.join(File.dirname(__FILE__), "tasks/solano.rake")
-    end
-
     generators do
       require "generators/solano/solano_generator"
     end

data/lib/solano_notify_and_deploy/version.rb

@@ -1,3 +1,3 @@
 module SolanoNotifyAndDeploy
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: solano_notify_and_deploy
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Nic Pillinger
@@ -51,10 +51,10 @@ files:
 - README.md
 - lib/generators/solano/USAGE
 - lib/generators/solano/solano_generator.rb
+- lib/generators/solano/templates/deploy.rake.erb
 - lib/generators/solano/templates/solano.yml.erb
 - lib/solano_notify_and_deploy.rb
 - lib/solano_notify_and_deploy/railtie.rb
-- lib/solano_notify_and_deploy/tasks/solano.rake
 - lib/solano_notify_and_deploy/version.rb
 - solano_notify_and_deploy.gemspec
 homepage: http://lsf.io

data/lib/solano_notify_and_deploy/tasks/solano.rake

@@ -1,57 +0,0 @@
-namespace :solano do
-
-  desc 'notify hipchat on build events'
-  task :notify, :hipchat_api_key, :hipchat_room_id do |t, args|
-    notify_build_status args[:hipchat_api_key], args[:hipchat_room_id]
-  end
-
-  desc 'notify hipchat on build events, deploy on successful build'
-  task :notify_and_deploy, :hipchat_api_key, :hipchat_room_id, :deploy_hook_url do |t, args|
-    notify_build_status args[:hipchat_api_key], args[:hipchat_room_id]
-    next unless build_passed?
-
-    succeeded = false
-    message = ""
-
-    begin
-      succeeded = deploy
-    rescue Exception => e
-      succeeded = false
-      message = e.message
-    end
-
-    unless succeeded
-      notify  args[:hipchat_api_key], args[:hipchat_room_id], "Deploy failed: #{message}", 'red'
-      raise "deployment failed"
-    end
-  end
-
-  private
-
-    def tddium?
-      ENV['TDDIUM'].present?
-    end
-
-    def passed?
-      ENV['TDDIUM_BUILD_STATUS'] == 'passed'
-    end
-
-    def build_passed?
-      tddium? && passed?
-    end
-
-    def deploy(url)
-      system "curl -X POST -d \"\" #{url}"
-    end
-
-    def notify_build_status(hipchat_api_key, hipchat_room_id)
-      notify hipchat_api_key, hipchat_room_id, "Build succeeded", "green" and return if build_passed?
-      notify hipchat_api_key, hipchat_room_id, "Build failed", "red"
-    end
-
-    def notify(hipchat_api_key, hipchat_room_id, message, colour)
-      client = HipChat::Client.new(hipchat_api_key)
-      client[hipchat_room_id].send('Solano', message, :color => colour)
-    end
-
-end