dogids-cli 0.0.19 → 0.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 80ec59b468779ec530624feea1a184e87c5eeccb
-  data.tar.gz: f652dddd35193576e00b7ee519e345c282397cda
+  metadata.gz: 648c482712018162c9cf439800a4bfb1e9a867f1
+  data.tar.gz: 7a1af27153ecce16015f4768470c1409f84fb6e2
 SHA512:
-  metadata.gz: e77351ed55840edeec18537708a8862f7dfcaaaf90b36a99c73762fcccd1482c3edda42ce060c7ee73494ab0a25db7bb058d923331a466f9ef136edb28785f8f
-  data.tar.gz: bc8998bb6d8e5706414f0a6e13c08ab251a04d58d459eb0355a173a1ffcb1c3b989cead1a06794a50bbdc8c53bd296b3d3ffefb76cf397aee0908fa1cec4b087
+  metadata.gz: 3cfdbe776f64deeb3f5dde4317e87856ee57ecbd50a92f808fae8daeca4132d446af03e1db71b53c8ee8c5ea254cf3ca3b4d7184a46c6836f103cf2c21402ace
+  data.tar.gz: 5089f64b096667de2d450c8c48a2820417f62d79a2d0dbee99e875252335bb7c7ea48e27cf3d544d1da2b9b9b28e1d892daeaba7b48a98d769afd5109eb90791

data/dogids_cli.gemspec

@@ -5,7 +5,7 @@ require "dogids/version"
 
 Gem::Specification.new do |spec|
   spec.name          = "dogids-cli"
-  spec.version       = "0.0.19"
+  spec.version       = "0.0.20"
   spec.authors       = ["Jaryd Krishnan"]
   spec.email         = ["jaryd@dogids.com"]
   spec.summary       = "Command line tool for dogIDs tasks"

data/lib/dogids.rb

@@ -2,5 +2,6 @@ require_relative "dogids/base"
 require_relative "dogids/cache"
 require_relative "dogids/config"
 require_relative "dogids/deploy"
+require_relative "dogids/reload"
 require_relative "dogids/ssh"
 require_relative "dogids/version"

data/lib/dogids/base.rb

@@ -41,26 +41,31 @@ module Dogids
 
   private
 
-    def get_config_url(location)
+    # Get configuration for environment and location
+    # @param [string] environment
+    # @param [string] location (Optional)
+    def get_config_url(environment, location = nil)
       config_file = set_config_location
-      if config_file.key?("#{location}") then
-        return config_file["#{location}"]
+      if location
+        return config_file[environment][location] if config_file[environment].has_key?(location)
+      elsif config_file.has_key?(environment)
+        return config_file[environment]
       else
         say("URL/IP hasn't been set for #{location} \n")
         say("Please set this first by running: \n")
-        say("dogids config #{location}","\e[32m")
+        say("dogids config:#{environment} #{location}","\e[32m")
         return false
       end
     end
 
     # Print a heading to the terminal for commands that are going to be run.
-    # @param heading [String]
+    # @param [String] heading
     def print_heading(heading)
       puts "-----> #{heading}"
     end
 
     # Print a message to the terminal about a command that's going to run.
-    # @param command [String]
+    # @param [String] command
     def print_command(command)
       command.split("\n").each do |line|
         print_wrapped(line, indent: 7)
@@ -68,14 +73,13 @@ module Dogids
     end
 
     # Run a command with Bash after first printing the command to the terminal.
-    # @param command [String]
+    # @param [String] command
     def run_command(command)
       print_command(command)
       `#{command}`
     end
 
     # Access local configuration file
-    # @param file [String]
     def set_config_location
       config = UserConfig.new('.dogids')
       config['conf.yaml']

data/lib/dogids/cache.rb

@@ -10,23 +10,28 @@ module Dogids
       puts " "
       puts "Cache Commands:"
       puts " "
-      puts "  dogids cache:dev clear           # Clear whole cache for the dogids.dev storefront"
-      puts "  dogids cache:dev category        # Clear category cache for the dogids.dev storefront"
-      puts "  dogids cache:dev css             # Clear CSS cache for the dogids.dev storefront"
-      puts "  dogids cache:dev javascript      # Clear Javascript cache for the dogids.dev storefront"
-      puts "  dogids cache:dev qa              # Clear Q&A cache for the dogids.dev storefront"
+      puts " Use the following format:"
+      puts "  dogids cache:<environment> <machine> <action>"
       puts " "
-      puts "  dogids cache:staging clear       # Clear whole cache for the staging.dogids.com storefront"
-      puts "  dogids cache:staging category    # Clear category cache for the staging.dogids.com storefront"
-      puts "  dogids cache:staging css         # Clear CSS cache for the staging.dogids.com storefront"
-      puts "  dogids cache:staging javascript  # Clear Javascript cache for the staging.dogids.com storefront"
-      puts "  dogids cache:staging qa          # Clear Q&A cache for the staging.dogids.com storefront"
+      puts " Here are some basic examples:"
       puts " "
-      puts "  dogids cache:production clear      # Clear whole cache for the dogids.com storefront"
-      puts "  dogids cache:production category   # Clear category cache for the dogids.dev storefront"
-      puts "  dogids cache:production css        # Clear CSS cache for the production.dogids.com storefront"
-      puts "  dogids cache:production javascript # Clear Javascript cache for the production.dogids.com storefront"
-      puts "  dogids cache:production qa         # Clear Q&A cache for the dogids.com storefront"
+      puts "  dogids cache:dev dev clear               # Clear whole cache for the dogids.dev storefront"
+      puts "  dogids cache:dev dev category            # Clear category cache for the dogids.dev storefront"
+      puts "  dogids cache:dev dev css                 # Clear CSS cache for the dogids.dev storefront"
+      puts "  dogids cache:dev dev javascript          # Clear Javascript cache for the dogids.dev storefront"
+      puts "  dogids cache:dev dev qa                  # Clear Q&A cache for the dogids.dev storefront"
+      puts " "
+      puts "  dogids cache:staging staging clear       # Clear whole cache for the staging.dogids.com storefront"
+      puts "  dogids cache:staging staging category    # Clear category cache for the staging.dogids.com storefront"
+      puts "  dogids cache:staging staging css         # Clear CSS cache for the staging.dogids.com storefront"
+      puts "  dogids cache:staging staging javascript  # Clear Javascript cache for the staging.dogids.com storefront"
+      puts "  dogids cache:staging staging qa          # Clear Q&A cache for the staging.dogids.com storefront"
+      puts " "
+      puts "  dogids cache:production web clear        # Clear whole cache for the dogids.com storefront"
+      puts "  dogids cache:production web category     # Clear category cache for the dogids.dev storefront"
+      puts "  dogids cache:production web css          # Clear CSS cache for the production.dogids.com storefront"
+      puts "  dogids cache:production web javascript   # Clear Javascript cache for the production.dogids.com storefront"
+      puts "  dogids cache:production web qa           # Clear Q&A cache for the dogids.com storefront"
       puts " "
     end
   end

data/lib/dogids/cache/development.rb

@@ -4,36 +4,36 @@ require "thor"
 module Dogids
   class Cli < Thor
     no_commands do
-      def cache_dev(vm_name = nil)
-        ssh_address = get_config_url("dev")
+      def cache_dev(vm_name = nil, cache = nil)
+        ssh_address = get_config_url("dev",vm_name)
         return if ssh_address == false
 
-        case vm_name
+        case cache
         when "category"
-          print_heading("Checking the category reviews cache")
+          print_heading("Checking the category items cache")
           Net::SSH.start("#{ssh_address}", "dogids") do |ssh|
             ssh.exec!(count_category_cache_files_dev_command) do |_channel, _stream, data|
               print_command("Current category reviews: " + data)
             end
-            if yes?("-----> Continue with clearing the cache? [no]")
-              print_heading("Clearing the development category cache")
+            if yes?("-----> Continue with clearing the DEV category items cache? [no]")
+              print_heading("Clearing the development category items cache")
               ssh.exec!(clear_category_cache_dev_command) do |_channel, _stream, data|
               end
             end
           end
         when "clear"
           print_heading("Let's start clearing the entire dev cache")
-          cache_dev("category")
-          cache_dev("qa")
-          cache_dev("javascript")
-          cache_dev("css")
+          cache_dev(vm_name,"category")
+          cache_dev(vm_name,"qa")
+          cache_dev(vm_name,"javascript")
+          cache_dev(vm_name,"css")
         when "css"
           print_heading("Checking the CSS cache")
           Net::SSH.start("#{ssh_address}", "dogids") do |ssh|
             ssh.exec!(count_css_cache_files_dev_command) do |_channel, _stream, data|
               print_command("Current CSS cache files: " + data)
             end
-            if yes?("-----> Continue with clearing the CSS cache? [no]")
+            if yes?("-----> Continue with clearing the DEV CSS cache? [no]")
               print_heading("Clearing the development CSS cache")
               ssh.exec!(clear_css_cache_dev_command) do |_channel, _stream, data|
               end
@@ -45,7 +45,7 @@ module Dogids
             ssh.exec!(count_javascript_cache_files_dev_command) do |_channel, _stream, data|
               print_command("Current Javascript cache files: " + data)
             end
-            if yes?("-----> Continue with clearing the Javascript cache? [no]")
+            if yes?("-----> Continue with clearing the DEV Javascript cache? [no]")
               print_heading("Clearing the development Javascript cache")
               ssh.exec!(clear_javascript_cache_dev_command) do |_channel, _stream, data|
               end
@@ -57,8 +57,8 @@ module Dogids
             ssh.exec!(count_qa_cache_files_dev_command) do |_channel, _stream, data|
               print_command("Current category reviews: " + data)
             end
-            if yes?("-----> Continue with clearing this cache? [no]")
-              print_heading("Clearing the development QA cache")
+            if yes?("-----> Continue with clearing the DEV product Q&A cache? [no]")
+              print_heading("Clearing the development Q&A cache")
               ssh.exec!(clear_qa_cache_dev_command) do |_channel, _stream, data|
               end
             end

data/lib/dogids/cache/production.rb

@@ -4,36 +4,36 @@ require "thor"
 module Dogids
   class Cli < Thor
     no_commands do
-      def cache_production(vm_name = nil)
-        ssh_address = get_config_url("web")
+      def cache_production(vm_name = nil, cache = nil)
+        ssh_address = get_config_url("production",vm_name)
         return if ssh_address == false
 
-        case vm_name
+        case cache
         when "category"
-          print_heading("Checking the category reviews cache")
+          print_heading("Checking the category items cache")
           Net::SSH.start("#{ssh_address}", "dogids") do |ssh|
             ssh.exec!(count_category_cache_files_production_command) do |_channel, _stream, data|
               print_command("Current category reviews: " + data)
             end
-            if yes?("-----> Continue with clearing the cache? [no]")
-              print_heading("Clearing the production category cache")
+            if yes?("-----> Continue with clearing the PRODUCTION category items cache? [no]")
+              print_heading("Clearing the production category items cache")
               ssh.exec!(clear_category_cache_production_command) do |_channel, _stream, data|
               end
             end
           end
         when "clear"
           print_heading("Let's start clearing the entire production cache")
-          cache_production("category")
-          cache_production("qa")
-          cache_dev("javascript")
-          cache_dev("css")
+          cache_production(vm_name,"category")
+          cache_production(vm_name,"qa")
+          cache_production(vm_name,"javascript")
+          cache_production(vm_name,"css")
         when "css"
           print_heading("Checking the CSS cache")
           Net::SSH.start("#{ssh_address}", "dogids") do |ssh|
             ssh.exec!(count_css_cache_files_production_command) do |_channel, _stream, data|
               print_command("Current CSS cache files: " + data)
             end
-            if yes?("-----> Continue with clearing the CSS cache? [no]")
+            if yes?("-----> Continue with clearing the PRODUCTION CSS cache? [no]")
               print_heading("Clearing the development CSS cache")
               ssh.exec!(clear_css_cache_production_command) do |_channel, _stream, data|
               end
@@ -45,7 +45,7 @@ module Dogids
             ssh.exec!(count_javascript_cache_files_production_command) do |_channel, _stream, data|
               print_command("Current Javascript cache files: " + data)
             end
-            if yes?("-----> Continue with clearing the Javascript cache? [no]")
+            if yes?("-----> Continue with clearing the PRODUCTION Javascript cache? [no]")
               print_heading("Clearing the development Javascript cache")
               ssh.exec!(clear_javascript_cache_production_command) do |_channel, _stream, data|
               end
@@ -57,8 +57,8 @@ module Dogids
             ssh.exec!(count_qa_cache_files_production_command) do |_channel, _stream, data|
               print_command("Current category reviews: " + data)
             end
-            if yes?("-----> Continue with clearing this cache? [no]")
-              print_heading("Clearing the production QA cache")
+            if yes?("-----> Continue with clearing the PRODUCTION product Q&A cache? [no]")
+              print_heading("Clearing the production product Q&A cache")
               ssh.exec!(clear_qa_cache_production_command) do |_channel, _stream, data|
               end
             end

data/lib/dogids/cache/staging.rb

@@ -4,17 +4,17 @@ require "thor"
 module Dogids
   class Cli < Thor
     no_commands do
-      def cache_staging(vm_name = nil)
-        ssh_address = get_config_url("staging")
+      def cache_staging(vm_name = nil, cache = nil)
+        ssh_address = get_config_url("staging",vm_name)
         return if ssh_address == false
-        case vm_name
+        case cache
         when "category"
           print_heading("Checking the category reviews cache")
           Net::SSH.start("#{ssh_address}", "dogids") do |ssh|
             ssh.exec!(count_category_cache_files_staging_command) do |_channel, _stream, data|
               print_command("Current category reviews: " + data)
             end
-            if yes?("-----> Continue with clearing the cache? [no]")
+            if yes?("-----> Continue with clearing the STAGING category item cache? [no]")
               print_heading("Clearing the staging category cache")
               ssh.exec!(clear_category_cache_staging_command) do |_channel, _stream, data|
               end
@@ -22,17 +22,17 @@ module Dogids
           end
         when "clear"
           print_heading("Let's start clearing the entire staging cache")
-          cache_staging("category")
-          cache_staging("qa")
-          cache_dev("javascript")
-          cache_dev("css")
+          cache_staging(vm_name,"category")
+          cache_staging(vm_name,"qa")
+          cache_staging(vm_name,"javascript")
+          cache_staging(vm_name,"css")
         when "css"
           print_heading("Checking the CSS cache")
           Net::SSH.start("#{ssh_address}", "dogids") do |ssh|
             ssh.exec!(count_css_cache_files_staging_command) do |_channel, _stream, data|
               print_command("Current CSS cache files: " + data)
             end
-            if yes?("-----> Continue with clearing the CSS cache? [no]")
+            if yes?("-----> Continue with clearing the STAGING CSS cache? [no]")
               print_heading("Clearing the development CSS cache")
               ssh.exec!(clear_css_cache_staging_command) do |_channel, _stream, data|
               end
@@ -44,7 +44,7 @@ module Dogids
             ssh.exec!(count_javascript_cache_files_staging_command) do |_channel, _stream, data|
               print_command("Current Javascript cache files: " + data)
             end
-            if yes?("-----> Continue with clearing the Javascript cache? [no]")
+            if yes?("-----> Continue with clearing the STAGING Javascript cache? [no]")
               print_heading("Clearing the development Javascript cache")
               ssh.exec!(clear_javascript_cache_staging_command) do |_channel, _stream, data|
               end
@@ -56,7 +56,7 @@ module Dogids
             ssh.exec!(count_qa_cache_files_staging_command) do |_channel, _stream, data|
               print_command("Current category reviews: " + data)
             end
-            if yes?("-----> Continue with clearing this cache? [no]")
+            if yes?("-----> Continue with clearing the STAGING product Q&A cache? [no]")
               print_heading("Clearing the staging QA cache")
               ssh.exec!(clear_qa_cache_staging_command) do |_channel, _stream, data|
               end

data/lib/dogids/config.rb

@@ -9,51 +9,68 @@ module Dogids
       case command
       when "list"
         list
-      when "admin"
-        set_config("admin")
-      when "db"
-        set_config("db")
-      when "dev"
-        set_config("dev")
-      when "staging"
-        set_config("staging")
-      when "web"
-        set_config("web")
-      when "worker"
-        set_config("worker")
       else
         puts " "
         puts "Config Commands:"
         puts " "
+        puts " Use the following so set environments:"
+        puts " dogids config:<environment> <machine>"
+        puts " "
         puts "  dogids config list            # List all current configurations"
         puts " "
-        puts "  dogids config admin           # Set URL/IP for Admin"
-        puts "  dogids config db              # Set URL/IP for DB"
-        puts "  dogids config dev             # Set URL/IP for Dev"
-        puts "  dogids config staging         # Set URL/IP for Staging"
-        puts "  dogids config web             # Set URL/IP for Web"
-        puts "  dogids config worker          # Set URL/IP for Worker"
+        puts "  dogids config:dev             # Set URL/IP for Development Machines"
+        puts "  dogids config:production      # Set URL/IP for Production Machines"
+        puts "  dogids config:staging         # Set URL/IP for Staging machines"
         puts " "
       end
     end
 
     no_commands do
+
+      # Config dev environment
+      # @param [string] location
+      def config_dev(location = nil)
+        location ? set_config("dev",location) : config
+      end
+
+      # Config staging environment
+      # @param [string] location
+      def config_staging(location = nil)
+        location ? set_config("staging",location) : config
+      end
+
+      # Config production environment
+      # @param [string] location
+      def config_production(location = nil)
+        location ? set_config("production",location) : config
+      end
+
       def list
         dogids_config = set_config_location
         if dogids_config.any? then
-          say("The following configurations are set: \n \n")
-          print_table(dogids_config)
+          say("The following configurations are set: \n")
+          dogids_config.each do |environment, locations|
+            say("\n##### #{environment}")
+            print_table(locations)
+          end
         else
           say("No configuration values have been set. Here's the command list:")
           config
         end
       end
 
-      def set_config(location)
+      # Set configuration files based on environment and location
+      # @param [string] environment
+      # @param [string] location
+      def set_config(environment,location)
         dogids_config = set_config_location
+        environment_configuration = Hash.new
+        if dogids_config["#{environment}"]
+          environment_configuration = dogids_config["#{environment}"].to_hash
+        end
         current_value = ""
-        if dogids_config.key?("#{location}") then
-          current_value = dogids_config["#{location}"]
+        if dogids_config["#{environment}"] != nil && dogids_config["#{environment}"]["#{location}"] != nil then
+          current_value = get_config_url(environment, location)
           say("Current #{location} URL/IP: #{current_value} \n","\e[32m")
           set_new = yes?("-------> Do you want to enter a new value?[no]")
           return if set_new != true
@@ -71,7 +88,8 @@ module Dogids
           confirm = yes?("-------> Do you want to #{confirm_string}?[no]")
           return if confirm != true
         end
-        dogids_config["#{location}"] = new_value
+        environment_configuration[location] = new_value
+        dogids_config["#{environment}"] = environment_configuration
         dogids_config.save
         say("The new URL/IP for #{location}: #{new_value}","\e[32m")
       end

data/lib/dogids/deploy/staging.rb

@@ -6,41 +6,53 @@ module Dogids
     no_commands do
       def deploy_staging
         print_heading("Deploying dogids.com site to staging server")
-        ssh_address = get_config_url("staging")
 
-        Net::SSH.start("#{ssh_address}", "dogids") do |ssh|
-          print_command("Checking the current git status")
-          ssh.exec!(staging_git_status_command) do |_channel, _stream, data|
-            print_command(data)
-          end
 
-          current_branch = ssh.exec!("cd /home/dogids/apps/dogids.com && git rev-parse --abbrev-ref HEAD").strip
+        server_addresses = [
+          "staging",
+          "staging2"
+        ]
+
+        server_addresses.each do |server_address|
+
+          ssh_address = get_config_url("staging",server_address)
+          next if ssh_address == false
 
-          print_heading("Current Branch: #{current_branch}")
-          print_heading("Available Branches:")
-          ssh.exec!("cd /home/dogids/apps/dogids.com && git branch -r --no-merged master") do |_channel, _stream, data|
-            print_command("master")
-            data.split("\n").each do |branch|
-              print_command(branch.gsub("origin/", ""))
+          Net::SSH.start("#{ssh_address}", "dogids") do |ssh|
+            print_command("Checking the current git status")
+            ssh.exec!(staging_git_status_command) do |_channel, _stream, data|
+              print_command(data)
             end
-          end
 
-          branch = ask("-----> Which branch would you like to deploy?").strip
-          return print_command("Fine, be that way.") if branch.length == 0
+            current_branch = ssh.exec!("cd /home/dogids/apps/dogids.com && git rev-parse --abbrev-ref HEAD").strip
 
-          print_command("Pulling latest from #{branch}")
-          ssh.exec!(staging_git_pull_command(branch)) do |_channel, _stream, data|
-            print_command(data)
-          end
+            print_heading("Current Branch: #{current_branch}")
+            print_heading("Available Branches:")
+            ssh.exec!("cd /home/dogids/apps/dogids.com && git branch -r --no-merged master") do |_channel, _stream, data|
+              print_command("master")
+              data.split("\n").each do |branch|
+                print_command(branch.gsub("origin/", ""))
+              end
+            end
 
-          print_command("Updating file permissions")
-          ssh.exec!(web_update_permissions_command) do |_channel, _stream, data|
-            print_command(data)
+            branch = ask("-----> Which branch would you like to deploy?").strip
+            break print_command("Fine, be that way.") if branch.length == 0
+
+            print_command("Pulling latest from #{branch}")
+            ssh.exec!(staging_git_pull_command(branch)) do |_channel, _stream, data|
+              print_command(data)
+            end
+
+            print_command("Updating file permissions")
+            ssh.exec!(web_update_permissions_command) do |_channel, _stream, data|
+              print_command(data)
+            end
           end
         end
 
         print_heading("Done.")
       end
+
     end
 
   private

data/lib/dogids/deploy/web.rb

@@ -9,11 +9,12 @@ module Dogids
 
         server_addresses = [
           "web",
+          "web2",
           "admin"
         ]
 
         server_addresses.each do |server_address|
-          ssh_address = get_config_url("#{server_address}")
+          ssh_address = get_config_url("production","#{server_address}")
           next if ssh_address == false
 
           print_command("Server(#{server_address}): #{ssh_address}")

data/lib/dogids/deploy/worker.rb

@@ -5,7 +5,7 @@ module Dogids
   class Cli < Thor
     no_commands do
       def deploy_worker
-        ssh_address = get_config_url("worker")
+        ssh_address = get_config_url("production","worker")
         return if ssh_address == false
 
         print_heading("Deploying dogids-backgrounder")

data/lib/dogids/reload.rb

@@ -0,0 +1,39 @@
+require "thor"
+module Dogids
+  class Cli < Thor
+    desc "reload", "Reloads the specified machine. Defaults to development"
+
+    # Reload the specified environment
+    # TODO add environments
+    # @param [string] app_name
+    def reload(app_name = nil)
+      if yes?("-----> Reload development? [no]")
+        reload_development_machine
+      else
+        update_vagrant_box if yes?("-----> Update Vagrant Box? (NOT RECOMMENDED) [no]")
+      end
+    end
+
+    no_commands do
+
+      # Upgrade local vagrant box (default is ubuntu/trusty64)
+      def update_vagrant_box
+        say("-----> Updating the vagrant box...","\e[32m")
+        system("cd ~/dogids-vagrant && vagrant box update")
+        system("cd ~/dogids-vagrant && vagrant box list")
+        if yes?("-----> Remove old boxes? (NOT RECOMMENDED) [no]")
+          system("cd ~/dogids-vagrant && vagrant box remove --all")
+          system("cd ~/dogids-vagrant && vagrant box add ubuntu/trusty64")
+        end
+        reload_development_machine
+      end
+
+      # Reloads development machine
+      def reload_development_machine
+        say("-----> Reloading the development machine...","\e[32m")
+        system("cd ~/dogids-vagrant && vagrant reload")
+      end
+
+    end
+  end
+end

data/lib/dogids/ssh.rb

@@ -9,21 +9,25 @@ module Dogids
     def ssh(vm_name = nil)
       case vm_name
       when "dev"
-        ssh_development(vm_name)
+        ssh_dev(vm_name)
       when "staging"
         ssh_staging(vm_name)
       else
         puts "Development SSH Commands:"
-        puts "  dogids ssh dev               # SSH into local development VM"
+        puts "  dogids ssh:dev dev            # SSH into local development VM"
+        puts "  dogids ssh:dev lb             # SSH into local development LB"
         puts " "
         puts "Staging SSH Commands:"
-        puts "  dogids ssh staging           # SSH into staging Apache/PHP/MySQL VM"
+        puts "  dogids ssh:staging lb         # SSH into staging LB"
+        puts "  dogids ssh:staging staging    # SSH into staging Apache/PHP/MySQL VM"
         puts " "
         puts "Production SSH Commands:"
-        puts "  dogids ssh:production admin  # SSH into VM for long running admin processes"
-        puts "  dogids ssh:production db     # SSH into production MySQL/Redis VM"
-        puts "  dogids ssh:production web    # SSH into production Apache/PHP VM"
-        puts "  dogids ssh:production worker # SSH into production Ruby/Sidekiq VM"
+        puts "  dogids ssh:production lb      # SSH into production LB"
+        puts "  dogids ssh:production railgun # SSH into production railgun instance"
+        puts "  dogids ssh:production admin   # SSH into VM for long running admin processes"
+        puts "  dogids ssh:production db      # SSH into production MySQL/Redis VM"
+        puts "  dogids ssh:production web     # SSH into production Apache/PHP VM"
+        puts "  dogids ssh:production worker  # SSH into production Ruby/Sidekiq VM"
         puts " "
       end
     end

data/lib/dogids/ssh/development.rb

@@ -3,11 +3,22 @@ require "thor"
 module Dogids
   class Cli < Thor
     no_commands do
-      def ssh_development(vm_name = nil)
-        if vm_name == "dev"
-          ssh_address = get_config_url(vm_name)
-          puts "Running: ssh -R 52698:localhost:52698 dogids@#{ssh_address}"
-          exec("ssh -R 52698:localhost:52698 dogids@#{ssh_address}")
+      def ssh_dev(vm_name = nil)
+        dev_machines = get_config_url("dev")
+        if dev_machines.has_key?(vm_name)
+          ssh_address = get_config_url("dev",vm_name)
+          if vm_name == "lb"
+            if yes?("----> Have you set up the dogIDs user for the development LB? [no]")
+              puts "Running:  dogids@#{ssh_address}"
+              exec("ssh dogids@#{ssh_address}")
+            else
+              puts "Running:  `cd ~/dogids-vagrant && vagrant ssh loadbalancer`"
+              exec("cd ~/dogids-vagrant && vagrant ssh loadbalancer")
+            end
+          else
+            puts "Running: `ssh -R 52698:localhost:52698 dogids@#{ssh_address}`"
+            exec("ssh -R 52698:localhost:52698 dogids@#{ssh_address}")
+          end
         else
           ssh
         end

data/lib/dogids/ssh/production.rb

@@ -4,28 +4,13 @@ module Dogids
   class Cli < Thor
     no_commands do
       def ssh_production(vm_name = nil)
-        case vm_name
-        when "admin"
-          ssh_address = get_config_url(vm_name)
-          if ssh_address then
-            puts "Running: `ssh -R 52698:localhost:52698 dogids@#{ssh_address}`"
-            exec("ssh -R 52698:localhost:52698 dogids@#{ssh_address}")
-          end
-        when "db"
-          ssh_address = get_config_url(vm_name)
-          if ssh_address then
-            puts "Running: `ssh -R 52698:localhost:52698 dogids@#{ssh_address}`"
-            exec("ssh -R 52698:localhost:52698 dogids@#{ssh_address}")
-          end
-        when "web"
-          ssh_address = get_config_url(vm_name)
-          if ssh_address then
-            puts "Running: `ssh -R 52698:localhost:52698 dogids@#{ssh_address}`"
-            exec("ssh -R 52698:localhost:52698 dogids@#{ssh_address}")
-          end
-        when "worker"
-          ssh_address = get_config_url(vm_name)
-          if ssh_address then
+        production_machines = get_config_url("production")
+        if production_machines.has_key?(vm_name)
+          ssh_address = get_config_url("production",vm_name)
+          if vm_name == "lb" || vm_name == "railgun"
+            puts "Running: `ssh root@#{ssh_address}`"
+            exec("ssh root@#{ssh_address}")
+          else
             puts "Running: `ssh -R 52698:localhost:52698 dogids@#{ssh_address}`"
             exec("ssh -R 52698:localhost:52698 dogids@#{ssh_address}")
           end

data/lib/dogids/ssh/staging.rb

@@ -4,10 +4,14 @@ module Dogids
   class Cli < Thor
     no_commands do
       def ssh_staging(vm_name = nil)
-        if vm_name == "staging"
-          ssh_address = get_config_url(vm_name)
-          if ssh_address then
-            puts "Running: ssh -R 52698:localhost:52698 dogids@#{ssh_address}"
+        staging_machines = get_config_url("staging")
+        if staging_machines.has_key?(vm_name)
+          ssh_address = get_config_url("staging",vm_name)
+          if vm_name == "lb"
+            puts "Running: `ssh root@#{ssh_address}`"
+            exec("ssh root@#{ssh_address}")
+          else
+            puts "Running: `ssh -R 52698:localhost:52698 dogids@#{ssh_address}`"
             exec("ssh -R 52698:localhost:52698 dogids@#{ssh_address}")
           end
         else

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dogids-cli
 version: !ruby/object:Gem::Version
-  version: 0.0.19
+  version: 0.0.20
 platform: ruby
 authors:
 - Jaryd Krishnan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-20 00:00:00.000000000 Z
+date: 2016-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -78,6 +78,7 @@ files:
 - lib/dogids/deploy/staging.rb
 - lib/dogids/deploy/web.rb
 - lib/dogids/deploy/worker.rb
+- lib/dogids/reload.rb
 - lib/dogids/ssh.rb
 - lib/dogids/ssh/development.rb
 - lib/dogids/ssh/production.rb