shipit-engine 0.8.9 → 0.9.0

data/lib/shipit/command.rb

@@ -8,6 +8,9 @@ module Shipit
     MAX_READ = 64.kilobytes
 
     Error = Class.new(StandardError)
+    Failed = Class.new(Error)
+    NotFound = Class.new(Error)
+    Denied = Class.new(Error)
 
     attr_reader :out, :code, :chdir, :env, :args, :pid, :timeout
 
@@ -72,8 +75,14 @@ module Shipit
       child_in = @out = @pid = nil
       FileUtils.mkdir_p(@chdir)
       with_full_path do
-        @out, child_in, @pid = PTY.spawn(@env, *interpolated_arguments, chdir: @chdir)
-        child_in.close
+        begin
+          @out, child_in, @pid = PTY.spawn(@env, *interpolated_arguments, chdir: @chdir)
+          child_in.close
+        rescue Errno::ENOENT
+          raise NotFound, "#{Shellwords.split(interpolated_arguments.first).first}: command not found"
+        rescue Errno::EACCES
+          raise Denied, "#{Shellwords.split(interpolated_arguments.first).first}: Permission denied"
+        end
       end
       @started = true
       self
@@ -93,21 +102,16 @@ module Shipit
 
       _, status = Process.waitpid2(@pid)
       @code = status.exitstatus
-      yield exit_message + "\n" unless success?
-
       self
     end
 
-    def check_status
-    end
-
     def red(text)
       "\033[1;31m#{text}\033[0m"
     end
 
     def stream!(&block)
       stream(&block)
-      raise Command::Error.new(exit_message) unless success?
+      raise Failed.new(exit_message) unless success?
       self
     end
 
@@ -146,7 +150,7 @@ module Shipit
       Timeout.timeout(wait) do
         read_stream(@out, &block)
       end
-    rescue Timeout::Error
+    rescue Timeout::Error, Errno::EIO # Somewhat expected on Linux: http://stackoverflow.com/a/10306782
     end
 
     def kill(sig)

data/lib/shipit/engine.rb

@@ -1,3 +1,5 @@
+require 'bootstrap'
+
 module Shipit
   class Engine < ::Rails::Engine
     isolate_namespace Shipit
@@ -8,15 +10,21 @@ module Shipit
       Rails.application.routes.default_url_options[:host] = Shipit.host
       Shipit::Engine.routes.default_url_options[:host] = Shipit.host
 
+      app.config.assets.paths << Emoji.images_path
       app.config.assets.precompile += %w(
         favicon.ico
         task.js
         shipit.js
         shipit.css
+        shipit_bs.js
+        shipit_bs.css
       )
       app.config.assets.precompile << proc do |path|
         path =~ /\Aplugins\/[\-\w]+\.(js|css)\Z/
       end
+      app.config.assets.precompile << proc do |path|
+        path.start_with?('emoji/') && path.end_with?('.png')
+      end
 
       ActionDispatch::ExceptionWrapper.rescue_responses[Shipit::TaskDefinition::NotFound.name] = :not_found
 

data/lib/shipit/template_renderer_extension.rb

@@ -0,0 +1,16 @@
+module TemplateRendererExtension
+  private
+
+  def render_template(template, layout_name = nil, *args)
+    if layout_name && bootstrap?(template)
+      layout_name = 'layouts/shipit_bootstrap'
+    end
+    super(template, layout_name, *args)
+  end
+
+  def bootstrap?(template)
+    template.identifier.start_with?('bootstrap/') || template.identifier.start_with?("#{Shipit.bootstrap_view_path}/")
+  end
+end
+
+ActionView::TemplateRenderer.prepend(TemplateRendererExtension)

data/lib/shipit/version.rb

@@ -1,3 +1,3 @@
 module Shipit
-  VERSION = '0.8.9'
+  VERSION = '0.9.0'
 end

data/test/controllers/deploys_controller_test.rb

@@ -15,11 +15,22 @@ module Shipit
       assert_response :success
     end
 
+    test "deploys can be observed as raw text" do
+      get :show, stack_id: @stack, id: @deploy.id, format: "txt"
+      assert_response :success
+      assert_equal("text/plain", @response.content_type)
+    end
+
     test ":new is success" do
       get :new, stack_id: @stack.to_param, sha: @commit.sha
       assert_response :success
     end
 
+    test ":new works for not yet deployed stacks" do
+      @stack = shipit_stacks(:undeployed_stack)
+      get :new, stack_id: @stack.to_param, sha: @stack.commits.last.sha
+    end
+
     test ":new shows a warning if a deploy is already running" do
       shipit_deploys(:shipit_running).update_column(:status, 'running')
 

data/test/controllers/stacks_controller_test.rb

@@ -167,5 +167,10 @@ module Shipit
       patch :update, id: @stack.to_param, stack: {ignore_ci: false}, return_to: stack_path(@stack)
       assert_redirected_to stack_path(@stack)
     end
+
+    test "#lookup redirects to the canonical URL" do
+      get :lookup, id: @stack.id
+      assert_redirected_to stack_path(@stack)
+    end
   end
 end

data/test/controllers/tasks_controller_test.rb

@@ -52,6 +52,12 @@ module Shipit
       assert_response :ok
     end
 
+    test "triggered tasks can be observed as raw text" do
+      get :show, stack_id: @stack, id: @task.id, format: "txt"
+      assert_response :success
+      assert_equal("text/plain", @response.content_type)
+    end
+
     test ":abort call abort! on the deploy" do
       @task = shipit_deploys(:shipit_running)
       @task.pid = 42

data/test/dummy/config/secrets.example.yml

@@ -13,6 +13,8 @@ development:
     # api_endpoint:
   host: 'http://localhost:3000'
   redis_url: "redis://127.0.0.1:6379/7"
+  # features:
+  #   - bootstrap
 
 test:
   secret_key_base: s3cr3ts3cr3ts3cr3ts3cr3ts3cr3ts3cr3t
@@ -29,3 +31,5 @@ test:
     #   -
     #   -
   redis_url: "redis://127.0.0.1:6379/7"
+  # features:
+  #   - bootstrap

data/test/dummy/config/secrets.yml

@@ -1,4 +1,6 @@
 development:
+  features:
+    - bootstrap
   secret_key_base: s3cr3ts3cr3ts3cr3ts3cr3ts3cr3ts3cr3t
   # github_domain: github.shopify.com
   github_oauth:

data/test/dummy/data/stacks/byroot/junk/production/deploys/83/bar.txt

@@ -0,0 +1,2 @@
+foo
+sadsadasd

data/test/dummy/data/stacks/byroot/junk/production/deploys/83/sdkfjsdf

@@ -0,0 +1 @@
+dslkfnds

data/test/dummy/data/stacks/byroot/junk/production/deploys/83/shipit.yml

@@ -0,0 +1,32 @@
+review:
+  checklist:
+    - Blah Blah
+  checks:
+    - echo 42
+
+deploy:
+  variables:
+    -
+      name: REBUILD
+      title: Force artifacts rebuild
+      default: '0'
+  pre:
+    - echo pre
+  override:
+    - echo 1
+    - env
+    - sleep 10
+  post:
+    - echo post
+ 
+rollback:
+  override:
+    - echo done
+    
+
+tasks:
+  restart:
+    action: Restart application
+    description: Trigger the restart of both app and jobs servers
+    steps:
+      - cap $ENVIRONMENT deploy:restart

data/test/dummy/data/stacks/byroot/junk/production/deploys/83/toto.txt

@@ -0,0 +1,2 @@
+A
+A

data/test/dummy/data/stacks/byroot/junk/production/git/bar.txt

@@ -1 +1,2 @@
 foo
+sadsadasd

data/test/dummy/data/stacks/byroot/junk/production/git/shipit.yml

@@ -10,10 +10,15 @@ deploy:
       name: REBUILD
       title: Force artifacts rebuild
       default: '0'
+  pre:
+    - echo pre
   override:
     - echo 1
+    - env
     - sleep 10
-
+  post:
+    - echo post
+ 
 rollback:
   override:
     - echo done

data/test/dummy/data/stacks/byroot/test/production/git/README.md

@@ -0,0 +1 @@
+# test

data/test/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20160303203940) do
+ActiveRecord::Schema.define(version: 20160324155046) do
 
   create_table "api_clients", force: :cascade do |t|
     t.text     "permissions", limit: 65535
@@ -180,6 +180,8 @@ ActiveRecord::Schema.define(version: 20160303203940) do
     t.text     "env"
     t.integer  "confirmations",                       default: 0,         null: false
     t.boolean  "allow_concurrency",                   default: false,     null: false
+    t.datetime "started_at"
+    t.datetime "ended_at"
   end
 
   add_index "tasks", ["rolled_up", "created_at", "status"], name: "index_tasks_on_rolled_up_and_created_at_and_status"

data/test/dummy/db/seeds.rb

@@ -142,6 +142,8 @@ module Shipit
         chunks:          create_chunks,
         additions: Faker::Number.number(3),
         deletions: Faker::Number.number(3),
+        started_at: Random.rand(15.minutes.to_i).seconds.ago,
+        ended_at: Time.now.utc,
         user: users.sample,
       )
       deploy.write("$ cap production deploy SHA=yolo")
@@ -154,6 +156,8 @@ module Shipit
       status: 'success',
       user: users.sample,
       chunks: create_chunks,
+      started_at: Random.rand(15.minutes.to_i).seconds.ago,
+      ended_at: Time.now.utc,
     )
 
     stack.tasks.create!(
@@ -167,6 +171,8 @@ module Shipit
         'steps' => ['cap $ENVIRONMENT restart'],
       ),
       chunks: create_chunks,
+      started_at: Random.rand(15.minutes.to_i).seconds.ago,
+      ended_at: Time.now.utc,
     )
   end
 end

data/test/fixtures/shipit/tasks.yml

@@ -19,6 +19,8 @@ shipit2:
   additions: 12
   deletions: 64
   created_at: <%= (60 - 2).minutes.ago.to_s(:db) %>
+  started_at: <%= (60 - 2).minutes.ago.to_s(:db) %>
+  ended_at: <%= (60 - 4).minutes.ago.to_s(:db) %>
 
 shipit_restart:
   user: walrus
@@ -41,6 +43,8 @@ shipit_restart:
       ]
     }
   created_at: <%= (60 - 3).minutes.ago.to_s(:db) %>
+  started_at: <%= (60 - 3).minutes.ago.to_s(:db) %>
+  ended_at: <%= (60 - 4).minutes.ago.to_s(:db) %>
 
 shipit_pending:
   since_commit_id: 2 # second
@@ -62,6 +66,7 @@ shipit_running:
   additions: 420
   deletions: 342
   created_at: <%= (60 - 5).minutes.ago.to_s(:db) %>
+  started_at: <%= (60 - 5).minutes.ago.to_s(:db) %>
 
 shipit_complete:
   user: bob
@@ -73,6 +78,8 @@ shipit_complete:
   additions: 420
   deletions: 342
   created_at: <%= (60 - 6).minutes.ago.to_s(:db) %>
+  started_at: <%= (60 - 6).minutes.ago.to_s(:db) %>
+  ended_at: <%= (60 - 2).minutes.ago.to_s(:db) %>
 
 shipit_aborted:
   user: bob
@@ -85,6 +92,8 @@ shipit_aborted:
   deletions: 342
   rollback_once_aborted: true
   created_at: <%= (60 - 7).minutes.ago.to_s(:db) %>
+  started_at: <%= (60 - 7).minutes.ago.to_s(:db) %>
+  ended_at: <%= (60 - 6).minutes.ago.to_s(:db) %>
 
 shipit_rollback:
   user: bob
@@ -97,3 +106,5 @@ shipit_rollback:
   additions: 420
   deletions: 342
   created_at: <%= (60 - 8).minutes.ago.to_s(:db) %>
+  started_at: <%= (60 - 8).minutes.ago.to_s(:db) %>
+  ended_at: <%= (60 - 7).minutes.ago.to_s(:db) %>

data/test/models/commits_test.rb

@@ -110,7 +110,7 @@ module Shipit
 
       @stack.deploys.create!(
         user_id: walrus.id,
-        since_commit: @stack.last_deployed_commit,
+        since_commit: @stack.commits.first,
         until_commit: new_commit,
         status: 'success',
       )

data/test/models/deploys_test.rb

@@ -103,6 +103,16 @@ module Shipit
       end
     end
 
+    test "transitioning to success persists `ended_at`" do
+      deploy = shipit_deploys(:shipit_running)
+
+      assert_nil deploy.ended_at
+      deploy.complete!
+      deploy.reload
+      assert_instance_of ActiveSupport::TimeWithZone, deploy.ended_at
+      assert_in_delta Time.now.utc, deploy.ended_at, 2
+    end
+
     test "transitioning to failed causes an event to be broadcasted" do
       deploy = shipit_deploys(:shipit_pending)
 
@@ -113,6 +123,16 @@ module Shipit
       end
     end
 
+    test "transitioning to failed persists `ended_at`" do
+      deploy = shipit_deploys(:shipit_running)
+
+      assert_nil deploy.ended_at
+      deploy.failure!
+      deploy.reload
+      assert_instance_of ActiveSupport::TimeWithZone, deploy.ended_at
+      assert_in_delta Time.now.utc, deploy.ended_at, 2
+    end
+
     test "transitioning to error causes an event to be broadcasted" do
       deploy = shipit_deploys(:shipit_pending)
 
@@ -123,6 +143,16 @@ module Shipit
       end
     end
 
+    test "transitioning to error persists `ended_at`" do
+      deploy = shipit_deploys(:shipit_running)
+
+      assert_nil deploy.ended_at
+      deploy.error!
+      deploy.reload
+      assert_instance_of ActiveSupport::TimeWithZone, deploy.ended_at
+      assert_in_delta Time.now.utc, deploy.ended_at, 2
+    end
+
     test "transitioning to running causes an event to be broadcasted" do
       deploy = shipit_deploys(:shipit_pending)
 
@@ -133,6 +163,16 @@ module Shipit
       end
     end
 
+    test "transitioning to running persists `started_at`" do
+      deploy = shipit_deploys(:shipit_pending)
+
+      assert_nil deploy.started_at
+      deploy.run!
+      deploy.reload
+      assert_instance_of ActiveSupport::TimeWithZone, deploy.started_at
+      assert_in_delta Time.now.utc, deploy.started_at, 2
+    end
+
     test "creating a deploy causes an event to be broadcasted" do
       shipit = shipit_stacks(:shipit)
       deploy = shipit.deploys.build(