ops_worker 0.0.5 → 0.0.6

data/bin/ops_worker

@@ -5,6 +5,7 @@ require 'ops_worker/cli'
 
 begin
   OpsWorker::CLI.start()
-rescue
+rescue => e
+  OpsWorker.logger.error { "Caught error running command: #{e.inspect()}" }
   exit(1)
 end

data/lib/ops_worker/app.rb

@@ -43,6 +43,10 @@ module OpsWorker
     def deploy(revision = nil)
       OpsWorker.logger.info {"Deploying app #{@name} from #{revision || @revision}"}
 
+      if deploying?
+        raise StandardError.new("#{@name} is already deploying")
+      end
+
       existing_revision = @revision.dup()
       changing_revisions = revision && revision != existing_revision
 
@@ -108,6 +112,21 @@ module OpsWorker
       DeploymentStatus.new(result[:deployment_id], @opsworks_client)
     end
 
+    # This is a best-efforts way to check if the current system is deploying by seeing if there is a deployment in
+    # progress that is running
+    def deploying?
+      deployments = @opsworks_client.describe_deployments(:app_id => @id)[:deployments]
+      if deployments.length > 0
+        latest_deployment = deployments.first
+
+        if latest_deployment[:status] == "running"
+          return true
+        end
+      end
+
+      false
+    end
+
     def app_server_instances
       online_instances().select do |i|
         i.layers.any? {|l| l.type == "rails-app" || l.type == "custom"}

data/lib/ops_worker/version.rb

@@ -1,3 +1,3 @@
 module OpsWorker
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ops_worker
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors: