phase 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b98166c521639cc9a17b9c261d187ce338115b0
-  data.tar.gz: 12531f8dcc6ce6107df04dbe395727b90ab95310
+  metadata.gz: 831f02bdb22a9315a749be3d9d68047dd4a68d2e
+  data.tar.gz: 4bdeb2e3e904abc8617dddb1f47f07be1c781638
 SHA512:
-  metadata.gz: 83fdd520be80187641bd67d6d2ff972d5fc12a0b71641dadc97ae26a68efa7d215f189501ed57e4996e9c7bad0a69d7dbd51b8f5973da79437a22a360ecd5864
-  data.tar.gz: 7f660c96a4f6dcb297b4b6e7647ab3cbd5ccab1f45c340534c099387bd3c69d4c44dffcc6e7b5d664d75e478ae9bc31a1fd150264814b5c82ee4dd5eeb3749bd
+  metadata.gz: e8029008bd5d8b99f32fee336b68f63ffb329b57cf20f3dc38ca528d60a8d576ec6bb390b4e4066fe207328ce6984bdc74db7ed1219d978b10d78e90e8e1a8ad
+  data.tar.gz: 9ac574ca17979e278f47db24ddb5a71d012ffc064db4180c3bcbd5000964842f33753259ae7d07c4f3b765b65097effbb4fb9201361b581697702ce164068c37

data/README.md

@@ -18,7 +18,28 @@ Or install it yourself as:
 
 ## Usage
 
-TODO: Write usage instructions here
+### Phasefile
+
+In order to configure Phase, you'll need to create a `Phasefile` at the
+root of your project.
+
+**Phasefile**
+```ruby
+Phase.configure do |config|
+  #   config.deploy.docker_repository = "mycompany/myrepo"
+  #   config.deploy.docker_repository = "https://docker.mycompany.com/myrepo"
+  #   config.deploy.asset_bucket = "static-assets"
+end
+```
+
+#### Docker Repository - Required
+This is where you tell phase where to push your built image to. Accepts
+Docker Hub naming convention of "user/reponame" or your own container
+host.
+
+#### S3 Assets
+Provide a bucket name and Phase will push your compiled assets to that S3
+Bucket.
 
 ## Contributing
 

data/VERSION

@@ -1 +1 @@
-1.0.1
+1.0.2

data/lib/phase.rb

@@ -7,8 +7,6 @@ require 'progressbar'
 require 'sshkit'
 require 'terminal-table'
 
-require 'pry'
-
 
 require 'phase/adapter'
 require 'phase/adapters/abstract'

data/lib/phase/cli/build.rb

@@ -6,6 +6,7 @@ module Phase
         c.syntax = "phase build [-s]"
 
         c.option "-s", "--sandbox", String, "Build in sandbox mode: uses current directory's possibly dirty git tree as build context."
+        c.option "-n", "--version-number", String, "Build number to create."
 
         c.description = <<-EOS.strip_heredoc
           Builds a new Docker image of the latest committed code on the current branch. Tags the
@@ -23,17 +24,20 @@ module Phase
       def initialize(args, options)
         super
         @clean_build = !options.sandbox
+        @version_number = options.version_number
       end
 
       def run
-        version_number = get_next_version_number
-
         build = ::Phase::Deploy::Build.new(version_number, clean_build: clean_build)
         build.execute!
       end
 
       private
 
+        def version_number
+          @version_number ||= get_next_version_number
+        end
+
         def get_next_version_number
           current_version = ::Phase::Deploy::Version.current
 

data/lib/phase/cli/deploy.rb

@@ -3,37 +3,37 @@ module Phase
     class Deploy < Command
 
       command :deploy do |c|
-        c.syntax = "phase deploy <instance_role> [-n version_number]"
-
-        c.option "-n", "--number", String, "Specific version number to deploy."
+        c.syntax = "phase deploy <environment_name> <version_number>"
 
         c.description = <<-EOS.strip_heredoc
-          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.
+          Builds and deploys code to the specified <environment_name>, which may be
+          any environment configured in the Phasefile.
         EOS
 
         c.action do |args, options|
-          options.default(number: ::Phase::Deploy::Version.current)
           new(args, options).run
         end
       end
 
-      attr_reader :instance_role
+      attr_reader :env_name, :version_number
 
       def initialize(args, options)
         super
 
-        fail "Must specify 'instance_role' name" if args.first.blank?
-        @instance_role  = args.first
+        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
       end
 
       def run
-        # environment = config.deploy.environments.find { |e| e.name == instance_role }
-        # fail "unknown environment: '#{instance_role}'" unless environment
+        environment = config.deploy.environments.find { |e| e.name == env_name }
+        fail "unknown environment: '#{env_name}'" unless environment
 
-        deployment = ::Phase::Deploy::Deployment.new(instance_role, options.number)
+        deployment = Deploy::Deployment.new(environment, version_tag: version_number)
         deployment.execute!
       end
 

data/lib/phase/config/deploy.rb

@@ -21,16 +21,10 @@ module Phase
 
       # @return [String] the cloud storage bucket ("directory") for storing compiled assets
       # @example Sample settings
-      #   config.deploy.docker_repository = "static-assets"
+      #   config.deploy.asset_bucket = "static-assets"
       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_run_flags = "-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/deployment.rb

@@ -2,70 +2,25 @@ module Phase
   module Deploy
 
     class Deployment
-      include ::Phase::Util::Console
-      include ::Phase::Util::Shell
+      attr_reader :options#, :build
 
-      attr_reader :role_name, :version_tag, :options
-
-      def initialize(role_name, version_tag, options = {})
-        @role_name, @version_tag, @options = role_name, version_tag, options
+      def initialize(options = {})
+        @options = options
       end
 
-      def execute!
-        hosts = ::Phase::Adapters::AWS::Server.where(role: role_name).map do |host|
-          "deploy@#{host.resource.dns_name}"
-        end
+      # def build
+      #   @build ||= Build.new(options[:version_tag])
+      # end
 
-        fail "No instance with role `role_name' found" if hosts.blank?
-
-        deploy_image(hosts)
+      def execute!
+        # build.execute!
+        deploy_image
       end
 
       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
-          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)'")
-
-            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 --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
-
-        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
+        def deploy_image
+          system("echo yaaaay")
         end
     end
 

data/lib/phase/version.rb

@@ -1,3 +1,3 @@
 module Phase
-	VERSION = "1.0.1"
+	VERSION = "1.0.2"
 end

data/phase.gemspec

@@ -6,7 +6,7 @@ require 'phase/version'
 Gem::Specification.new do |spec|
   spec.name          = "phase"
   spec.version       = Phase::VERSION
-  spec.authors       = ["Piers Mainwaring", "Orca Health, Inc."]
+  spec.authors       = ["Piers Mainwaring"]
   spec.email         = ["piers@impossibly.org"]
   spec.summary       = "A simple way to manage cloud instances within a multi-subnet network, like an AWS VPC."
   spec.description   = ""

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phase
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Piers Mainwaring
-- Orca Health, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-15 00:00:00.000000000 Z
+date: 2016-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -261,7 +260,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A simple way to manage cloud instances within a multi-subnet network, like