rat_deployer 0.1.10 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 19683d62cba337d7a36e0d19ba5500c8a78eebb5
-  data.tar.gz: c1a9186d1108d5377d02e882dca1482725e319d8
+  metadata.gz: 62f3865952fcdfe384e29675e293cf14c366cd0c
+  data.tar.gz: ef8f40dfa437099645704bdeaceb3b35c2ab278e
 SHA512:
-  metadata.gz: 034cdad0bb5d9c1c4585cf62f8523d237dc780d6d6313d4dafa09bbc9ef5b6780c034bd937149abeb82bb03df74eca687b9453c911b4b458d5b2748f6cd6d750
-  data.tar.gz: a3d8eba9c96ffe4a63814bef407576fe60e1a56c81edbd8b4bbdcf3d0c294e38e26d7e8be68b1892d5a0063abda4ca2f13d70f8421cbaa5f4c18699e776d9d5e
+  metadata.gz: c91cfb7161d0c22b9e07f7c70e00e486e5ae068f31118d659184962c2a1196ca052930391b5014c586e1a9ddab36af827f2e92624683b2c7bba91e3e1e4907fa
+  data.tar.gz: 919ff30c8c9a36e5580a6db8fb76f2dd40fba2071744673031f46847b6f555e6d4a18607c09787a01d5b230d0f19c4128becd8469ab75bb183504606c6dea1be

data/lib/rat_deployer/cli.rb

@@ -1,6 +1,5 @@
 require 'thor'
 
-require 'rat_deployer/cli/images'
 require 'rat_deployer/command'
 require 'rat_deployer/notifier'
 
@@ -8,18 +7,20 @@ module RatDeployer
   class Cli < Thor
     include RatDeployer::Command
 
-    desc 'images SUBCOMMAND ...ARGS', 'manage images'
-    subcommand 'images', RatDeployer::Cli::Images
-
     desc "deploy", "deploys current environment"
     def deploy
-      RatDeployer::Notifier.notify "Starting deploy on #{ENV.fetch('RAT_ENV')}"
+      RatDeployer::Notifier.notify_deploy_start
 
-      RatDeployer::Cli::Images.new.update
       RatDeployer::Cli.new.compose('pull')
       RatDeployer::Cli.new.compose('up -d')
 
-      RatDeployer::Notifier.notify "Ended deploy on #{ENV.fetch('RAT_ENV')}"
+      RatDeployer::Notifier.notify_deploy_end
+    rescue Exception => e
+      RatDeployer::Notifier.notify <<-STR
+Failed deploy on #{ENV.fetch('RAT_ENV')}"
+Reason:
+  #{e.message}
+      STR
     end
 
     desc "compose ARGS...", "runs docker-compose command with default flags"

data/lib/rat_deployer/command.rb

@@ -1,5 +1,6 @@
 require "colorize"
 require 'highline/import'
+require 'rat_deployer/config'
 
 module RatDeployer
   module Command

data/lib/rat_deployer/config.rb

@@ -4,7 +4,7 @@ require 'deep_merge'
 module RatDeployer
   module Config
     def self.all
-      @all ||= YAML.load_file File.expand_path('./rat_config.yml')
+      @all ||= YAML.load_file(File.expand_path('./rat_config.yml')) || {}
     end
 
     def self.env

data/lib/rat_deployer/notifier.rb

@@ -1,16 +1,40 @@
+require 'rat_deployer/config'
+require 'active_support/core_ext/string'
 require 'slack-notifier'
 
 module RatDeployer
   module Notifier
+    def self.notify_deploy_start
+      notify_deploy "Starting deploy on #{ENV.fetch('RAT_ENV')}"
+    end
+
+    def self.notify_deploy_end
+      notify_deploy "Ended deploy on #{ENV.fetch('RAT_ENV')}"
+    end
+
+    def self.notify_deploy(title)
+      props = get_deploy_properties
+
+      slack_notifier.post(
+        attachments: [{
+          title:  title,
+          fields: get_deploy_properties.map do |k,v|
+            {title: k.to_s.titleize, value: v, short: true}
+          end
+        }]
+      )
+    end
+
     def self.notify(msg)
+      return unless webhook_url
       self.slack_notifier.ping msg
     end
 
+    private
+
     def self.slack_notifier
       @slack_notifier ||=
         begin
-          webhook_url = RatDeployer::Config.all.fetch("slack_webhook_url")
-
           Slack::Notifier.new(
             webhook_url,
             channel: '#general',
@@ -18,5 +42,20 @@ module RatDeployer
           )
         end
     end
