sambot 0.1.110 → 0.1.111

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa2109d02bfb359fefc1600cc8f153047e2392d0
-  data.tar.gz: 86f6b773b656669841db39f6417f97e785782012
+  metadata.gz: 04cf2aa5575db3b8d682df8834ee8219bfbf7ebf
+  data.tar.gz: e664f1bfdb6988720af8966aa6bf9af92277502d
 SHA512:
-  metadata.gz: 231c4161192aa3f385786557a446f316c525f6523d935636485406575c26f7f17a20f5eb0d67b75b0f29bfd7e9fdeee75063d451073847461fb142b99ea7e4db
-  data.tar.gz: 5cfd929629ec2951d8e3f29cef1ed2b8c012c2ba0dbfa171ba7a0cce13b9e69f7c9e8004d48ff8d08f1c9c9388fa27b4732c22ff102d38b3d1e7ea9aa2d26e12
+  metadata.gz: 71f8344676808ea81f690b06891fb80820de093e37635b937613b8102e2f6b236d4f97b28d89d10ce5af5d6433340fd4a51d808d1c94e806cf97136f00244142
+  data.tar.gz: a4a9d08a9e08102507cddc15f060a2cb398752067481dbc823e53fc023703a39966235a1b50dab517984e900e5c49c36d5f6edd585a2a3296595f702e5df8082

data/lib/sambot.rb

@@ -27,7 +27,9 @@ require_relative 'sambot/ssh/config_section'
 require_relative 'sambot/ssh/parser'
 
 require_relative 'sambot/developer_workflow/tunnel'
+require_relative 'sambot/developer_workflow/tunnels'
 require_relative 'sambot/developer_workflow/brew'
+require_relative 'sambot/developer_workflow/proxy'
 require_relative 'sambot/developer_workflow/networking'
 require_relative 'sambot/developer_workflow/dns'
 require_relative 'sambot/developer_workflow/session'
@@ -36,13 +38,8 @@ require_relative 'sambot/developer_workflow/workstation'
 
 require_relative 'sambot/commands/base_command'
 require_relative 'sambot/commands/cookbook'
-require_relative 'sambot/commands/rdp'
 require_relative 'sambot/commands/session'
 require_relative 'sambot/commands/workstation'
-require_relative 'sambot/commands/instance'
-require_relative 'sambot/commands/dns'
-require_relative 'sambot/commands/team'
-require_relative 'sambot/commands/report'
 
 require_relative 'sambot/cli'
 

data/lib/sambot/chef/cookbook.rb

@@ -7,6 +7,12 @@ module Sambot
   module Chef
     class Cookbook
 
+        def self.register(config)
+          name = config['name']
+          identifier = config['identifier']
+          
+        end
+
         def self.build(config, essential_files, generated_files)
           validate_cookbook_structure(config['platforms'], essential_files, generated_files)
           setup_test_kitchen(config)
@@ -42,6 +48,7 @@ module Sambot
             'name' => name,
             'version' => '0.0.1',
             'platforms' => platforms,
+            'identifier' => '',
             'suites' => [{
               'name' => 'default',
               'run_list' => [

data/lib/sambot/cli.rb

@@ -12,8 +12,5 @@ module Sambot
     desc 'workstation', 'Manage engineer workstations'
     subcommand 'workstation', Sambot::Commands::Workstation
 
-    desc 'dns', 'Manage DEV/QE DNS'
-    subcommand 'dns', Sambot::Commands::DNS
-
   end
 end

data/lib/sambot/commands/base_command.rb

@@ -60,11 +60,15 @@ module Sambot
 
       no_commands do
 
-        def execute(access = :standard)
-          if access == :sudo
-            ensure_running_as_sudo
-          else
-            ensure_not_running_as_sudo
+        def execute(need_dev_credentials: false, need_sudo_password: false)
+          if need_dev_credentials && !ENV['SAMBOT_DEV_USERNAME']
+            raise ApplicationError, 'Your DEV/QE username needs to be set in the environment variable SAMBOT_DEV_USERNAME before this command can be run.'
+          end
+          if need_dev_credentials && !ENV['SAMBOT_DEV_PASSWORD']
+            raise ApplicationError, 'Your DEV/QE password needs to be set in the environment variable SAMBOT_DEV_PASSWORD before this command can be run.'
+          end
+          if need_sudo_password && !ENV['SAMBOT_SUDO_PASSWORD']
+            raise ApplicationError, 'Your local password needs to be set in the environment variable SAMBOT_SUDO_PASSWORD before this command can be run.'
           end
           Runtime.ensure_latest
           yield
@@ -72,14 +76,6 @@ module Sambot
           UI.error(e.message)
         end
 
-        def ensure_not_running_as_sudo
-          #raise ApplicationError, "This command should not be run as sudo" unless ENV['USER'] != 'root'
-        end
-
-        def ensure_running_as_sudo
-          #raise ApplicationError, "This command needs to be run as sudo" unless ENV['USER'] == 'root'
-        end
-
         def config
            Config.new.read
         end

data/lib/sambot/commands/cookbook.rb

@@ -37,6 +37,11 @@ module Sambot
         execute { puts "##teamcity[buildNumber '#{config['version'].to_s}']" }
       end
 
+      desc 'register', 'Registers the cookbook short name in Consul for use with Rundeck machine creation jobs'
+      def register
+        execute { Chef::Cookbook.register(config) }
+      end
+
     end
   end
 end

data/lib/sambot/commands/session.rb

@@ -6,23 +6,21 @@ module Sambot
 
       namespace 'session'
 
-      desc 'start', 'Start a new DEV/QE session'
+      desc 'start', 'Start a new Sambot session'
       def start
-        execute(:sudo) do
-          username = ENV['SAMBOT_SESSION_USERNAME']
-          password = ENV['SAMBOT_SESSION_PASSWORD']
-          unless username && password
-            username = ask(' What is your DEV/QE username i.e. jsmith? ')
-            password = ask(' What is your DEV/QE password? ', :echo => false)
-            say('')
-          end
-          DeveloperWorkflow::Session.new.start(username, password)
+        execute(need_dev_credentials: true, need_sudo_password: true) do
+          DeveloperWorkflow::Session.new.start(ENV['SAMBOT_DEV_USERNAME'], ENV['SAMBOT_DEV_PASSWORD'], ENV['SAMBOT_SUDO_PASSWORD'])
         end
       end
 
-      desc 'stop', 'Stop the DEV/QE session'
+      desc 'stop', 'Stop any active Sambot session'
       def stop
-        execute(:sudo) { DeveloperWorkflow::Session.new.stop }
+        execute(need_sudo_password: true) { DeveloperWorkflow::Session.new.stop }
+      end
+
+      desc 'status', 'Show the status of your Sambot session'
+      def status
+        execute(need_sudo_password: true) { DeveloperWorkflow::Session.new.show }
       end
 
     end

data/lib/sambot/commands/workstation.rb

@@ -8,9 +8,8 @@ module Sambot
 
       desc 'configure', 'Sets up an engineering workstation'
       def configure
-        execute do
-          username = ask(' What is your DEV/QE Active Directory username i.e. john.smith? ')
-          DeveloperWorkflow::Workstation.configure(username)
+        execute(need_dev_credentials: true, need_sudo_password: true) do
+          DeveloperWorkflow::Workstation.configure(ENV['SAMBOT_DEV_PASSWORD'])
         end
       end
 

data/lib/sambot/developer_workflow/brew.rb

@@ -5,25 +5,40 @@ module Sambot
     class Brew
 
       def configure
+        UI.debug("Updating Homebrew formulas and casks")
         update
         tap('caskroom/cask')
         update
       end
 
       def update
-        `brew update`
+        Bundler.with_clean_env do
+          `brew update`
+        end
       end
 
       def tap(name)
-        `brew tap #{name}`
+        Bundler.with_clean_env do
+          `brew tap #{name}`
+        end
       end
 
-      def list_casks
-        `brew cask list`.split
+      def install_cask(cask, binary)
+        result = `which #{binary}`
+        if result
+          UI.info("Not installing the Homebrew cask #{cask} as the corresponding binary is already available")
+        else
+          `brew cask install #{cask}`
+        end
       end
 
-      def list_formulas
-        `brew list`.split
+      def install_formula(formula, binary)
+        result = `which #{binary}`
+        if result
+          UI.info("Not installing the Homebrew formula #{formula} as the corresponding binary is already available")
+        else
+          `brew install #{formula}`
+        end
       end
 
     end

data/lib/sambot/developer_workflow/dns.rb

@@ -6,27 +6,36 @@ module Sambot
   module DeveloperWorkflow
     class DNS
 
-      def self.update_hosts(forwards, src = '/etc/hosts')
-        modify_hosts(forwards, src) do |entries, key, value|
+      def self.update_hosts(forwards, src = '/etc/hosts', dest = nil)
+        UI.info('Updating your hosts file to allow access to Advertising Studio services through local SSH tunnels')
+        modify_hosts(forwards, src, dest) do |entries, key, value|
+          UI.debug("Adding hosts entry #{key} #{value[:ip]}")
           entries << Hosts::Entry.new(value[:ip], key)
         end
       end
 
-      def self.reset_hosts(forwards, src = '/etc/hosts')
-        modify_hosts(forwards, src)
+      def self.reset_hosts(forwards, src = '/etc/hosts', dest = nil)
+        UI.info('Removing extra entries in hosts file')
+        modify_hosts(forwards, src, dest)
       end
 
       private
 
-      def self.modify_hosts(forwards, src)
-        UI.debug('Updating your hosts file.')
+      def self.modify_hosts(forwards, src, dest)
         hosts = Hosts::File.read(src)
         entries = hosts.elements
         forwards.each do |key, value|
           entries.delete_if  { |entry| entry.is_a?(Aef::Hosts::Entry) && entry.name == key.to_s}
           yield(entries, key, value) if block_given?
         end
-        hosts.write
+        if dest
+          hosts.write(:path => dest)
+        else
+          tempfile = Tempfile.new
+          hosts.write(:path => tempfile.path)
+          Runtime.sudo("cp #{tempfile.path} /etc/hosts")
+        end
+
       end
 
     end

data/lib/sambot/developer_workflow/networking.rb

@@ -7,7 +7,8 @@ module Sambot
 
       attr_reader :local_addresses
 
-      def initialize
+      def self.local_addresses
+        return @local_addresses if @local_addresses
         addr_infos = Socket.getifaddrs
         @local_addresses = []
         addr_infos.each do |addr_info|
@@ -15,14 +16,19 @@ module Sambot
                 @local_addresses << addr_info.addr.ip_address
             end
         end
+        @local_addresses
       end
 
-      def configure(ip)
-        if local_addresses.include?(ip)
-          `sudo ifconfig lo0 -alias #{ip}`
+      def self.configure(forwards)
+        network = Networking.new
+        forwards.each do |key, value|
+          ip = value[:ip]
+          if local_addresses.include?(ip)
+            Runtime.sudo("ifconfig lo0 -alias #{ip}")
+          end
+          UI.debug "Setting up the local IP #{ip} for accessing #{key}"
+          Runtime.sudo("ifconfig lo0 alias #{ip} up")
         end
-        UI.debug "Setting up the local IP #{ip} for SSH tunneling purposes."
-        `sudo ifconfig lo0 alias #{ip} up`
       end
 
     end

data/lib/sambot/developer_workflow/proxy.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module Sambot
+  module DeveloperWorkflow
+    class Proxy
+
+      def self.start(forwards)
+        template_path = FileManagement::TemplateProvider.get_path('haproxy.conf.erb')
+        input = File.read(template_path)
+        eruby = Erubis::Eruby.new(input)
+        services = forwards.map do |key, value|
+          {
+            name: key.to_s.split('.')[0],
+            ip: value[:ip],
+            tunnel_port: value[:local_port],
+            local_port: value[:port]
+          }
+        end
+        services.each do |service|
+          UI.debug("Proxying #{service[:name]}.brighter.io:#{service[:local_port]} to #{service[:ip]}:#{service[:tunnel_port]}")
+        end
+        contents = eruby.evaluate({services: services})
+        temp_config = Tempfile.new
+        File.write(temp_config.path, contents)
+        Runtime.sudo("haproxy -f #{temp_config.path}")
+      end
+
+      def self.stop
+
+      end
+
+    end
+  end
+end

data/lib/sambot/developer_workflow/session.rb

@@ -2,6 +2,7 @@
 require 'titan'
 require 'net/ssh'
 require 'dante'
+require 'haproxy-tools'
 
 module Dante
   class Runner
@@ -18,37 +19,34 @@ module Sambot
       BASTION_HOST_IP = '146.177.10.174'
 
       FORWARDS = {
-        'chef.brighter.io': { ip: '127.0.0.13', port: 443 },
-        'teamcity.brighter.io': { ip: '127.0.0.14', port: 443 },
-        'splunk.brighter.io': { ip: '127.0.0.15', port: 443 },
-        'jenkins.brighter.io': { ip: '127.0.0.16', port: 443 },
-        'vault.brighter.io': { ip: '127.0.0.17', port: 8200 }
+        'chef.brighter.io': { ip: '127.0.0.13', port: 443, local_port: 9013 },
+        'teamcity.brighter.io': { ip: '127.0.0.14', port: 443, local_port: 9014 },
+        'splunk.brighter.io': { ip: '127.0.0.15', port: 443, local_port: 9015 },
+        'jenkins.brighter.io': { ip: '127.0.0.16', port: 443, local_port: 9016 },
+        'vault.brighter.io': { ip: '127.0.0.17', port: 8200, local_port: 9017 }
       }
 
-      def start(username, password)
-        kill_active_sessions
+      def start(username, password, sudo_password)
+        Tunnels.stop
         unless verify_credentials(username, password)
-          UI.error 'The session could not be started.'
+          UI.error 'The session could not be started'
           exit
         end
-        setup_networking
-        start_daemon_for_tunneling(username, password)
-        setup_secrets_management(username, password)
-        UI.info("Your session has now started. Run `sambot session stop` to close it.")
+        DNS.update_hosts(FORWARDS)
+        Proxy.start(FORWARDS)
+        Networking.configure(FORWARDS)
+        Tunnels.start(username, password, BASTION_HOST_IP, FORWARDS)
+        #setup_secrets_management(username, password)
+        UI.info("Your session has now started - run `sambot session stop` to close it")
       end
 
       def stop
-        kill_active_sessions
+        Tunnels.stop
         DNS.reset_hosts(FORWARDS)
       end
 
       private
 
-      def kill_active_sessions
-        Dante::Runner.new('sambot-session').execute(:kill => true)
-        UI.debug("All active Sambot sessions have been closed.")
-      end
-
       def verify_credentials(username, password)
         full_username = "DEV\\#{username}"
         begin
@@ -61,44 +59,21 @@ module Sambot
         rescue Errno::ECONNREFUSED
           puts "  Connection refused"
         rescue Net::SSH::Disconnect
-          UI.error "Invalid username or password provided."
+          UI.error "Invalid username or password provided"
         end
         return false
       end
 
-      def start_daemon_for_tunneling(username, password)
-        Dante::Runner.new('sambot-session').execute(:daemonize => true, :log_path => 'sambot-session.log') do
-          setup_ssh_tunnels(username, password)
-        end
-      end
-
       def setup_secrets_management(username, password)
-        Vault.setup_environment('vault.brighter.io', FORWARDS['vault.brighter.io'.to_sym][:port], '/etc/profile.d/')
         unless Vault.has_environment_variables?('/etc/profile.d/')
-          Vault.dump_environment('sambot.env')
-          UI.info("Because this is the first time you have created a session, environment variables need to be set. Run `source sambot.env` to add them this session - future sessions won't need this step.")
+          UI.info("You have either not configured your workstation or you have not opened up a new shell to pick up the changes applied during configuration")
         end
-        UI.debug "Authenticating with Hashicorp Vault in Rackspace DEV/QE..."
+        UI.debug "Authenticating with Hashicorp Vault in Rackspace DEV/QE"
         token = Vault.authenticate(username, password)
-        UI.debug "Saving your Vault authentication token to ~/.vault-token..."
+        UI.debug "Saving your Vault authentication token to ~/.vault-token"
         Vault.save_token(token)
       end
 
-      def setup_ssh_tunnels(username, password)
-        full_username = "DEV\\#{username}"
-        UI.debug "Opening a connection to the Rackspace DEV/QE environment..."
-        Net::SSH.start(BASTION_HOST_IP, full_username, :password => password) do |session|
-          FORWARDS.each { |key, value| Tunnel.create(session, key, value[:ip], value[:port]) }
-          session.loop {true}
-        end
-      end
-
-      def setup_networking
-        DNS.update_hosts(FORWARDS)
-        network = Networking.new
-        FORWARDS.each { |key, value| network.configure(value[:ip]) }
-      end
-
     end
   end
 end

data/lib/sambot/developer_workflow/tunnel.rb

@@ -5,9 +5,9 @@ module Sambot
   module DeveloperWorkflow
     class Tunnel
 
-      def self.create(session, host, ip, port)
-        UI.debug "Creating a tunnel from #{ip}:#{port} to #{host}:#{port}."
-        session.forward.local(ip, port, host, port)
+      def self.create(session, host, ip, port, local_port)
+        UI.debug "Creating a tunnel from #{ip}:#{local_port} to #{host}:#{port}"
+        session.forward.local(ip, local_port, host, port)
       end
 
     end

data/lib/sambot/developer_workflow/tunnels.rb

@@ -0,0 +1,40 @@
+module Sambot
+  module DeveloperWorkflow
+
+    class Tunnels
+
+      PID_PATH = '/tmp/sambot-session.pid'
+
+      LOG_PATH = '/tmp/sambot-session.log'
+
+      SESSION_ID = 'sambot'
+
+      def self.start(username, password, bastion_host_ip, forwards)
+        UI.info("Starting daemon for tunneling - log is available at #{LOG_PATH}")
+        Dante::Runner.new(SESSION_ID).execute(:daemonize => true, :pid_path => PID_PATH, :log_path => LOG_PATH) do
+          setup_ssh_tunnels(username, password, bastion_host_ip, forwards)
+        end
+        sleep(2)
+        puts "----- Background Daemon Log -----"
+        puts File.read(LOG_PATH)
+        puts "---------------------------------"
+      end
+
+      def self.stop
+        Dante::Runner.new(SESSION_ID).execute(:kill => true, :pid_path => PID_PATH)
+        UI.debug("All active sessions have been closed")
+        File.delete(LOG_PATH) if File.exist?(LOG_PATH)
+      end
+
+      def self.setup_ssh_tunnels(username, password, bastion_host_ip, forwards)
+        full_username = "DEV\\#{username}"
+        UI.debug "Opening a connection to the Rackspace DEV/QE environment"
+        Net::SSH.start(bastion_host_ip, full_username, :password => password) do |session|
+          forwards.each { |key, value| Tunnel.create(session, key, value[:ip], value[:port], value[:local_port]) }
+          session.loop {true}
+        end
+      end
+
+    end
+  end
+end

data/lib/sambot/developer_workflow/vault.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'vault'
+require 'open4'
 
 module Sambot
   module DeveloperWorkflow
@@ -19,14 +20,16 @@ module Sambot
         secret.auth.client_token
       end
 
-      def self.setup_environment(host, port, root = '/etc/profile.d/')
+      def self.setup_environment(root = '/etc/profile.d/')
         save_environment_variable('VAULT_SKIP_VERIFY', true)
         save_environment_variable('VAULT_ADDR', TARGET)
       end
 
       def self.save_environment_variable(key, value, path = '/etc/profile.d/')
         path = File.join(path, "#{key}.sh")
-        File.write(path, "export #{key}=#{value}")
+        file = Tempfile.new('foo')
+        file.write("export #{key}=#{value}")
+        Runtime.sudo("cp #{file.path} #{path}")
         ENV[key] = value.to_s
       end
 

data/lib/sambot/developer_workflow/workstation.rb

@@ -4,45 +4,52 @@ module Sambot
   module DeveloperWorkflow
     class Workstation
 
-      FORMULAS = %w{golang git}
-
-      CASKS = %w{virtualbox vagrant vagrant-manager chefdk}
+      FORMULAS = {
+        'git': 'git',
+        'vault': 'vault',
+        'haproxy': 'haproxy'
+      }
+
+      CASKS = {
+        'virtualbox': 'virtualbox',
+        'vagrant': 'vagrant',
+        'chefdk': 'chef'
+      }
 
       XCODE_INSTALLATION_SCRIPT = 'xcode-select --install'
 
       def self.configure(username)
-        UI.debug('Updating your environment variables.')
         update_environment_variables
         install_native_binaries
-        UI.info('Your workstation is now ready for use. Please close this shell and open up a new one to start making use of your new environment.')
+        UI.info('Your workstation is now ready for use - please close this shell and open up a new one to start making use of your new environment')
       end
 
       def self.install_native_binaries
-        system(XCODE_INSTALLATION_SCRIPT)
+        if `xcode-select version`
+          UI.info("Not installing XCode Developer Tools as they are already")
+        else
+          system(XCODE_INSTALLATION_SCRIPT)
+        end
         brew = Brew.new
         brew.configure
         install_formulas(brew)
         install_casks(brew)
       end
 
-      def self.install_formulas(brew)
-        CASKS.each do |formula|
-          brew.install_cask(formula) unless brew.list_formulas.include?(formula)
+      def self.install_casks(brew)
+        CASKS.each do |formula, binary|
+          brew.install_cask(formula, binary)
         end
       end
 
       def self.install_formulas(brew)
-        FORMULAS.each do |formula|
-          brew.install_formula(formula) unless brew.list_formulas.include?(formula)
+        FORMULAS.each do |formula, binary|
+          brew.install_formula(formula, binary)
         end
       end
 
-      def self.update_ssh_configuration(username)
-        config = Ssh::Parser.new.update('DEV\\' + username)
-        config.save
-      end
-
       def self.update_environment_variables
+        UI.debug('Updating your Vault environment variables')
         Vault.setup_environment
       end
 

data/lib/sambot/runtime.rb

@@ -12,10 +12,18 @@ module Sambot
 
         def self.ensure_latest
           latest_version = Gems.new.versions('sambot')[0]["number"]
-          UI.debug("Current Sambot version is #{Sambot::VERSION}.")
-          UI.debug("Latest Sambot version is #{latest_version}.")
+          UI.debug("Current version is #{Sambot::VERSION}")
+          UI.debug("Latest version is #{latest_version}")
           if is_obsolete
-            UI.info('A newer version of the sambot gem exists. Please update the gem before continuing.')
+            UI.info('A newer version of this gem exists - please update the gem before continuing')
+          end
+        end
+
+        def self.sudo(command)
+          Open4::popen4("sudo -S #{command}") do |pid, stdin, stdout, stderr|
+            stdin.puts ENV['SAMBOT_SUDO_PASSWORD']
+            stdin.close
+            stdout.read
           end
         end
 

data/lib/sambot/templates/haproxy.conf.erb

@@ -0,0 +1,21 @@
+global
+    chroot /var/lib/haproxy
+    stats socket /run/haproxy/admin.sock mode 660 level admin
+    stats timeout 30s
+    daemon
+
+defaults
+    log     global
+    mode    tcp
+    option  tcplog
+    timeout connect 5000
+    timeout client  50000
+    timeout server  50000
+
+<% @services.each do |service| %>
+backend <%= service[:name] %>-service
+  server <%= service[:name] %>-server <%= service[:ip] %>:<%= service[:tunnel_port] %>
+frontend <%= service[:name] %>
+  bind <%= service[:ip] %>:<%= service[:local_port] %>
+  default_backend <%= service[:name] %>-service
+<% end %>

data/lib/sambot/ui.rb

@@ -4,15 +4,18 @@ module Sambot
       module UI
 
         def self.debug(msg)
-          Thor.new.say("debug: #{msg}", :yellow)
+          date_format = DateTime.now.strftime("%Y-%m-%d %H:%M:%S")
+          Thor.new.say("#{date_format} [D] #{msg}", :yellow)
         end
 
         def self.info(msg)
-          Thor.new.say(" info: #{msg}", :green)
+          date_format = DateTime.now.strftime("%Y-%m-%d %H:%M:%S")
+          Thor.new.say("#{date_format} [I] #{msg}", :green)
         end
 
         def self.error(msg)
-          Thor.new.say("error: #{msg}", :red)
+          date_format = DateTime.now.strftime("%Y-%m-%d %H:%M:%S")
+          Thor.new.say("#{date_format} [E] #{msg}", :red)
         end
 
       end

data/lib/sambot/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Sambot
-  VERSION = '0.1.110'.freeze
+  VERSION = '0.1.111'.freeze
 end

data/sambot.gemspec

@@ -31,6 +31,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'dante'
   spec.add_dependency 'net-ssh'
   spec.add_dependency 'titan'
+  spec.add_dependency 'open4'
+  spec.add_dependency 'haproxy-tools'
   spec.add_dependency 'chef', '~> 12.18'
   spec.add_dependency 'thor', '~> 0.19'
   spec.add_dependency 'erubis', '~> 2.7', '>= 2.7.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sambot
 version: !ruby/object:Gem::Version
-  version: 0.1.110
+  version: 0.1.111
 platform: ruby
 authors:
 - Olivier Kouame
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-21 00:00:00.000000000 Z
+date: 2017-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor-hollaback
@@ -178,6 +178,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: open4
+  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: haproxy-tools
+  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: chef
   requirement: !ruby/object:Gem::Requirement
@@ -410,7 +438,6 @@ files:
 - ".ruby-version"
 - Gemfile
 - README.md
-- Rakefile
 - bin/sambot
 - bin/setup
 - lib/sambot.rb
@@ -422,19 +449,16 @@ files:
 - lib/sambot/cli.rb
 - lib/sambot/commands/base_command.rb
 - lib/sambot/commands/cookbook.rb
-- lib/sambot/commands/dns.rb
-- lib/sambot/commands/instance.rb
-- lib/sambot/commands/rdp.rb
-- lib/sambot/commands/report.rb
 - lib/sambot/commands/session.rb
-- lib/sambot/commands/team.rb
 - lib/sambot/commands/workstation.rb
 - lib/sambot/config.rb
 - lib/sambot/developer_workflow/brew.rb
 - lib/sambot/developer_workflow/dns.rb
 - lib/sambot/developer_workflow/networking.rb
+- lib/sambot/developer_workflow/proxy.rb
 - lib/sambot/developer_workflow/session.rb
 - lib/sambot/developer_workflow/tunnel.rb
+- lib/sambot/developer_workflow/tunnels.rb
 - lib/sambot/developer_workflow/vault.rb
 - lib/sambot/developer_workflow/workstation.rb
 - lib/sambot/dns/records.rb
@@ -471,6 +495,7 @@ files:
 - lib/sambot/templates/.rubocop.yml
 - lib/sambot/templates/Berksfile
 - lib/sambot/templates/chefignore
+- lib/sambot/templates/haproxy.conf.erb
 - lib/sambot/templates/metadata.rb.erb
 - lib/sambot/templates/pre-push
 - lib/sambot/templates/startup-script.ps1

data/Rakefile

@@ -1,6 +0,0 @@
-require 'bundler/gem_tasks'
-require 'rspec/core/rake_task'
-
-RSpec::Core::RakeTask.new(:spec)
-
-task default: :spec

data/lib/sambot/commands/dns.rb

@@ -1,45 +0,0 @@
-# frozen_string_literal: true
-
-require 'git'
-
-module Sambot
-  module Commands
-    class DNS < BaseCommand
-
-      namespace 'dns'
-
-      desc 'remove', 'Removes the given DNS entry'
-      option :hostname, :required => true, :desc => 'The DNS name for the A record'
-      def remove
-        execute(:sudo) do
-          Sambot::DNS::Repository.new.records.remove(options[:hostname])
-        end
-      end
-
-      desc 'list', 'Shows all DNS entries'
-      def list
-        execute do
-          records = Sambot::DNS::Repository.new.list_records
-          say
-          print_table(records)
-        end
-      end
-
-      desc 'show', 'Shows a given DNS entry'
-      def show
-      rescue ApplicationError => e
-        UI.error(e.message)
-      end
-
-      desc 'add', 'Adds or modify a DNS entry'
-      option :address, :required => true, :desc => 'The internal IP address for the A record'
-      option :hostname, :required => true, :desc => 'The DNS name for the A record'
-      option :team, :desc => 'The team owning the instance pointed to. Leave blank if the hostname contains stable, patch or unstable i.e. stable-api'
-      long_desc docs('cookbook/clean')
-      def add
-          execute(:sudo) { Sambot::DNS::Repository.new.records.add(options[:hostname], options[:address], options[:team]) }
-      end
-
-    end
-  end
-end

data/lib/sambot/commands/instance.rb

@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-module Sambot
-  module Commands
-
-    class Instance < BaseCommand
-
-      namespace 'instance'
-
-      desc 'generate', 'Generate a name for an instance based on the instance characteristics supplied'
-      def generate
-        execute {}
-      end
-
-    end
-  end
-end

data/lib/sambot/commands/rdp.rb

@@ -1,18 +0,0 @@
-# frozen_string_literal: true
-
-module Sambot
-  module Commands
-    class RDP < BaseCommand
-
-      namespace 'rdp'
-
-      desc 'config', 'Get a configuration file for Remote Desktop Manager Free'
-      def config
-        execute do
-
-        end
-      end
-
-    end
-  end
-end

data/lib/sambot/commands/report.rb

@@ -1,16 +0,0 @@
-# frozen_string_literal: true
-
-module Sambot
-  module Commands
-    class Report < BaseCommand
-
-      namespace 'report'
-
-      desc 'consistency', 'Checks the build pipeline is consistent'
-      def consistency
-        execute {}
-      end
-
-    end
-  end
-end

data/lib/sambot/commands/team.rb

@@ -1,16 +0,0 @@
-# frozen_string_literal: true
-
-module Sambot
-  module Commands
-    class Team < BaseCommand
-
-      namespace 'team'
-
-      desc 'list', 'Display the names and symbols of all Advertising Studio engineering teams'
-      def list
-        execute {}
-      end
-
-    end
-  end
-end