phase 1.0.0.rc1 → 1.0.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9418e0cabac33009818c8d089c896b5b4cb81004
-  data.tar.gz: b7346fdc18bcad141314d0e96247e6bb9e3aaf55
+  metadata.gz: d23b4d3bd81128770584534b887898b10ca94dd3
+  data.tar.gz: 116bd3d5c7348e2bf1348fec4e6081f82d3f8748
 SHA512:
-  metadata.gz: 94f9716929b4f0b402104f6c9012300664dde3c1e35df93bd914aa84ed4fbd236f59534f062648a56bc768e745369ea0d3ea0fefcd8dd6aeaaa8ee7eb1860026
-  data.tar.gz: 15248f3be2d0e843db4f9778421715204d965af8d1822113f104aea05f081c7304808f96e0d95a6d9221084aeaba267baf8a885064ba8d592b0fa89726da372f
+  metadata.gz: ed13ea799acffc32bf3ac1cb7932bf1fc61034904378eb54b0a419171043dbeb73a8e2832708e573e22623137c49b92c80a4ec3c44422d2ee0b7087003d5c960
+  data.tar.gz: 2afba04a8973a9eb24488aa4db781ae09ade8ab6fb92c2b21c9dd91e313715768cb0dc9307306719aa999d4ad2131af4b1ac0b9b0f285cb26e0ece314a562b8c

data/lib/phase/cli/deploy.rb

@@ -3,37 +3,37 @@ module Phase
     class Deploy < Command
 
       command :deploy do |c|
-        c.syntax = "phase deploy <environment_name> <version_number>"
+        c.syntax = "phase deploy <instance_role> [-n version_number]"
+
+        c.option "-n", "--number", String, "Specific version number to deploy."
 
         c.description = <<-EOS.strip_heredoc
-          Builds and deploys code to the specified <environment_name>, which may be
-          any environment configured in the Phasefile.
+          Builds and deploys code to instance with the specified <instance_role> in their
+          "Role" tags. Deploys the current version (in the file set via
+          `config.deploy.version_lockfile`) unless an alternate version is provided with the
+          -n option.
         EOS
 
         c.action do |args, options|
+          options.default(number: ::Phase::Deploy::Version.current)
           new(args, options).run
         end
       end
 
-      attr_reader :env_name, :version_number
+      attr_reader :instance_role
 
       def initialize(args, options)
         super
 
-        fail "must specify both environment and version number" unless args.count >= 2
-
-        @env_name       = args[0]
-        @version_number = args[1]
-
-        fail "must specify environment"    unless env_name
-        fail "must specify version number" unless version_number
+        fail "Must specify 'instance_role' name" if args.first.blank?
+        @instance_role  = args.first
       end
 
       def run
-        environment = config.deploy.environments.find { |e| e.name == env_name }
-        fail "unknown environment: '#{env_name}'" unless environment
+        # environment = config.deploy.environments.find { |e| e.name == instance_role }
+        # fail "unknown environment: '#{instance_role}'" unless environment
 
-        deployment = Deploy::Deployment.new(environment, version_tag: version_number)
+        deployment = ::Phase::Deploy::Deployment.new(instance_role, options.number)
         deployment.execute!
       end
 

data/lib/phase/config/deploy.rb

@@ -25,6 +25,12 @@ module Phase
       attr_accessor :asset_bucket
 
 
+      # @return [String] any options or switches to be passed to the Docker daemon at runtime
+      # @example Sample settings
+      #   config.deploy.docker_repository = "-v /dir:/dir -e VAR=value --env-file=.environment"
+      attr_accessor :docker_run_flags
+
+
       def initialize
         @environments = []
         @version_lockfile = "VERSION"

data/lib/phase/configuration.rb

@@ -13,7 +13,7 @@ module Phase
       @aws_region           = "us-east-1"
       @adapter              = ::Phase::Adapters::AWS
 
-      self.backend = ::Phase::SSH::Backend
+      # self.backend = ::Phase::SSH::Backend
       set_aws_credentials!
     end
 

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

@@ -80,7 +80,7 @@ module Phase
         # directory rather than building in a clean, committed environment. This could lead
         # to errors in the compiled assets.
         def precompile_assets
-          shell("RAILS_GROUPS=assets rake assets:precompile") do |status|
+          shell("RAILS_GROUPS=assets RAILS_ENV=production rake assets:precompile") do |status|
             fail "Couldn't precompile assets"
           end
         end
@@ -94,7 +94,7 @@ module Phase
         # This needs to run *before* the version gets updated so we know which version
         # number to pull from the registry.
         def pull_latest_build
-          shell("docker pull #{docker_repo}:#{::Phase::Deploy::Version.current}")
+          shell("docker pull #{docker_repo}:#{::Phase::Deploy::Version.current}", allow_failure: true)
         end
 
         def push

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

@@ -2,25 +2,57 @@ module Phase
   module Deploy
 
     class Deployment
-      attr_reader :options#, :build
+      include ::Phase::Util::Console
+      include ::Phase::Util::Shell
 
-      def initialize(options = {})
-        @options = options
-      end
+      attr_reader :role_name, :version_tag, :options
 
-      # def build
-      #   @build ||= Build.new(options[:version_tag])
-      # end
+      def initialize(role_name, version_tag, options = {})
+        @role_name, @version_tag, @options = role_name, version_tag, options
+      end
 
       def execute!
-        # build.execute!
-        deploy_image
+        hosts = ::Phase::Adapters::AWS::Server.where(role: role_name).map do |host|
+          "deploy@#{host.resource.dns_name}"
+        end
+
+        fail "No instance with role `role_name' found" if hosts.blank?
+
+        deploy_image(hosts)
       end
 
       private
 
-        def deploy_image
-          system("echo yaaaay")
+        def deploy_image(hosts, options = {})
+          image_name   = docker_image_name
+          server_count = 2  # FIXME: make this a config var
+          run_flags    = docker_run_flags
+
+          ::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)'")
+
+            server_count.times do |i|
+              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)
+            end
+          end
+        end
+
+        def docker_image_name
+          @docker_image ||= "#{::Phase.config.deploy.docker_repository}:#{version_tag}"
+        end
+
+        def docker_run_flags
+          @docker_run_flags ||= ::Phase.config.deploy.docker_run_flags
         end
     end
 

data/lib/phase/util/shell.rb

@@ -5,7 +5,7 @@ module Phase
 
       def shell(*args)
         options = args.extract_options!
-        options.reverse_merge({
+        options.reverse_merge!({
           allow_failure: false
         })
 

data/lib/phase/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phase
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc1
+  version: 1.0.0.rc2
 platform: ruby
 authors:
 - Piers Mainwaring
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-18 00:00:00.000000000 Z
+date: 2015-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander