gantree 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6dd186b31072e4741042bc7d9c5a4388a7c391d
-  data.tar.gz: 4c56ecf06781010d285322daaf5d65c77a09b061
+  metadata.gz: 5c9066e820c79531b4b14df1d934894fcd6cdf9e
+  data.tar.gz: 5bc51c84e948f50f16491ad538982184eca0d5de
 SHA512:
-  metadata.gz: 6d082baaffe38b7741065e1839a11e120f3ed1813fec06be5dd62bb5498c978ec9035414077276fb2d103f88cfdbd0c1c0882282c6b3323f2b7bdf0c6c5a2852
-  data.tar.gz: 8a8c83091488b7799f148bcb5388e8b56fead36d20f4136a97154723d6e38e731fd0d2b03775c4e297701ebb1b1b7ae882e90fc38ef1c819107937c777db69f3
+  metadata.gz: 80ac061c5af38cb83f8bcaa18be4839dc63b84ba9ea1bf7de7b332b83980c664cc0451b7bf02b70c1a0c2f1b4c23b875561111d708c07395ff5b0a3c797d7025
+  data.tar.gz: b1fbed05adec9846cbc4d3653cc23d3239733db7b5cca379874ea458ba98959bbbaa49ce09d9cf38d8fe67b3c5b1e3b4b3448e1f7797f498e1931fbefeb12890

data/Gemfile

@@ -9,3 +9,4 @@ gem "rake"
 gem "guard-rspec", require: false
 gem "webmock"
 gem "cloudformation-ruby-dsl"
+gem "archive-zip"

data/Gemfile.lock

@@ -2,6 +2,8 @@ GEM
   remote: https://rubygems.org/
   specs:
     addressable (2.3.6)
+    archive-zip (0.7.0)
+      io-like (~> 0.3.0)
     aws-sdk (1.52.0)
       aws-sdk-v1 (= 1.52.0)
     aws-sdk-v1 (1.52.0)
@@ -30,6 +32,7 @@ GEM
     guard-rspec (4.3.1)
       guard (~> 2.1)
       rspec (>= 2.14, < 4.0)
+    io-like (0.3.0)
     json (1.8.1)
     listen (2.7.9)
       celluloid (>= 0.15.2)
@@ -78,6 +81,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  archive-zip
   aws-sdk
   cloudformation-ruby-dsl
   codeclimate-test-reporter

data/gantree.gemspec

@@ -24,10 +24,11 @@ Gem::Specification.new do |spec|
   spec.add_dependency "colorize"
   spec.add_dependency "rubyzip"
   spec.add_dependency "cloudformation-ruby-dsl"
+  spec.add_dependency "archive-zip"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "guard"
   spec.add_development_dependency "guard-bundler"
   spec.add_development_dependency "guard-rspec"
-end
+end

data/lib/gantree/cli.rb

@@ -9,6 +9,7 @@ module Gantree
     option :branch, :desc => 'branch to deploy'
     method_option :tag, :aliases => "-t", :desc => "set docker tag to deploy"
     method_option :env, :aliases => "-e", :desc => "elastic beanstalk environment"
+    method_option :ext, :aliases => "-x", :desc => "ebextensions folder/repo"
     def deploy app
       Gantree::Deploy.new(app, options).run
     end

data/lib/gantree/deploy.rb

@@ -1,14 +1,16 @@
+require 'archive/zip'
+
 module Gantree
   class Deploy
 
     def initialize app,options
       @options = options
+      @ext = @options[:ext]
       AWS.config(
         :access_key_id => ENV['AWS_ACCESS_KEY_ID'],
         :secret_access_key => ENV['AWS_SECRET_ACCESS_KEY'])
       @app = @options[:env] || app.match(/^[a-zA-Z]*\-([a-zA-Z]*)\-[a-zA-Z]*\-([a-zA-Z]*\d*)/)[1] + "-" + app.match(/^([a-zA-Z]*)\-([a-zA-Z]*)\-[a-zA-Z]*\-([a-zA-Z]*\d*)/)[1] + '-' + app.match(/^([a-zA-Z]*)\-([a-zA-Z]*)\-[a-zA-Z]*\-([a-zA-Z]*\d*)/)[3]
       @env = app
-      @version_label = set_version_label
       @eb = AWS::ElasticBeanstalk::Client.new
       @s3 = AWS::S3.new
       @tag = options.tag
@@ -16,42 +18,31 @@ module Gantree
 
     def run
       puts "Deploying #{@app}"
+      @packeged_version = create_version_files
       upload_to_s3
-      create_version
+      clean_up
+      create_eb_version
       update_application
     end
 
     private
 
     def upload_to_s3
