phase 0.0.14 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9590eb70829edd6661e39eb4068ee18a060ec7fa
-  data.tar.gz: a57a7125ac33e183892a1106ffa54b246d9dc00e
+  metadata.gz: 0348a387cd72008efb9ac4e146666f193ac0007b
+  data.tar.gz: 3b871ecfcc7d89b48dcc90ff78cd114b3e749240
 SHA512:
-  metadata.gz: 391d201d50bdf8fc062a267cbfa9420770ae91ae3ce964ec701b3b0413a59465ecbe91465b08b565898c829504bbf54c1c8f7b1728cdf8101d43e3eecc52366b
-  data.tar.gz: 8ba069008cb11010e2ff2a08287b47684acb68a7d91be271fdc056e4db365bb05bfd494207f9d18defa6a5d577647c35ce2bb07d5aada630aa559e419976ad3f
+  metadata.gz: 7912b55eb7b03d26e9fae06c27f2dd46eb7f693dfdd5e4a89207ec03880e27abfb3221eaa35a451b26f06341be771d1a69a26ce49adba59c84466eef064970f1
+  data.tar.gz: df587124963dc679162d2e825a5a92ed1a4b7c1b0049dde356dba42b481d252df0adce6fa3486760d2de899c51cebe4d419c07d0a1d51ab4d4c87d6b03dd1ecf

data/VERSION

@@ -1 +1 @@
-0.0.14
+0.0.15

data/lib/phase/cli/deploy.rb

@@ -3,10 +3,12 @@ module Phase
     class Deploy < Command
 
       command :deploy do |c|
-        c.syntax = "phase deploy <environment>"
+        c.syntax = "phase deploy [-e environment_name] version_number"
+
+        c.option "-e", "--env environment_name", String, "Deploy to this environment."
 
         c.description = <<-EOS.strip_heredoc
-          Builds and deploys code to the specified <environment>. <environment> may be
+          Builds and deploys code to the specified 'environment_name'. 'environment_name' may be
           any environment configured in the Phasefile.
         EOS
 
@@ -15,18 +17,31 @@ module Phase
         end
       end
 
-      attr_reader :environment
+      attr_reader :version_number
 
       def initialize(args, options)
-        @environment = args.first
         super
+
+        @version_number = args.first
+
+        fail "must specify environment with '-e'" unless options.env
+        fail "must specify version number" unless version_number
       end
 
       def run
-        if environment == "sandbox"
-          deployment = ::Phase::Deploy::SandboxDeployment.new
+        opts = {
+          version_tag: version_number
+        }
+
+        deployment = case options.env
+        when "sandbox"
+          ::Phase::Deploy::SandboxDeployment.new(opts)
+        when "staging"
+          ::Phase::Deploy::StagingDeployment.new(opts)
+        when "production"
+          ::Phase::Deploy::ProductionDeployment.new(opts)
         else
-          deployment = ::Phase::Deploy::Deployment.new(environment)
+          fail "unknown environment: '#{environment}'"
         end
 
         deployment.execute!

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

@@ -2,42 +2,56 @@ module Phase
   module Deploy
 
     class Build
+      include ::Phase::Util::Shell
+
       attr_reader :version_tag, :build_dir
 
       def initialize(version_tag, options = {})
         @version_tag = version_tag
-        @build_dir = options.fetch(:build_dir, "./build")
+        @build_dir = ::Pathname.new( options.fetch(:build_dir, "build") )
       end
 
-      def execute
+      def execute!
         build_image
-        tag_image
+        # tag_image
         push
       end
 
       private
 
         def build_image
-          clear_build_dir
+          remove_stale_build_dir
           clone_local_repo
-          system("docker build -t #{repo_name}:#{version_tag} #{build_dir}")
+
+          shell("docker build -t #{repo_name}:#{version_tag} #{build_dir}") do |status|
+            fail "couldn't build Docker image"
+          end
         end
 
-        def clear_build_dir
-          ::FileUtils.mkdir_p(build_dir)
+        def remove_stale_build_dir
+          ::FileUtils.rm_r(build_dir)
         end
 
         def clone_local_repo
-          system("git clone --depth 1 -- file://$(pwd) #{build_dir}")
+          shell("git clone --depth 1 -- file://$(pwd) #{build_dir}") do |status|
+            fail "couldn't clone local copy of git repository"
+          end
         end
 
-        def tag_image
-          system("docker tag #{repo_name}:#{version_tag} #{repo_name}:latest")
-        end
+        # def tag_image
+        #   shell("docker tag #{repo_name}:#{version_tag} #{repo_name}:latest") do |status|
+        #     fail "couldn't tag Docker image"
+        #   end
+        # end
 
         def push
-          system("docker push #{repo_name}:#{version_tag}")
-          system("docker push #{repo_name}:latest")
+          shell("docker push #{repo_name}:#{version_tag}") do |status|
+            fail "couldn't push #{repo_name}:#{version_tag}"
+          end
+
+          shell("docker push #{repo_name}:latest") do |status|
+            fail "couldn't push #{repo_name}:latest"
+          end
         end
 
         def repo_name
@@ -55,11 +69,15 @@ module Phase
       private
 
         def build_image
-          system("docker build -t #{repo_name}:#{version_tag} .")
+          shell("docker build -t #{repo_name}:#{version_tag} .") do |status|
+            fail "couldn't build Docker image"
+          end
         end
 
         def push
-          system("docker push #{repo_name}:#{version_tag}")
+          shell("docker push #{repo_name}:#{version_tag}") do |status|
+            fail "couldn't push #{repo_name}:#{version_tag}"
+          end
         end
     end
 

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

@@ -2,25 +2,42 @@ module Phase
   module Deploy
 
     class Deployment
-      attr_reader :environment, :build
+      attr_reader :options, :build
 
-      def initialize(environment, options = {})
-        @environment = environment
-        @build = Build.new(options[:version_tag])
+      def initialize(options = {})
+        @options = options
+      end
+
+      def build
+        @build ||= Build.new(options[:version_tag])
       end
 
       def execute!
-        @build.execute
+        build.execute!
         deploy_image
       end
+
+      private
+
+        def deploy_image
+          system("")
+        end
     end
 
 
     class SandboxDeployment < Deployment
-      def initialize(options = {})
-        @build = SandboxBuild.new(options[:version_tag])
+      def build
+        @build ||= SandboxBuild.new(options[:version_tag])
       end
     end
 
+
+    class StagingDeployment < Deployment
+    end
+
+
+    class ProductionDeployment < Deployment
+    end
+
   end
 end

data/lib/phase/util/shell.rb

@@ -0,0 +1,15 @@
+module Phase
+  module Util
+    module Shell
+      include Console
+
+      def shell(*args)
+        log "running: #{args.join(' ')}"
+        status = !!system(*args)
+        yield $? unless status
+        return status
+      end
+
+    end
+  end
+end

data/lib/phase/version.rb

@@ -1,3 +1,3 @@
 module Phase
-	VERSION = "0.0.14"
+	VERSION = "0.0.15"
 end

data/lib/phase.rb

@@ -4,6 +4,7 @@ require 'colorize'
 require 'erb'
 require 'fog'
 require 'progressbar'
+require 'pry'
 require 'sshkit'
 require 'terminal-table'
 
@@ -13,6 +14,10 @@ require 'phase/adapters/abstract'
 require 'phase/adapters/aws'
 
 require "phase/util/console"
+require "phase/util/shell"
+
+require 'phase/kit/deploy/build'
+require 'phase/kit/deploy/deployment'
 
 require 'phase/kit/ipa/app'
 require 'phase/kit/ipa/enterprise_deployment'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phase
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
 platform: ruby
 authors:
 - Piers Mainwaring
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-11 00:00:00.000000000 Z
+date: 2015-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -232,6 +232,7 @@ files:
 - lib/phase/tasks/deploy.rb
 - lib/phase/templates/ipa_xml.plist
 - lib/phase/util/console.rb
+- lib/phase/util/shell.rb
 - lib/phase/version.rb
 - phase.gemspec
 - spec/dsl_spec.rb