gaptool-client 0.8.0.pre.alpha9 → 0.8.0.pre.alpha10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5eb227c335b95b93411e1446529c5da13437e753
-  data.tar.gz: 870b19b48fa7ae86a5f701153e0277b44dfb0213
+  metadata.gz: fa9dd20c5a3510871c8f608509468eecbe10af1d
+  data.tar.gz: 6b630911606322dcfe84c079d39ac1f84a3519d8
 SHA512:
-  metadata.gz: b2e6a9fde7bd8dc82e2712e96e694e25a46f7a17084c42e04e0655989e8a6ba863170f0e392975d060972061efe1d69384eb3ba11ab21330b872c8c0d7ae8771
-  data.tar.gz: a382e833341ba9f73f7a16a5b8d9c717c6dae977e3ef82113cc0e005b1554ee20f7249f1877557520a96810a473b092c7cc7d784b9b15fbabbbf949321e4d05f
+  metadata.gz: e1a964392d1513c5d6737d74be6c80a4c1f7817c49aa41670fd6737a8253330b1410b5fdebee963567c8e6db5859635e8af716ca36a070415f6c9483628280d5
+  data.tar.gz: 97a514d92544ed74fe8be26135623f816d568cd42460a36717289369faf3f7f53feadb5ecf70f37e095e1a88b13a88cd66b326ee5651146a9f635ef6d319b315

data/VERSION

@@ -1 +1 @@
-0.8.0-alpha9
+0.8.0-alpha10

data/gaptool-client.gemspec

@@ -18,6 +18,6 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'json', '~> 1.8'
   s.add_runtime_dependency 'rainbow', '~> 2.0'
   s.add_runtime_dependency 'clamp', '~> 0.6'
-  s.add_runtime_dependency 'gaptool-api', '~> 0.8'
+  s.add_runtime_dependency 'gaptool-api', '>= 0.8.1'
   s.add_runtime_dependency 'sshkit', '~> 1.8', '>= 1.8.1'
 end

data/lib/gaptool_client/api.rb

@@ -4,7 +4,11 @@ require 'gaptool-api'
 module Gaptool
   module API
     def self.client
-      @client ||= GTAPI::GaptoolServer.new(
+      @client ||= new
+    end
+
+    def self.new
+      GTAPI::GaptoolServer.new(
         ENV['GT_USER'], ENV['GT_KEY'],
         ENV['GT_URL'], ENV['GT_AWS_ZONE']
       )
@@ -15,19 +19,20 @@ module Gaptool
       role = opts[:role]
       environment = opts[:environment]
       params = opts[:params]
+      cl = opts[:client] || client
 
       if instance
         puts Rainbow('Ignoring role and environment as instance is set').red \
           if role || environment
-        [Gaptool::API.client.getonenode(instance)]
+        [cl.getonenode(instance)]
       elsif role && environment
-        Gaptool::API.client.getenvroles(role, environment, params)
+        cl.getenvroles(role, environment, params)
       elsif role
-        Gaptool::API.client.getrolenodes(role, params)
+        cl.getrolenodes(role, params)
       elsif environment
-        Gaptool::API.client.getenvnodes(environment, params)
+        cl.getenvnodes(environment, params)
       else
-        Gaptool::API.client.getallnodes(params)
+        cl.getallnodes(params)
       end
     end
 

data/lib/gaptool_client/commands.rb

@@ -1,6 +1,5 @@
 # coding: utf-8
 # rubocop:disable Metrics/LineLength
-#
 require 'rainbow'
 require 'json'
 require 'clamp'
@@ -23,11 +22,21 @@ module Gaptool
            'override chef run_list. recipe[cb::recipe] or role[myrole]. Can be specified multiple times',
            multivalued: true, attribute_name: 'chef_runlist')
     option ['--no-terminate'], :flag, 'Add terminate protection'
+
     def execute
       no_terminate = no_terminate? ? true : nil
-      Gaptool::API.client.addnode(zone, type, role, environment, nil, security_group,
-                                  ami, chef_repo, chef_branch, chef_runlist,
-                                  no_terminate)
+      res = Gaptool::API.client.addnode(zone, type, role, environment, nil, security_group,
+                                        ami, chef_repo, chef_branch, chef_runlist,
+                                        no_terminate)
+      if res['result'] == 'error'
+        puts Rainbow(res['message']).red
+        exit 1
+      end
+
+      puts "#{Rainbow('Successfully init instance').green} #{Rainbow(res['instance']).blue}:"
+      res.select { |k, _| k != 'instance' && k != 'secret' }.sort.each do |k, v|
+        puts "- #{k}: #{Rainbow(v).blue}"
+      end
     end
   end
 
@@ -214,28 +223,16 @@ module Gaptool
 
       nodes = nodes.map do |x|
         x['whyrun'] = whyrun?
-        x['chef_branch'] = chef_branch
-        x['attrs'] = attrs
+        x['attrs'] = {
+          'chef_branch' => chef_branch
+        }.merge(attrs)
         x
       end
 
       pre_hook = proc do |node|
-        if node['chef_runlist'].nil?
-          runlist = ['recipe[main]']
-        elsif node['chef_runlist'].is_a? Array
-          runlist = node['chef_runlist']
-        end
-        json = {
-          'role' => node['role'],
-          'environment' => node['environment'],
-          'run_list' => runlist,
-          'apps' => node['apps'] || [],
-          'gaptool' => {
-            'user' => ENV['GT_USER'],
-            'key' => ENV['GT_KEY'],
-            'url' => ENV['GT_URL']
-          }
-        }.merge(node['attrs'])
+        cl = Gaptool::API.new
+        json = cl.getnodeattrs(node['instance'], node['attrs'])
+        json['run_list'] ||= node['chef_runlist'] || ['recipe[main]']
         git = 'sudo -u admin git'
         pull = "#{git} fetch --all; #{git} reset --hard origin/`#{git} rev-parse --abbrev-ref HEAD`"
         wopts = node['whyrun'] ? ' -W ' : ''
@@ -246,6 +243,8 @@ module Gaptool
         end
         upload!(StringIO.new(json.to_json), '/tmp/chef.json')
         script = <<-EOS
+#!/bin/bash
+set -e
 cd /var/data/admin/ops
 #{pull}
 sudo chef-solo -c /var/data/admin/ops/cookbooks/solo.rb -j /tmp/chef.json -E #{node['environment']}#{wopts}
@@ -276,8 +275,9 @@ EOS
     option ['-s', '--serial'], :flag, 'Run command serially. Order of execution is unknown.'
     option ['-c', '--continue-on-errors'], :flag, 'Continue execution even if one or more hosts fail'
     option ['-b', '--batch-size'], 'SIZE', "How many hosts to run in parallel (defaults to #{Gaptool::SSH::BATCH_SIZE})", default: Gaptool::SSH::BATCH_SIZE
+    option ['-v', '--verbose'], :flag, 'More verbose output'
 
-    def execute # rubocop:disable Metrics/MethodLength
+    def execute
       attrs = Gaptool::Helpers.split_attrs(attribute_list)
       if instance
         n = Gaptool::API.client.getonenode(instance)
@@ -307,45 +307,33 @@ EOS
         seen << x['instance']
         res
       end
+
       nodes = nodes.map do |x|
-        x['apps'] = x['apps']
-        x['apps_to_deploy'] = (Set.new(x['apps']) & app_set).to_a
-        x['rollback'] = rollback?
-        x['branch'] = branch || 'master'
-        x['migrate'] = migrate?
-        x['attrs'] = attrs
+        x['verbose'] = verbose?
+        x['attrs'] = {
+          'deploy_apps' => (Set.new(x['apps']) & app_set).to_a,
+          'rollback' => rollback?,
+          'branch' => branch,
+          'migrate' => migrate?
+        }.merge(attrs)
         x
       end
 
       pre_hook = proc do |node|
+        client = Gaptool::API.new
+        json = client.getnodeattrs(node['instance'], node['attrs'])
+        json['run_list'] = node['chef_runlist'] || ['recipe[deploy]']
         host = "#{node['role']}:#{node['environment']}:#{node['instance']}"
         puts "#{Rainbow('Deploying apps').cyan} '" + \
-             Rainbow(node['apps_to_deploy'].join(' ')).green + \
+             Rainbow(json['deploy_apps'].join(' ')).green + \
              "' #{Rainbow('on').cyan} " + \
              Rainbow(host).green
+        puts "#{Rainbow(host).green}: #{JSON.pretty_generate(json)}" if node['verbose']
 
-        if node['chef_runlist'].nil?
-          runlist = ['recipe[deploy]']
-        elsif node['chef_runlist'].is_a? Array
-          runlist = node['chef_runlist']
-        end
-        json = {
-          'role' => node['role'],
-          'environment' => node['environment'],
-          'run_list' => runlist,
-          'apps' => node['apps'],
-          'deploy_apps' => node['apps_to_deploy'],
-          'rollback' => node['rollback'],
-          'branch' => node['branch'],
-          'migrate' => node['migrate'],
-          'gaptool' => {
-            'user' => ENV['GT_USER'],
-            'key' => ENV['GT_KEY'],
-            'url' => ENV['GT_URL']
-          }
-        }.merge(node['attrs']).to_json
-        upload!(StringIO.new(json), '/tmp/chef.json')
+        upload!(StringIO.new(json.to_json), '/tmp/chef.json')
         script = <<-EOS
+#!/bin/bash
+set -e
 cd /var/data/admin/ops
 sudo -u admin git pull
 sudo chef-solo -c /var/data/admin/ops/cookbooks/solo.rb -j /tmp/chef.json -E #{node['environment']}

data/lib/gaptool_client/ssh.rb

@@ -58,14 +58,14 @@ Host #{host} #{node['instance']}
         emark = "# -- end #{node['instance']}"
 
         if Regexp.new(mark).match(content)
-          puts Rainbow("Updating ssh config for #{get_host(node)}").green if verbose
+          puts Rainbow("Updating ssh config for #{Gaptool::API.get_host(node)}").green if verbose
           content.gsub!(/#{mark}.*?#{emark}/m, snip.strip)
         elsif Regexp.new(STOP_MARKER).match(content)
-          puts Rainbow("Adding ssh config for #{get_host(node)}").green if verbose
+          puts Rainbow("Adding ssh config for #{Gaptool::API.get_host(node)}").green if verbose
           content.gsub!(/#{STOP_MARKER}/m, snip + "\n" + STOP_MARKER)
         else
           puts Rainbow('No gt ssh config found: please run gt ssh-config').yellow
-          puts Rainbow("Adding ssh config for #{get_host(node)}").green if verbose
+          puts Rainbow("Adding ssh config for #{Gaptool::API.get_host(node)}").green if verbose
           content = <<-EOF
 #{content}
 #{START_MARKER}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gaptool-client
 version: !ruby/object:Gem::Version
-  version: 0.8.0.pre.alpha9
+  version: 0.8.0.pre.alpha10
 platform: ruby
 authors:
 - Francesco Laurita
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-03 00:00:00.000000000 Z
+date: 2016-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -58,16 +58,16 @@ dependencies:
   name: gaptool-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: 0.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: 0.8.1
 - !ruby/object:Gem::Dependency
   name: sshkit
   requirement: !ruby/object:Gem::Requirement