+
+    def self.webhook_url
+      @webhook_url ||= RatDeployer::Config.all["slack_webhook_url"]
+    end
+
+    def self.get_deploy_properties
+      require 'socket'
+
+      {
+        env:        ENV.fetch('RAT_ENV'),
+        user:       ENV.fetch('USER'),
+        hostname:   Socket.gethostname,
+        started_at: Time.now.to_s
+      }
+    end
   end
 end

data/lib/rat_deployer/version.rb

@@ -1,3 +1,3 @@
 module RatDeployer
-  VERSION = "0.1.10"
+  VERSION = "0.1.11"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rat_deployer
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.11
 platform: ruby
 authors:
 - Nicolas Oga
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-27 00:00:00.000000000 Z
+date: 2017-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -68,6 +68,20 @@ dependencies:
         version: 1.7.8
 - !ruby/object:Gem::Dependency
   name: slack-notifier
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+- !ruby/object:Gem::Dependency
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -119,7 +133,6 @@ files:
 - bin/rat
 - lib/rat_deployer.rb
 - lib/rat_deployer/cli.rb
-- lib/rat_deployer/cli/images.rb
 - lib/rat_deployer/command.rb
 - lib/rat_deployer/config.rb
 - lib/rat_deployer/notifier.rb
@@ -150,4 +163,3 @@ signing_key:
 specification_version: 4
 summary: A micro-framework to deploy dockerized apps
 test_files: []
-has_rdoc: 

data/lib/rat_deployer/cli/images.rb

@@ -1,112 +0,0 @@
-require 'thor'
-require 'yaml'
-
-require 'rat_deployer/config'
-require 'rat_deployer/command'
-
-module RatDeployer
-  class Cli < Thor
-    class Images < Thor
-      include RatDeployer::Command
-
-      desc 'update [SERVICES...]', 'Update images'
-      def update(*images)
-        get_images(images).each do |image|
-          put_heading "Updating image #{image}"
-
-          do_build(image)
-          do_push(image) if RatDeployer::Config.remote
-        end
-      end
-
-      desc 'build [SERVICES...]', 'Build images'
-      def build(*images)
-        get_images(images).each &method(:do_build)
-      end
-
-      desc 'push [SERVICES...]', 'Push images'
-      def push(*images)
-        get_images(images).each &method(:do_push)
-      end
-
-      private
-
-      def get_images(images)
-        images.any? ? images : all_images
-      end
-
-      def all_images
-        docker_conf = YAML.load(`RAT_PROMPT=false rat compose config`)
-        images = docker_conf.fetch("services").map { |_, c| c.fetch("image") }.uniq
-      end
-
-      def do_build(image)
-        put_heading "Building image #{image}"
-        return unless image_conf_is_present?(image)
-        ensure_image_source(image)
-        run "docker build #{source_path(image)} -t #{image}"
-      end
-
-      def do_push(image)
-        put_heading "Pusinhg image #{image}"
-        return unless image_conf_is_present?(image)
-        run "docker push #{image}"
-      end
-
-      def ensure_image_source(image)
-        if git_conf(image)
-          git_clone_repo(image) unless source_present?(image)
-          git_fetch(image)
-          git_checkout(image)
-        else
-          unless source_present?(image)
-            put_error "Source for image #{image} is not present and no git config was provided for it. Either provide git url and optionally branch or provision the source yourself at #{source_path(image)}"
-          end
-        end
-      end
-
-      def git_clone_repo(image)
-        url = image_conf(image).fetch('git').fetch('url')
-        run "git clone #{url} #{source_path(image)}"
-      end
-
-      def git_checkout(image)
-        run "git -C #{source_path(image)} checkout -f #{git_branch(image)}"
-      end
-
-      def git_fetch(image)
-        run "git -C #{source_path(image)} fetch --tags --all --prune"
-      end
-
-      def git_branch(image)
-        git_conf(image).fetch('branch', 'origin/master')
-      end
-
-      def git_conf(image)
-        image_conf(image)['git']
-      end
-
-      def image_conf(image)
-        RatDeployer::Config.images[image]
-      end
-
-      def source_path(image)
-        folder = image_conf(image).fetch('source', image)
-        File.expand_path("./sources/#{folder}")
-      end
-
-      def source_present?(image)
-        File.exists? source_path(image)
-      end
-
-      def image_conf_is_present?(image)
-        if image_conf(image)
-          true
-        else
-          put_warning "No image config found for image #{image}. Skipping"
-          false
-        end
-      end
-    end
-  end
-end