-      
-      filename = @version_label
-      FileUtils.cp("Dockerrun.aws.json", filename)
-      set_tag_to_deploy if @tag
-      key = File.basename(filename)
-      begin
-        puts "uploading dockerrun to #{@app}-versions"
-        @s3.buckets["#{@app}-versions"].objects[key].write(:file => filename)
-      rescue AWS::S3::Errors::NoSuchBucket
-        puts "bucket didn't exist...creating"
-        bucket = @s3.buckets.create("#{@app}-versions")
-        retry
-      rescue AWS::S3::Errors::AccessDenied
-        puts "Your key is not configured for s3 access, please let your operations team know"
-        FileUtils.rm(filename)
-        exit
-      end
-      FileUtils.rm(filename)
+      key = File.basename(@packeged_version)
+      check_version_bucket
+      puts "uploading #{@packeged_version} to #{@app}-versions"
+      @s3.buckets["#{@app}-versions"].objects[key].write(:file => @packeged_version)
+      FileUtils.rm(@packeged_version)
     end
 
-    def create_version
+    def create_eb_version
       begin
         @eb.create_application_version({
           :application_name => @app,
-          :version_label => @version_label,
+          :version_label => @packeged_version,
           :source_bundle => {
             :s3_bucket => "#{@app}-versions",
-            :s3_key => @version_label
+            :s3_key => @packeged_version
           }
         })
       rescue AWS::ElasticBeanstalk::Errors::InvalidParameterValue
@@ -59,7 +50,7 @@ module Gantree
         begin 
           @eb.delete_application_version({
             :application_name => @app,
-            :version_label => @version_label,
+            :version_label => @packeged_version,
             :delete_source_bundle => false
           })
           retry
@@ -73,23 +64,97 @@ module Gantree
       begin
         @eb.update_environment({
           :environment_name => @env,
-          :version_label => @version_label
+          :version_label => @packeged_version
         })
       rescue AWS::ElasticBeanstalk::Errors::InvalidParameterValue
         puts "#{@env} doesn't exist"
       end
     end
 
-    def set_version_label
+    def create_version_files
       branch = `git rev-parse --abbrev-ref HEAD`
+      puts "branch: #{branch}"
       hash = `git rev-parse --verify --short #{branch}`.strip
-      "#{@env}-#{hash}-Dockerrun.aws.json"
+      puts "hash #{hash}"
+      version = "#{@env}-#{hash}"
+      puts "version: #{version}"
+      dockerrun = "Dockerrun.aws.json"
+      set_tag_to_deploy(dockerrun) if @tag
+      unless ext?
+        new_dockerrun = "#{version}-Dockerrun.aws.json"
+        FileUtils.cp("Dockerrun.aws.json", new_dockerrun)
+        new_dockerrun
+      else
+        zip = "#{version}.zip"
+        clone_repo if repo?
+        Archive::Zip.archive(zip, ['.ebextensions/', dockerrun])
+        zip
+      end
     end
 
-    def set_tag_to_deploy
-      docker =JSON.parse(IO.read("Dockerrun.aws.json"))
+    def set_tag_to_deploy file
+      docker = JSON.parse(IO.read(file))
       docker["Image"]["Name"].gsub!(/:(.*)$/, ":#{@tag}")
-      IO.write(@version_label,JSON.pretty_generate(docker))
+      IO.write(file,JSON.pretty_generate(docker))
+    end
+
+    def ext?
+      if @ext
+        true
+      else
+        false
+      end
+    end
+
+    def repo?
+      if @ext.include? "github"
+        true
+      else
+        false
+      end
+    end
+
+    def local?
+      File.directory?(@ext)
+    end
+
+    def get_ext_repo
+      if ext_branch?
+        repo = @ext.sub.(get_ext_branch)
+      else
+        @ext
+      end
+    end
+
+    def ext_branch?
+      if @ext.count(":") == 2
+        true
+      else
+        false
+      end
+    end
+
+    def get_ext_branch
+      branch = @ext.match(/:.*(:.*)$/)[0]
+    end
+
+    def clone_repo
+      if ext_branch?
+        `git clone -b #{get_ext_branch} #{get_ext_repo}`
+      else
+        `git clone #{get_ext_repo}`
+      end
+    end
+
+    def check_version_bucket
+      name = "#{@app}-versions"
+      bucket = @s3.buckets[name] # makes no request
+      @s3.buckets.create(name) unless bucket.exists?
+    end
+
+    def clean_up
+      `git checkout Dockerrun.aws.json` # reverts back to original Dockerrun.aws.json
+      `git checkout .ebextensions/` if ext?
     end
   end
 end

data/lib/gantree/version.rb

@@ -1,3 +1,3 @@
 module Gantree
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gantree
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Felix
@@ -94,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: archive-zip
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement