phase 0.0.16.1 → 0.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d5ebb4484b885d8dad52f7413fdaf3c50929d193
-  data.tar.gz: 55d319392ca5d5056f071e05831c951f15a59395
+  metadata.gz: 86303d226d273b681f3cee115252b999fdff08f3
+  data.tar.gz: 8b6762e471c86eaf776ecaf5fa6ab87346b28d84
 SHA512:
-  metadata.gz: 6553814d3f824afe7db88505de68b74dfdc07c8468568ec671512552771684bfb764af74856351dcd5cc02051d703da7d1a7be8a8c3812683b941bed5043a49d
-  data.tar.gz: 2e1476f1da9b4f3a8088074c049bb9326ceb4323f2f8b7ece9e4e1bf2de07ec06574047d22a2b4444678eb17eaff0b8e97c604ec2e6c347611a4640250f162f4
+  metadata.gz: 00a2ff363da264cdcd570c3ca42fe70062efe39d02853c90b4ac9867a2fd6a8faac32d336afccd6f41fe2233169a55a865028a410c0370977b00375e73668fee
+  data.tar.gz: b04c21f1298172bef6bff6efa074d3fa7776ecd460c165429ed7040c0e6140e662d10fb58ad70bb685f2f08f645fd8786445017f0eabda087828ff14728cbe3d

data/lib/phase/cli/build.rb

@@ -3,7 +3,9 @@ module Phase
     class Build < Command
 
       command :build do |c|
-        c.syntax = "phase build <version_number>"
+        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.description = <<-EOS.strip_heredoc
           Builds a new Docker image of the latest committed code on the current branch. Tags the
@@ -11,25 +13,38 @@ module Phase
         EOS
 
         c.action do |args, options|
+          options.default(sandbox: false)
           new(args, options).run
         end
       end
 
-      attr_reader :version_number
+      attr_reader :clean_build, :version_number
 
       def initialize(args, options)
         super
-
-        @version_number = args[0]
-
-        fail "must specify version number" unless version_number
+        @clean_build = !options.sandbox
       end
 
       def run
-        build = ::Phase::Deploy::Build.new(version_number)
+        version_number = get_next_version_number
+        ::Phase::Deploy::Version.update(version_number) if clean_build
+
+        build = ::Phase::Deploy::Build.new(version_number, clean: clean_build)
         build.execute!
       end
 
+      private
+
+        def get_next_version_number
+          current_version = ::Phase::Deploy::Version.current
+
+          log "Last release was version #{ current_version.magenta }." if current_version
+
+          input = ask "New version number:"
+          fail "version number is required" if input.blank?
+          input
+        end
+
     end
   end
 end

data/lib/phase/config/deploy.rb

@@ -13,8 +13,15 @@ module Phase
       attr_accessor :docker_repository
 
 
+      # @return [String] the path (relative to Phasefile) to the version lockfile (default "VERSION")
+      # @example Sample settings
+      #   config.deploy.version_lockfile = "lib/myproj/version.lock"
+      attr_accessor :version_lockfile
+
+
       def initialize
         @environments = []
+        @version_lockfile = "VERSION"
       end
 
       # Adds a new deployment environment.

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

@@ -4,14 +4,21 @@ module Phase
     class Build
       include ::Phase::Util::Shell
 
-      attr_reader :version_tag, :build_dir
+      attr_reader :build_dir, :clean, :version_tag
 
       def initialize(version_tag, options = {})
+        @clean       = options.fetch(:clean, true)
         @version_tag = version_tag
-        @build_dir = ::Pathname.new( options.fetch(:build_dir, "build") )
+
+        if clean
+          @build_dir = ::Pathname.new( options.fetch(:build_dir, "build") )
+        else
+          @build_dir = ::Pathname.new(".")
+        end
       end
 
       def execute!
+        check_environment
         build_image
         # tag_image
         push
@@ -20,40 +27,45 @@ module Phase
       private
 
         def build_image
-          prepare_build
+          prepare_clean_build if clean
 
           shell("docker build -t #{repo_name}:#{version_tag} #{build_dir}") do |status|
-            fail "couldn't build Docker image"
+            fail "Couldn't build Docker image"
+          end
+        end
+
+        def check_environment
+          shell("docker ps > /dev/null 2>&1") do |status|
+            fail <<-EOS.strip_heredoc
+              Docker isn't responding. Is boot2docker running? Try:
+                  boot2docker start && $(boot2docker shellinit)
+            EOS
           end
         end
 
         def clone_local_git_repo
           current_branch = `git rev-parse --abbrev-ref HEAD`.strip
-          shell("git clone --reference $(pwd) --branch #{current_branch} --depth 1 -- file://$(pwd) #{build_dir}") do |status|
-            fail "couldn't clone local copy of git repository"
+          shell("git clone --reference $(pwd) --branch #{current_branch} -- file://$(pwd) #{build_dir}") do |status|
+            fail "Couldn't clone local copy of git repository"
           end
         end
 
-        def prepare_build
+        def last_committed_mtime_for_file(file_path)
+          rev_hash = `git rev-list HEAD "#{file_path}" | head -n 1`.chomp
+          time_str = `git show --pretty=format:%ai --abbrev-commit #{rev_hash} | head -n 1`.chomp
+          ::DateTime.parse(time_str).to_time
+        end
+
+        def prepare_clean_build
           remove_stale_build_dir!
           clone_local_git_repo
           set_file_modification_timestamps
         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
           shell("docker push #{repo_name}:#{version_tag}") do |status|
-            fail "couldn't push #{repo_name}:#{version_tag}"
+            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 remove_stale_build_dir!
@@ -65,7 +77,34 @@ module Phase
         end
 
         def set_file_modification_timestamps
-          
+          log "Preparing docker cache..."
+
+          queue = ::Queue.new
+
+          ::FileUtils.cd(build_dir) do
+            # Sets consistent mtime on directories because docker cares about that
+            system("find . -type d | xargs touch -t 7805200000")
+
+            files = `git ls-files`.split
+            files.each { |f| queue.push(f) }
+
+            bar = ::ProgressBar.new("Setting mtimes", files.count)
+
+            threads = 4.times.map do |idx|
+              ::Thread.new do
+                begin
+                  while path = queue.pop(true)
+                    ::FileUtils.touch(path, mtime: last_committed_mtime_for_file(path))
+                    bar.inc
+                  end
+                rescue ThreadError
+                end
+              end
+            end
+
+            threads.each(&:join)
+            bar.finish
+          end
         end
     end
 

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

@@ -0,0 +1,29 @@
+module Phase
+  module Deploy
+
+    class Version
+      class << self
+
+        def current
+          ::File.read( ::Phase.config.deploy.version_lockfile ).chomp rescue nil
+        end
+
+        def next
+          current.to_i + 1
+        end
+
+        def update(new_version)
+          write_version(new_version)
+        end
+
+        private
+
+          def write_version(new_version)
+            ::File.open( ::Phase.config.deploy.version_lockfile, 'w' ) { |f| f.write(new_version) }
+          end
+
+      end
+    end
+
+  end
+end

data/lib/phase/util/console.rb

@@ -2,10 +2,18 @@ module Phase
   module Util
     module Console
 
+      # Prompts user for input.
+      def ask(str)
+        print "[phase] ".blue.on_cyan + "#{str}".black.on_cyan + " "
+        STDIN.gets.chomp
+      end
+
+      # Prints a message.
       def log(str)
         puts "[phase]".green + " #{ str }"
       end
 
+      # Prints a message and then exits.
       def fail(str)
         puts
         abort "[phase]".red + " #{ str }"

data/lib/phase/version.rb

@@ -1,3 +1,3 @@
 module Phase
-	VERSION = "0.0.16.1"
+	VERSION = "0.0.17"
 end

data/lib/phase.rb

@@ -7,6 +7,8 @@ require 'progressbar'
 require 'sshkit'
 require 'terminal-table'
 
+require 'pry'
+
 
 require 'phase/adapter'
 require 'phase/adapters/abstract'
@@ -17,6 +19,7 @@ require "phase/util/shell"
 
 require 'phase/kit/deploy/build'
 require 'phase/kit/deploy/deployment'
+require 'phase/kit/deploy/version'
 
 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.16.1
+  version: 0.0.17
 platform: ruby
 authors:
 - Piers Mainwaring
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-29 00:00:00.000000000 Z
+date: 2015-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -225,6 +225,7 @@ files:
 - lib/phase/dsl.rb
 - lib/phase/kit/deploy/build.rb
 - lib/phase/kit/deploy/deployment.rb
+- lib/phase/kit/deploy/version.rb
 - lib/phase/kit/ipa/app.rb
 - lib/phase/kit/ipa/enterprise_deployment.rb
 - lib/phase/kit/keys/key.rb
@@ -260,7 +261,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.2.3
 signing_key: 
 specification_version: 4
 summary: A simple way to manage cloud instances within a multi-subnet network, like