gantree 0.4.6 → 0.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ff66472c33546db57fb72859e6c1d0d914d45aec
-  data.tar.gz: a239a2c814966bfe9978291d219449d3352ba51f
+  metadata.gz: 375f0ba44dd429bb2dac4ec8d9d7487cb799f22b
+  data.tar.gz: b71597843a51ddaf68838f4b339e9d6359bb5cf6
 SHA512:
-  metadata.gz: bedf8c651dc799fd32d75f7ccbde70cb496d783b15f68013ad60c90c7f15c34eb0bb7e705d4098472e7119a3aa53417bb63bcd5517453c53555b2496c025279d
-  data.tar.gz: f4ed2f47b20d2177669d6516ed85ef5a9c51ab78a47aad295828a7ebc69ae519d1c4abe8d8bb44b663f594d7c84924b6a030aba384bb3a46653abefaf9099fe1
+  metadata.gz: 7cd977a7179d2b9b09df0313809284e95567f1633e8cdaf4c4143cdf6a4691ef18a3b07817b5afa30054c2fd2cfe821997deacd4ec44144e7f6b984c0ff44556
+  data.tar.gz: 6be3ab8f036c1bdaf56421482f5aa8fc6c0d2a95907092d9eb6c8c91cfd7c409e47e6ee13cd2e82436baa60ffa66f55a2de7c2f5ff1c7fa302cfe4cc5179d93a

data/.travis.yml

@@ -1,11 +1,16 @@
 language: ruby
 cache: bundler
 rvm:
-- 2.1.2
-before_script: echo "{"https://index.docker.io/v1/":{"auth":"ZmVlbG9ib3Q6azF6a2F6a29udHIwbDF0","email":"felix.a.rod@gmail.com"}"
+- 2.1.3
+before_script:
+- echo "{"https://index.docker.io/v1/":{"auth":"$DOCKER_TOKEN","email":"$DOCKER_EMAIL"}"
   > $HOME/.dockercfg
 env:
   global:
   - secure: OoLMnBOcoXTPOimdyh4ju8yW2YpLBXEOdljN1gVQzjIIv24cQ0BxWAAktjExntkYAjnRpxzTKK5ZkWadXm8NK7TtzFU80padk+WYVzuE1Xngxw/OhS1Z6NYL8+D3ortSANqoOB6r/Z13Sb5XClYDWlj5/GGzf4AerY5xgh2nJQc=
   - secure: MCPnXXEMJkamb3HuYS0H+YeMDKORYAekCfB8YMrtUeMR3QTSe2yQ6eMaNC/I2D5g8cNw60mRagaMyDMadZ4aVQ4sUK1YOHexs/vPJrVrIJU8ZGFsueQyboJun1NZLGvKAIAok7yAEEfwftCd+svYrtrTtV88fk9deOnBLs4o3gM=
   - secure: QZ00MAXO+Lblk/6Q0Bi+YQQLJtJYVHqMattxjIi72q5aOPQOSMT8UjDvOhDF2D/Le0wGBqVQxpxbpP/5cSGCLxtAfBijTyIirnkqV2td4hiXNfyQn3a+KnOifquJ8Vmo1tp/vvKGN16PIrLQCi5ARlcTj8QxfOFIihsrpelg9Ik=
+  - secure: hs4c8HbrCmZzS1o1FFwymGKVgHDXahuh5h3Kp7mweHiGBV/QJsUy6sJq5oJMCZLPw6cqZ03NcpNaj+zwrt9pKkPnawyInLus6qrdv/OshMRRzFtXRT5HKt1u21KE3Qotg3+Cw8mPHCKHxi+Q2g57SyhM9ETZ74u83iqtBBLPXL8=
+  - secure: DRrSBPqc17MxNAU7H57dDNp25c0NzsPZEk3LwGtkNTSBQaJVqDM52BESRgcjUMpW9yO4qg3KEVxyip/fYB2wjMRO8tXIgb86HJktOHv3flKE4OSKni+lfzTW02Pm02bRJJ4TbDvwk1NGrPar5mHcSpHQiCibmjlcv9gDXTd9ZRs=
+  - secure: ovEq5bbK10ubB7PBiw+hN63L82Z0Azi8rGih5pnSI9VdHIViECKUM6FPciVFADA5xl+C4H/9oVxLaeDKqAsYvm1BsqBSnw4i8/0gmOa5twK4GpBPo4xkCMr9T5hA0xDGgN39AAEijJZVVmi+ecUpojHxVoxtEbjMK77Ud44mSMc=
+  - secure: hpE4SKYumT1GAo5Q56DZ7q0DK7CT4rKp0MpnZLZnO7ob0TPy6UCQZViOaIRuLQ7aj5wzWToHdOPkzBIyE5H8DfV84lvsBYktFac5TLoiU+nxl/aSzO11tfIY0gneKEyjSjWIS0zgNXE7F7zTC6R46dPGpq8nnW7dEyZwDKmy8jw=

data/lib/gantree/cli.rb

@@ -12,6 +12,7 @@ module Gantree
     method_option :ext, :aliases => "-x", :desc => "ebextensions folder/repo"
     option :dry_run, :aliases => "-d", :desc => "do not actually deploy the app"
     option :silent, :aliases => "-s", :desc => "mute notifications"
+    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"
     def deploy name
       Gantree::Deploy.new(name, merge_defaults(options)).run
@@ -59,14 +60,14 @@ module Gantree
     end
 
     desc "build", "build and tag a docker application"
+    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"
-    option :hub, :aliases => "-h", :desc => "hub (docker|quay)"
     def build
       Gantree::Docker.new(merge_defaults(options)).build
     end
 
     desc "push", "build and tag a docker application"
-    option :hub, :aliases => "-h", :desc => "hub (docker|quay)"
+    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
@@ -77,16 +78,16 @@ module Gantree
       puts Gantree::Docker.new(merge_defaults(options)).tag
     end
 
-    desc "shipit", "tag a docker application"
+    desc "ship", "tag a docker application"
     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 :dry_run, :aliases => "-d", :desc => "do not actually deploy the app"
     option :silent, :aliases => "-s", :desc => "mute notifications"
     option :autodetect_app_role, :desc => "use naming convention to determin role"
-    option :hub, :aliases => "-h", :desc => "hub (docker|quay)"
+    option :image_path, :aliases => "-i", :desc => "hub image path ex. (bleacher/cms | quay.io/bleacherreport/cms)"
     option :hush, :desc => "quite puts messages", :default => true
-    def shipit server
+    def ship server
       docker = Gantree::Docker.new(merge_defaults(options))
       docker.build
       docker.push

data/lib/gantree/deploy.rb

@@ -117,7 +117,7 @@ module Gantree
           })
           puts "Deployed #{@packaged_version} to #{env} on #{@app}".green
         rescue AWS::ElasticBeanstalk::Errors::InvalidParameterValue
-          puts "Error: Something went wrong durring the deploy to #{env}".red
+          puts "Error: Something went wrong during the deploy to #{env}".red
         end
       end
     end
@@ -131,6 +131,7 @@ module Gantree
       version = "#{@app}-#{hash}-#{time_stamp}"
       puts "version: #{version}"
       #auto_detect_app_role if @options[:autodetect_app_role] == true
+      set_image_path if @options[:image_path]
       set_tag_to_deploy if @options[:tag]
       unless ext?
         new_dockerrun = "#{version}-Dockerrun.aws.json"
@@ -151,16 +152,19 @@ module Gantree
       IO.write(@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(@dockerrun_file, JSON.pretty_generate(docker))
+      image
+    end
+
     def autodetect_app_role env
       enabled = @options[:autodetect_app_role]
       if enabled == true || enabled == "true"
         role = env.split('-')[2]
         puts "Deploying app as a #{role}"
-        #role_cmd = IO.read("roles/#{role}").gsub("\n",'')
-        #docker = JSON.parse(IO.read(@dockerrun_file))
-        #docker["Cmd"] = role_cmd
-        #IO.write(@dockerrun_file,JSON.pretty_generate(docker))
-        #puts "Setting role cmd to '#{role_cmd}'"
         [{:option_name => "ROLE", :value => role, :namespace => "aws:elasticbeanstalk:application:environment" }]
       else 
         []

data/lib/gantree/docker.rb

@@ -7,18 +7,17 @@ module Gantree
       check_credentials
       set_aws_keys
       @options = options
-      @hub = @options[:hub]
-      raise "Please provide a hub name in your .gantreecfg ex { hub : 'bleacher' }" unless @hub
-      @repo = `basename $(git rev-parse --show-toplevel)`.strip
+      @image_path = @options[:image_path]
+      raise "Please provide an image path name in .gantreecfg ex. { 'image_path' : 'bleacher/cms' }" unless @image_path
       @tag = @options[:tag] ||= tag
     end
 
     def build 
       puts "Building..."
-      output = `docker build -t #{@hub}/#{@repo}:#{@tag} .`
+      output = `docker build -t #{@image_path}:#{@tag} .`
       if $?.success?
-        puts "Image Built: #{@hub}/#{@repo}:#{@tag}".green 
-        puts "docker push #{@hub}/#{@repo}:#{@tag}" unless @options[:hush]
+        puts "Image Built: #{@image_path}:#{@tag}".green 
+        puts "gantree push --image-path #{@image_path} -t #{@tag}" unless @options[:hush]
         puts "gantree deploy app_name -t #{@tag}" unless @options[:hush]
       else
         puts "Error: Image was not built successfully".red
@@ -28,10 +27,10 @@ module Gantree
     end
 
     def push 
-      puts "Pushing..."
-      output = `docker push #{@hub}/#{@repo}:#{@tag}`
+      puts "Pushing to #{@image_path}:#{@tag} ..."
+      output = `docker push #{@image_path}:#{@tag}`
       if $?.success?
-        puts "Image Pushed: #{@hub}/#{@repo}:#{@tag}".green 
+        puts "Image Pushed: #{@image_path}:#{@tag}".green 
         puts "gantree deploy app_name -t #{@tag}" unless @options[:hush]
       else
         puts "Error: Image was not pushed successfully".red

data/lib/gantree/stack.rb

@@ -103,7 +103,7 @@ module Gantree
     def replace_env_references file
       origin_tags = @options[:dupe].split("-")
       new_tags = @options[:stack_name].split("-")
-      possible_roles = ["app","worker","listener","djay","scheduler"]
+      possible_roles = ["app","worker","listener","djay","scheduler","sched"]
       possible_roles.each do |role|
         origin_env = [origin_tags[1],origin_tags[0],role,origin_tags[2]].join('-')
         new_env = [new_tags[1],new_tags[0],role,new_tags[2]].join('-')

data/lib/gantree/version.rb

@@ -1,3 +1,3 @@
 module Gantree
-  VERSION = "0.4.6"
+  VERSION = "0.4.7"
 end

data/spec/lib/gantree/deploy_spec.rb

@@ -44,6 +44,13 @@ describe Gantree::Deploy do
     gd.set_aws_keys
   end
 
+  it "the image path is dynamic" do 
+    options = { image_path: "quay.io/bleacherreport/cms" }
+    deploy = Gantree::Deploy.new(@env,options)
+    image_path = deploy.instance_variable_get("@options")[:image_path]
+    expect(image_path).to eq("quay.io/bleacherreport/cms")
+  end
+
   it "raises an error when no aws keys in ENV" do
     ENV['AWS_ACCESS_KEY_ID'] = nil
     ENV['AWS_SECRET_ACCESS_KEY'] = nil
@@ -54,3 +61,20 @@ describe Gantree::Deploy do
   end
 end
 
+def dockerrun
+'
+{
+  "AWSEBDockerrunVersion": "1",
+  "Image": {
+    "Name": "bleacher/cms",
+    "Update": true
+  },
+  "Logging": "/var/log/nginx",
+  "Ports": [
+    {
+      "ContainerPort": "300"
+    }
+  ]
+}
+'
+end

data/spec/lib/gantree/docker_spec.rb

@@ -0,0 +1,19 @@
+require "spec_helper"
+require "pry"
+
+describe Gantree::Docker do
+  before(:all) do
+    ENV['AWS_ACCESS_KEY_ID'] = 'FAKE_AWS_ACCESS_KEY'
+    ENV['AWS_SECRET_ACCESS_KEY'] = 'FAKE_AWS_SECRET_ACCESS_KEY'
+  end
+
+  it "requires an image_path option to be set"
+  it "generates a unique tag for you"
+  it "allows you to set your own tag to build"
+  it "allows you to set your own tag to push"
+  it "builds dockerfiles with tag"
+  it "accepts image path parameter"
+  it "pushes tag to dockerhub"
+
+end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gantree
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.4.7
 platform: ruby
 authors:
 - Felix
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-05 00:00:00.000000000 Z
+date: 2014-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -283,6 +283,7 @@ files:
 - lib/gantree/version.rb
 - spec/lib/gantree/cli_spec.rb
 - spec/lib/gantree/deploy_spec.rb
+- spec/lib/gantree/docker_spec.rb
 - spec/lib/gantree/init_spec.rb
 - spec/lib/gantree/stack_spec.rb
 - spec/spec_helper.rb
@@ -316,6 +317,7 @@ summary: This tool is intended to help you setup a Dockerrun.aws.json which allo
 test_files:
 - spec/lib/gantree/cli_spec.rb
 - spec/lib/gantree/deploy_spec.rb
+- spec/lib/gantree/docker_spec.rb
 - spec/lib/gantree/init_spec.rb
 - spec/lib/gantree/stack_spec.rb
 - spec/spec_helper.rb