phase 0.0.17 → 1.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 86303d226d273b681f3cee115252b999fdff08f3
-  data.tar.gz: 8b6762e471c86eaf776ecaf5fa6ab87346b28d84
+  metadata.gz: 9418e0cabac33009818c8d089c896b5b4cb81004
+  data.tar.gz: b7346fdc18bcad141314d0e96247e6bb9e3aaf55
 SHA512:
-  metadata.gz: 00a2ff363da264cdcd570c3ca42fe70062efe39d02853c90b4ac9867a2fd6a8faac32d336afccd6f41fe2233169a55a865028a410c0370977b00375e73668fee
-  data.tar.gz: b04c21f1298172bef6bff6efa074d3fa7776ecd460c165429ed7040c0e6140e662d10fb58ad70bb685f2f08f645fd8786445017f0eabda087828ff14728cbe3d
+  metadata.gz: 94f9716929b4f0b402104f6c9012300664dde3c1e35df93bd914aa84ed4fbd236f59534f062648a56bc768e745369ea0d3ea0fefcd8dd6aeaaa8ee7eb1860026
+  data.tar.gz: 15248f3be2d0e843db4f9778421715204d965af8d1822113f104aea05f081c7304808f96e0d95a6d9221084aeaba267baf8a885064ba8d592b0fa89726da372f

data/lib/phase/cli/build.rb

@@ -27,9 +27,8 @@ module Phase
 
       def run
         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 = ::Phase::Deploy::Build.new(version_number, clean_build: clean_build)
         build.execute!
       end
 
@@ -41,7 +40,7 @@ module Phase
           log "Last release was version #{ current_version.magenta }." if current_version
 
           input = ask "New version number:"
-          fail "version number is required" if input.blank?
+          fail "Version number is required" if input.blank?
           input
         end
 

data/lib/phase/cli/ssh.rb

@@ -2,7 +2,7 @@ module Phase
   module CLI
     class SSH < Command
       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]"
+        c.syntax = "phase ssh [-i instance_id] [-n instance_name] [-r instance_role] [-u user] [-c conn_str] [username@instance_name|instance_id] [command...]"
 
         c.option "-i", "--id instance_id", String, "Connects to the instance with this ID."
         c.option "-n", "--name instance_name", String, "Connects to the instance with this 'Name' tag."
@@ -21,8 +21,15 @@ module Phase
 
       def run
         parse_connection_string
-        log "connecting to instance #{ instance.resource.id }..."
-        exec "#{ options.conn } #{ username }@#{ instance.resource.dns_name }"
+        ssh_command = args.last if args.count > 1
+
+        if ssh_command
+          log "running on instance #{ instance.resource.id }: `#{ ssh_command }'"
+          exec "#{ options.conn } #{ username }@#{ instance.resource.dns_name } #{ ssh_command }"
+        else
+          log "connecting to instance #{ instance.resource.id }..."
+          exec "#{ options.conn } #{ username }@#{ instance.resource.dns_name }"
+        end
       end
 
       private

data/lib/phase/config/deploy.rb

@@ -19,6 +19,12 @@ module Phase
       attr_accessor :version_lockfile
 
 
+      # @return [String] the cloud storage bucket ("directory") for storing compiled assets
+      # @example Sample settings
+      #   config.deploy.docker_repository = "static-assets"
+      attr_accessor :asset_bucket
+
+
       def initialize
         @environments = []
         @version_lockfile = "VERSION"

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

@@ -4,13 +4,13 @@ module Phase
     class Build
       include ::Phase::Util::Shell
 
-      attr_reader :build_dir, :clean, :version_tag
+      attr_reader :build_dir, :clean_build, :version_tag
 
       def initialize(version_tag, options = {})
-        @clean       = options.fetch(:clean, true)
+        @clean_build = options.fetch(:clean_build, true)
         @version_tag = version_tag
 
-        if clean
+        if clean_build
           @build_dir = ::Pathname.new( options.fetch(:build_dir, "build") )
         else
           @build_dir = ::Pathname.new(".")
@@ -18,29 +18,45 @@ module Phase
       end
 
       def execute!
