gantree 0.6.12 → 0.6.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f116287b6b0d78ea181d2dd0d5b8dde83ac1694
-  data.tar.gz: b8a77ab6d88277bc91f05610a759c53786e2381d
+  metadata.gz: 50b355b94e1db6af77bba9fe524c4a27e3afd233
+  data.tar.gz: 0a40a6e40065c15129cb7e2006b3129604af2c3e
 SHA512:
-  metadata.gz: cf13c9a5167c09350fce19ca3e97b87fcdf556e93d4854d67b43bdebef8d96171a60fb4e01cf2c27469bf758a46387cfedcb58f4be2aa9c7d04d24ad2f88161c
-  data.tar.gz: 70ffef4035acf3590e3a0466b728e2773270827bee841417216980e3e94bd40c21a3bcfea82961b18613411100d7305ea110ad8cdf8dc2f2d27d423503bf7ce8
+  metadata.gz: 9d9c3adbf26e1aab68b11dcceb7510b13c7b95caa344b2e1b303e6df7e5f74cffcca571e2352cc3a95cf26dc46a30186aa640f429cee429644edd9b35eea38bb
+  data.tar.gz: 71bc1db480b53accdd87b128c9b4c2806a41368bb186c42bf9fcc2ef14a175e8e34de3462bb3de72481ac0e55852162aa749bb63293441c5b7826bfbb5b7569d

data/.gitignore

@@ -2,6 +2,8 @@
 *.swo
 *.gem
 *.rbc
+*.tar.gz
+.idea
 .bundle
 .config
 .yardoc
@@ -9,7 +11,10 @@ InstalledFiles
 _yardoc
 coverage
 doc/
+gantree-*
 lib/bundler/man
+packaging/vendor
+packaging/*.tar.gz
 pkg
 rdoc
 spec/reports

data/.ruby-version

@@ -1 +1 @@
-2.1.3
+2.1.5

data/Makefile

@@ -0,0 +1,27 @@
+VERSION := 0.6.17
+
+# Change this variable to your organisation s3 bucket
+S3_BUCKET := s3://br-jenkins/gantree
+
+all: build
+
+version:
+	@echo "${VERSION}"
+
+build:
+	gem build gantree.gemspec
+
+install:
+	gem install --local gantree-${VERSION}.gem
+
+linux:
+	#docker run -ti --rm -v `pwd`:/workspace -w /workspace ruby:2.1.5 /bin/bash -c "bundle install && bundle exec rake package:linux:x86_64"
+	@echo "=> push latest version linux binary to : ${S3_BUCKET}"
+	aws s3 cp ./gantree-${VERSION}-linux-x86_64.tar.gz ${S3_BUCKET}/ --sse AES256 --acl public-read
+
+osx:
+	docker run -ti --rm -v `pwd`:/workspace -w /workspace ruby:2.1.5 /bin/bash -c "bundle install && bundle exec rake package:osx"
+
+clean:
+	rm -rf gantree-${VERSION}-*.tar.gz
+	rm -rf gantree-${VERSION}.gem

data/README.md

@@ -19,6 +19,14 @@ This tool is intended to help you setup a Dockerrun.aws.json which allows you to
 ### Prerequisites 
 You need to have your AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY environment variables set in order to use the tool as well as the proper aws permissions for Elastic Beanstalk, and S3 access. 
 
+Note : For gantree versions >= 0.6.14, configuration of AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY environment variables is not necessary if running on an instance with IAM Roles enabled.
+
+To check if your EC2 has iam role or not, run below command.
+
+```
+curl http://169.254.169.254/latest/meta-data/iam/info/
+```
+
 *Install docker for MAC OSX*
 https://docs.docker.com/installation/mac/
 
@@ -184,6 +192,23 @@ PostgreSQL: ```gantree create your_app_name --rds pg```
 
 Mysql: ```gantree create your_app_name --rds msql```
 
+## Traveling Ruby : 
+ 
+You can now compile this into a tarball and distribute.  
+ 
+#### To generate tarball & push to s3.ß
+```
+# Change below variable in Makefile before you run below command
+S3_BUCKET := s3://<YOUR_AWS_BUCKET>
+make clean && make linux
+```
+#### To use gantree binary
+```
+aws s3 cp s3://<your_bucket>/gantree-0.6.15-linux-x86_64.tar.gz .
+tar -xf gantree-0.6.15-linux-x86_64.tar.gz -C /opt
+ln -s /opt/gantree-0.6.15-linux-x86_64/gantree /usr/bin/gantree
+```
+
 ## TODO:
 
 #### What if you want a cdn behind each of your generated applications

data/Rakefile

@@ -1,5 +1,11 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+require 'bundler/gem_tasks'
+require 'bundler/setup'
+require 'rspec/core/rake_task'
+require 'gantree/version'
+
+PACKAGE_NAME = "gantree"
+VERSION = Gantree::VERSION
+TRAVELING_RUBY_VERSION = "20150210-2.1.5"
 
 task :default => :spec
 
@@ -20,3 +26,95 @@ namespace :clean do
     FileUtils.rm_rf('spec/fixtures/vcr_cassettes')
   end
 end
+
+
+namespace :package do
+  namespace :linux do
+    desc "Package your app for Linux x86"
+    task :x86 => [:bundle_install, "packaging/traveling-ruby-#{TRAVELING_RUBY_VERSION}-linux-x86.tar.gz"] do
+      create_package("linux-x86")
+    end
+
+    desc "Package your app for Linux x86_64"
+    task :x86_64 => [:bundle_install, "packaging/traveling-ruby-#{TRAVELING_RUBY_VERSION}-linux-x86_64.tar.gz"] do
+      create_package("linux-x86_64")
+    end
+  end
+
+  desc "Package your app for OS X"
+  task :osx => [:bundle_install, "packaging/traveling-ruby-#{TRAVELING_RUBY_VERSION}-osx.tar.gz"] do
+    create_package("osx")
+  end
+
+  desc "Install gems to local directory"
+  task :bundle_install do
+    if RUBY_VERSION !~ /^2\.1\./
+      abort "You can only 'bundle install' using Ruby 2.1, because that's what Traveling Ruby uses."
+    end
+    sh "rm -rf packaging/tmp"
+    sh "mkdir packaging/tmp"
+    sh "cp Gemfile Gemfile.lock packaging/tmp/"
+    Bundler.with_clean_env do
+      sh "cd packaging/tmp && env BUNDLE_IGNORE_CONFIG=1 bundle install --path ../vendor --without development"
+    end
+    sh "rm -rf packaging/tmp"
+    sh "rm -f packaging/vendor/*/*/cache/*"
+  end
+end
+
+file "packaging/traveling-ruby-#{TRAVELING_RUBY_VERSION}-linux-x86.tar.gz" do
+  download_runtime("linux-x86")
+end
+
+file "packaging/traveling-ruby-#{TRAVELING_RUBY_VERSION}-linux-x86_64.tar.gz" do
+  download_runtime("linux-x86_64")
+end
+
+file "packaging/traveling-ruby-#{TRAVELING_RUBY_VERSION}-osx.tar.gz" do
+  download_runtime("osx")
+end
+
+file "packaging/traveling-ruby-#{TRAVELING_RUBY_VERSION}-osx-nokogiri-1.6.5.tar.gz" do
+  download_native_extension("osx", "nokogiri-1.6.5")
+end
+
+file "packaging/traveling-ruby-#{TRAVELING_RUBY_VERSION}-linux-x86-nokogiri-1.6.5.tar.gz" do
+  download_native_extension("linux-x86", "nokogiri-1.6.5")
+end
+
+file "packaging/traveling-ruby-#{TRAVELING_RUBY_VERSION}-linux-x86_64-nokogiri-1.6.5.tar.gz" do
+  download_native_extension("linux-x86_64", "nokogiri-1.6.5")
+end
+
+def download_runtime(target)
+  sh "cd packaging && curl -L -O --fail " +
+    "https://d6r77u77i8pq3.cloudfront.net/releases/traveling-ruby-#{TRAVELING_RUBY_VERSION}-#{target}.tar.gz"
+end
+
+def download_native_extension(target, gem_name_and_version)
+  sh "curl -L --fail -o packaging/traveling-ruby-#{TRAVELING_RUBY_VERSION}-#{target}-#{gem_name_and_version}.tar.gz " +
+    "https://d6r77u77i8pq3.cloudfront.net/releases/traveling-ruby-gems-#{TRAVELING_RUBY_VERSION}-#{target}/#{gem_name_and_version}.tar.gz"
+end
+
+def create_package(target)
+  package_dir = "#{PACKAGE_NAME}-#{VERSION}-#{target}"
+  sh "rm -rf #{package_dir}"
+  sh "mkdir #{package_dir}"
+  sh "mkdir -p #{package_dir}/app/bin"
+  sh "mkdir -p #{package_dir}/lib/app"
+  sh "mkdir #{package_dir}/lib/ruby"
+  sh "mkdir #{package_dir}/bin"
+  sh "tar -xzf packaging/traveling-ruby-#{TRAVELING_RUBY_VERSION}-#{target}.tar.gz -C #{package_dir}/lib/ruby"
+  sh "cp packaging/wrapper.sh #{package_dir}/gantree"
+  sh "chmod +x #{package_dir}/gantree"
+  sh "cp -pR packaging/vendor #{package_dir}/lib/"
+  sh "cp Gemfile Gemfile.lock #{package_dir}/lib/vendor/"
+  sh "mkdir #{package_dir}/lib/vendor/.bundle"
+  sh "cp packaging/bundler-config #{package_dir}/lib/vendor/.bundle/config"
+  sh "cp bin/gantree #{package_dir}/app/bin/gantree"
+  sh "cp -a lib #{package_dir}/app"
+  if !ENV['DIR_ONLY']
+    sh "tar -czf #{package_dir}.tar.gz #{package_dir}"
+    sh "rm -rf #{package_dir}"
+  end
+end

data/lib/gantree/base.rb

@@ -2,13 +2,34 @@ require "colorize"
 require 'librato/metrics'
 require 'bigdecimal'
 require 'bigdecimal/util'
+require 'net/http'
+
 module Gantree
   class Base
     def check_credentials
-      raise "Please set your AWS Environment Variables" unless ENV['AWS_SECRET_ACCESS_KEY']
-      raise "Please set your AWS Environment Variables" unless ENV['AWS_ACCESS_KEY_ID']
+      timeout = false
+
+      url = URI.parse("http://169.254.169.254/latest/meta-data/iam/info/")
+
+      http = Net::HTTP.new(url.host, url.port)
+
+      http.read_timeout = 3
+      http.open_timeout = 3
+
+      begin
+          resp = http.start() { |http| http.get(url.path) }.code
+      rescue Net::OpenTimeout
+          timeout = true
+      end
+
+      if timeout == false && resp == '200'
+        puts "Using IAM Role".green
+      else
+        raise "Please set your AWS Environment Variables" unless ENV['AWS_SECRET_ACCESS_KEY']
+        raise "Please set your AWS Environment Variables" unless ENV['AWS_ACCESS_KEY_ID']
+      end
     end
-    
+
     def self.check_for_updates opts
       puts opts.inspect
       enabled =  opts[:auto_updates]
@@ -19,8 +40,8 @@ module Gantree
       puts "Auto updates disabled".light_blue if !enabled
       puts "Updating from #{current_version} to #{latest_version}...".green
       if  current_version == latest_version && enabled
-        system("gem update gantree --force") 
-      else 
+        system("gem update gantree --force")
+      else
         puts "gem already up to date".light_blue
       end
        update_configuration(opts[:auto_configure]) if opts[:auto_configure]
@@ -42,10 +63,14 @@ module Gantree
     end
 
     def set_aws_keys
-      AWS.config(
-        :access_key_id => ENV['AWS_ACCESS_KEY_ID'],
-        :secret_access_key => ENV['AWS_SECRET_ACCESS_KEY']
-      )
+      unless ENV['AWS_ACCESS_KEY_ID'] == nil && ENV['AWS_SECRET_ACCESS_KEY'] == nil
+        AWS.config(
+            :access_key_id => ENV['AWS_ACCESS_KEY_ID'],
+            :secret_access_key => ENV['AWS_SECRET_ACCESS_KEY']
+        )
+      else
+        AWS.config(:credential_provider => AWS::Core::CredentialProviders::EC2Provider.new)
+      end
     end
 
     def s3
@@ -78,7 +103,7 @@ module Gantree
         raise "Please Set Envinronment Name with -e"
       end
     end
-    
+
     def authenticate_librato
       if @options[:librato]
         Librato::Metrics.authenticate @options[:librato][:email], @options[:librato][:token]
@@ -126,7 +151,7 @@ module Gantree
         puts "uploading cfn templates to #{@options[:cfn_bucket]}/#{@options[:stack_name]}"
       else
         puts "creating bucket #{@options[:cfn_bucket]}/#{@options[:stack_name]} to upload templates"
-        s3.buckets.create(bucket_name) 
+        s3.buckets.create(bucket_name)
       end
     end
 

data/lib/gantree/deploy_version.rb

@@ -36,7 +36,15 @@ module Gantree
 
     def set_tag_to_deploy
       image = docker["Image"]["Name"]
-      image.gsub!(/:(.*)$/, ":#{@options[:tag]}")
+      token = image.split(":")
+      if token.length == 3
+        image = token[0] + (":") + token[1] + ":#{@options[:tag]}"
+        docker["Image"]["Name"] = image
+      elsif token.length == 2
+        image.gsub!(/:(.*)$/, ":#{@options[:tag]}")
+      else
+        puts "Too many ':'".yellow
+      end
       IO.write("/tmp/#{@dockerrun_file}", JSON.pretty_generate(docker))
     end
 

data/lib/gantree/version.rb

@@ -1,3 +1,3 @@
 module Gantree
-  VERSION = "0.6.12"
+  VERSION = "0.6.18"
 end

data/packaging/bundler-config

@@ -0,0 +1,3 @@
+BUNDLE_PATH: .
+BUNDLE_WITHOUT: development
+BUNDLE_DISABLE_SHARED_GEMS: '1'

data/packaging/wrapper.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+set -e
+
+# Figure out where this script is located.
+SELFDIR="`readlink -f /usr/bin/gantree`"
+SELFDIR=`dirname $SELFDIR`
+
+# Tell Bundler where the Gemfile and gems are.
+export BUNDLE_GEMFILE="$SELFDIR/lib/vendor/Gemfile"
+unset BUNDLE_IGNORE_CONFIG
+
+# Run the actual app using the bundled Ruby interpreter, with Bundler activated.
+eval "$SELFDIR/lib/ruby/bin/ruby" -rbundler/setup -rreadline "$SELFDIR/app/bin/gantree $@"
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gantree
 version: !ruby/object:Gem::Version
-  version: 0.6.12
+  version: 0.6.18
 platform: ruby
 authors:
 - Felix
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-11 00:00:00.000000000 Z
+date: 2016-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -291,6 +291,7 @@ files:
 - Gemfile.lock
 - Guardfile
 - LICENSE.txt
+- Makefile
 - README.md
 - Rakefile
 - bin/gantree
@@ -317,6 +318,8 @@ files:
 - lib/gantree/update.rb
 - lib/gantree/version.rb
 - lib/gantree/wiki.rb
+- packaging/bundler-config
+- packaging/wrapper.sh
 - spec/fixtures/project/Dockerrun.aws.json
 - spec/lib/gantree/1_release_notes_spec.rb
 - spec/lib/gantree/cli_spec.rb