sambot 0.1.128 → 0.1.129

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 50f8c7236ffafbc01eee654443bcdbaf58e2cd62
-  data.tar.gz: 2580fb8acd9d6778503a490823e3db31b7a271c3
+  metadata.gz: 74354ecb486f502bef4e42cc0eeccb524c4ba430
+  data.tar.gz: 304bdaeddc89d90e94e4db420dae51d358a68730
 SHA512:
-  metadata.gz: a129a763a04a28f92893f9704963081291a064bddf796a9896a778159ad55a679409f4f65fa2c1bccacfbb907811e9d1a51701a79a4a7440fdb3add222aeada9
-  data.tar.gz: 2a403e57d2bb4d2a6a168297bfd96e88394a12f131d0b5e938a3b1b21abb84a3affda464333b5ecd6f82c41b33c34e659b0a7ca76f379ff72519f61713309ed6
+  metadata.gz: b4ab09d24caaa18c9c9f5da891989bfc9a0466f3788e5e7b1a10db26665d5e7004b10fa5602bca10b80d9b2b33c58927336d61e350b4282fc2dc0973748b328a
+  data.tar.gz: 7abc63bc782d94a03ef3c5b3dad68a2d092cb4569b390d435db6f7226a8bb3c39e4041114232979814e0a07d34cbba16881ee1d15baf10198c2e6b05b5faddc3

data/.gitignore

@@ -11,3 +11,4 @@
 # rspec failure tracking
 .rspec_status
 sambot-session.log
+/.env

data/lib/sambot/base_command.rb

@@ -41,19 +41,15 @@ class Thor
       command = all_commands[meth]
       handle_no_command_error(meth) unless command
       shell.say
-      shell.say("Usage:", :green)
+      shell.say("  Usage:", :green)
       shell.say
-      shell.say "  sambot #{namespace} #{command_name} "
+      shell.say "  sambot #{command_name} "
       shell.say
       shell.say
       class_options_help(shell, nil => command.options.values)
-      if command.long_description
-        shell.say "Description:", :green
-        shell.say
-        shell.print_wrapped(docs("#{namespace}/#{command_name}"), :indent => 2)
-      else
-        shell.say command.description
-      end
+      shell.say "  Description:", :green
+      shell.say
+      shell.print_wrapped(docs("#{command_name}"), :indent => 2)
       shell.say
     end
   end
@@ -97,7 +93,7 @@ module Sambot
         end
 
         def self.docs(path)
-          File.read(File.join(File.dirname(__FILE__), '../docs', path + '.txt'))
+          File.read(File.join(File.dirname(__FILE__), '/docs', path + '.txt'))
         end
 
       end

data/lib/sambot/docs/{cookbook/build.txt → build.txt}

@@ -6,20 +6,16 @@ The configuration file should be called .config.yml and stored in the root of
 the Chef cookbook. After the command is run, all the files required to author
 a cookbook will be placed in the same directory as the .config.yml file.
 
-An example default structure for a cookbook would be the below:
-|- recipes
-     |- default.rb
-|- spec
-|- .config.yml
-|- README.md
-
-The above is the minimal folder structure required for a cookbook.
-
 The .config.yml has the following structure:
+
 * name - the name of the cookbook
+
 * version - the version of the cookbook
+
 * platforms - the different platforms the cookbook can run on, centos and/or windows
+
 * description - a description for the cookbook
+
 * suites - the suites attribute that would go into the .kitchen.yml files and should follow exactly that structure
 
 Furthermore, a pre-push Git hook will be generated which will check the cookbook

data/lib/sambot/docs/start.txt

@@ -0,0 +1,21 @@
+This command will start a new 'Sambot' session.
+
+A session is a period of time during which you want to interact with services inside
+our Rackspace DEV environment. To do so several things need to take place:
+
+* A set of SSH tunnels will be created to the bastion host in Rackspace, allowing you
+to seamlessly access resources.
+
+* Your /etc/hosts will be updated with the most commonly used services to point to your
+local machine. This will allow you to transparently connect to a service .i.e https://chef.brighter.io
+as if you were connecting directly - in fact, you'll be going through a local tunnel!
+
+* You will be logged into Vault allowing you to start using the Vault CLI without further
+authentication required.
+
+* An HAProxy instance will be started locally in order to correctly route ports. This is required
+to transparently used the correct ports on a single IP.
+
+You can run `sambot session` over and over again without any problems. Once your session is complete
+and you want to close the session, simply run `sambot stop` and this will remove the tunnels, stop
+HAProxy and reset your /etc/hosts file to its original contents.

data/lib/sambot/docs/stop.txt

