phase 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a5ff6bc6d3419a4db17beedd39f87f202ba5bf81
-  data.tar.gz: f6a4b30d2ce4b88efcffba57df2ba3e55bf344d4
+  metadata.gz: 8b98166c521639cc9a17b9c261d187ce338115b0
+  data.tar.gz: 12531f8dcc6ce6107df04dbe395727b90ab95310
 SHA512:
-  metadata.gz: 35bce38c4b5a50a287b49adaff057b08991e5f8de223f9fd4b11b44be66dff0ce728fccaab3aeafea16f6b83d682708a4ba12584fc6c05551a102aca9c444421
-  data.tar.gz: 5f5bf3a268ede5bae6b1c6511e232adcdea5b00b8f14c2287540d4fa8a2aa3a1a347e2bdda792275b675caa3d3612365e691523063b5cf6abb4e76ac2fa9ded8
+  metadata.gz: 83fdd520be80187641bd67d6d2ff972d5fc12a0b71641dadc97ae26a68efa7d215f189501ed57e4996e9c7bad0a69d7dbd51b8f5973da79437a22a360ecd5864
+  data.tar.gz: 7f660c96a4f6dcb297b4b6e7647ab3cbd5ccab1f45c340534c099387bd3c69d4c44dffcc6e7b5d664d75e478ae9bc31a1fd150264814b5c82ee4dd5eeb3749bd

data/VERSION

@@ -1 +1 @@
-0.0.15
+1.0.1

data/lib/phase/config/deploy.rb

@@ -27,7 +27,7 @@ module Phase
 
       # @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"
+      #   config.deploy.docker_run_flags = "-v /dir:/dir -e VAR=value --env-file=.environment"
       attr_accessor :docker_run_flags
 
 

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

@@ -51,8 +51,8 @@ module Phase
 
           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)
+              Docker isn't responding. Is docker-machine running? Try:
+                  docker-machine start dev && eval $(docker-machine env dev)
             EOS
           end
 
@@ -70,12 +70,6 @@ module Phase
           ::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.
@@ -88,7 +82,6 @@ module Phase
         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
@@ -113,38 +106,6 @@ module Phase
           ::FileUtils.rm_rf(build_dir)
         end
 
-        def set_file_modification_timestamps
-          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 too
-            shell("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
-
         def sync_assets
           bucket = ::Phase.config.deploy.asset_bucket
           return log("Set `deploy.asset_bucket` in Phasefile to enable asset syncing") if bucket.blank?

data/lib/phase/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phase
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Piers Mainwaring
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-23 00:00:00.000000000 Z
+date: 2016-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -261,7 +261,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.3
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: A simple way to manage cloud instances within a multi-subnet network, like
@@ -269,4 +269,3 @@ summary: A simple way to manage cloud instances within a multi-subnet network, l
 test_files:
 - spec/dsl_spec.rb
 - spec/spec_helper.rb
-has_rdoc: