gantree 0.6.5 → 0.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fab5339982cb3099c8b0a393375b0700907f751a
-  data.tar.gz: d689ccf77086f35f6bea4cc3a7da1b69535029b8
+  metadata.gz: c09441aca3f3edcf71fdda17ddcb33a211bb5626
+  data.tar.gz: ee0db92cf08dc80d4283e03ff45d11c81d2f5fe8
 SHA512:
-  metadata.gz: 72ff98c01a21d02a83960a6dbc5d492f1c0b745fdacb3ecdc4c4339237151c1847657c43d44b020c2989d1cc7f57fa847953d50b9c109937dfcf58d15ff03580
-  data.tar.gz: e0ea01beb2ef7c3dbd302daf41e3253b54c25802a335afe0d55740fb2cbc5b94bd6160b4a96185ff3b417ce26086d8567cf78a85a4d2ca827f159e138df73fd0
+  metadata.gz: fae795326dad9be1d7713b45b84a21842f6ab7c1d819df6265daaf72da3fc0267ddd4d03d580e543f3417c29681a2a031ed1c61318394c758ad4d2aa995e2e2e
+  data.tar.gz: b556a99549286699d243004ceccf6cb0ee2cefd48b9ebd79e5d8fc6e2740cb9baf4cdf97c350e4accd5182dabf859ce64759f155532e8149366b9a0bb672a77b

data/lib/gantree.rb

@@ -1,5 +1,6 @@
 $:.unshift(File.expand_path("../", __FILE__))
 require "gantree/base"
+require "gantree/config"
 require "gantree/version"
 require "gantree/deploy"
 require "gantree/deploy_applications"

data/lib/gantree/base.rb

@@ -24,6 +24,7 @@ module Gantree
         puts "gem already up to date".light_blue
       end
        update_configuration(opts[:auto_configure]) if opts[:auto_configure]
+       Gantree::Config.merge_defaults(opts)
     end
 
     def self.update_configuration repo

data/lib/gantree/cli.rb

@@ -20,8 +20,8 @@ module Gantree
     option :auth, :desc => "dockerhub authentation, example: bucket/key"
     option :release_notes_staging, :type => :boolean, :default => false, :desc => "force release notes generation for staging deploys"
     def deploy name
-      opts = merge_defaults(options)
-      Gantree::Base.check_for_updates(opts)
+      opts = Gantree::Config.merge_defaults(options)
+      opts = Gantree::Base.check_for_updates(opts)
       Gantree::Deploy.new(name,opts).run 
     end
 
@@ -45,7 +45,7 @@ module Gantree
     option :dupe, :alias => "-d", :desc => "copy an existing template into a new template"
     option :local, :alias => "-l", :desc => "use a local cfn nested template"
     def create app
-      Gantree::Create.new(app, merge_defaults(options)).run
+      Gantree::Create.new(app, Gantree::Config.merge_defaults(options)).run
     end
 
     desc "update APP", "update a cfn stack"
@@ -54,18 +54,18 @@ module Gantree
     option :role, :aliases => "-r", :desc => "add an app role (worker|listner|scheduler)"
     option :solution, :aliases => "-s", :desc => "change solution stack"
     def update app
-      Gantree::Update.new(app, merge_defaults(options)).run
+      Gantree::Update.new(app, Gantree::Config.merge_defaults(options)).run
     end
 
     desc "delete APP", "delete a cfn stack"
     option :force, :desc => "do not prompt", :default => false
     def delete app
-      Gantree::Delete.new(app, merge_defaults(options)).run
+      Gantree::Delete.new(app, Gantree::Config.merge_defaults(options)).run
     end
 
     desc "restart APP", "restart an eb app"
     def restart app
-      Gantree::App.new(app, merge_defaults(options)).restart
+      Gantree::App.new(app, Gantree::Config.merge_defaults(options)).restart
     end
 
     desc "build", "build and tag a docker application"
@@ -73,7 +73,7 @@ module Gantree
     option :image_path, :aliases => "-i", :desc => "docker hub image path ex. (bleacher/cms | quay.io/bleacherreport/cms)"
     option :tag, :aliases => "-t", :desc => "set docker tag to build"
     def build
-      docker = Gantree::Docker.new(merge_defaults(options))
+      docker = Gantree::Docker.new(Gantree::Config.merge_defaults(options))
       docker.build
     end
 
@@ -83,7 +83,7 @@ module Gantree
     option :image_path, :aliases => "-i", :desc => "docker hub image path ex. (bleacher/cms | quay.io/bleacherreport/cms)"
     option :tag, :aliases => "-t", :desc => "set docker tag to push"
     def push
-      Gantree::Docker.new(merge_defaults(options)).push
+      Gantree::Docker.new(Gantree::Config.merge_defaults(options)).push
     end
 
     desc "tag", "tag a docker application"
@@ -103,8 +103,8 @@ module Gantree
     option :auth, :desc => "dockerhub authentation, example: bucket/key"
     option :release_notes_staging, :type => :boolean, :default => false, :desc => "force release notes generation for staging deploys"
     def ship server
-      opts = merge_defaults(options)
-      Gantree::Base.check_for_updates(opts)
+      opts = Gantree::Config.merge_defaults(options)
+      opts = Gantree::Base.check_for_updates(opts)
       docker = Gantree::Docker.new(opts)
       docker.pull
       docker.build
@@ -118,25 +118,6 @@ module Gantree
       puts VERSION
     end
 
-    protected
-
-    def merge_defaults(options={})
-      configs = ["#{ENV['HOME']}/.gantreecfg",".gantreecfg"]
-      hash = {}
-      configs.each do |config|
-        hash.merge!(merge_config(options,config)) if config_exists?(config)
-      end
-      Hash[hash.map{ |k, v| [k.to_sym, v] }]
-    end 
-    
-    def merge_config options, config
-      defaults = JSON.parse(File.open(config).read) 
-      defaults.merge(options)
-    end 
-
-    def config_exists? config
-      File.exist? config
-    end
   end
 end
 

data/lib/gantree/config.rb

@@ -0,0 +1,25 @@
+require 'colorize'
+
+module Gantree
+  class Config
+    class << self
+      def merge_defaults(options={})
+        configs = ["#{ENV['HOME']}/.gantreecfg",".gantreecfg"]
+        hash = {}
+        configs.each do |config|
+          hash.merge!(merge_config(options,config)) if config_exists?(config)
+        end
+        Hash[hash.map{ |k, v| [k.to_sym, v] }]
+      end
+
+      def merge_config options, config
+        defaults = JSON.parse(File.open(config).read)
+        defaults.merge(options)
+      end
+
+      def config_exists? config
+        File.exist? config
+      end
+    end
+  end
+end

data/lib/gantree/deploy.rb

@@ -69,7 +69,7 @@ module Gantree
       create_eb_version
       update_application(envs)
       if @options[:slack]
-        msg = "#{ENV['USER']} is deploying #{@packaged_version} to #{@app} "
+        msg = "#{ENV['USER']} is deploying #{@packaged_version} to #{@app} #{@envs.inspect}"
         msg += "Tag: #{@options[:tag]}" if @options[:tag]
         Notification.new(@options[:slack]).say(msg) unless @options[:silent]
       end

data/lib/gantree/version.rb

@@ -1,3 +1,3 @@
 module Gantree
-  VERSION = "0.6.5"
+  VERSION = "0.6.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gantree
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.6.6
 platform: ruby
 authors:
 - Felix
@@ -304,6 +304,7 @@ files:
 - lib/gantree/cfn/resources.rb
 - lib/gantree/cli.rb
 - lib/gantree/cli/help.rb
+- lib/gantree/config.rb
 - lib/gantree/create.rb
 - lib/gantree/delete.rb
 - lib/gantree/deploy.rb