@@ -0,0 +1,7 @@
+This command will stop a 'Sambot' session. It will do the following:
+
+* Close any open tunnels to the bastion host.
+
+* Reset your /etc/hosts file to its original content.
+
+* Stop the local HAProxy instance. 

data/lib/sambot/docs/version.txt

@@ -0,0 +1,3 @@
+This command will output the version of the cookbook in the current directory.
+
+It is mostly used for CI in order to give TeamCity builds their correct version number. 

data/lib/sambot/version.rb

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

data/lib/sambot/workflow/session.rb

@@ -25,6 +25,9 @@ module Sambot
         'teamcity.brighter.io': {
           tunnel_port: 9001, dest_port: 8111, proxy_port: 443
         },
+        'rundeck.brighter.io': {
+          tunnel_port: 9008, dest_port: 4440, proxy_port: 443
+        },
         'splunk.brighter.io': {
           tunnel_port: 9002, dest_port: 8080, proxy_port: 443
         },

data/lib/sambot/workflow/vault.rb

@@ -21,7 +21,7 @@ module Sambot
         end
       end
 
-      def self.setup_environment(forwards, target = File.expand_path('~/.bash_profile'))
+      def self.setup_environment(forwards, target = File.expand_path('~/.zshrc'))
         save_environment_variable('VAULT_SKIP_VERIFY', true, target)
         save_environment_variable('VAULT_ADDR', build_vault_address(forwards), target)
       end
@@ -30,23 +30,23 @@ module Sambot
         "https://vault.brighter.io:#{forwards[:'vault.brighter.io'][:proxy_port]}"
       end
 
-      def self.save_environment_variable(key, value, target = File.expand_path('~/.bash_profile'))
+      def self.save_environment_variable(key, value, target = File.expand_path('~/.zshrc'))
         contents = File.read(target)
         contents = contents.gsub(/export #{key}=#{value}/, '') if has_environment_variable?(key, value, target)
         new_line = "export #{key}=#{value.to_s}\n"
-        UI.debug("Adding `#{new_line}` to your ~/.bash_profile")
+        UI.debug("Adding `#{new_line}` to your ~/.zshrc")
         contents << new_line
         File.write(target, contents)
         ENV[key] = value.to_s
       end
 
-      def self.has_environment_variables?(forwards, target = File.expand_path('~/.bash_profile'))
+      def self.has_environment_variables?(forwards, target = File.expand_path('~/.zshrc'))
         has_vault_skip_verify = has_environment_variable?('VAULT_SKIP_VERIFY', true, target)
         has_vault_addr = has_environment_variable?('VAULT_ADDR', build_vault_address(forwards), target)
         (has_vault_addr != nil) && (has_vault_skip_verify != nil)
       end
 
-      def self.has_environment_variable?(key, value, target = File.expand_path('~/.bash_profile'))
+      def self.has_environment_variable?(key, value, target = File.expand_path('~/.zshrc'))
         contents = File.read(target)
         contents.match(/export #{key}=#{value}/)
       end

data/sambot.gemspec

@@ -42,7 +42,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'thor', '~> 0.19'
   spec.add_dependency 'erubis', '~> 2.7', '>= 2.7.0'
   spec.add_dependency 'gems', '~> 1.0', '>= 1.0.0'
-  spec.add_development_dependency 'aruba'
   spec.add_dependency  'awesome_print'
   spec.add_development_dependency  'pry'
   spec.add_development_dependency  'fuubar'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sambot
 version: !ruby/object:Gem::Version
-  version: 0.1.128
+  version: 0.1.129
 platform: ruby
 authors:
 - Olivier Kouame
@@ -274,20 +274,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
-- !ruby/object:Gem::Dependency
-  name: aruba
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: awesome_print
   requirement: !ruby/object:Gem::Requirement
@@ -469,13 +455,13 @@ files:
 - lib/sambot/config.rb
 - lib/sambot/dns/records.rb
 - lib/sambot/dns/repository.rb
-- lib/sambot/docs/cookbook/build.txt
-- lib/sambot/docs/cookbook/clean.txt
-- lib/sambot/docs/cookbook/generate.txt
-- lib/sambot/docs/cookbook/version.txt
-- lib/sambot/docs/session/start.txt
-- lib/sambot/docs/session/stop.txt
-- lib/sambot/docs/workstation/configure.txt
+- lib/sambot/docs/build.txt
+- lib/sambot/docs/clean.txt
+- lib/sambot/docs/configure.txt
+- lib/sambot/docs/generate.txt
+- lib/sambot/docs/start.txt
+- lib/sambot/docs/stop.txt
+- lib/sambot/docs/version.txt
 - lib/sambot/rackspace/client.rb
 - lib/sambot/rackspace/flavors.rb
 - lib/sambot/rackspace/images.rb