release_manager 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d6069b076747b74494e4aaf2d464abd5436d742b
-  data.tar.gz: 277bbc9bb132f094ccf4cdcc7a761741cd92eaef
+  metadata.gz: 1e186490a7357d97daefeaf8337a6de1fb1f12dd
+  data.tar.gz: b9f2e85a0497c460847291524f598e151988b28c
 SHA512:
-  metadata.gz: 892cde4d6302725ada12b0b1e89f2854d61fac8d375492b1916a5d5d8e5cce99c6871107a2f8cac1bdd1a5cf2b51427297fdd7c0501448d7e6530ac9bd72ce46
-  data.tar.gz: 1fbc83551bdb199c07ea26835e98e0d9ddff4195de16ff5845419dff6f665b4024dd2518dc74322cd8ae381e7941b00372de578ae18c66687f9f60a3938b0486
+  metadata.gz: 93b5fdde39f5917395ad9743a91a41c6be41cc3845d2e01271980015af99c6f03ec940ad908c0a4c968159aaec22c86fa7f65f7d5882b9c377dfb3d13ede8813
+  data.tar.gz: 1624f3df2c269bbc2128c5d5afce001f0856f3581a11f55024e7ae6367b83e6291c21e2dbd55407f40952e2d4efda63fe44b15c78f13b90a3a6d92d921f55a79

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Release Manager
 
+## Unreleased
+
+## 0.8.1
+ * Improves error handling when tags already exist
+ * Fixes #12 - deploy-r10k does not write a patch file
 ## 0.8.0
  * Allows for creating sandboxes from different targets
  * Allow for releasing one off patches with release-mod

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    release_manager (0.8.0)
+    release_manager (0.8.1)
       gitlab (~> 4.2.0)
       highline (~> 1.7)
       rugged (~> 0.26)

data/README.md

@@ -308,11 +308,11 @@ uses the version in metadata.json file as a reference and increments to semver i
 
 Follow the steps below to create a new patch release and deploy straight to production
 
-1. Create a new sandbox based on the branch or tag you want to fix. `sandbox-create -s v0.5.0 -n patch_0.5.1`
+1. Create a new sandbox based on the branch or tag you want to fix. `sandbox-create -s upstream/v0.5.0 -n patch_0.5.1`
 2. cd ~/repos/r10k-control
 3. Make your changes in that branch and update the changelog
-4. Push your code to the remote Git repo and activate your CI pipeline (optional)
-5. Release the new version `release-mod -l patch -s patch_0.5.1`  (creates tag v0.5.1)
+4. Push your code to the remote Git repo and activate your CI pipeline (recommended)
+5. Release the new version `release-mod -l patch -s patch_0.5.1`  (creates tag v0.5.1 from the sandbox)
 6. Deploy the patch release to production `deploy-r10k -s v0.5.1 -d production`
 
 ## Configuration Settings

data/lib/release_manager/git/utilites.rb

@@ -255,8 +255,10 @@ module ReleaseManager
       # @param [String] file - the path to the patch file you want to apply
       def apply_patch(file)
         # TODO: change this to rugged implementation
+        empty = File.read(file).length < 1
         logger.info("Applying patch #{file}")
         output = ''
+        logger.debug("The patch file is empty for some reason") if empty
         Dir.chdir(path) do
           output = `#{git_command} apply #{file} 2>&1`
         end

data/lib/release_manager/r10k_deployer.rb

@@ -99,6 +99,7 @@ class R10kDeployer
     return control_repo.logger.info("nothing to commit or deploy") if diff.deltas.count < 1
     Tempfile.open('git_patch') do |patchfile|
       patchfile.write(diff.patch)
+      patchfile.rewind  # allows us to read from the beginning of the file
       control_repo.apply_patch(patchfile.path)
       control_repo.add_all
     end

data/lib/release_manager/release.rb

@@ -108,33 +108,39 @@ class Release
   # currently this must be done manually by a release manager
   #
   def release
-    unless auto_release?
-      print "Have you merged your code?  Did you fetch and rebase against the upstream?  Want to continue (y/n)?: ".yellow
-      answer = gets.downcase.chomp
-      if answer == 'n'
-        return false
+    begin
+      unless auto_release?
+        print "Have you merged your code?  Did you fetch and rebase against the upstream?  Want to continue (y/n)?: ".yellow
+        answer = gets.downcase.chomp
+        if answer == 'n'
+          return false
+        end
       end
-    end
 
-    # updates the metadata.json file to the next version
-    bump
-    # updates the changelog to the next version based on the metadata file
-    id = bump_log
-    # tags the r10k-module with the version found in the metadata.json file
-    tag(id)
-    # pushes the updated code and tags to the upstream repo
-    if auto_release?
-     push
-     return
-    end
-    print "Ready to release version #{version} to #{puppet_module.source}\n and forever change history(y/n)?: ".yellow
-    answer = gets.downcase.chomp
-    if answer == 'y'
-      push
-      $?.success?
-    else
-      puts "Nah, forget it, this release wasn't that cool anyways.".yellow
-      false
+      # updates the metadata.json file to the next version
+      bump
+      # updates the changelog to the next version based on the metadata file
+      id = bump_log
+      # tags the r10k-module with the version found in the metadata.json file
+      tag(id)
+      # pushes the updated code and tags to the upstream repo
+      if auto_release?
+       push
+       return
+      end
+      print "Ready to release version #{version} to #{puppet_module.source}\n and forever change history(y/n)?: ".yellow
+      answer = gets.downcase.chomp
+      if answer == 'y'
+        push
+        $?.success?
+      else
+        puts "Nah, forget it, this release wasn't that cool anyways.".yellow
+        false
+      end
+    rescue Rugged::TagError => e
+      logger.fatal(e.message)
+      logger.fatal("You might need to rebase your branch")
+      exit 1
     end
   end
 

data/lib/release_manager/remote_release.rb

@@ -9,25 +9,31 @@ class RemoteRelease < Release
   # currently this must be done manually by a release manager
   #
   def release
-    unless auto_release?
-      print "Have you merged your code?  Did you fetch and rebase against the upstream?  Want to continue (y/n)?: ".yellow
-      answer = gets.downcase.chomp
-      if answer == 'n'
-        return false
-      end
-      print "Ready to release version #{version.next} to #{puppet_module.source}\n and forever change history(y/n)?: ".yellow
-      answer = gets.downcase.chomp
-      if answer != 'y'
-        puts "Nah, forget it, this release wasn't that cool anyways.".yellow
-        return false
+    begin
+      unless auto_release?
+        print "Have you merged your code?  Did you fetch and rebase against the upstream?  Want to continue (y/n)?: ".yellow
+        answer = gets.downcase.chomp
+        if answer == 'n'
+          return false
+        end
+        print "Ready to release version #{version.next} to #{puppet_module.source}\n and forever change history(y/n)?: ".yellow
+        answer = gets.downcase.chomp
+        if answer != 'y'
+          puts "Nah, forget it, this release wasn't that cool anyways.".yellow
+          return false
+        end
       end
+      # updates the metadata.js file to the next version
+      bump
+      # updates the changelog to the next version based on the metadata file
+      id = bump_log
+      # tags the r10k-module with the version found in the metadata.json file
+      tag(id)
+    rescue Rugged::TagError => e
+      logger.fatal(e.message)
+      logger.fatal("You might need to rebase your branch")
+      exit 1
     end
-    # updates the metadata.js file to the next version
-    bump
-    # updates the changelog to the next version based on the metadata file
-    id = bump_log
-    # tags the r10k-module with the version found in the metadata.json file
-    tag(id)
   end
 
   def run

data/lib/release_manager/version.rb

@@ -1,3 +1,3 @@
 module ReleaseManager
-  VERSION = "0.8.0"
+  VERSION = "0.8.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: release_manager
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Corey Osman
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-12-11 00:00:00.000000000 Z
+date: 2017-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gitlab