phase 1.0.0.rc2 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d23b4d3bd81128770584534b887898b10ca94dd3
-  data.tar.gz: 116bd3d5c7348e2bf1348fec4e6081f82d3f8748
+  metadata.gz: a5ff6bc6d3419a4db17beedd39f87f202ba5bf81
+  data.tar.gz: f6a4b30d2ce4b88efcffba57df2ba3e55bf344d4
 SHA512:
-  metadata.gz: ed13ea799acffc32bf3ac1cb7932bf1fc61034904378eb54b0a419171043dbeb73a8e2832708e573e22623137c49b92c80a4ec3c44422d2ee0b7087003d5c960
-  data.tar.gz: 2afba04a8973a9eb24488aa4db781ae09ade8ab6fb92c2b21c9dd91e313715768cb0dc9307306719aa999d4ad2131af4b1ac0b9b0f285cb26e0ece314a562b8c
+  metadata.gz: 35bce38c4b5a50a287b49adaff057b08991e5f8de223f9fd4b11b44be66dff0ce728fccaab3aeafea16f6b83d682708a4ba12584fc6c05551a102aca9c444421
+  data.tar.gz: 5f5bf3a268ede5bae6b1c6511e232adcdea5b00b8f14c2287540d4fa8a2aa3a1a347e2bdda792275b675caa3d3612365e691523063b5cf6abb4e76ac2fa9ded8

data/lib/phase/cli/ssh.rb

@@ -1,6 +1,9 @@
 module Phase
   module CLI
     class SSH < Command
+
+      DEFAULT_CONNECTION_STRING = "ssh -A".freeze
+
       command :ssh do |c|
         c.syntax = "phase ssh [-i instance_id] [-n instance_name] [-r instance_role] [-u user] [-c conn_str] [username@instance_name|instance_id] [command...]"
 
@@ -12,7 +15,7 @@ module Phase
 
         c.description = "Connects to the the specified instance via SSH."
         c.action do |args, options|
-          options.default role: ::Phase.config.bastion_role, conn: "ssh -A"
+          options.default role: ::Phase.config.bastion_role, conn: DEFAULT_CONNECTION_STRING
           new(args, options).run
         end
       end
@@ -24,6 +27,9 @@ module Phase
         ssh_command = args.last if args.count > 1
 
         if ssh_command
+          # Force pseudo-tty allocation for remote console/tail tasks
+          options.conn = "ssh -At" if options.conn == DEFAULT_CONNECTION_STRING
+
           log "running on instance #{ instance.resource.id }: `#{ ssh_command }'"
           exec "#{ options.conn } #{ username }@#{ instance.resource.dns_name } #{ ssh_command }"
         else

data/lib/phase/kit/deploy/build.rb

@@ -88,7 +88,7 @@ module Phase
         def prepare_clean_build
           remove_stale_build_dir!
           clone_local_git_repo
-          set_file_modification_timestamps
+          # set_file_modification_timestamps
         end
 
         # This needs to run *before* the version gets updated so we know which version

data/lib/phase/kit/deploy/deployment.rb

@@ -24,25 +24,38 @@ module Phase
       private
 
         def deploy_image(hosts, options = {})
-          image_name   = docker_image_name
-          server_count = 2  # FIXME: make this a config var
-          run_flags    = docker_run_flags
+          image_name    = docker_image_name
+          server_count  = 2  # FIXME: make this a config var
+          run_flags     = docker_run_flags
+          delay_seconds = 35  # FIXME: make this a config var
 
           ::SSHKit::Coordinator.new(hosts).each(options) do
             execute(:docker, :pull, image_name)
 
             # TODO: fail if pending migrations
-            execute(:docker, :run,  run_flags, "--rm -it", image_name,
-              "bundle exec rails runner '::ActiveRecord::Migrator.needs_migration? ? exit(1) : exit(0)'")
+            # execute(:docker, :run,  run_flags, "--rm -it", image_name,
+              # "bundle exec rails runner '::ActiveRecord::Migrator.needs_migration? ? exit(1) : exit(0)'")
 
             server_count.times do |i|
+              progress_bar = ::ProgressBar.new("Deploying ##{i}", delay_seconds)
+
               server_name = "server-#{i}"
               port_number = 3000 + i  # FIXME: make this a config var
 
               execute(:docker, :stop, server_name, raise_on_non_zero_exit: false)
               execute(:docker, :rm,   server_name, raise_on_non_zero_exit: false)
 
-              execute(:docker, :run,  run_flags, "-p #{port_number}:3000 -d", image_name)
+              execute(:docker, :run,  run_flags, "-p #{port_number}:3000 --name #{server_name} -d", image_name)
+
+              # TODO: test for server responding correctly
+              unless i == server_count - 1
+                delay_seconds.times do
+                  sleep 1
+                  progress_bar.inc
+                end
+              end
+
+              progress_bar.finish
             end
           end
         end

data/lib/phase/version.rb

@@ -1,3 +1,3 @@
 module Phase
-	VERSION = "1.0.0.rc2"
+	VERSION = "1.0.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phase
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc2
+  version: 1.0.0
 platform: ruby
 authors:
 - Piers Mainwaring
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-20 00:00:00.000000000 Z
+date: 2015-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -256,9 +256,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.3