-        check_environment
+        prepare_environment
+        build_assets
+        commit_new_version!
         build_image
-        # tag_image
         push
       end
 
       private
 
+        def build_assets
+          precompile_assets
+          sync_assets
+        end
+
         def build_image
-          prepare_clean_build if clean
+          prepare_clean_build if clean_build
 
-          shell("docker build -t #{repo_name}:#{version_tag} #{build_dir}") do |status|
+          shell("docker build -t #{docker_repo}:#{version_tag} #{build_dir}") do |status|
             fail "Couldn't build Docker image"
           end
         end
 
-        def check_environment
+        def commit_new_version!
+          ::Phase::Deploy::Version.update(version_tag)
+          shell("git add -f public/assets/*manifest* #{::Phase.config.deploy.version_lockfile}", allow_failure: true)
+          shell("git commit -m 'Built v#{version_tag}'", allow_failure: true)
+        end
+
+        def prepare_environment
+          raise_on_dirty_index!
+
           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
+
+          pull_latest_build
         end
 
         def clone_local_git_repo
@@ -50,40 +66,62 @@ module Phase
           end
         end
 
+        def docker_repo
+          ::Phase.config.deploy.docker_repository
+        end
+
         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
 
+        # FIXME: This approach isn't ideal because it compiles assets in the *working* git
+        # 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|
+            fail "Couldn't precompile assets"
+          end
+        end
+
         def prepare_clean_build
           remove_stale_build_dir!
           clone_local_git_repo
           set_file_modification_timestamps
         end
 
+        # 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}")
+        end
+
         def push
-          shell("docker push #{repo_name}:#{version_tag}") do |status|
-            fail "Couldn't push #{repo_name}:#{version_tag}"
+          shell("docker push #{docker_repo}:#{version_tag}") do |status|
+            fail "Couldn't push #{docker_repo}:#{version_tag}"
           end
         end
 
-        def remove_stale_build_dir!
-          ::FileUtils.rm_rf(build_dir)
+        def raise_on_dirty_index!
+          shell('git diff-index --quiet --cached HEAD') do |status|
+            fail "Other changes are already staged. Commit or stash them first"
+          end
         end
 
-        def repo_name
-          ::Phase.config.deploy.docker_repository
+        def remove_stale_build_dir!
+          ::FileUtils.rm_rf(build_dir)
         end
 
         def set_file_modification_timestamps
-          log "Preparing docker cache..."
+          log("Preparing docker cache...")
 
+          # Threadsafe queue for multiple threads to pull from
           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")
+            # Sets consistent mtime on directories because docker cares about that too
+            shell("find . -type d | xargs touch -t 7805200000")
 
             files = `git ls-files`.split
             files.each { |f| queue.push(f) }
@@ -106,6 +144,15 @@ module Phase
             bar.finish
           end
         end
+
+        def sync_assets
+          bucket = ::Phase.config.deploy.asset_bucket
+          return log("Set `deploy.asset_bucket` in Phasefile to enable asset syncing") if bucket.blank?
+
+          shell("RAILS_GROUPS=assets FOG_DIRECTORY=#{bucket} rake assets:sync") do |status|
+            fail "Couldn't sync assets to The Clouds"
+          end
+        end
     end
 
   end

data/lib/phase/util/console.rb

@@ -15,7 +15,6 @@ module Phase
 
       # Prints a message and then exits.
       def fail(str)
-        puts
         abort "[phase]".red + " #{ str }"
       end
 

data/lib/phase/util/shell.rb

@@ -4,10 +4,17 @@ module Phase
       include Console
 
       def shell(*args)
+        options = args.extract_options!
+        options.reverse_merge({
+          allow_failure: false
+        })
+
         log "running: #{args.join(' ')}"
-        status = !!system(*args)
-        yield $? unless status
-        return status
+        succeeded = !!system(*args) || options[:allow_failure]
+
+        yield $? unless succeeded
+
+        succeeded
       end
 
     end

data/lib/phase/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phase
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  version: 1.0.0.rc1
 platform: ruby
 authors:
 - Piers Mainwaring
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-12 00:00:00.000000000 Z
+date: 2015-06-18 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: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.3