revision 1.2.7 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 682306be7408f18b9346de0b36dc9b98b1fc104209191bbb6cba601b9cba0509
-  data.tar.gz: 0c48f5c2952dc1a2abe7c68010d708b48a93ad3da4fc63d9d031f05846f610d0
+  metadata.gz: d52b5583cb4ae656d41eb5389156de53000fedd75980cda75e21b97ff9a81a4f
+  data.tar.gz: f2c5381a07f171f9d5bb45f09edf6465bc1a8666adaf293db0820a58282c2a49
 SHA512:
-  metadata.gz: 55a4cefdae2b4014f90fad6c36865ad69745baa6e0b2944a41f37fc68632dc38d1487dd420210425cab22e555f01d1352d92db491dbc441206e3d2d06c4a8a8b
-  data.tar.gz: '0369665bfdd54f97bdb1f7cf92c5f530199cd5beb80fb0b1cd7440060767786014285549f9a6bc7207ecee17ab8bdd848a11dd83fa38f1885aa88c42710189f1'
+  metadata.gz: 341c226a4413b6e43b49ecd073ee87431c989d209f27f3bbf5d2c0e871d9998c2fbb8f67d7cb2161260d379e74695694be0a055b9f23b8975f0d172da952ef44
+  data.tar.gz: f0aa801651600773e6764a51c88316920276d6ee9bf38d03351fcc534835a7d0bc167e97dcf5b8ac4c78b58234d04072f3dfe968007f8cef08693e501c42c69b

data/README.org

@@ -49,6 +49,11 @@
 
 ** From source
 
+   #+BEGIN_SRC sh
+git clone git@git.nmd.ie/lib/
+   #+END_SRC
+
+
 *** Checkout
 
     #+BEGIN_SRC sh

data/lib/revision/cli.rb

@@ -128,7 +128,7 @@ module Revision
       if ask("Rebuild and archive any releasables (Y/n)?").upcase!='N'
         r.package
       end
-      if ask("Commit changes to existing files and add a Git tag (y/N)?").upcase=='Y'
+      if ask("Commit changes to existing files and add a Git tag (Y/n)?").upcase!='N'
         r.tag
         if ask("Push changes/tag to origin (Y/n)?").upcase=='N' || !r.push
           say "To push from the command line, type 'git push --tags' at a shell prompt"

data/lib/revision/releasable.rb

@@ -88,6 +88,20 @@ module Revision
       EOT
     end
 
+    def exec_pipeline(type, steps, skip_steps=0)
+      exec_steps = steps[skip_steps..-1]
+      puts "{type} :: Executing steps #{skip_steps+1} to #{steps.length}..."
+      Dir.chdir(@root) do
+        exec_steps.each_with_index do |step, index|
+          step_index = index+1+skip_steps
+          puts "... (#{step_index}/#{steps.length}) #{step}"
+          system(step)
+          puts "{type} :: WARNING: step #{step_index}: #{step} exit status #{$?.exitstatus}" unless $?.exitstatus.zero?
+        end
+      end
+
+    end
+
     def build(skip_steps = 0)
       if @build_def.dig(:environment, :variables)
         @build_def[:environment][:variables].each do |key, value|
@@ -105,16 +119,17 @@ module Revision
           ENV[key] = value
         end
       end
-      steps = @build_def[:steps][skip_steps..-1]
-      puts "Executing #{steps.length} of #{@build_def[:steps].length} build steps..."
-      Dir.chdir(@root) do
-        steps.each_with_index do |step, index|
-          step_index = index+1+skip_steps
-          puts "... (#{step_index}/#{@build_def[:steps].length}) #{step}"
-          system(step)
-          puts "WARNING: build step #{step_index}: #{step} exit status #{$?.exitstatus}" unless $?.exitstatus.zero?
-        end
-      end
+      exec_pipeline('build', @build_def[:steps], skip_steps)
+      # steps = @build_def[:steps][skip_steps..-1]
+      # puts "Executing #{steps.length} of #{@build_def[:steps].length} build steps..."
+      # Dir.chdir(@root) do
+      #   steps.each_with_index do |step, index|
+      #     step_index = index+1+skip_steps
+      #     puts "... (#{step_index}/#{@build_def[:steps].length}) #{step}"
+      #     system(step)
+      #     puts "WARNING: build step #{step_index}: #{step} exit status #{$?.exitstatus}" unless $?.exitstatus.zero?
+      #   end
+      # end
     end
 
     def tag_id
@@ -189,13 +204,22 @@ module Revision
         File.delete(archive_name)
       end
       Zip::File.open(archive_name, Zip::File::CREATE) do |zipfile|
-        artefact_map.each { |src, dest| zipfile.add(dest,src) }
+        artefact_map.each do |src, dest|
+          #TODO: Add directory processing....
+          zipfile.add(dest,src)
+        end
         puts "... embedding revision history as #{changelog_name} "
         zipfile.get_output_stream(changelog_name) { |os| output_changelog(os)}
       end
+
+      if @config.dig(:archive)
+        archive_root = File.expand_path(@config[:archive])
+        puts "... moving #{archive_name} to #{archive_root}"
+        FileUtils.mkdir_p(archive_root)
+        FileUtils.mv(archive_name, archive_root)
+      end
     end
 
-    # def deploy(destination)
     def deploy(destination='')
       if destination=='' and @config.dig(:deploy, :dest)
         destination = @config[:deploy][:dest]
@@ -204,9 +228,22 @@ module Revision
       raise Errors::NotSpecified.new(':deploy/:dest') if destination==''
       destination = File.expand_path(destination)
 
+      if @config.dig(:deploy, :pre)
+        exec_pipeline('deploy (pre)', @config[:deploy][:pre])
+      end
+
       puts "Deploying #{@artefacts.length} build artefacts to #{destination}..."
-      artefact_map(destination).each { |src, dest| FileUtils.cp(src,dest) }
-      #TODO Add changelog
+      artefact_map(destination).each do |src, dest|
+        if File.exist?(dest)
+          puts "... deleting existing '#{dest}'"
+          FileUtils.rm_rf(dest)
+        end
+        FileUtils.cp_r(src,dest)
+      end
+      File.open(File.join(destination,changelog_name),'w') { |f| output_changelog(f)}
+      if @config.dig(:deploy, :post)
+        exec_pipeline('deploy (post)', @config[:deploy][:post])
+      end
     end
 
     def package

data/lib/revision/version.rb

@@ -1,10 +1,21 @@
 # Defines the revision ID for the revision gem
 module Revision
-  VERSION = "1.2.7"
+  VERSION = "1.3.1"
 end
 
 # <BEGIN CHANGELOG>
 # 
+# Version 1.3.1 (20 May 2019)
+# - Corrected bug when deploying changelog:w
+# 
+# Version 1.3.0 (20 May 2019)
+# - Added :archive: (archive root definition)
+# - Added optional :pre: and :post: steps to :deploy: definition
+# 
+# Version 1.2.8 (20 May 2019)
+# - Updated Git tag/commit behaviour -- now commit/tag/push by default
+# - Updated deploy to remove existing targets and copy entire directory trees
+# 
 # Version 1.2.7 (17 May 2019)
 # - 'deploy' now expands '~' in paths
 # 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: revision
 version: !ruby/object:Gem::Version
-  version: 1.2.7
+  version: 1.3.1
 platform: ruby
 authors:
 - Cormac Cannon
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-05-17 00:00:00.000000000 Z
+date: 2019-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor