harrison 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fbd178c641c35846dfc9376babcf2af16ae15bbe
-  data.tar.gz: e27ddc623943e272a38f0fb72f69b1e312a4618e
+  metadata.gz: 760f8c56d329abf35ed7cd9c77796ec77dc783d5
+  data.tar.gz: 30481788ad2ea5bf4220e55cf5b88aa61537550f
 SHA512:
-  metadata.gz: ddabbccb099cf66d35df61f1b58589cff24eed24906f238b0785d3a4609cc165d6f91fe3eea1f51cb41c0d92f704d9424cacd4f7b03f641f71c9f4fa47103d47
-  data.tar.gz: 81cbf3d1f671f8fcd952756b81baecd9136dd694cdb33a3d3fdc1a6ab12029fa49cfbfd75cdf17d42c156f0bfba5de448dbca7a60e51346bc79e1832a37af384
+  metadata.gz: a518dc8a366adcf5c6ef5136d4d259f1b83a0fe1ea3894cc3e5ffd8696e996d9c34a237654fd0f43b7f769b5e291748d90af086ecebcf419aab734c4e7f1e445
+  data.tar.gz: e2eab336ca70464544ebf239f8d48796aab72bbb4c13a342b5cb609ba12cee4ebcb61e32ca80b7722ce6a5582704ac32f53b195f1dfd03c39733ab83fed3338e

data/CHANGELOG

@@ -1,3 +1,7 @@
+0.7.0
+-------------------
+- Added ability to calculate build host dynamically in package task.
+
 0.6.0
 -------------------
 - Added ability to package from forks. When packaging from HEAD or a branch,

data/lib/harrison/base.rb

@@ -6,9 +6,11 @@ module Harrison
     def initialize(arg_opts=[], opts={})
       # Config helpers for Harrisonfile.
       self.class.option_helper(:user)
+      self.class.option_helper(:env)
 
       @arg_opts = arg_opts
       @arg_opts << [ :debug, "Output debug messages.", :type => :boolean, :default => false ]
+      @arg_opts << [ :env, "Environment to package for or deploy to. This can be examined in your Harrisonfile to calculate target hosts.", :type => :string ]
 
       @options = opts
     end

data/lib/harrison/deploy.rb

@@ -15,7 +15,6 @@ module Harrison
     def initialize(opts={})
       # Config helpers for Harrisonfile.
       self.class.option_helper(:hosts)
-      self.class.option_helper(:env)
       self.class.option_helper(:base_dir)
       self.class.option_helper(:deploy_via)
       self.class.option_helper(:keep)
@@ -24,7 +23,6 @@ module Harrison
       # Command line opts for this action. Will be merged with common opts.
       arg_opts = [
         [ :hosts, "List of remote hosts to deploy to. Can also be specified in Harrisonfile.", :type => :strings ],
-        [ :env, "Environment to deploy to. This can be examined in your Harrisonfile to calculate target hosts.", :type => :string ],
         [ :keep, "Number of recent deploys to keep after a successful deploy. (Including the most recent deploy.) Defaults to keeping all deploys forever.", :type => :integer ],
         [ :confirm, "Whether to interactively confirm the list of target hosts for deployment.", :type => :flag, :default => true ],
       ]

data/lib/harrison/package.rb

@@ -39,6 +39,16 @@ module Harrison
       # Resolve commit ref to an actual short SHA.
       resolve_commit!
 
+      if self.host.respond_to?(:call)
+        resolved_host = self.host.call(self)
+        self.host = resolved_host
+      end
+
+      # Require at least one host.
+      if !self.host || self.host.empty?
+        abort("ERROR: Unable to resolve build host.")
+      end
+
       puts "Packaging #{commit} from #{remote_url} for \"#{project}\" on #{host}..."
 
       # Make sure the folder to save the artifact to locally exists.
@@ -69,7 +79,16 @@ module Harrison
       remote_exec("rm -rf #{build_dir} && mkdir -p #{build_dir}")
 
       # Check out target commit into the build_dir.
-      remote_exec("cd cached && GIT_WORK_TREE=../#{build_dir} git checkout --detach -f #{commit} && git checkout -f -") # TODO: When git is upgraded: --ignore-other-worktrees
+      checkout_failure = catch :failure do
+        remote_exec("cd cached && GIT_WORK_TREE=../#{build_dir} git checkout --detach -f #{commit} && git checkout -f -") # TODO: When git is upgraded: --ignore-other-worktrees
+
+        # We want "checkout_failure" to be false if nothing was caught.
+        false
+      end
+
+      if checkout_failure
+        abort("ERROR: Unable to checkout requested git reference '#{commit}' on build server, ensure you have pushed the requested branch or tag to the remote repo.")
+      end
 
       # Run user supplied build code in the context of the checked out code.
       begin

data/lib/harrison/version.rb

@@ -1,3 +1,3 @@
 module Harrison
-  VERSION = "0.6.0"
+  VERSION = "0.7.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: harrison
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Jesse Scott
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-19 00:00:00.000000000 Z
+date: 2018-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop
@@ -207,7 +207,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Simple artifact-based deployment for web applications.