rat_deployer 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 74983b96f796cdeb6f4cd9f2e8772175c8a12585
-  data.tar.gz: 7cf240bdd56de28e636f6169aae2c750c77c2c6b
+  metadata.gz: 9434ec7c84475197340d979cd8cd297eeed41802
+  data.tar.gz: 9168a21f79a69cb597c61b703b3ec1ede5d65026
 SHA512:
-  metadata.gz: a027dacb0771134117aba68c8feded26a3985fe461e54e6c7f388eee990d63279a07fe29b2b947e14f249de3fb4cca63aadaee2c8691121aee9f01420c88b898
-  data.tar.gz: 45c19071b97022807ed5bb0d1934ccc92920589c3c8e726ee9fd21b3772fb69166fc50d2ba2aead08b139998b1f5c7ec30e90336540ef2dbb0c2bcad50761f53
+  metadata.gz: 8f62a6495fe7e3fa55c7a958c1bcaf5b39c2355cb1278236abdf51ee0bcd71e4306b572b5f5ef1ad20f1714dbdf448ed2273e11b9673610f843eaac4c737cbb3
+  data.tar.gz: 9b1870d24db2c922e4556d260f129363e3a5385a0f4ca8b7706a11b0b9cf18e14217d7a6f31ef0262f994347168141a342b2dfc032bf2c2b824499a017987d1f

data/lib/rat_deployer/cli.rb

@@ -1,4 +1,5 @@
 require 'thor'
+require 'fileutils'
 
 require 'rat_deployer/command'
 require 'rat_deployer/notifier'
@@ -13,11 +14,11 @@ module RatDeployer
 
       if services.any?
         services_str = services.join(' ')
-        RatDeployer::Cli.new.compose("pull #{services_str}")
-        RatDeployer::Cli.new.compose("up -d --no-deps --force-recreate #{services_str}")
+        compose("pull #{services_str}")
+        compose("up -d --no-deps --force-recreate #{services_str}")
       else
-        RatDeployer::Cli.new.compose('pull')
-        RatDeployer::Cli.new.compose('up -d')
+        compose('pull')
+        compose('up -d')
       end
 
       RatDeployer::Notifier.notify_deploy_end

data/lib/rat_deployer/config.rb

@@ -6,40 +6,19 @@ module RatDeployer
     def self.all
       @all ||= YAML.load_file(File.expand_path('./rat_config.yml')) || {}
     end
-
-    def self.env
-      ENV.fetch('RAT_ENV')
-    end
-
-    def self.images
-      all.fetch('images', {})
-    end
-
-    def self.environmental
-      all.fetch('environments', {})
-    end
-
     def self.for_env(e = env)
+      environmental = all.fetch('environments', {})
       default_conf = environmental.fetch('default', {})
       env_conf     = environmental.fetch(e)
-      default_conf.deep_merge(env_conf)
-    end
-
-    def self.prompt_enabled?
-      ENV['RAT_PROMPT'] != "false"
-    end
 
-    # Loads machine config for current env.
-    # Acceps either a docker-machine machine name
-    # or an object with keys ca_cert, cert, key, and host.
-    def self.machine
-      for_env.fetch("machine")
+      default_conf.deep_merge(env_conf)
     end
 
-    def self.remote
-      env_var = ENV['RAT_REMOTE']
-      env_var.nil? ? true : env_var == 'true'
-    end
+    def self.prompt_enabled?() ENV['RAT_PROMPT'] != "false" end
+    def self.machine() for_env.fetch("machine") end
+    def self.remote() ENV['RAT_REMOTE'] =~ /true|1|yes/ end
+    def self.env() ENV.fetch('RAT_ENV') end
+    def self.images() all.fetch('images', {}) end
 
     def self.remote_machine_flags
       case machine

data/lib/rat_deployer/notifier.rb

@@ -14,6 +14,14 @@ module RatDeployer
       notify_deploy "Ended deploy on #{ENV.fetch('RAT_ENV')}"
     end
 
+    def self.notify(msg)
+      return unless webhook_url
+      return unless webhook_url
+      self.slack_notifier.ping msg
+    end
+
+    private
+
     def self.notify_deploy(title)
       return unless webhook_url
       props = get_deploy_properties
@@ -33,14 +41,6 @@ module RatDeployer
       )
     end
 
-    def self.notify(msg)
-      return unless webhook_url
-      return unless webhook_url
-      self.slack_notifier.ping msg
-    end
-
-    private
-
     def self.slack_notifier
       return unless webhook_url
 

data/lib/rat_deployer/version.rb

@@ -1,3 +1,3 @@
 module RatDeployer
-  VERSION = "0.3.1"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rat_deployer
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Nicolas Oga
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-12 00:00:00.000000000 Z
+date: 2017-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor