docker_deploy 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c87bef033c84edc20c5374e3db7e1dd4529134a
-  data.tar.gz: 4d1d410a0943d2f588fd77c391996d75886286d5
+  metadata.gz: 618c41243bbfc6326b2e47d0213e6706a7a27a04
+  data.tar.gz: 7626dd1c00d644e7a2ee649edf02b58093aa35ae
 SHA512:
-  metadata.gz: ad82a948cb2860c0ced2e2088a16610f14e37c8abebf07b9a6906a796a32a4654d65255b3b042f094ebcfbe78edf164401c9633682df0c89206d21a319639f51
-  data.tar.gz: 00c4c938679942f75f5accb4bb0ce7d0b3ec75b2bb77f6ae4578b32a433b267f8ce5e264e0fc33f8af6337722e4aa3e596bd24e0bc621b4f35f6b646e73bdf24
+  metadata.gz: 4ccb8cd48d557375771a5bc5519789179753083d5d79d29855ca4bb894137225096484770c8c974274fd5c0dccc00d250a069f6d63237cf58f75113acf8268aa
+  data.tar.gz: 172aa8b76dab46e8436e31aee6b67ae1c11e695ea7ba281fba805d6b69d8619c2f73e219784cb438a86d471221a5882d5e89f638df14f055157e0b30625d6c72

data/lib/docker_deploy/context.rb

@@ -39,8 +39,14 @@ module DockerDeploy
       @revision ||= `git rev-parse HEAD`.chomp[0...8]
     end
 
+    def local(&block)
+      stage = LocalStage.new(self)
+      stage.instance_eval(&block)
+      @stages << stage
+    end
+
     def stage(name, &block)
-      stage = Stage.new(self, name)
+      stage = RemoteStage.new(self, name)
       stage.instance_eval(&block)
       @stages << stage
     end

data/lib/docker_deploy/local_stage.rb

@@ -0,0 +1,18 @@
+module DockerDeploy
+  class LocalStage < Stage
+    def initialize(context)
+      super(context, :local)
+      @servers = []
+      @deploy = ["docker:build", :restart]
+    end
+
+    def server(server)
+      @servers << SSHKit::Host.new(server)
+    end
+
+    def run(cmd)
+      sh(cmd)
+    end
+    alias_method :run_once, :run
+  end
+end

data/lib/docker_deploy/remote_stage.rb

@@ -0,0 +1,24 @@
+module DockerDeploy
+  class RemoteStage < Stage
+    def initialize(context, name)
+      super
+      @servers = []
+    end
+
+    def server(server)
+      @servers << SSHKit::Host.new(server)
+    end
+
+    def run(cmd)
+      on servers do
+        execute(cmd)
+      end
+    end
+
+    def run_once(cmd)
+      on servers.first do
+        execute(cmd)
+      end
+    end
+  end
+end

data/lib/docker_deploy/stage.rb

@@ -1,11 +1,12 @@
 module DockerDeploy
   class Stage
-    attr_reader :name, :servers, :variables, :links, :env_files
+    include Rake::FileUtilsExt
+
+    attr_reader :name, :servers, :variables, :links, :env_files, :deploy
 
     def initialize(context, name)
       @context = context
       @name = name
-      @servers = []
       @env_files = []
       @variables = {}
       @ports = {}
@@ -29,20 +30,11 @@ module DockerDeploy
       @env_files.push(env_file)
     end
 
-    def deploy(sequence = nil)
-      @deploy = sequence if sequence
-      @deploy
-    end
-
     def host(name = nil)
       @host = name if name
       @host
     end
 
-    def server(server)
-      @servers << SSHKit::Host.new(server)
-    end
-
     def link_mappings
       format_params("--link %s:%s", @context.links.merge(@links))
     end

data/lib/docker_deploy/task.rb

@@ -26,40 +26,46 @@ module DockerDeploy
 
             desc "Pull down code from the docker registry"
             task :pull do
-              on stage.servers do
-                execute :docker, "pull #{context.image}"
-              end
+              stage.run "docker pull #{context.image}"
             end
 
             desc "Stop the application and remove its container"
             task :stop do
-              on stage.servers do
-                execute :docker, "inspect #{context.container} 2>&1 > /dev/null && docker stop #{context.container} && docker rm #{context.container} || true"
-              end
+              stage.run "docker inspect #{context.container} 2>&1 > /dev/null && docker stop #{context.container} && docker rm #{context.container} || true"
             end
 
             desc "Start the application in a container using the latest image."
             task :start do
-              on stage.servers do
-                execute :docker, "run -d #{stage.port_mappings} #{stage.link_mappings} #{stage.options} --name #{context.container} #{context.image}:latest"
-
-                puts "\n\nStarted: #{stage.host}\n"
-              end
+              stage.run "docker run -d #{stage.port_mappings} #{stage.link_mappings} #{stage.options} --name #{context.container} #{context.image}:latest"
             end
 
             desc "Run migrations in the latest image."
             task :migrate do
-              on stage.servers.first do
-                execute :docker, "run  #{stage.link_mappings} #{stage.options} -i -t --rm=true #{context.image}:latest bundle exec rake db:create db:migrate"
-              end
+              stage.run_once "docker run #{stage.link_mappings} #{stage.options} -i -t --rm=true #{context.image}:latest bundle exec rake db:create db:migrate"
             end
 
-            desc "Run a Rails console in the container"
+            desc "Run a Rails console in a container"
             task :console do
-              puts "Console is currently broken :("
-              puts "Run:\n"
-              puts "ssh #{stage.servers.first}"
-              puts "docker run #{stage.options} -i -t --rm=true #{stage.link_mappings} #{context.image}:latest bundle exec rails console"
+              cmd = "docker run #{stage.options} -i -t --rm=true #{stage.link_mappings} #{context.image}:latest bundle exec rails console"
+              if stage.is_a?(RemoteStage)
+                puts "Console is currently broken :("
+                puts "SSH in and run:\n"
+                puts cmd
+              else
+                stage.run_once(cmd)
+              end
+            end
+
+            desc "Run a shell in a container"
+            task :shell do
+              cmd = "docker run #{stage.options} -i -t --rm=true #{stage.link_mappings} #{context.image}:latest /bin/bash"
+              if stage.is_a?(RemoteStage)
+                puts "Shell is currently broken :("
+                puts "SSH in and run:\n"
+                puts cmd
+              else
+                stage.run_once(cmd)
+              end
             end
 
             desc "Restart the running container."

data/lib/docker_deploy/version.rb

@@ -1,3 +1,3 @@
 module DockerDeploy
-  VERSION = "0.1.2"
+  VERSION = "0.2.0"
 end

data/lib/docker_deploy.rb

@@ -5,6 +5,8 @@ require "shellwords"
 require "docker_deploy/version"
 require "docker_deploy/context"
 require "docker_deploy/stage"
+require "docker_deploy/remote_stage"
+require "docker_deploy/local_stage"
 require "docker_deploy/task"
 
 # Improvement on the broken piece of crap text formatter in SSHKit.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: docker_deploy
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Jonas Nicklas
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-03 00:00:00.000000000 Z
+date: 2014-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sshkit
@@ -69,6 +69,8 @@ files:
 - docker_deploy.gemspec
 - lib/docker_deploy.rb
 - lib/docker_deploy/context.rb
+- lib/docker_deploy/local_stage.rb
+- lib/docker_deploy/remote_stage.rb
 - lib/docker_deploy/stage.rb
 - lib/docker_deploy/task.rb
 - lib/docker_deploy/version.rb