gantree 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f2ae59a84ba4cc1cbf6268302812a9f0967d5ab0
-  data.tar.gz: 7a2eaf75e5402e6359d7139840eddf2dfde682f9
+  metadata.gz: f7097d09fb40c111aa6e5dd2d8321dfc72352573
+  data.tar.gz: f329a9331b10fddbc1b4992e2df9625a0eeb7642
 SHA512:
-  metadata.gz: 8603d40c915d2a0c5b8f6a5be9a5c417a9410d462b95b0c5a3f8a007263d5c48705eecaa274468e864e573e613c2258b13df32769949d21f190e7bbb1889684c
-  data.tar.gz: 6b4161e9c89dfe8e1368f4969a89cf94c3792045b9d741c6e27192717f5feefa5ca98979b3674c0a3584e903ca6e38d51da3e5c6f5592a1b016bc1f6545fea6a
+  metadata.gz: 6baaee7fc76003a556a8f2c47b30e56fd6c0b70eea6556c2c1ebdb9aca930180b5ca18d730ba36bee9aa747d76ac2cbbcf7d80205d8208e97c505ee183bfdc74
+  data.tar.gz: f4f5f8570cf4ee3f0055a128b595c9ba068d9a79ef50681d0548543b2b92b8bbb3ea3279e646a05f71b11eb7fce3fa4458e1d934b401eb52e7a26739870b7351

data/.gitignore

@@ -18,3 +18,5 @@ test/version_tmp
 tmp
 cfn/*
 tmp.txt
+
+spec/fixtures/project/*.zip

data/lib/gantree/cli.rb

@@ -17,6 +17,7 @@ module Gantree
     option :image_path, :aliases => "-i", :desc => "docker hub image path ex. (bleacher/cms | quay.io/bleacherreport/cms)"
     option :autodetect_app_role, :desc => "use naming convention to determin role (true|false)", :type => :boolean, :default => true
     option :eb_bucket, :desc => "bucket to store elastic beanstalk versions"
+    option :auth, :desc => "dockerhub authentation, example: bucket/key"
     def deploy name
       opts = merge_defaults(options)
       Gantree::Base.check_for_updates(opts)
@@ -98,6 +99,7 @@ module Gantree
     option :image_path, :aliases => "-i", :desc => "hub image path ex. (bleacher/cms | quay.io/bleacherreport/cms)"
     option :hush, :desc => "quite puts messages", :default => true
     option :eb_bucket, :desc => "bucket to store elastic beanstalk versions"
+    option :auth, :desc => "dockerhub authentation, example: bucket/key"
     def ship server
       opts = merge_defaults(options)
       Gantree::Base.check_for_updates(opts)

data/lib/gantree/deploy_version.rb

@@ -6,11 +6,13 @@ require_relative 'notification'
 module Gantree
   class DeployVersion < Deploy
 
+    attr_reader :packaged_version, :dockerrun_file
     def initialize options, env
       @options = options
       @ext = @options[:ext]
       @ext_role = @options[:ext_role]
-      @dockerrun_file = "Dockerrun.aws.json"
+      @project_root = @options[:project_root]
+      @dockerrun_file = "#{@project_root}Dockerrun.aws.json"
       @env = env
     end
 
@@ -18,18 +20,32 @@ module Gantree
       @packaged_version = create_version_files
     end
 
+    def docker
+      @docker ||= JSON.parse(IO.read(@dockerrun_file))  
+    end
+
+    def set_auth
+      docker["Authentication"] = {}
+      items = @options[:auth].split("/")
+      bucket = items.shift
+      key = items.join("/")
+      docker["Authentication"]["Bucket"] = bucket
+      docker["Authentication"]["Key"] = key
+      IO.write("/tmp/#{@dockerrun_file}", JSON.pretty_generate(docker))
+    end
+
     def set_tag_to_deploy
-      docker = JSON.parse(IO.read(@dockerrun_file))
       image = docker["Image"]["Name"]
       image.gsub!(/:(.*)$/, ":#{@options[:tag]}")
       IO.write("/tmp/#{@dockerrun_file}", JSON.pretty_generate(docker))
     end
 
     def set_image_path
-      docker = JSON.parse(IO.read(@dockerrun_file))
       image = docker["Image"]["Name"]
       image.gsub!(/(.*):/, "#{@options[:image_path]}:")
-      IO.write("/tmp/#{@dockerrun_file}", JSON.pretty_generate(docker))
+      path = "/tmp/#{@dockerrun_file}"
+      FileUtils.mkdir_p(File.dirname(path)) unless File.exist?(path)
+      IO.write(path, JSON.pretty_generate(docker))
       image
     end
 
@@ -37,10 +53,11 @@ module Gantree
       clean_up
       version = "#{tag}-#{Time.now.strftime("%m-%d-%Y-%H-%M-%S")}"
       puts "version: #{version}"
+      set_auth if @options[:auth]
       set_image_path if @options[:image_path]
       set_tag_to_deploy
       if File.directory?(".ebextensions/") || @ext || @ext_role
-        zip = "#{version}.zip"
+        zip = "#{@project_root}#{version}.zip"
         merge_extensions
         puts "The following files are being zipped".yellow
         system('ls -l /tmp/merged_extensions/.ebextensions/')

data/lib/gantree/version.rb

@@ -1,3 +1,3 @@
 module Gantree
-  VERSION = "0.6.1"
+  VERSION = "0.6.2"
 end

data/spec/fixtures/project/Dockerrun.aws.json

@@ -0,0 +1,13 @@
+{
+  "AWSEBDockerrunVersion": "1",
+  "Image": {
+    "Name": "bleacher/carburetor",
+    "Update": true
+  },
+  "Logging": "/var/log/nginx",
+  "Ports": [
+    {
+      "ContainerPort": "300"
+    }
+  ]
+}

data/spec/lib/gantree/deploy_version_spec.rb

@@ -0,0 +1,40 @@
+require "spec_helper"
+
+describe Gantree::DeployVersion do
+  before(:all) do
+  end
+
+  after(:all) do
+    FileUtils.rm_f(Dir.glob("spec/fixtures/project/*.zip"))
+  end
+
+  it "should create package version" do
+    @options = {
+      :ext => "git@github.com:br/.ebextensions.git", 
+      :tag => "br-develop_mkemnitz-30b9bf6", 
+      :image_path => "bleacher/carburetor",
+      :project_root => "spec/fixtures/project/"
+    }
+    @env = "stag-carburetor-app-s1"
+    @version = Gantree::DeployVersion.new(@options, @env)
+    packaged_version = @version.run
+    expect(File.exist?(packaged_version)).to be true
+  end
+
+  it "should add auth info" do
+    @options = {
+      :ext => "git@github.com:br/.ebextensions.git", 
+      :tag => "br-develop_mkemnitz-30b9bf6", 
+      :image_path => "bleacher/carburetor",
+      :project_root => "spec/fixtures/project/",
+      :auth => "docker-cfgs/brops.dockercfg"
+    }
+    @env = "stag-carburetor-app-s1"
+    @version = Gantree::DeployVersion.new(@options, @env)
+    @version.set_auth
+    data = JSON.parse(IO.read("/tmp/#{@version.dockerrun_file}"))
+    expect(data["Authentication"]["Bucket"]).to eq "docker-cfgs"
+    expect(data["Authentication"]["Key"]).to eq "brops.dockercfg"
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gantree
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Felix
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-11 00:00:00.000000000 Z
+date: 2015-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -315,9 +315,11 @@ files:
 - lib/gantree/release_notes.rb
 - lib/gantree/update.rb
 - lib/gantree/version.rb
+- spec/fixtures/project/Dockerrun.aws.json
 - spec/lib/gantree/1_release_notes_spec.rb
 - spec/lib/gantree/cli_spec.rb
 - spec/lib/gantree/deploy_spec.rb
+- spec/lib/gantree/deploy_version_spec.rb
 - spec/lib/gantree/docker_spec.rb
 - spec/lib/gantree/init_spec.rb
 - spec/spec_helper.rb
@@ -349,9 +351,11 @@ summary: This tool is intended to help you setup a Dockerrun.aws.json which allo
   allows you to do versioned deploys to your Elastic Beanstalk application and create
   an archive of every versioned Dockerrun.aws.json in amazons s3 bucket service.
 test_files:
+- spec/fixtures/project/Dockerrun.aws.json
 - spec/lib/gantree/1_release_notes_spec.rb
 - spec/lib/gantree/cli_spec.rb
 - spec/lib/gantree/deploy_spec.rb
+- spec/lib/gantree/deploy_version_spec.rb
 - spec/lib/gantree/docker_spec.rb
 - spec/lib/gantree/init_spec.rb
 - spec/spec_helper.rb