gantree 0.5.5 → 0.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 93e1fc2560310823eff776281bbb89f504e8ccf0
-  data.tar.gz: 6202b52059da3c876d4c7bb28d21da5d774abf46
+  metadata.gz: 87590bdf6a18af8ca085d1d15fced297ad9c2bdf
+  data.tar.gz: 632a00ef006d70bad2d6e7e055b6cc2e00030136
 SHA512:
-  metadata.gz: 047dd9170aa2e325a51abe1ad122bb5b11311d428b579d7187d2798ef6103790bc55dbdbfa7c35f618bf85e314a4f6e38ff53284175a79b41b2b612048e96e1b
-  data.tar.gz: a51ebe0952e5182c0364182c327f38f7784a671011ba6d64554235d9e768bc0dd933f392c4c3695f4359c575dd236e3e16b65d1acd6f0aea421ec380e07d4d7f
+  metadata.gz: ed60ac21a9d8863a4b0036a6af1708a7b5f68a34c7e4ac5f242bbd794d4e91511ecb31a12c304011431a8c66d88f934562384b340814bad19b00159302e60d76
+  data.tar.gz: 9e9b6879f83124fd6d25806e0dbd12bcd519faa99506483ff1e4bc70946fbdacfb8d4a1db7177088eba57236458e24b515ff8d2a07d77aa0a2dc267d4ca41e55

data/lib/gantree/base.rb

@@ -7,22 +7,29 @@ module Gantree
       raise "Please set your AWS Environment Variables" unless ENV['AWS_ACCESS_KEY_ID']
     end
     
-    def self.check_for_updates enabled
-      return if $0.include? "bin/gantree"
-      latest_version = `gem search gantree | grep gantree | awk '{ print $2 }' | tr -d '()'`.strip
-      current_version = `gantree -v`.strip
+    def self.check_for_updates opts
+      puts opts.inspect
+      enabled =  opts[:auto_updates]
+      #return if $0.include? "bin/gantree"
+      latest_version = `gem search gantree | grep gantree | awk '{ print $2 }' | tr -d '()'`.strip.to_i
+      current_version = VERSION.to_i
       puts "Auto updates enabled".light_blue if enabled
       puts "Auto updates disabled".light_blue if !enabled
-      if latest_version != current_version && enabled
+      if  current_version < latest_version && enabled
         puts "Updating from #{current_version} to #{latest_version}...".green
-        if system("gem update gantree --force") 
-          puts "Gem updated".green
-        else 
-          puts "Gem failed to update".red
-        end
+        system("gem update gantree --force") 
       else 
         puts "gem already up to date".light_blue
       end
+       update_configuration(opts[:auto_configure]) if opts[:auto_configure]
+    end
+
+    def self.update_configuration repo
+      puts "Auto configuring from #{repo}".light_blue
+      FileUtils.rm_rf("/tmp/gantreecfg") if File.directory?("/tmp/gantreecfg")
+      system("git clone #{repo} /tmp/gantreecfg")
+      FileUtils.cp("/tmp/gantreecfg/.gantreecfg","#{ENV['HOME']}/")
+      puts "Auto Configured".green
     end
 
     def print_options

data/lib/gantree/cli.rb

@@ -10,7 +10,6 @@ module Gantree
 
     desc "deploy APP", "deploy specified APP"
     long_desc Help.deploy
-    option :branch, :desc => 'branch to deploy'
     option :tag, :aliases => "-t", :desc => "set docker tag to deploy", :default => Gantree::Base.new.tag
     option :ext, :aliases => "-x", :desc => "ebextensions folder/repo"
     option :ext_role, :desc => "role based extension repo (bleacher specific)"
@@ -20,7 +19,7 @@ module Gantree
     option :eb_bucket, :desc => "bucket to store elastic beanstalk versions"
     def deploy name
       opts = merge_defaults(options)
-      Gantree::Base.check_for_updates(opts[:auto_updates])
+      Gantree::Base.check_for_updates(opts)
       Gantree::Deploy.new(name,opts).run 
     end
 
@@ -91,7 +90,6 @@ module Gantree
 
     desc "ship", "build, push and deploy docker container to elastic beanstalk"
     long_desc Help.ship
-    option :branch, :desc => 'branch to deploy'
     option :tag, :aliases => "-t", :desc => "set docker tag to deploy", :default => Gantree::Base.new.tag
     option :ext, :aliases => "-x", :desc => "ebextensions folder/repo"
     option :silent, :aliases => "-s", :desc => "mute notifications"
@@ -101,7 +99,7 @@ module Gantree
     option :eb_bucket, :desc => "bucket to store elastic beanstalk versions"
     def ship server
       opts = merge_defaults(options)
-      Gantree::Base.check_for_updates(opts[:auto_updates])
+      Gantree::Base.check_for_updates(opts)
       docker = Gantree::Docker.new(opts)
       docker.pull
       docker.build

data/lib/gantree/deploy.rb

@@ -65,7 +65,6 @@ module Gantree
       @packaged_version = version.run
       puts @packaged_version
       upload_to_s3 
-      version.clean_up 
       create_eb_version
       update_application(envs)
       if @options[:slack]
@@ -84,6 +83,7 @@ module Gantree
         `git tag #{tag}`
         `git push --tags`
       end
+      version.clean_up
     end
 
     def upload_to_s3

data/lib/gantree/deploy_version.rb

@@ -34,7 +34,8 @@ module Gantree
     end
 
     def create_version_files
-      version = "#{tag}-#{Time.now.strftime("%b-%d-%Y-%a-%H-%M-%S")}"
+      clean_up
+      version = "#{tag}-#{Time.now.strftime("%m-%d-%Y-%H-%M-%S")}"
       puts "version: #{version}"
       set_image_path if @options[:image_path]
       set_tag_to_deploy
@@ -46,13 +47,10 @@ module Gantree
         Archive::Zip.archive(zip, ['/tmp/merged_extensions/.ebextensions/', "/tmp/#{@dockerrun_file}"])
         zip
       else
-        new_dockerrun = "#{version}-Dockerrun.aws.json"
-        FileUtils.cp("Dockerrun.aws.json", new_dockerrun)
+        new_dockerrun = "/tmp/#{version}-Dockerrun.aws.json"
+        FileUtils.cp("/tmp/Dockerrun.aws.json", new_dockerrun)
         new_dockerrun
       end
-    rescue => e
-      puts e
-      clean_up
     end
 
     def ext?
@@ -109,18 +107,15 @@ module Gantree
     end
 
     def clean_up
-      `rm -rf #{@packaged_version}` if @packaged_version
-      `git checkout Dockerrun.aws.json` # reverts back to original Dockerrun.aws.json
-      FileUtils.rm_rf("/tmp/#{@ext.split('/').last}")
-      FileUtils.rm_rf("/tmp/#{@ext_role.split('/').last}:#{get_role_type}")
-      FileUtils.rm_rf("/tmp/merged_extensions/")
-    rescue => e
-      puts "Warning: had some trouble cleaning up".yellow
-      puts e
+      puts "Cleaning up tmp files".yellow
+      FileUtils.rm_rf @packaged_version if @packaged_version
+      FileUtils.rm_rf("/tmp/#{@ext.split('/').last}") if File.directory?("/tmp/#{@ext.split('/').last}")
+      FileUtils.rm_rf("/tmp/#{@ext_role.split('/').last}:#{get_role_type}") if File.directory?("/tmp/#{@ext_role.split('/').last}:#{get_role_type}")
+      FileUtils.rm_rf("/tmp/merged_extensions/") if File.directory? "/tmp/merged_extensions/"
+      puts "All tmp files removed".green
     end
     
     def merge_extensions
-      clean_up
       FileUtils.mkdir("/tmp/merged_extensions/")
       FileUtils.mkdir("/tmp/merged_extensions/.ebextensions/")
       clone_repo @ext if @ext

data/lib/gantree/version.rb

@@ -1,3 +1,3 @@
 module Gantree
-  VERSION = "0.5.5"
+  VERSION = "0.5.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gantree
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.5.6
 platform: ruby
 authors:
 - Felix