dogids-cli 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9becc796a407d3752471e2c8ef203db609d8436d
-  data.tar.gz: 76eaf5e85b6251987bfe88bb4bd859367a0b0848
+  metadata.gz: aa07e0fb723b31824d0f81721700bd083d1b6211
+  data.tar.gz: f673d02dcd01b5ab7ce3a900c41e3dd35692c416
 SHA512:
-  metadata.gz: ebf24f6097016edf30f4512870f83ed982fd63b61ee94bb6572210bbb68387fdc752fc0346ca9c279d86f28ca129924a08643f26415404a358b8a9618c4e0c5d
-  data.tar.gz: 4ba7b749b1766f55c33edcae555bd51d669ddeb35da910d19bcbaa30d60f26a17a74a3f126525d7e40cba538e40629ad6266ea5483ec055ddc2415be09e24093
+  metadata.gz: 12cfade143faf878c3d9c17e0a3008a9def9d5165442c6f29669dfda3e57648fde24323c1b408670300f2b53cf34b224214da536d145170012977ed457ec7b68
+  data.tar.gz: f0f1178482676df50f887f46f14e5f0d06277b1fc3b669c628e96559de1cc932fa3453082b6ac8f498e0938d0a23cd587e8f9cb246858f7035ab8891d8945773

data/lib/dogids/base.rb

@@ -49,7 +49,9 @@ module Dogids
     # Print a message to the terminal about a command that's going to run.
     # @param command [String]
     def print_command(command)
-      print_wrapped(command, indent: 7)
+      command.split("\n").each do |line|
+        print_wrapped(line, indent: 7)
+      end
     end
 
     # Run a command with Bash after first printing the command to the terminal.

data/lib/dogids/deploy/staging.rb

@@ -5,10 +5,10 @@ module Dogids
   class Cli < Thor
     no_commands do
       def deploy_staging
-        print_heading("Deploying dogids.com site to staging server...")
+        print_heading("Deploying dogids.com site to staging server")
 
         Net::SSH.start("staging.dogids.com", "dogids") do |ssh|
-          print_command("Checking the current git status...")
+          print_command("Checking the current git status")
           ssh.exec!(staging_git_status_command) do |_channel, _stream, data|
             print_command(data)
           end
@@ -24,15 +24,15 @@ module Dogids
             end
           end
 
-          branch = ask("-----> What branch would you like to deploy?").strip
+          branch = ask("-----> Which branch would you like to deploy?").strip
           return print_command("Fine, be that way.") if branch.length == 0
 
-          print_command("Pulling latest from #{branch}...")
+          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...")
+          print_command("Updating file permissions")
           ssh.exec!(web_update_permissions_command) do |_channel, _stream, data|
             print_command(data)
           end

data/lib/dogids/deploy/web.rb

@@ -5,21 +5,21 @@ module Dogids
   class Cli < Thor
     no_commands do
       def deploy_web
-        print_heading("Deploying dogids.com...")
+        print_heading("Deploying dogids.com")
 
         Net::SSH.start("web1.dogids.codelation.net", "dogids") do |ssh|
-          print_command("Checking the current git status...")
+          print_command("Checking the current git status")
           ssh.exec!(web_git_status_command) do |_channel, _stream, data|
             print_command(data)
           end
 
           if yes?("-----> Continue with deployment? [no]")
-            print_command("Pulling latest from master...")
+            print_command("Pulling latest from master")
             ssh.exec!(web_git_pull_command) do |_channel, _stream, data|
               print_command(data)
             end
 
-            print_command("Updating file permissions...")
+            print_command("Updating file permissions")
             ssh.exec!(web_update_permissions_command) do |_channel, _stream, data|
               print_command(data)
             end

data/lib/dogids/deploy/worker.rb

@@ -5,21 +5,22 @@ module Dogids
   class Cli < Thor
     no_commands do
       def deploy_worker
-        print_heading("Deploying dogids-backgrounder...")
+        print_heading("Deploying dogids-backgrounder")
 
         Net::SSH.start("worker1.dogids.codelation.net", "dogids") do |ssh|
-          print_command("Pulling latest from master...")
+          print_command("Pulling latest from master")
           ssh.exec!(worker_git_pull_command) do |_channel, _stream, data|
             print_command(data)
           end
 
-          print_heading("Running bundle install...")
-          ssh.exec!(worker_bundle_install_command) do |_channel, _stream, data|
+          print_heading("Building application")
+          ssh.exec!(worker_build_command) do |_channel, _stream, data|
             print_command(data)
           end
 
-          if yes?("-----> Do you want to restart Sidekiq? [no]")
-            command = "sudo restart dogids-backgrounder"
+          print_heading("Restarting")
+          %w(clock web worker).each do |process|
+            command = "sudo start dogids-#{process} && sudo restart dogids-#{process}"
             ssh.exec!(command) do |_channel, _stream, data|
               print_command(data)
             end
@@ -32,6 +33,13 @@ module Dogids
 
   private
 
+    def worker_build_command
+      commands = []
+      commands << "cd /home/dogids/apps/dogids-backgrounder"
+      commands << "git archive master | docker run -v /tmp/dogids-backgrounder-cache:/tmp/cache:rw -i -a stdin -a stderr -a stdout flynn/slugbuilder - > slug.tgz"
+      commands.join("&& ")
+    end
+
     def worker_git_pull_command
       commands = []
       commands << "cd /home/dogids/apps/dogids-backgrounder"

data/lib/dogids/version.rb

@@ -3,13 +3,13 @@ require "open-uri"
 require "thor"
 
 module Dogids
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 
   class Cli < Thor
     desc "update", "Update dogids-cli to latest version"
     def update
       command = "gem install dogids-cli"
-      puts "Running #{command}..."
+      puts "Running #{command}"
       exec(command)
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dogids-cli
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Brian Pattison