shipment-deploy 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 86469817a1abdb8afef74ba478c6fbcc4cd09e6d
-  data.tar.gz: c1d42b3aa527d742484ca4a0584ce949fdf67a03
+  metadata.gz: 7dc543b41e53f64aa3e3a2f8258075a61b510475
+  data.tar.gz: eb0240009362593422324bdf3e064b978db117a1
 SHA512:
-  metadata.gz: 26e85ca97548fb373f653d9e4316cd48a89661b7046637410b6ae3f452892b28d7fb35e0db99604e240f9db6d12c0766ae27241f5a4ec7ce553e18d34186b4cf
-  data.tar.gz: f326df3df0e58440109d16598e947469a2d92e2ebc16fbe3ddc9d0668c0293bd3db5dc2c25663e8fbf686e369753d98fba5b55effa548c6a73bbf7b60781e32c
+  metadata.gz: 0219c5c43851a0ed2a6e92d02ebb57237fb7052c4cb670f3081712cb243f36e018b83ee4db49e709c2af6c3a470b9f65a895909206e5ff93dfac5a0bb728c8e0
+  data.tar.gz: 08cc1e8af18e4bda0f0179ecfe826158d407d201e55ae8be94a8b1571ec33e7ba50dcd1ed77be6fdf2105811493379f2f6fbcac5367a01c10745cdbe510d2c88

data/README.md

@@ -4,7 +4,7 @@ Easy deployment using Docker
 
 ## Installation
 
-    $ gem install shipment
+    $ gem install shipment-deploy
 
 ## Usage
 
@@ -41,6 +41,16 @@ stdout on the server.
 
 ## Todo
 
+### For Logging Feature
+
+1. Check to see if project Gemfile has `rails_12factor`, remove it, and
+   rebundle.
+2. Add the following line inside `config/environments/production.rb`: `config.logger = Logger.new('/var/lib/docker/volumes/log/production.log')`
+3. Add `logs` command that runs `tail -f log/production.log` on the
+   server.
+
+### Other Stuff
+
 1. Only add `.shipmet` to `.gitignore` once, duh!
 2. Handle SSH authorization issues when re-setting up. DigitalOcean
    allows adding multiple keys with the same name. Need to delete
@@ -56,17 +66,16 @@ command is run.)
    setups/deploys.
 7. Look into creating a base image that already includes ruby and
    postgres containers. (Requires support from DigitalOcean.)
-8. Look into using `docker attach` to allow viewing logs.
-9. Better deal with committing and pushing on `ship this`. Right now,
+8. Better deal with committing and pushing on `ship this`. Right now,
    rejected pushes would break everything.
-10. Create simple way to symlink credentials from an `application.yml` or
+9. Create simple way to symlink credentials from an `application.yml` or
    `.env` file.
-11. Fix messy output during setup and deploy. Also, deal with duplicate
+10. Fix messy output during setup and deploy. Also, deal with duplicate
    'Done.'s when a command is re-run.
-12. Speed everything up.
-13. Clean up the classes. Most things are doing *way* too much.
-14. Write specs!
-15. Add cleanup option to remove all system config.
+11. Speed everything up.
+12. Clean up the classes. Most things are doing *way* too much.
+13. Write specs!
+14. Add cleanup option to remove all system config.
 
 ## Contributing
 

data/lib/shipment/cli.rb

@@ -3,6 +3,7 @@ require 'shipment/mooring'
 require 'shipment/credentials_checker'
 require 'shipment/rigging'
 require 'shipment/slip'
+require 'shipment/manifest'
 
 module Shipment
 
@@ -50,6 +51,22 @@ module Shipment
 
       Shipment::Slip.cast_off
     end
+
+    desc "logs", "View logs"
+    long_desc <<-LONGDESC
+    `ship logs` will tail your application's production logs.
+    LONGDESC
+    def logs
+      if !Shipment::CredentialsChecker.verify
+        Shipment::Mooring.lash
+      end
+
+      if !File.exist?('.shipment')
+        Shipment::Rigging.rig
+      end
+
+      Shipment::Manifest.review
+    end
   end
 
 end

data/lib/shipment/manifest.rb

@@ -0,0 +1,14 @@
+require 'yaml'
+require 'shipment/server/ssh_client'
+require 'shipment/project/repo'
+
+module Shipment
+  class Manifest
+    def self.review
+      Shipment::Server::SSHClient.tail_logs(
+        repo: Shipment::Project::Repo.new,
+        ip_address: YAML.load(File.read('.shipment'))[:ip_address]
+      )
+    end
+  end
+end

data/lib/shipment/project/customizer.rb

@@ -29,6 +29,8 @@ module Shipment
         update_db_info
         puts "-----> ".green + "Adding .shipment file to .gitignore..."
         add_shipment_to_gitignore
+        puts "-----> ".green + "Ensuring correct logging settings..."
+        fix_logging_settings
         puts "-----> ".green + "Committing and pushing changes..."
         commit_and_push
       end
@@ -40,6 +42,39 @@ module Shipment
         git.push(git.remote("origin"))
       end
 
+      def fix_logging_settings
+        remove_12_factor_gem
+        update_production_rb
+      end
+
+      def remove_12_factor_gem
+        if !!File.read('Gemfile').match(/rails_12factor/)
+          File.open('Gemfile.tmp', 'w') do |tmp|
+            File.readlines('Gemfile').each do |line|
+              tmp.write(line) unless line.match(/rails_12factor/)
+            end
+          end
+
+          FileUtils.mv 'Gemfile.tmp', 'Gemfile'
+
+          system("bundle install > /dev/null")
+        end
+      end
+
+      def update_production_rb
+        File.open('production.rb.tmp', 'w') do |tmp|
+          File.readlines('config/environments/production.rb').each do |line|
+            if line == 'end' || line == "end\n"
+              tmp.write("  config.logger = Logger.new('/var/lib/docker/volumes/log/production.log')\nend")
+            else
+              tmp.write(line)
+            end
+          end
+        end
+
+        FileUtils.mv 'production.rb.tmp', 'config/environments/production.rb'
+      end
+
       def add_shipment_to_gitignore
         File.open(".gitignore", "a") do |f|
           f.write '.shipment'

data/lib/shipment/server/ssh_client.rb

@@ -19,6 +19,10 @@ module Shipment
         new(repo, ip_address).deploy
       end
 
+      def self.tail_logs(repo:, ip_address:)
+        new(repo, ip_address).tail_logs
+      end
+
       def initialize(repo, ip_address)
         @gh_username, @gh_token = Netrc.read["shipment.gh"]
         @ip_address = ip_address
@@ -40,7 +44,15 @@ module Shipment
         kill_and_commit_old_server
         start_new_server
         puts "-----> ".green + "Done.\nYour application is accessable at: #{ip_address}"
+      end
 
+      def tail_logs
+        puts "-----> ".green + "Accessing application logs..."
+        begin
+          run_remote_command("tail -f log/production.log")
+        rescue Interrupt
+          puts "\nDone."
+        end
       end
 
       def kill_and_commit_old_server
@@ -51,7 +63,7 @@ module Shipment
       def start_new_server
         puts "-----> ".green + "Restarting server..."
         redis_command, sidekiq_command = parse_redis_and_sidekiq
-        run_remote_command("docker run -d -p 80:3000 --name application -e SECRET_KEY_BASE=#{secret_key_base} #{repo_user}/#{repo_name} /bin/bash -c 'kill -9 $(pgrep -f sidekiq) > /dev/null 2>&1 && kill -9 $(pgrep -f redis-server) > /dev/null 2>&1 && kill -9 $(pgrep -f rails) > /dev/null 2>&1 && source /etc/profile.d/rvm.sh && rm -rf #{repo_name} && git clone #{repo_url} #{repo_name} && cd #{repo_name} && bundle install && RAILS_ENV=production bundle exec rake db:migrate#{redis_command}#{sidekiq_command} && rails server -p 3000 -e production'")
+        run_remote_command("docker run -d -p 80:3000 --name application -e SECRET_KEY_BASE=#{secret_key_base} -v /root/log:/var/lib/docker/volumes/log #{repo_user}/#{repo_name} /bin/bash -c 'kill -9 $(pgrep -f sidekiq) > /dev/null 2>&1 && kill -9 $(pgrep -f redis-server) > /dev/null 2>&1 && kill -9 $(pgrep -f rails) > /dev/null 2>&1 && source /etc/profile.d/rvm.sh && rm -rf #{repo_name} && git clone #{repo_url} #{repo_name} && cd #{repo_name} && bundle install && RAILS_ENV=production bundle exec rake db:migrate#{redis_command}#{sidekiq_command} && rails server -p 3000 -e production'")
       end
 
       def parse_redis_and_sidekiq
@@ -122,6 +134,7 @@ module Shipment
 
         puts "-----> ".green + "Done.\nReady to deploy."
         puts "Your server's IP Address is: #{ip_address}"
+        puts "Deploy with: ship out"
       end
 
       def pull_ruby_image
@@ -146,7 +159,7 @@ module Shipment
 
       def migrate
         puts "-----> ".green + "Migrating database..."
-        run_remote_command("docker run --name migrate #{repo_user}/#{repo_name} /bin/bash -c 'source /etc/profile.d/rvm.sh && cd #{repo_name} && RAILS_ENV=production bundle exec rake db:migrate' && docker rm migrate")
+        run_remote_command("docker run --name migrate #{repo_user}/#{repo_name} /bin/bash -c 'source /etc/profile.d/rvm.sh && mkdir -p /var/lib/docker/volumes/log && touch /var/lib/docker/volumes/log/production.log && cd #{repo_name} && RAILS_ENV=production bundle exec rake db:migrate && cd ..' && docker commit migrate #{repo_user}/#{repo_name} && docker rm migrate")
       end
 
       #def save_docker_image

data/lib/shipment/version.rb

@@ -1,4 +1,4 @@
 module Shipment
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shipment-deploy
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Logan Hasson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-18 00:00:00.000000000 Z
+date: 2014-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -197,6 +197,7 @@ files:
 - lib/shipment.rb
 - lib/shipment/cli.rb
 - lib/shipment/credentials_checker.rb
+- lib/shipment/manifest.rb
 - lib/shipment/mooring.rb
 - lib/shipment/project/customizer.rb
 - lib/shipment/project/repo.rb